Fixes + hues window

kaczy93 · Apr 2, 2024 · a3cd23f · a3cd23f
1 parent 61f4d8e
commit a3cd23f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CentrED/HuesManager.cs b/CentrED/HuesManager.cs
@@ -10,8 +10,8 @@ public class HuesManager
     public static HuesManager Instance => _instance;
 
     public const int HUE_SIZE = 32;
-    public const int TEXTURE_WIDTH = 32 * HUE_SIZE; //32 hues of 32 values per row
-    public const int TEXTURE_HEIGHT = 512; //That's enough to fit 16k textures
+    public const int TEXTURE_WIDTH = 16 * HUE_SIZE; //16 hues of 32 values per row
+    public const int TEXTURE_HEIGHT = 1024; //That's enough to fit 16k textures
     public readonly Texture2D Texture;
     public readonly int HuesCount;
     public readonly string[] Names;
@@ -85,7 +85,7 @@ public Vector4 GetHueVector(ushort hue, bool partial, float alpha = 1)
 
         if (hue != 0)
         {
-            // hue -= 1;
+            hue -= 1;
             mode = partial ? HueMode.PARTIAL : HueMode.HUED;
         }
         else

diff --git a/CentrED/Renderer/Shaders/MapEffect.fx b/CentrED/Renderer/Shaders/MapEffect.fx
@@ -109,7 +109,7 @@ float4 StaticsPSMain(PSInput pin) : SV_Target0
 
     if (mode == HUED || (mode == PARTIAL && color.r == color.g && color.r == color.b))
     {
-        float2 hue = float2(floor(pin.Hue.x % 32) / 32 + color.r / 32, floor(pin.Hue.x / 32) / 512);
+        float2 hue = float2(frac(pin.Hue.x / 16) + color.r / 16, (pin.Hue.x + 1) / 16 / 1024);
         color.rgb = tex2D(HueSampler, hue).rgb;
     }
     else if (mode == RGB)

diff --git a/CentrED/Renderer/Shaders/MapEffect.fxc b/CentrED/Renderer/Shaders/MapEffect.fxc
diff --git a/CentrED/UI/Windows/HuesWindow.cs b/CentrED/UI/Windows/HuesWindow.cs
@@ -306,7 +306,7 @@ private void DrawHueRow(int index)
                 CEDGame.UIManager.DrawImage
                 (
                     HuesManager.Instance.Texture,
-                    new Rectangle(0, index - 1, 32, 1),
+                    new Rectangle((index - 1) % 16 * 32, index / 16, 32, 1),
                     new Vector2(ImGui.GetContentRegionAvail().X, _hueRowHeight)
                 );
             }