From c4f0516d5318601d0cded9f59cd26c2b2e50210a Mon Sep 17 00:00:00 2001
From: Nick <nicholasconnors@hotmail.ca>
Date: Sun, 10 Jul 2022 11:02:56 -0400
Subject: [PATCH] Use SetScaleCurve everywhere

---
 NewHorizons/Builder/Body/ProxyBuilder.cs              |  7 +------
 NewHorizons/Builder/Body/RingBuilder.cs               |  7 +------
 NewHorizons/Builder/Body/StarBuilder.cs               |  4 ++--
 NewHorizons/Builder/Body/WaterBuilder.cs              |  7 +------
 .../Components/SizeControllers/SizeController.cs      |  2 +-
 .../Modules/VariableSize/VariableSizeModule.cs        | 11 +----------
 6 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/NewHorizons/Builder/Body/ProxyBuilder.cs b/NewHorizons/Builder/Body/ProxyBuilder.cs
index 817f57cf..dfbcf125 100644
--- a/NewHorizons/Builder/Body/ProxyBuilder.cs
+++ b/NewHorizons/Builder/Body/ProxyBuilder.cs
@@ -170,12 +170,7 @@ namespace NewHorizons.Builder.Body
         private static void AddSizeController(GameObject go, VariableSizeModule.TimeValuePair[] curve, float size)
         {
             var sizeController = go.AddComponent<SizeController>();
-            var animCurve = new AnimationCurve();
-            foreach (var pair in curve)
-            {
-                animCurve.AddKey(new Keyframe(pair.time, pair.value));
-            }
-            sizeController.scaleCurve = animCurve;
+            sizeController.SetScaleCurve(curve);
             sizeController.size = size;
         }
 
diff --git a/NewHorizons/Builder/Body/RingBuilder.cs b/NewHorizons/Builder/Body/RingBuilder.cs
index 55d84c04..5a7b6a64 100644
--- a/NewHorizons/Builder/Body/RingBuilder.cs
+++ b/NewHorizons/Builder/Body/RingBuilder.cs
@@ -126,12 +126,7 @@ namespace NewHorizons.Builder.Body
             if (ring.curve != null)
             {
                 var levelController = ringGO.AddComponent<SizeController>();
-                var curve = new AnimationCurve();
-                foreach (var pair in ring.curve)
-                {
-                    curve.AddKey(new Keyframe(pair.time, pair.value));
-                }
-                levelController.scaleCurve = curve;
+                levelController.SetScaleCurve(ring.curve);
             }
 
             return ringGO;
diff --git a/NewHorizons/Builder/Body/StarBuilder.cs b/NewHorizons/Builder/Body/StarBuilder.cs
index 05fcaa35..38ffb8b0 100644
--- a/NewHorizons/Builder/Body/StarBuilder.cs
+++ b/NewHorizons/Builder/Body/StarBuilder.cs
@@ -132,7 +132,7 @@ namespace NewHorizons.Builder.Body
 
             starGO.SetActive(false);
             var controller = starGO.AddComponent<StarEvolutionController>();
-            if (starModule.curve != null) controller.scaleCurve = starModule.GetAnimationCurve();
+            if (starModule.curve != null) controller.SetScaleCurve(starModule.curve);
             controller.size = starModule.size;
             controller.atmosphere = sunAtmosphere;
             controller.supernova = supernova;
@@ -164,7 +164,7 @@ namespace NewHorizons.Builder.Body
 
             starGO.SetActive(false);
             var controller = starGO.AddComponent<StarEvolutionController>();
-            if (starModule.curve != null) controller.scaleCurve = starModule.GetAnimationCurve();
+            if (starModule.curve != null) controller.SetScaleCurve(starModule.curve);
             controller.size = starModule.size;
             controller.supernova = supernova;
             controller.StartColour = starModule.tint;
diff --git a/NewHorizons/Builder/Body/WaterBuilder.cs b/NewHorizons/Builder/Body/WaterBuilder.cs
index fdb85ec8..0ddc00d5 100644
--- a/NewHorizons/Builder/Body/WaterBuilder.cs
+++ b/NewHorizons/Builder/Body/WaterBuilder.cs
@@ -102,12 +102,7 @@ namespace NewHorizons.Builder.Body
             if (module.curve != null)
             {
                 var sizeController = waterGO.AddComponent<WaterSizeController>();
-                var curve = new AnimationCurve();
-                foreach (var pair in module.curve)
-                {
-                    curve.AddKey(new Keyframe(pair.time, pair.value));
-                }
-                sizeController.scaleCurve = curve;
+                sizeController.SetScaleCurve(module.curve);
                 sizeController.oceanFogMaterial = fogGO.GetComponent<MeshRenderer>().material;
                 sizeController.size = module.size;
             }
diff --git a/NewHorizons/Components/SizeControllers/SizeController.cs b/NewHorizons/Components/SizeControllers/SizeController.cs
index 74cc13ac..83702bec 100644
--- a/NewHorizons/Components/SizeControllers/SizeController.cs
+++ b/NewHorizons/Components/SizeControllers/SizeController.cs
@@ -4,7 +4,7 @@ namespace NewHorizons.Components.SizeControllers
 {
     public class SizeController : MonoBehaviour
     {
-        public AnimationCurve scaleCurve;
+        public AnimationCurve scaleCurve { get; protected set; }
         public float CurrentScale { get; protected set; }
         public float size = 1f;
 
diff --git a/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs b/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs
index 7daf95f2..d220a15d 100644
--- a/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs
+++ b/NewHorizons/External/Modules/VariableSize/VariableSizeModule.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using UnityEngine;
 
 namespace NewHorizons.External.Modules.VariableSize
@@ -11,15 +11,6 @@ namespace NewHorizons.External.Modules.VariableSize
         /// </summary>
         public TimeValuePair[] curve;
 
-        public AnimationCurve GetAnimationCurve(float size = 1f)
-        {
-            var curve = new AnimationCurve();
-            if (this.curve != null)
-                foreach (var pair in this.curve)
-                    curve.AddKey(new Keyframe(pair.time, size * pair.value));
-            return curve;
-        }
-
         [JsonObject]
         public class TimeValuePair
         {