RepoMirrors
/
kami-blue
mirror of https://github.com/kami-blue/client
1
0
Fork 1
Code Issues Releases Wiki Activity

start converting to colourset

This commit is contained in:
Bella 2020-02-13 21:15:02 -05:00
parent 6b3c0d1f26
commit 32a8b47db3
4 changed files with 65 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java
View File

@ -20,6 +20,7 @@ import me.zeroeightsix.kami.util.Wrapper;
import org.lwjgl.opengl.GL11;
import static me.zeroeightsix.kami.util.ColourConverter.toF;
import static me.zeroeightsix.kami.util.ColourSet.*;
import static org.lwjgl.opengl.GL11.*;
/**
@ -47,10 +48,10 @@ public class KamiFrameUI<T extends Frame> extends AbstractComponentUI<Frame> {
glDisable(GL_TEXTURE_2D);
glColor4f(.17f, .17f, .18f, .9f);
RenderHelper.drawFilledRectangle(0, 0, component.getWidth(), component.getHeight());
glColor3f(toF(116), toF(101), toF(247)); // SEARCHCOLOUR: main ui outline color
glLineWidth(1.5f);
RenderHelper.drawRectangle(0, 0, component.getWidth(), component.getHeight());
RenderHelper.drawFilledRectangle(0, 0, component.getWidth(), component.getHeight()); // Main window
glColor3f(componentWindowOutline.getRed(), componentWindowOutline.getGreen(), componentWindowOutline.getBlue());
glLineWidth(componentWindowOutlineWidth);
RenderHelper.drawRectangle(0, 0, component.getWidth(), component.getHeight()); // Border / Outline
GL11.glColor3f(1, 1, 1);
ff.drawString(component.getWidth() / 2 - ff.getStringWidth(component.getTitle()) / 2, 1, component.getTitle());
@ -105,9 +106,9 @@ public class KamiFrameUI<T extends Frame> extends AbstractComponentUI<Frame> {
if (component.isPinnable()) {
if (component.isPinned())
glColor3f(toF(209), toF(150), toF(250)); // SEARCHCOLOUR: Pinned Component colour
glColor3f(componentPinnedColour.getRed(), componentPinnedColour.getGreen(), componentPinnedColour.getBlue());
else
glColor3f(toF(239), toF(217), toF(255));
glColor3f(componentUnpinnedColour, componentUnpinnedColour, componentUnpinnedColour);
RenderHelper.drawCircle(7, 4, 2f);
glLineWidth(3f);
glBegin(GL_LINES);
@ -119,7 +120,7 @@ public class KamiFrameUI<T extends Frame> extends AbstractComponentUI<Frame> {
}
if (component.equals(xLineComponent)) {
glColor3f(.44f, .44f, .44f);
glColor3f(componentLineColour, componentLineColour, componentLineColour);
glLineWidth(1f);
glBegin(GL_LINES);
{

22
src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootCheckButtonUI.java
View File

@ -6,34 +6,22 @@ import me.zeroeightsix.kami.gui.rgui.component.use.CheckButton;
import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI;
import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer;
import java.awt.*;
import static me.zeroeightsix.kami.util.ColourSet.*;
import static org.lwjgl.opengl.GL11.*;
/**
* Created by 086 on 4/08/2017.
*/
public class RootCheckButtonUI<T extends CheckButton> extends AbstractComponentUI<CheckButton> {
// SEARCHCOLOUR: CheckButton Colours
protected Color backgroundColour = new Color(67, 54, 191); // normal
protected Color backgroundColourHover = new Color(67, 54, 191); // light
protected Color idleColourNormal = new Color(200, 200, 200); // lighter grey
protected Color downColourNormal = new Color(190, 190, 190); // light grey
protected Color idleColourToggle = new Color(165, 158, 232); // lighter
protected Color downColourToggle = idleColourToggle.brighter();
@Override
public void renderComponent(CheckButton component, FontRenderer ff) {
glColor4f(backgroundColour.getRed() / 255f, backgroundColour.getGreen() / 255f, backgroundColour.getBlue() / 255f, component.getOpacity());
if (component.isToggled()) {
glColor3f(.9f, backgroundColour.getGreen() / 255f, backgroundColour.getBlue() / 255f);
glColor4f(checkButtonBackgroundColour.getRed(), checkButtonBackgroundColour.getGreen(), checkButtonBackgroundColour.getBlue(), component.getOpacity());
if (component.isToggled()) { // I don't know why the R in this one is separate, 086 wrote it that way
glColor3f(checkButtonBackgroundColourOther, checkButtonBackgroundColour.getGreen(), checkButtonBackgroundColour.getBlue());
}
if (component.isHovered() || component.isPressed()) {
glColor4f(backgroundColourHover.getRed() / 255f, backgroundColourHover.getGreen() / 255f, backgroundColourHover.getBlue() / 255f, component.getOpacity());
glColor4f(checkButtonBackgroundColourHover.getRed(), checkButtonBackgroundColourHover.getGreen(), checkButtonBackgroundColourHover.getBlue(), component.getOpacity());
}
String text = component.getName();

18
src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootColorizedCheckButtonUI.java
View File

@ -8,6 +8,7 @@ import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer;
import java.awt.*;
import static me.zeroeightsix.kami.util.ColourSet.*;
import static org.lwjgl.opengl.GL11.*;
/**
@ -17,20 +18,19 @@ public class RootColorizedCheckButtonUI extends RootCheckButtonUI<ColorizedCheck
RootSmallFontRenderer ff = new RootSmallFontRenderer();
public RootColorizedCheckButtonUI() {
backgroundColour = new Color(200, backgroundColour.getGreen(), backgroundColour.getBlue());
backgroundColourHover = new Color(255, backgroundColourHover.getGreen(), backgroundColourHover.getBlue());
downColourNormal = new Color(190, 190, 190);
public RootColorizedCheckButtonUI() { // why are these values all hardcoded screm aksdlksalkdlk
checkButtonBackgroundColour = new Color(200, checkButtonBackgroundColour.getGreen(), checkButtonBackgroundColour.getBlue());
checkButtonBackgroundColourHover = new Color(255, checkButtonBackgroundColourHover.getGreen(), checkButtonBackgroundColourHover.getBlue());
}
@Override
public void renderComponent(CheckButton component, FontRenderer aa) {
glColor4f(backgroundColour.getRed() / 255f, backgroundColour.getGreen() / 255f, backgroundColour.getBlue() / 255f, component.getOpacity());
glColor4f(checkButtonBackgroundColour.getRed() / 255f, checkButtonBackgroundColour.getGreen() / 255f, checkButtonBackgroundColour.getBlue() / 255f, component.getOpacity());
if (component.isHovered() || component.isPressed()) {
glColor4f(backgroundColourHover.getRed() / 255f, backgroundColourHover.getGreen() / 255f, backgroundColourHover.getBlue() / 255f, component.getOpacity());
glColor4f(checkButtonBackgroundColourHover.getRed() / 255f, checkButtonBackgroundColourHover.getGreen() / 255f, checkButtonBackgroundColourHover.getBlue() / 255f, component.getOpacity());
}
if (component.isToggled()) {
glColor3f(backgroundColour.getRed() / 255f, backgroundColour.getGreen() / 255f, backgroundColour.getBlue() / 255f);
glColor3f(checkButtonBackgroundColour.getRed() / 255f, checkButtonBackgroundColour.getGreen() / 255f, checkButtonBackgroundColour.getBlue() / 255f);
}
// RenderHelper.drawRoundedRectangle(0,0,component.getWidth(), component.getHeight(), 3f);
@ -42,8 +42,8 @@ public class RootColorizedCheckButtonUI extends RootCheckButtonUI<ColorizedCheck
}
glEnd();
Color idleColour = component.isToggled() ? idleColourToggle : idleColourNormal;
Color downColour = component.isToggled() ? downColourToggle : downColourNormal;
Color idleColour = component.isToggled() ? checkButtonIdleColourToggle : checkButtonIdleColourNormal;
Color downColour = component.isToggled() ? checkButtonDownColourToggle : checkButtonDownColourNormal;
glColor3f(1, 1, 1);
glEnable(GL_TEXTURE_2D);

43
src/main/java/me/zeroeightsix/kami/util/ColourSet.java Normal file
View File

@ -0,0 +1,43 @@
package me.zeroeightsix.kami.util;
import java.awt.*;
import static me.zeroeightsix.kami.util.ColourConverter.toF;
/**
* @author S-B99
* Class for all the main GUI colours used by the default kami theme
* mfw I make it easier for skids to customize kami
*/
public class ColourSet {
/* Check Button colours */
public static Color checkButtonBackgroundColour = new Color(toF(67), toF(54), toF(191)); // normal colored
public static Color checkButtonBackgroundColourHover = new Color(toF(67), toF(54), toF(191)); // light colored
public static float checkButtonBackgroundColourOther = .9f;
public static Color checkButtonIdleColourNormal = new Color(200, 200, 200); // lighter grey
public static Color checkButtonDownColourNormal = new Color(190, 190, 190); // light grey
public static Color checkButtonIdleColourToggle = new Color(165, 158, 232); // lighter colored
public static Color checkButtonDownColourToggle = checkButtonIdleColourToggle.brighter();
/* Component colours */
public static Color componentMainWindow = new Color(.17f, .17f, .18f, .9f);
public static float[] componentMainWindowArray;
// public static float[] getComponentMainWindowArray() {
// componentMainWindowArray[0] = .17f;
// componentMainWindowArray[1] = .17f;
// componentMainWindowArray[2] = .18f;
// componentMainWindowArray[3] = .9f;
// return componentMainWindowArray;
// }
public static Color componentWindowOutline = new Color(toF(116), toF(101), toF(247));
public static float componentWindowOutlineWidth = 1.5f;
public static Color componentPinnedColour = new Color(toF(165), toF(41), toF(255));
public static float componentUnpinnedColour = toF(168.3);
public static float componentLineColour = toF(112.2);
}