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

fix gui colors for #36

This commit is contained in:
Bella 2020-03-02 10:32:46 -05:00
parent fb0593850f
commit 54f6a15430
6 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiEnumButtonUI.java
View File

@ -9,6 +9,8 @@ import org.lwjgl.opengl.GL11;
import java.awt.*;
import static me.zeroeightsix.kami.util.ColourConverter.toF;
import static me.zeroeightsix.kami.util.ColourSet.enumColour;
import static org.lwjgl.opengl.GL11.*;
/**
@ -48,7 +50,7 @@ public class KamiEnumButtonUI extends AbstractComponentUI<EnumButton> {
float downscale = 1.1f;
glDisable(GL_TEXTURE_2D);
glColor3f(.60f, .56f, 1.00f); // SEARCHCOLOUR: Enum and Bind Colours
glColor3f(toF(enumColour.getRed()), toF(enumColour.getGreen()), toF(enumColour.getBlue())); // SEARCHCOLOUR: Enum and Bind Colours
glBegin(GL_LINES);
{
glVertex2d(startX, height / downscale);

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

@ -49,7 +49,7 @@ public class KamiFrameUI<T extends Frame> extends AbstractComponentUI<Frame> {
glColor4f(.17f, .17f, .18f, .9f);
RenderHelper.drawFilledRectangle(0, 0, component.getWidth(), component.getHeight()); // Main window
glColor3f(componentWindowOutline.getRed(), componentWindowOutline.getGreen(), componentWindowOutline.getBlue());
glColor3f(toF(componentWindowOutline.getRed()), toF(componentWindowOutline.getGreen()), toF(componentWindowOutline.getBlue()));
glLineWidth(componentWindowOutlineWidth);
RenderHelper.drawRectangle(0, 0, component.getWidth(), component.getHeight()); // Border / Outline
@ -106,9 +106,9 @@ public class KamiFrameUI<T extends Frame> extends AbstractComponentUI<Frame> {
if (component.isPinnable()) {
if (component.isPinned())
glColor3f(componentPinnedColour.getRed(), componentPinnedColour.getGreen(), componentPinnedColour.getBlue());
glColor3f(toF(componentPinnedColour.getRed()), toF(componentPinnedColour.getGreen()), toF(componentPinnedColour.getBlue()));
else
glColor3f(componentUnpinnedColour, componentUnpinnedColour, componentUnpinnedColour);
glColor3f(toF(componentUnpinnedColour), toF(componentUnpinnedColour), toF(componentUnpinnedColour));
RenderHelper.drawCircle(7, 4, 2f);
glLineWidth(3f);
glBegin(GL_LINES);
@ -120,7 +120,7 @@ public class KamiFrameUI<T extends Frame> extends AbstractComponentUI<Frame> {
}
if (component.equals(xLineComponent)) {
glColor3f(componentLineColour, componentLineColour, componentLineColour);
glColor3f(toF(componentLineColour), toF(componentLineColour), toF(componentLineColour));
glLineWidth(1f);
glBegin(GL_LINES);
{

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

@ -6,6 +6,7 @@ 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 static me.zeroeightsix.kami.util.ColourConverter.toF;
import static me.zeroeightsix.kami.util.ColourSet.*;
import static org.lwjgl.opengl.GL11.*;
@ -16,12 +17,12 @@ public class RootCheckButtonUI<T extends CheckButton> extends AbstractComponentU
@Override
public void renderComponent(CheckButton component, FontRenderer ff) {
glColor4f(checkButtonBackgroundColour.getRed(), checkButtonBackgroundColour.getGreen(), checkButtonBackgroundColour.getBlue(), component.getOpacity());
glColor4f(toF(checkButtonBackgroundColour.getRed()), toF(checkButtonBackgroundColour.getGreen()), toF(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());
glColor3f(checkButtonBackgroundColourOther, toF(checkButtonBackgroundColour.getGreen()), toF(checkButtonBackgroundColour.getBlue()));
}
if (component.isHovered() || component.isPressed()) {
glColor4f(checkButtonBackgroundColourHover.getRed(), checkButtonBackgroundColourHover.getGreen(), checkButtonBackgroundColourHover.getBlue(), component.getOpacity());
glColor4f(toF(checkButtonBackgroundColourHover.getRed()), toF(checkButtonBackgroundColourHover.getGreen()), toF(checkButtonBackgroundColourHover.getBlue()), component.getOpacity());
}
String text = component.getName();

11
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.ColourConverter.toF;
import static me.zeroeightsix.kami.util.ColourSet.*;
import static org.lwjgl.opengl.GL11.*;
@ -19,18 +20,18 @@ public class RootColorizedCheckButtonUI extends RootCheckButtonUI<ColorizedCheck
RootSmallFontRenderer ff = new RootSmallFontRenderer();
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());
checkButtonBackgroundColour = new Color(toF(200), toF(checkButtonBackgroundColour.getGreen()), toF(checkButtonBackgroundColour.getBlue()));
checkButtonBackgroundColourHover = new Color(toF(255), toF(checkButtonBackgroundColourHover.getGreen()), toF(checkButtonBackgroundColourHover.getBlue()));
}
@Override
public void renderComponent(CheckButton component, FontRenderer aa) {
glColor4f(checkButtonBackgroundColour.getRed() / 255f, checkButtonBackgroundColour.getGreen() / 255f, checkButtonBackgroundColour.getBlue() / 255f, component.getOpacity());
glColor4f(toF(checkButtonBackgroundColour.getRed()), toF(checkButtonBackgroundColour.getGreen()), toF(checkButtonBackgroundColour.getBlue()), component.getOpacity());
if (component.isHovered() || component.isPressed()) {
glColor4f(checkButtonBackgroundColourHover.getRed() / 255f, checkButtonBackgroundColourHover.getGreen() / 255f, checkButtonBackgroundColourHover.getBlue() / 255f, component.getOpacity());
glColor4f(toF(checkButtonBackgroundColourHover.getRed()), toF(checkButtonBackgroundColourHover.getGreen()), toF(checkButtonBackgroundColourHover.getBlue()), component.getOpacity());
}
if (component.isToggled()) {
glColor3f(checkButtonBackgroundColour.getRed() / 255f, checkButtonBackgroundColour.getGreen() / 255f, checkButtonBackgroundColour.getBlue() / 255f);
glColor3f(toF(checkButtonBackgroundColour.getRed()), toF(checkButtonBackgroundColour.getGreen()), toF(checkButtonBackgroundColour.getBlue()));
}
// RenderHelper.drawRoundedRectangle(0,0,component.getWidth(), component.getHeight(), 3f);

8
src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/RootSliderUI.java
View File

@ -7,6 +7,8 @@ import me.zeroeightsix.kami.gui.rgui.component.use.Slider;
import me.zeroeightsix.kami.gui.rgui.render.AbstractComponentUI;
import me.zeroeightsix.kami.gui.rgui.render.font.FontRenderer;
import static me.zeroeightsix.kami.util.ColourConverter.toF;
import static me.zeroeightsix.kami.util.ColourSet.sliderColour;
import static org.lwjgl.opengl.GL11.*;
/**
@ -18,7 +20,7 @@ public class RootSliderUI extends AbstractComponentUI<Slider> {
@Override
public void renderComponent(Slider component, FontRenderer aa) {
glColor4f(1, 0.33f, 0.33f, component.getOpacity());
glColor4f(toF(sliderColour.getRed()), toF(sliderColour.getGreen()), toF(sliderColour.getBlue()), component.getOpacity());
glLineWidth(2.5f);
int height = component.getHeight();
double value = component.getValue();
@ -35,12 +37,12 @@ public class RootSliderUI extends AbstractComponentUI<Slider> {
glVertex2d(component.getWidth(), height / downscale);
}
glEnd();
glColor3f(1, 0.33f, 0.33f);
glColor3f(toF(sliderColour.getRed()), toF(sliderColour.getGreen()), toF(sliderColour.getBlue()));
RenderHelper.drawCircle((int) w, height / downscale, 2f);
String s = value + "";
if (component.isPressed()) {
w -= smallFontRenderer.getStringWidth(s) / 2;
w -= smallFontRenderer.getStringWidth(s) / 2f;
w = Math.max(0, Math.min(w, component.getWidth() - smallFontRenderer.getStringWidth(s)));
smallFontRenderer.drawString((int) w, 0, s);
} else {

16
src/main/java/me/zeroeightsix/kami/util/ColourSet.java
View File

@ -11,8 +11,8 @@ import static me.zeroeightsix.kami.util.ColourConverter.toF;
*/
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 Color checkButtonBackgroundColour = new Color(67, 54, 191); // normal colored
public static Color checkButtonBackgroundColourHover = new Color(67, 54, 191); // light colored
public static float checkButtonBackgroundColourOther = .9f;
public static Color checkButtonIdleColourNormal = new Color(200, 200, 200); // lighter grey
@ -33,11 +33,15 @@ public class ColourSet {
// return componentMainWindowArray;
// }
public static Color componentWindowOutline = new Color(toF(116), toF(101), toF(247));
public static Color componentWindowOutline = new Color(116, 101, 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);
public static Color componentPinnedColour = new Color(165, 41, 255);
public static double componentUnpinnedColour = 168.3;
public static double componentLineColour = 112.2;
public static Color sliderColour = new Color(155, 144, 255);
public static Color enumColour = new Color(116, 101, 247);
}