ConfiguratorBase: Added GetMainColor and GetSecondaryColor

lmoreloss · Jan 9, 2021 · b43b6bc · b43b6bc
1 parent 2d3eb1a
commit b43b6bc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Samples/Buildings/Runtime/BuildingGeneratorConfigurator.cs b/Samples/Buildings/Runtime/BuildingGeneratorConfigurator.cs
@@ -90,7 +90,7 @@ public void Generate(bool randomizeConfig = true)
             if (randomizeConfig)
             {
                 GeneratePalette();
-                config.palette.wallColor = GetMainColorHSV().ToColor();
+                config.palette.wallColor = GetMainColor();
             }
 
             if (generator == null)

diff --git a/Samples/CellularAutomata/CellularAutomatonConfigurator.cs b/Samples/CellularAutomata/CellularAutomatonConfigurator.cs
@@ -105,7 +105,7 @@ private void Generate()
             GeneratePalette();
 
             deadColor = GetMainColorHSV().WithSV(0.3f, 0.2f).ToColor();
-            aliveColor = GetMainColorHSV().ToColor();
+            aliveColor = GetMainColor();
         }
 
         private void DrawCells()

diff --git a/Samples/Chairs/ChairGeneratorConfigurator.cs b/Samples/Chairs/ChairGeneratorConfigurator.cs
@@ -109,7 +109,7 @@ public void Generate(bool randomizeConfig = true)
             {
                 GeneratePalette();
 
-                config.color = GetMainColorHSV().ToColor();
+                config.color = GetMainColor();
             }
 
             var chairDraft = ChairGenerator.Chair(config);

diff --git a/Samples/Common/ConfiguratorBase.cs b/Samples/Common/ConfiguratorBase.cs
@@ -88,11 +88,21 @@ protected ColorHSV GetMainColorHSV()
             return targetPalette.mainColor;
         }
 
+        protected Color GetMainColor()
+        {
+            return targetPalette.mainColor.ToColor();
+        }
+
         protected ColorHSV GetSecondaryColorHSV()
         {
             return targetPalette.secondaryColor;
         }
 
+        protected Color GetSecondaryColor()
+        {
+            return targetPalette.secondaryColor.ToColor();
+        }
+
         protected void SetupSkyboxAndPalette()
         {
             RenderSettings.skybox = new Material(RenderSettings.skybox);