Small fixes

IxxyXR · Feb 18, 2024 · 0ce1912 · 0ce1912
1 parent 49a7434
commit 0ce1912
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/Assets/Scripts/StairsTest.cs b/Assets/Scripts/StairsTest.cs
@@ -11,11 +11,11 @@ public class StairsTest : TestBase
     public float Scaling = 0;
     public float Distance = 1f;
     public Vector3 vector;
-    
+
     [ContextMenu("Go")]
     public override void Go()
     {
-        poly = Grids.Build(GridEnums.GridTypes.K_4_4_4_4, GridEnums.GridShapes.Plane, 1, 1);
+        poly = Grids.Build(GridEnums.GridTypes.Square, GridEnums.GridShapes.Plane, 1, 1);
         for (var i = 0; i < Segments; i++)
         {
             poly = poly.Loft(new OpParams(0, Distance, filter: Filter.Role(Roles.Existing)));

diff --git a/Packages/Polyhydra/com.ixxy.polyhydra/Core/Runtime/PolyMesh.cs b/Packages/Polyhydra/com.ixxy.polyhydra/Core/Runtime/PolyMesh.cs
@@ -381,21 +381,17 @@ public static PolyMesh GenerateConwaySeedShape(SeedShape seedShape, float param
         {
             var gridTypeMap = new Dictionary<string, GridEnums.GridTypes>
             {
-                {"333333", GridEnums.GridTypes.K_3_3_3_3_3_3},
-                {"4444", GridEnums.GridTypes.K_4_4_4_4},
-                {"666", GridEnums.GridTypes.K_6_6_6},
-                {"33336", GridEnums.GridTypes.K_3_3_3_3_6},
-                {"33344", GridEnums.GridTypes.K_3_3_3_4_4},
-                {"33434", GridEnums.GridTypes.K_3_3_4_3_4},
-                {"3464", GridEnums.GridTypes.K_3_4_6_4},
-                {"3636", GridEnums.GridTypes.K_3_6_3_6},
-                {"31212", GridEnums.GridTypes.K_3_12_12},
-                {"4612", GridEnums.GridTypes.K_4_6_12},
-                {"488", GridEnums.GridTypes.K_4_8_8},
-                {"33412333333", GridEnums.GridTypes.K_3_3_4_12__3_3_3_3_3_3},
-                {"33663636", GridEnums.GridTypes.K_3_3_6_6__3_6_3_6},
-                {"3431231212", GridEnums.GridTypes.K_3_4_3_12__3_12_12},
-                {"34463636", GridEnums.GridTypes.K_3_4_4_6__3_6_3_6},
+                {"333333", GridEnums.GridTypes.Triangular},
+                {"4444", GridEnums.GridTypes.Square},
+                {"666", GridEnums.GridTypes.Hexagonal},
+                {"33336", GridEnums.GridTypes.SnubTrihexagonal},
+                {"33344", GridEnums.GridTypes.ElongatedTriangular},
+                {"33434", GridEnums.GridTypes.SnubSquare},
+                {"3464", GridEnums.GridTypes.Rhombitrihexagonal},
+                {"3636", GridEnums.GridTypes.Trihexagonal},
+                {"31212", GridEnums.GridTypes.TruncatedHexagonal},
+                {"4612", GridEnums.GridTypes.TruncatedTrihexagonal},
+                {"488", GridEnums.GridTypes.TruncatedSquare}
             };
 
             PolyMesh poly = null;

diff --git a/Packages/Polyhydra/com.ixxy.polyhydra/Core/Runtime/Vertex.cs b/Packages/Polyhydra/com.ixxy.polyhydra/Core/Runtime/Vertex.cs
@@ -3,9 +3,9 @@
 using UnityEngine;
 
 namespace Polyhydra.Core {
-    
+
     public class Vertex {
-        
+
         #region constructors
 
         public Vertex(float x, float y, float z)
@@ -56,6 +56,7 @@ public Vector3 Normal {
             }
         }
 
+        // TODO - is this the same as HalfEdges?
         public List<Vertex> Neighbours
         {
             get {

diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset
@@ -34,6 +34,7 @@ MonoBehaviour:
     - com.nomnom.new-package-helper
     - com.openupm
     - com.syomus.proceduraltoolkit
+    - jillejr.newtonsoft.json-for-unity
     m_IsDefault: 0
     m_Capabilities: 0
     m_ConfigSource: 4
@@ -42,6 +43,6 @@ MonoBehaviour:
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -824
+    m_UserModificationsInstanceId: -826
     m_OriginalInstanceId: -828
   m_LoadAssets: 50