diff options
Diffstat (limited to 'src/main/java/io/polyfrost/oneconfig/renderer')
-rw-r--r-- | src/main/java/io/polyfrost/oneconfig/renderer/Renderer.java | 25 | ||||
-rw-r--r-- | src/main/java/io/polyfrost/oneconfig/renderer/TrueTypeFont.java | 6 |
2 files changed, 20 insertions, 11 deletions
diff --git a/src/main/java/io/polyfrost/oneconfig/renderer/Renderer.java b/src/main/java/io/polyfrost/oneconfig/renderer/Renderer.java index 03aafdd..012fdc8 100644 --- a/src/main/java/io/polyfrost/oneconfig/renderer/Renderer.java +++ b/src/main/java/io/polyfrost/oneconfig/renderer/Renderer.java @@ -41,13 +41,8 @@ public class Renderer extends Gui { } public static void drawRegularPolygon(double x, double y, int radius, int sides, int color, double lowerAngle, double upperAngle) { - float f3 = (float) (color >> 24 & 255) / 255.0F; - float f = (float) (color >> 16 & 255) / 255.0F; - float f1 = (float) (color >> 8 & 255) / 255.0F; - float f2 = (float) (color & 255) / 255.0F; - GL11.glDisable(GL11.GL_TEXTURE_2D); - GlStateManager.color(f, f1, f2, f3); + setGlColor(color); GlStateManager.enableBlend(); GlStateManager.disableAlpha(); worldRenderer.begin(GL11.GL_POLYGON, DefaultVertexFormats.POSITION); @@ -121,4 +116,22 @@ public class Renderer extends Gui { return new Color(f, f1, f2, f3); } + /** + * Set GL color from the given Color variable. + */ + public static void setGlColor(Color color) { + GlStateManager.color(color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f); + } + + /** + * Set GL color from the given color as an Integer. + */ + public static void setGlColor(int color) { + float f1 = (float) (color >> 8 & 255) / 255.0F; + float f = (float) (color >> 16 & 255) / 255.0F; + float f2 = (float) (color & 255) / 255.0F; + float f3 = (float) (color >> 24 & 255) / 255.0F; + GlStateManager.color(f,f1,f2,f3); + } + } diff --git a/src/main/java/io/polyfrost/oneconfig/renderer/TrueTypeFont.java b/src/main/java/io/polyfrost/oneconfig/renderer/TrueTypeFont.java index 01901eb..9a51e68 100644 --- a/src/main/java/io/polyfrost/oneconfig/renderer/TrueTypeFont.java +++ b/src/main/java/io/polyfrost/oneconfig/renderer/TrueTypeFont.java @@ -310,10 +310,6 @@ public class TrueTypeFont { public void drawString(String text, float x, float y, float scaleX, float scaleY, int format, int color) { - float f = (float) (color >> 16 & 255) / 255.0F; - float f1 = (float) (color >> 8 & 255) / 255.0F; - float f3 = (float) (color >> 24 & 255) / 255.0F; - float f2 = (float) (color & 255) / 255.0F; int startIndex = 0; int endIndex = text.length() - 1; IntObject intObject; @@ -360,7 +356,7 @@ public class TrueTypeFont { GlStateManager.enableAlpha(); GlStateManager.enableBlend(); - GlStateManager.color(f, f1, f2, f3); + Renderer.setGlColor(color); while (i >= startIndex && i <= endIndex) { charCurrent = text.charAt(i); if (charCurrent < 256) { |