From 6300ff493fe90fd06162d2f4ce91339c07a50d11 Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Wed, 30 Jul 2025 17:23:41 +0200
Subject: feat(dev): unpleasant gradient cape

---
 .../assets/firmament/gui/config/macros/combos.xml      |   2 +-
 .../assets/firmament/gui/config/macros/wheel.xml       |   2 +-
 .../assets/firmament/shaders/circle_discard_color.fsh  |   7 ++++---
 .../firmament/textures/cape/unpleasant_gradient.png    | Bin 0 -> 176471 bytes
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/assets/firmament/textures/cape/unpleasant_gradient.png

(limited to 'src/main/resources')

diff --git a/src/main/resources/assets/firmament/gui/config/macros/combos.xml b/src/main/resources/assets/firmament/gui/config/macros/combos.xml
index 5141125..91edae3 100644
--- a/src/main/resources/assets/firmament/gui/config/macros/combos.xml
+++ b/src/main/resources/assets/firmament/gui/config/macros/combos.xml
@@ -11,7 +11,7 @@
 							<Panel background="VANILLA" insets="6">
 								<Column>
 									<Row>
-										<Text text="@command" width="280"/>
+										<Text text="@commandR" width="280"/>
 									</Row>
 									<Row>
 										<Text text="@formattedCombo" width="250"/>
diff --git a/src/main/resources/assets/firmament/gui/config/macros/wheel.xml b/src/main/resources/assets/firmament/gui/config/macros/wheel.xml
index 19922fe..80826c9 100644
--- a/src/main/resources/assets/firmament/gui/config/macros/wheel.xml
+++ b/src/main/resources/assets/firmament/gui/config/macros/wheel.xml
@@ -24,7 +24,7 @@
 										</Align>
 									</Row>
 									<Array data="@commands">
-										<Text text="@text" width="280"/>
+										<Text text="@textR" width="280"/>
 									</Array>
 								</Column>
 							</Panel>
diff --git a/src/main/resources/assets/firmament/shaders/circle_discard_color.fsh b/src/main/resources/assets/firmament/shaders/circle_discard_color.fsh
index ae46059..8fcd99f 100644
--- a/src/main/resources/assets/firmament/shaders/circle_discard_color.fsh
+++ b/src/main/resources/assets/firmament/shaders/circle_discard_color.fsh
@@ -3,8 +3,9 @@
 in vec4 vertexColor;
 in vec2 texCoord0;
 
-uniform vec4 ColorModulator;
-uniform float InnerCutoutRadius;
+layout(std140) uniform CutoutRadius {
+	float InnerCutoutRadius;
+};
 
 out vec4 fragColor;
 
@@ -18,5 +19,5 @@ void main() {
 	{
 		discard;
 	}
-	fragColor = color * ColorModulator;
+	fragColor = color;
 }
diff --git a/src/main/resources/assets/firmament/textures/cape/unpleasant_gradient.png b/src/main/resources/assets/firmament/textures/cape/unpleasant_gradient.png
new file mode 100644
index 0000000..da2eb85
Binary files /dev/null and b/src/main/resources/assets/firmament/textures/cape/unpleasant_gradient.png differ
-- 
cgit