From 7fa97bc9f696f69291ccc12071faf7a65efd9a56 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Fri, 24 Nov 2023 00:44:37 +0100 Subject: [PATCH] slots for filters --- Assets/Scripts/Games/Global/Filter.cs | 6 +++--- Assets/Scripts/Minigames.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/Games/Global/Filter.cs b/Assets/Scripts/Games/Global/Filter.cs index 3f0683d57..96bb56daf 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 985d5f635..c15345f5a 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()