From 52cbc6fb947611392fdd99bc5f5dcf1f92cac84b Mon Sep 17 00:00:00 2001 From: Bella Date: Tue, 11 Feb 2020 19:27:13 -0500 Subject: [PATCH] add a colourconverter --- .../kami/gui/kami/theme/kami/KamiEnumButtonUI.java | 2 +- .../kami/gui/kami/theme/kami/KamiFrameUI.java | 3 ++- .../me/zeroeightsix/kami/util/ColourConverter.java | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/main/java/me/zeroeightsix/kami/util/ColourConverter.java diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiEnumButtonUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiEnumButtonUI.java index 73b069c06..f4dadd381 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiEnumButtonUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiEnumButtonUI.java @@ -48,7 +48,7 @@ public class KamiEnumButtonUI extends AbstractComponentUI { float downscale = 1.1f; glDisable(GL_TEXTURE_2D); - glColor3f(.60f, .56f, 1.00f); // ENUM AND BIND COLORS + glColor3f(.60f, .56f, 1.00f); // SEARCHCOLOUR: Enum and Bind Colours glBegin(GL_LINES); { glVertex2d(startX, height / downscale); diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java index f7767a281..00bb18001 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/theme/kami/KamiFrameUI.java @@ -19,6 +19,7 @@ import me.zeroeightsix.kami.util.ColourHolder; import me.zeroeightsix.kami.util.Wrapper; import org.lwjgl.opengl.GL11; +import static me.zeroeightsix.kami.util.ColourConverter.toF; import static org.lwjgl.opengl.GL11.*; /** @@ -47,7 +48,7 @@ public class KamiFrameUI extends AbstractComponentUI { glColor4f(.17f, .17f, .18f, .9f); RenderHelper.drawFilledRectangle(0, 0, component.getWidth(), component.getHeight()); - glColor3f(.60f, .56f, 1.00f); + glColor3f(toF(116), toF(101), toF(247)); // SEARCHCOLOUR: main ui outline color glLineWidth(1.5f); RenderHelper.drawRectangle(0, 0, component.getWidth(), component.getHeight()); diff --git a/src/main/java/me/zeroeightsix/kami/util/ColourConverter.java b/src/main/java/me/zeroeightsix/kami/util/ColourConverter.java new file mode 100644 index 000000000..0d9f3d741 --- /dev/null +++ b/src/main/java/me/zeroeightsix/kami/util/ColourConverter.java @@ -0,0 +1,10 @@ +package me.zeroeightsix.kami.util; + +/** + * @author S-B99 + */ +public class ColourConverter { + public static float toF(int i) { + return i / 255f; + } +}