remove unnecessary rootgenconfig parameter. refactor HexGridCamera.At…

…tachCamera parameter to support lack of RootGenConfig
jordanstudioroot · Jul 1, 2020 · 467e2ea · 467e2ea
1 parent 079db56
commit 467e2ea
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 30 deletions.
diff --git a/Assets/rootgen-unitycsharp/Runtime/Camera/HexGridCamera.cs b/Assets/rootgen-unitycsharp/Runtime/Camera/HexGridCamera.cs
@@ -183,14 +183,15 @@ public bool SuspendInput {
 // ~ Non-Static
 
 // ~~ public
-    public static void AttachCamera(HexMap grid, float hexOuterRadius) {
+
+    public static void AttachCamera(HexMap map, float hexSize) {
         HexGridCamera resultMono;
-        _hexOuterRadius = hexOuterRadius;
+        _hexOuterRadius = hexSize; 
 
         if (InstanceValidation.InstanceExists<HexGridCamera>()) {
             resultMono = InstanceValidation.GetFirstInstance<HexGridCamera>();
-            resultMono.transform.SetParent(grid.transform, false);
-            resultMono.TargetGrid = grid;
+            resultMono.transform.SetParent(map.transform, false);
+            resultMono.TargetGrid = map;
             resultMono.enabled = true;
             if (InstanceValidation.SingleInstanceExists<HexGridCamera>()) {
                 RootLog.Log(
@@ -212,8 +213,8 @@ public static void AttachCamera(HexMap grid, float hexOuterRadius) {
         else {
             GameObject resultObj = new GameObject("HexGridCamera");
             resultMono = resultObj.AddComponent<HexGridCamera>();
-            resultMono.transform.SetParent(grid.transform, false);
-            resultMono.TargetGrid = grid;
+            resultMono.transform.SetParent(map.transform, false);
+            resultMono.TargetGrid = map;
             resultMono.enabled = true;
 
             GameObject swivelObj = new GameObject("Swivel");
@@ -241,19 +242,23 @@ public static void AttachCamera(HexMap grid, float hexOuterRadius) {
             cameraMono.farClipPlane = 1000f;
             cameraMono.depth = -1f;
 
-            resultMono.transform.SetParent(grid.transform, false);
+            resultMono.transform.SetParent(map.transform, false);
 
-            if (grid.GridCenter) {
+            if (map.GridCenter) {
                 resultMono.SetPosition(
-                    grid,
-                    grid.GridCenter.transform.position.x,
-                    grid.GridCenter.transform.position.z,
-                    hexOuterRadius
+                    map,
+                    map.GridCenter.transform.position.x,
+                    map.GridCenter.transform.position.z,
+                    _hexOuterRadius
                 );
             }
         }
     }
 
+    public static void AttachCamera(HexMap grid, RootGenConfig config) {
+        AttachCamera(grid, config.hexSize);
+    }
+
     public void ValidatePosition(HexMap grid, float hexOuterRadius) {
         AdjustPosition(grid, 0, 0, hexOuterRadius);
     }

diff --git a/Assets/rootgen-unitycsharp/Runtime/Core/MapGenerator.cs b/Assets/rootgen-unitycsharp/Runtime/Core/MapGenerator.cs
@@ -38,7 +38,7 @@ public class MapGenerator {
     /// </returns>
     public HexMap GenerateMap(
         RootGenConfig config,
-        bool editMode
+        bool editMode = true
     ) {
         string diagnostics = "Generate Map Performance Diagnostics\n\n";
 

diff --git a/Assets/rootgen-unitycsharp/Runtime/Core/RootGen.cs b/Assets/rootgen-unitycsharp/Runtime/Core/RootGen.cs
@@ -36,16 +36,15 @@ public RootGen() {
 /// </returns>
     public HexMap GenerateMap(
         RootGenConfig config,
-        bool editMode
+        bool editMode = true
     ) {
         Destroy.DestroyAll<HexMap>();
 
         HexMap result = _mapGenerator.GenerateMap(
-            config,
-            editMode
+            config
         );
 
-        HexGridCamera.AttachCamera(result, config.hexSize);
+        HexGridCamera.AttachCamera(result, config);
         return result;
     }
 

diff --git a/Assets/rootgen-unitycsharp/Runtime/Examples/RootGenExampleApp.cs b/Assets/rootgen-unitycsharp/Runtime/Examples/RootGenExampleApp.cs
@@ -20,7 +20,7 @@ void OnEnable() {
     // Start is called before the first frame update
     void Start() {
         if (config) {
-            _hexMap = _rootGen.GenerateMap(config, true);
+            _hexMap = _rootGen.GenerateMap(config);
             _hexMap.Draw(config.hexSize);
         }
         else {
@@ -34,7 +34,7 @@ void Update()
     {
         if (Input.GetKeyUp(KeyCode.R)) {
             if (config) {
-                _hexMap = _rootGen.GenerateMap(config, true);
+                _hexMap = _rootGen.GenerateMap(config);
                 _hexMap.Draw(config.hexSize);
             }
             else {

diff --git a/Assets/rootgen-unitycsharp/Runtime/ScriptableObjects/RootGenConfig.cs b/Assets/rootgen-unitycsharp/Runtime/ScriptableObjects/RootGenConfig.cs
@@ -84,9 +84,6 @@ public class RootGenConfig : ScriptableObject
     [Range(0f, 1f)]
     public float startingMoisture = 0.1f;
 
-    [Range(0, 20)]
-    public int riverPercentage = 10;
-
     [Range(0f, 1f)]
     public float extraLakeProbability = 0.25f;
 

diff --git a/Assets/rootgen-unitycsharp/Tests.meta b/Assets/rootgen-unitycsharp/Tests.meta