From 2a4a5b9f8f01d3c3fd1c8e52afe2d5e7b4c1c022 Mon Sep 17 00:00:00 2001
From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date: Fri, 24 Nov 2023 16:46:21 +0100
Subject: [PATCH] Screen Tiling Bug Fix + Filter Slots (#584)

* fixed weird bug

* slots for filters
---
 Assets/Scripts/Games/Global/Filter.cs | 6 +++---
 Assets/Scripts/Minigames.cs           | 2 +-
 Assets/Scripts/ScreenTiling.cs        | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Assets/Scripts/Games/Global/Filter.cs b/Assets/Scripts/Games/Global/Filter.cs
index 3f0683d5..96bb56da 100644
--- a/Assets/Scripts/Games/Global/Filter.cs
+++ b/Assets/Scripts/Games/Global/Filter.cs
@@ -119,13 +119,13 @@ namespace HeavenStudio.Games.Global
             {
                 if (e.beat > songPosBeat) continue;
                 var func = Util.EasingFunction.GetEasingFunction((Util.EasingFunction.Ease)e["ease"]);
-                int track = (int)e["track"];
+                int slot = e["slot"];
                 float normalizedBeat = Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(e.beat, e.length));
 
                 float intensity = func(1 - e["start"], 1 - e["end"], normalizedBeat);
 
-                amplifies[track - 1].LutTexture = amplifyTextures[(int)e["filter"]];
-                amplifies[track - 1].BlendAmount = intensity;
+                amplifies[slot - 1].LutTexture = amplifyTextures[(int)e["filter"]];
+                amplifies[slot - 1].BlendAmount = intensity;
             }
         }
 
diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs
index 985d5f63..c15345f5 100644
--- a/Assets/Scripts/Minigames.cs
+++ b/Assets/Scripts/Minigames.cs
@@ -791,7 +791,7 @@ namespace HeavenStudio
                             new Param("fadeout", new EntityTypes.Float(0, 100, 0), "Fade Out")*/
 
                             // new
-
+                            new Param("slot", new EntityTypes.Integer(1, 10, 1), "Slot", "Slot 1 is activated first and slot 10 last."),
                             new Param("start", new EntityTypes.Float(0, 1, 1), "Start Intensity"),
                             new Param("end", new EntityTypes.Float(0, 1, 1), "End Intensity"),
                             new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "", new()
diff --git a/Assets/Scripts/ScreenTiling.cs b/Assets/Scripts/ScreenTiling.cs
index 16863676..b08181c0 100644
--- a/Assets/Scripts/ScreenTiling.cs
+++ b/Assets/Scripts/ScreenTiling.cs
@@ -9,14 +9,12 @@ namespace HeavenStudio
     public class ScreenTiling : MonoBehaviour
     {
         private RawImage _image;
-        private RectTransform _rectTransform;
 
         private List<RiqEntity> _events = new();
 
         private void Awake()
         {
             _image = GetComponent<RawImage>();
-            _rectTransform = GetComponent<RectTransform>();
         }
 
         private void Start()
@@ -48,14 +46,12 @@ namespace HeavenStudio
                 float newYScroll = func(e["yScrollStart"], e["yScrollEnd"], clampNormal);
 
                 _image.uvRect = new Rect(newXScroll, newYScroll, newXTiles, newYTiles);
-                _rectTransform.localScale = new Vector3(1 / newXTiles, 1 / newYTiles);
             }
         }
 
         public void ResetUVRect()
         {
             _image.uvRect = new Rect(0, 0, 1, 1);
-            _rectTransform.localScale = Vector3.one;
         }
     }
 }