diff options
| author | syeyoung <cyong06@naver.com> | 2021-02-06 14:43:37 +0900 |
|---|---|---|
| committer | syeyoung <cyong06@naver.com> | 2021-02-06 14:43:37 +0900 |
| commit | e7d6517b2e1fb4aa7a5993e53739006a3fca39c8 (patch) | |
| tree | ab097980bcd8809c2bcfa55b832367fd44f38036 /src/main/java/kr/syeyoung/dungeonsguide/gui/elements | |
| parent | 5f51b33a4f19454072c92638e040647d4a3f6f38 (diff) | |
| download | Skyblock-Dungeons-Guide-e7d6517b2e1fb4aa7a5993e53739006a3fca39c8.tar.gz Skyblock-Dungeons-Guide-e7d6517b2e1fb4aa7a5993e53739006a3fca39c8.tar.bz2 Skyblock-Dungeons-Guide-e7d6517b2e1fb4aa7a5993e53739006a3fca39c8.zip | |
THE period to gui overhaul
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide/gui/elements')
| -rw-r--r-- | src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MEditableAColor.java | 5 | ||||
| -rw-r--r-- | src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MPortableColorEdit.java | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MEditableAColor.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MEditableAColor.java index 61b506c3..fb4ba784 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MEditableAColor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MEditableAColor.java @@ -45,10 +45,7 @@ public class MEditableAColor extends MPanel { int x = (rectangle.width - getSize().width) / 2; int y = (rectangle.height - getSize().height) / 2; - if (color.isChroma()) - Gui.drawRect(x,y,x+getSize().width,y+getSize().height, RenderUtils.getChromaColorAt(absMousex - relMousex0, absMousey - relMousey0, color.getChromaSpeed())); - else - Gui.drawRect(x,y,x+getSize().width,y+getSize().height, getColor().getRGB()); + Gui.drawRect(x,y,x+getSize().width,y+getSize().height, RenderUtils.getColorAt(absMousex - relMousex0, absMousey - relMousey0, color)); Gui.drawRect(x,y,x+getSize().width,y+1, 0xff333333); Gui.drawRect(x,y,x+1,y+getSize().height, 0xff333333); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MPortableColorEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MPortableColorEdit.java index fd4d49dc..360b4f0c 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MPortableColorEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/gui/elements/MPortableColorEdit.java @@ -82,7 +82,7 @@ public class MPortableColorEdit extends MPanel { GL11.glBegin(GL11.GL_TRIANGLES); - rgb = RenderUtils.getChromaColorAt(0,0, chromaSpeed); + rgb = RenderUtils.getChromaColorAt(0,0, chromaSpeed, hsv[1], hsv[2], alpha); r = (rgb >> 16 & 255) / 255.0f; g = (rgb >> 8 & 255) / 255.0f; b = (rgb & 255) / 255.0f; |