refactoring mapgenerator.cs

Assets/rootgen-unitycsharp/Editor/BiomeDrawer.cs

@@ -0,0 +1,23 @@
+#if(UNITY_EDITOR)
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor.UIElements;
+
+[CustomPropertyDrawer(typeof(CubeVector))]
+public class BiomeDrawer : PropertyDrawer {
+    public override void OnGUI(
+        Rect position,
+        SerializedProperty property,
+        GUIContent label
+    ) {
+        Biome biome = new Biome(
+            (Terrains)property.FindPropertyRelative("Terrain").intValue,
+            property.FindPropertyRelative("plant").intValue
+        );
+
+        position = EditorGUI.PrefixLabel(position, label);
+        GUI.Label(position, biome.ToString());
+    }
+}
+#endif

Assets/rootgen-unitycsharp/Editor/ClimateDataDrawer.cs

@@ -0,0 +1,24 @@
+#if (UNITY_EDITOR)
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor.UIElements;
+
+[CustomPropertyDrawer(typeof(ClimateData))]
+public class ClimateDataDrawer : PropertyDrawer {
+    public override void OnGUI(
+        Rect position,
+        SerializedProperty property,
+        GUIContent label
+    ) {
+        ClimateData cubeVector = new ClimateData(
+            property.FindPropertyRelative("clouds").floatValue,
+            property.FindPropertyRelative("moisture").floatValue,
+            property.FindPropertyRelative("temperature").floatValue
+        );
+
+        position = EditorGUI.PrefixLabel(position, label);
+        GUI.Label(position, cubeVector.ToString());
+    }
+}
+#endif

Assets/rootgen-unitycsharp/Editor/CubeVectorDrawer.cs

@@ -0,0 +1,23 @@
+#if (UNITY_EDITOR)
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor.UIElements;
+
+[CustomPropertyDrawer(typeof(CubeVector))]
+public class CubeVectorDrawer : PropertyDrawer {
+    public override void OnGUI(
+        Rect position,
+        SerializedProperty property,
+        GUIContent label
+    ) {
+        CubeVector cubeVector = new CubeVector(
+            property.FindPropertyRelative("_x").intValue,
+            property.FindPropertyRelative("_z").intValue
+        );
+
+        position = EditorGUI.PrefixLabel(position, label);
+        GUI.Label(position, cubeVector.ToString());
+    }
+}
+#endif

Assets/rootgen-unitycsharp/Runtime/Collections/FeatureContainer.cs

@@ -475,7 +475,7 @@ int wrapSize
             if (hasRightWall) {
                 bool hasTower = false;
 
-                if (leftHex.Elevation == rightHex.Elevation) {
+                if (leftHex.elevation == rightHex.elevation) {
                     RandomHash rootHash = HexagonPoint.SampleHashGrid (
                         (pivot + left + right) * 1f / 3f
                     );
@@ -495,7 +495,7 @@ int wrapSize
                     hasTower
                 );
             }
-            else if (leftHex.Elevation < rightHex.Elevation) {
+            else if (leftHex.elevation < rightHex.elevation) {
                 AddWallWedge(
                     pivot,
                     left,
@@ -514,7 +514,7 @@ int wrapSize
             }
         }
         else if (hasRightWall) {
-            if (rightHex.Elevation < leftHex.Elevation) {
+            if (rightHex.elevation < leftHex.elevation) {
                 AddWallWedge(
                     right,
                     pivot,

Assets/rootgen-unitycsharp/Runtime/Core/Hex.cs

@@ -4,9 +4,38 @@
 using System.Collections.Generic;
 
 public class Hex : MonoBehaviour, IHexPoint {
-
     [SerializeField]
-    public Terrains terrainType;
+    private ClimateData _climateData;
+    public ClimateData ClimateData { 
+        get {
+            return _climateData;
+        } 
+
+        set {
+            _climateData = value;
+        } 
+    }
+
+    [SerializeField]
+    private Biome _biome;
+    public Biome Biome { 
+        get {
+            return _biome;
+        } 
+
+        set {
+            _biome = value;
+        } 
+    }
+
+    public Terrains TerrainType {
+        get {
+            return _biome.terrain;
+        }
+    }
+
+    [SerializeField]
+    private CubeVector _cubeCoordinates;
 
     private static int MaxFeatureLevel {
         get {
@@ -26,15 +55,15 @@ public Vector3 Position {
     public float StreamBedY {
         get {
             return
-                (Elevation + HexagonPoint.streamBedElevationOffset) *
+                (elevation + HexagonPoint.streamBedElevationOffset) *
                 HexagonPoint.elevationStep;
         }
     }
 
     public float RiverSurfaceY {
         get {
             return
-                (Elevation + HexagonPoint.waterElevationOffset) *
+                (elevation + HexagonPoint.waterElevationOffset) *
                 HexagonPoint.elevationStep;
         }
     }
@@ -49,7 +78,7 @@ public float WaterSurfaceY {
 
     public bool IsUnderwater {
         get {
-            return WaterLevel > Elevation;
+            return WaterLevel > elevation;
         }
     }
 
@@ -61,8 +90,8 @@ public bool IsSpecial {
 
     public int ViewElevation {
         get { 
-            return Elevation >= WaterLevel ? 
-                Elevation : WaterLevel;
+            return elevation >= WaterLevel ? 
+                elevation : WaterLevel;
         }
     }
 
@@ -72,7 +101,15 @@ public bool IsVisible {
         }
     }
 
-    public CubeVector Coordinates { get; private set; }
+    public CubeVector CubeCoordinates {
+        get {
+            return _cubeCoordinates;
+        } 
+
+        private set {
+            _cubeCoordinates = value;
+        } 
+    }
 
     private Mesh GetInteractionMesh(float radius) {
         Mesh result = new Mesh();
@@ -119,20 +156,20 @@ public void InteractionMeshEnabled(bool enabled, float outerRadius) {
         }
     }
 
-    public int Elevation { get; private set; }
+    public int elevation;
 
     public void SetElevation(
         int elevation,
         float hexOuterRadius,
         int wrapSize
     ) {
-        if (Elevation == elevation) {
+        if (this.elevation == elevation) {
             return;
         }
 
         int originalViewElevation = ViewElevation;
 
-        Elevation = elevation;
+        this.elevation = elevation;
 
         if (ViewElevation != originalViewElevation) {
             ShaderData.ViewElevationChanged();
@@ -148,7 +185,13 @@ int wrapSize
     public int WaterLevel { get; set; }
     public int UrbanLevel { get; set; }
     public int FarmLevel { get; set; }
-    public int PlantLevel { get; set; }
+
+    public int PlantLevel { 
+        get {
+            return _biome.plant;
+        }
+    }
+
     public int SpecialIndex { get; set; }
     public bool IsExplored { get; set; }
     public int SearchPhase { get; set; }
@@ -187,7 +230,7 @@ int wrapSize
         GameObject resultObj = new GameObject("Hex");
         Hex resultMono = resultObj.AddComponent<Hex>();
 
-        resultMono.Coordinates = CubeVector.FromOffsetCoordinates(
+        resultMono.CubeCoordinates = CubeVector.FromOffsetCoordinates(
             offsetX,
             offsetZ,
             wrapSize
@@ -210,7 +253,7 @@ public void ResetVisibility() {
     }
 
     public ElevationEdgeTypes GetEdgeType(Hex otherHex) {
-        return HexagonPoint.GetEdgeType(Elevation, otherHex.Elevation);
+        return HexagonPoint.GetEdgeType(elevation, otherHex.elevation);
     }
 
     public void DisableHighlight() {
@@ -272,21 +315,21 @@ public void SetLabel(string text) {
     public override string ToString() {
         return 
             "[X: " +
-                Coordinates.X.ToString() + ", Y:" +
-                Coordinates.Y.ToString() + ", Z:" +
-                Coordinates.Z.ToString() +
+                CubeCoordinates.X.ToString() + ", Y:" +
+                CubeCoordinates.Y.ToString() + ", Z:" +
+                CubeCoordinates.Z.ToString() +
             "]";
     }
 
     private void Awake() {
         //SetEnabledInteractionMesh(true);
-        Elevation = int.MinValue;
+        elevation = int.MinValue;
     }
 
     private bool IsValidRiverDestination(Hex neighbor) {
         return neighbor &&
         (
-            Elevation >= neighbor.Elevation || WaterLevel == neighbor.Elevation
+            elevation >= neighbor.elevation || WaterLevel == neighbor.elevation
         );
     }
 
@@ -304,7 +347,7 @@ private void RefreshPosition(
         int wrapSize
     ) {
         Vector3 position = transform.localPosition;
-        position.y = Elevation * HexagonPoint.elevationStep;
+        position.y = elevation * HexagonPoint.elevationStep;
 
         position.y +=
             (