Separate arrow and dot glow scales

TheBlackParrot · TheBlackParrot · commit 426d35ef245e · 2024-12-30T06:39:31.000-06:00
diff --git a/NoteTweaks/Configuration/PluginConfig.cs b/NoteTweaks/Configuration/PluginConfig.cs
@@ -30,7 +30,8 @@ internal class PluginConfig
         public virtual float ColorBoostRight { get; set; }
 
         public virtual float GlowIntensity { get; set; } = 1.0f;
-        public virtual float GlowScale { get; set; } = 1.0f;
+        public virtual float ArrowGlowScale { get; set; } = 1.0f;
+        public virtual float DotGlowScale { get; set; } = 1.0f;
         public virtual bool EnableChainDots { get; set; } = true;
         public virtual Vector2 ChainDotScale { get; set; } = Vector2.one;
         public virtual bool EnableChainDotGlow { get; set; } = true;
diff --git a/NoteTweaks/Patches/NoteArrowPatch.cs b/NoteTweaks/Patches/NoteArrowPatch.cs
@@ -328,7 +328,7 @@ internal static void Postfix(ColorNoteVisuals __instance, ref MeshRenderer[] ___
                         
                         Transform arrowGlowTransform = arrowGlowObject.transform;
                         
-                        Vector3 glowScale = new Vector3(scale.x * Plugin.Config.GlowScale * 0.6f, scale.y * Plugin.Config.GlowScale * 0.3f, 0.6f);
+                        Vector3 glowScale = new Vector3(scale.x * Plugin.Config.ArrowGlowScale * 0.6f, scale.y * Plugin.Config.ArrowGlowScale * 0.3f, 0.6f);
                         Vector3 glowPosition = new Vector3(_initialPosition.x + Plugin.Config.ArrowPosition.x, _initialPosition.y + Plugin.Config.ArrowPosition.y, _initialPosition.z);
                         
                         arrowGlowTransform.localScale = glowScale;
@@ -375,14 +375,14 @@ internal static void Postfix(ColorNoteVisuals __instance, ref MeshRenderer[] ___
                         dotPosition = new Vector3(_initialChainDotPosition.x, _initialChainDotPosition.y, _initialChainDotPosition.z);
                         glowPosition = new Vector3(_initialChainDotPosition.x, _initialChainDotPosition.y, _initialChainDotPosition.z + 0.001f);
                         dotScale = new Vector3(Plugin.Config.ChainDotScale.x / 18f, Plugin.Config.ChainDotScale.y / 18f, 1.0f);
-                        glowScale = new Vector3((Plugin.Config.ChainDotScale.x / 5.4f) * Plugin.Config.GlowScale, (Plugin.Config.ChainDotScale.y / 5.4f) * Plugin.Config.GlowScale, 1.0f);
+                        glowScale = new Vector3((Plugin.Config.ChainDotScale.x / 5.4f) * Plugin.Config.DotGlowScale, (Plugin.Config.ChainDotScale.y / 5.4f) * Plugin.Config.DotGlowScale, 1.0f);
                     }
                     else
                     {
                         dotPosition = new Vector3(_initialDotPosition.x + Plugin.Config.DotPosition.x, _initialDotPosition.y + Plugin.Config.DotPosition.y, _initialDotPosition.z);
                         glowPosition = new Vector3(_initialDotPosition.x + Plugin.Config.DotPosition.x, _initialDotPosition.y + Plugin.Config.DotPosition.y, _initialDotPosition.z + 0.001f);
                         dotScale = new Vector3(Plugin.Config.DotScale.x / 5f, Plugin.Config.DotScale.y / 5f, 1.0f);
-                        glowScale = new Vector3((Plugin.Config.DotScale.x / 1.5f) * Plugin.Config.GlowScale, (Plugin.Config.DotScale.y / 1.5f) * Plugin.Config.GlowScale, 1.0f);
+                        glowScale = new Vector3((Plugin.Config.DotScale.x / 1.5f) * Plugin.Config.DotGlowScale, (Plugin.Config.DotScale.y / 1.5f) * Plugin.Config.DotGlowScale, 1.0f);
                     }
                     
                     Transform originalDot = isChainLink ? meshRenderer.transform.parent.Find("Circle") : meshRenderer.transform.parent.Find("NoteCircleGlow");
diff --git a/NoteTweaks/UI/BSML/Settings.bsml b/NoteTweaks/UI/BSML/Settings.bsml
@@ -69,9 +69,6 @@
             
             <toggle-setting apply-on-change="true" value="EnableFaceGlow" text="Enable Glowing Face Symbols"
                             hover-hint="Show glow around symbols"/>
-            <slider-setting apply-on-change="true" value="GlowScale" text="Glow Scale"
-                            min="0.01" max="2.0" increment="0.01" show-buttons="true" formatter="PercentageFormatter"
-                            hover-hint="Scale of glow on face symbols"/>
             <slider-setting apply-on-change="true" value="GlowIntensity" text="Glow Intensity"
                             min="0.01" max="3.0" increment="0.01" show-buttons="true" formatter="PercentageFormatter"
                             hover-hint="Intensity of glow on face symbols"/>
@@ -95,6 +92,12 @@
             <slider-setting apply-on-change="true" value="ArrowOffsetY" text="Vertical Arrow Offset"
                             min="-2.0" max="2.0" increment="0.005" show-buttons="true" formatter="PreciseFloatFormatter"
                             hover-hint="Vertical offset (Y-axis) of note arrows"/>
+
+            <horizontal><text text="-----" font-size="4" color="#00000000"/></horizontal>
+
+            <slider-setting apply-on-change="true" value="ArrowGlowScale" text="Arrow Glow Scale"
+                            min="0.01" max="2.0" increment="0.01" show-buttons="true" formatter="PercentageFormatter"
+                            hover-hint="Scale of glow on arrows"/>
         </modifier-container>
     </tab>
 
@@ -103,13 +106,13 @@
             <toggle-setting apply-on-change="true" value="EnableDots" text="Show Dots"
                             hover-hint="Show dots"/>
 
-            <horizontal><text text="-----" font-size="4" color="#00000000"/></horizontal>
+            <horizontal><text text="-----" font-size="2" color="#00000000"/></horizontal>
 
             <slider-setting apply-on-change="true" value="DotMeshSides" text="Dot Shape Sides"
                             min="4" max="48" increment="1" integer-only="true" show-buttons="true"
                             hover-hint="Amount of sides on the dot symbol"/>
     
-            <horizontal><text text="-----" font-size="4" color="#00000000"/></horizontal>
+            <horizontal><text text="-----" font-size="2" color="#00000000"/></horizontal>
     
             <slider-setting apply-on-change="true" value="DotScaleX" text="Horizontal Dot Scale"
                             min="0.05" max="3.0" increment="0.05" show-buttons="true" formatter="PercentageFormatter"
@@ -118,14 +121,20 @@
                             min="0.05" max="3.0" increment="0.05" show-buttons="true" formatter="PercentageFormatter"
                             hover-hint="Vertical scale (Y-axis) of note dots"/>
     
-            <horizontal><text text="-----" font-size="4" color="#00000000"/></horizontal>
+            <horizontal><text text="-----" font-size="2" color="#00000000"/></horizontal>
     
             <slider-setting apply-on-change="true" value="DotOffsetX" text="Horizontal Dot Offset"
                             min="-2.0" max="2.0" increment="0.005" show-buttons="true" formatter="PreciseFloatFormatter"
                             hover-hint="Horizontal offset (X-axis) of note dots"/>
             <slider-setting apply-on-change="true" value="DotOffsetY" text="Vertical Dot Offset"
                             min="-2.0" max="2.0" increment="0.005" show-buttons="true" formatter="PreciseFloatFormatter"
                             hover-hint="Vertical offset (Y-axis) of note dots"/>
+
+            <horizontal><text text="-----" font-size="2" color="#00000000"/></horizontal>
+
+            <slider-setting apply-on-change="true" value="DotGlowScale" text="Dot Glow Scale"
+                            min="0.01" max="2.0" increment="0.01" show-buttons="true" formatter="PercentageFormatter"
+                            hover-hint="Scale of glow on dots"/>
         </modifier-container>
     </tab>
 
diff --git a/NoteTweaks/UI/PreviewViewController.cs b/NoteTweaks/UI/PreviewViewController.cs
@@ -97,7 +97,7 @@ public static void UpdateDotPosition()
         public static void UpdateDotScale()
         {
             Vector3 scale = new Vector3(Plugin.Config.DotScale.x / 5f, Plugin.Config.DotScale.y / 5f, 1.0f);
-            Vector3 glowScale = new Vector3((Plugin.Config.DotScale.x / 1.5f) * Plugin.Config.GlowScale, (Plugin.Config.DotScale.y / 1.5f) * Plugin.Config.GlowScale, 1.0f);
+            Vector3 glowScale = new Vector3((Plugin.Config.DotScale.x / 1.5f) * Plugin.Config.DotGlowScale, (Plugin.Config.DotScale.y / 1.5f) * Plugin.Config.DotGlowScale, 1.0f);
             
             for (int i = 0; i < NoteContainer.transform.childCount; i++)
             {
@@ -127,7 +127,7 @@ public static void UpdateArrowPosition()
         public static void UpdateArrowScale()
         {
             Vector3 scale = new Vector3(Plugin.Config.ArrowScale.x, Plugin.Config.ArrowScale.y, 1.0f);
-            Vector3 glowScale = new Vector3(scale.x * Plugin.Config.GlowScale * 0.6f, scale.y * Plugin.Config.GlowScale * 0.3f, 0.6f);
+            Vector3 glowScale = new Vector3(scale.x * Plugin.Config.ArrowGlowScale * 0.6f, scale.y * Plugin.Config.ArrowGlowScale * 0.3f, 0.6f);
             
             for (int i = 0; i < NoteContainer.transform.childCount; i++)
             {
@@ -245,7 +245,7 @@ private static void CreateNote(GameNoteController notePrefab, string extraName,
                 Vector3 dotPosition = new Vector3(_initialDotPosition.x + Plugin.Config.DotPosition.x, _initialDotPosition.y + Plugin.Config.DotPosition.y, _initialDotPosition.z);
                 Vector3 glowPosition = new Vector3(_initialDotPosition.x + Plugin.Config.DotPosition.x, _initialDotPosition.y + Plugin.Config.DotPosition.y, _initialDotPosition.z + 0.001f);
                 Vector3 dotScale = new Vector3(Plugin.Config.DotScale.x / 5f, Plugin.Config.DotScale.y / 5f, 1.0f);
-                Vector3 glowScale = new Vector3((Plugin.Config.DotScale.x / 1.5f) * Plugin.Config.GlowScale, (Plugin.Config.DotScale.y / 1.5f) * Plugin.Config.GlowScale, 1.0f);
+                Vector3 glowScale = new Vector3((Plugin.Config.DotScale.x / 1.5f) * Plugin.Config.DotGlowScale, (Plugin.Config.DotScale.y / 1.5f) * Plugin.Config.DotGlowScale, 1.0f);
 
                 originalDotTransform.localScale = dotScale;
                 originalDotTransform.localPosition = dotPosition;
diff --git a/NoteTweaks/UI/SettingsViewController.cs b/NoteTweaks/UI/SettingsViewController.cs
@@ -221,13 +221,22 @@ protected float ColorBoostRight
             }
         }
 
-        protected float GlowScale
+        protected float ArrowGlowScale
         {
-            get => _config.GlowScale;
+            get => _config.ArrowGlowScale;
             set
             {
-                _config.GlowScale = value;
+                _config.ArrowGlowScale = value;
                 NotePreviewViewController.UpdateArrowScale();
+            }
+        }
+        
+        protected float DotGlowScale
+        {
+            get => _config.DotGlowScale;
+            set
+            {
+                _config.DotGlowScale = value;
                 NotePreviewViewController.UpdateDotScale();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public static void UpdateDotPosition()`
`97`	`97`	`public static void UpdateDotScale()`
`98`	`98`	`{`
`99`	`99`	`Vector3 scale = new Vector3(Plugin.Config.DotScale.x / 5f, Plugin.Config.DotScale.y / 5f, 1.0f);`
`100`		`- Vector3 glowScale = new Vector3((Plugin.Config.DotScale.x / 1.5f) * Plugin.Config.GlowScale, (Plugin.Config.DotScale.y / 1.5f) * Plugin.Config.GlowScale, 1.0f);`
	`100`	`+ Vector3 glowScale = new Vector3((Plugin.Config.DotScale.x / 1.5f) * Plugin.Config.DotGlowScale, (Plugin.Config.DotScale.y / 1.5f) * Plugin.Config.DotGlowScale, 1.0f);`
`101`	`101`
`102`	`102`	`for (int i = 0; i < NoteContainer.transform.childCount; i++)`
`103`	`103`	`{`
`@@ -127,7 +127,7 @@ public static void UpdateArrowPosition()`
`127`	`127`	`public static void UpdateArrowScale()`
`128`	`128`	`{`
`129`	`129`	`Vector3 scale = new Vector3(Plugin.Config.ArrowScale.x, Plugin.Config.ArrowScale.y, 1.0f);`
`130`		`- Vector3 glowScale = new Vector3(scale.x * Plugin.Config.GlowScale * 0.6f, scale.y * Plugin.Config.GlowScale * 0.3f, 0.6f);`
	`130`	`+ Vector3 glowScale = new Vector3(scale.x * Plugin.Config.ArrowGlowScale * 0.6f, scale.y * Plugin.Config.ArrowGlowScale * 0.3f, 0.6f);`
`131`	`131`
`132`	`132`	`for (int i = 0; i < NoteContainer.transform.childCount; i++)`
`133`	`133`	`{`
`@@ -245,7 +245,7 @@ private static void CreateNote(GameNoteController notePrefab, string extraName,`
`245`	`245`	`Vector3 dotPosition = new Vector3(_initialDotPosition.x + Plugin.Config.DotPosition.x, _initialDotPosition.y + Plugin.Config.DotPosition.y, _initialDotPosition.z);`
`246`	`246`	`Vector3 glowPosition = new Vector3(_initialDotPosition.x + Plugin.Config.DotPosition.x, _initialDotPosition.y + Plugin.Config.DotPosition.y, _initialDotPosition.z + 0.001f);`
`247`	`247`	`Vector3 dotScale = new Vector3(Plugin.Config.DotScale.x / 5f, Plugin.Config.DotScale.y / 5f, 1.0f);`
`248`		`- Vector3 glowScale = new Vector3((Plugin.Config.DotScale.x / 1.5f) * Plugin.Config.GlowScale, (Plugin.Config.DotScale.y / 1.5f) * Plugin.Config.GlowScale, 1.0f);`
	`248`	`+ Vector3 glowScale = new Vector3((Plugin.Config.DotScale.x / 1.5f) * Plugin.Config.DotGlowScale, (Plugin.Config.DotScale.y / 1.5f) * Plugin.Config.DotGlowScale, 1.0f);`
`249`	`249`
`250`	`250`	`originalDotTransform.localScale = dotScale;`
`251`	`251`	`originalDotTransform.localPosition = dotPosition;`
Original file line number	Diff line number	Diff line change
`@@ -221,13 +221,22 @@ protected float ColorBoostRight`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`
`224`		`- protected float GlowScale`
	`224`	`+ protected float ArrowGlowScale`
`225`	`225`	`{`
`226`		`- get => _config.GlowScale;`
	`226`	`+ get => _config.ArrowGlowScale;`
`227`	`227`	`set`
`228`	`228`	`{`
`229`		`- _config.GlowScale = value;`
	`229`	`+ _config.ArrowGlowScale = value;`
`230`	`230`	`NotePreviewViewController.UpdateArrowScale();`
	`231`	`+ }`
	`232`	`+ }`
	`233`	`+`
	`234`	`+ protected float DotGlowScale`
	`235`	`+ {`
	`236`	`+ get => _config.DotGlowScale;`
	`237`	`+ set`
	`238`	`+ {`
	`239`	`+ _config.DotGlowScale = value;`
`231`	`240`	`NotePreviewViewController.UpdateDotScale();`
`232`	`241`	`}`
`233`	`242`	`}`