diff --git a/Assets/UltraCombos.Metamesh/Editor/GeodesicMesh.cs b/Assets/UltraCombos.Metamesh/Editor/GeodesicMesh.cs index c8c12d5..abf404c 100644 --- a/Assets/UltraCombos.Metamesh/Editor/GeodesicMesh.cs +++ b/Assets/UltraCombos.Metamesh/Editor/GeodesicMesh.cs @@ -392,14 +392,11 @@ namespace Metamesh public void MapABOBtoOBOA() { - //var point = new Vector2Int(0, 0); for (var i = 0; i < this.isoVecsABOB.Count; i++) { var temp = new List(); for (var j = 0; j < 3; j++) { - //point.x = this.isoVecsABOB[i][j].x; - //point.y = this.isoVecsABOB[i][j].y; var point = this.isoVecsABOB[i][j]; if (this.vertexTypes[i][j] == 0) { @@ -415,14 +412,11 @@ namespace Metamesh public void MapABOBtoBAOA() { - //var point = new Vector2Int(0, 0); for (var i = 0; i < this.isoVecsABOB.Count; i++) { var temp = new List(); for (var j = 0; j < 3; j++) { - //point.x = this.isoVecsABOB[i][j].x; - //point.y = this.isoVecsABOB[i][j].y; var point = this.isoVecsABOB[i][j]; if (this.vertexTypes[i][j] == 1) { @@ -877,7 +871,7 @@ namespace Metamesh if (goldbergPolyhedronData.face.Count <= m) { if (goldbergPolyhedronData.face.Count != m) - Debug.Log($"goldbergPolyhedronData.face.Count != m: {goldbergPolyhedronData.face.Count} != {m}"); + Debug.LogWarning($"goldbergPolyhedronData.face.Count != m: {goldbergPolyhedronData.face.Count} != {m}"); goldbergPolyhedronData.face.Add(tempFace); } else @@ -901,8 +895,6 @@ namespace Metamesh goldbergPolyhedronData.vertex[el] = new Vector3(cx / 3, cy / 3, cz / 3); } - - ; } return goldbergPolyhedronData; @@ -916,18 +908,18 @@ namespace Metamesh "Geodesic", new Dictionary() { - {0, new Vector3(0, PHI, -1)}, - {1,new Vector3(-PHI, 1, 0)}, - {2,new Vector3(-1, 0, -PHI)}, - {3,new Vector3(1, 0, -PHI)}, - {4,new Vector3(PHI, 1, 0)}, - {5,new Vector3(0, PHI, 1)}, - {6,new Vector3(-1, 0, PHI)}, - {7,new Vector3(-PHI, -1, 0)}, - {8,new Vector3(0, -PHI, -1)}, - {9,new Vector3(PHI, -1, 0)}, - {10,new Vector3(1, 0, PHI)}, - {11,new Vector3(0, -PHI, 1)}, + { 0, new Vector3(0, PHI, -1) }, + { 1, new Vector3(-PHI, 1, 0) }, + { 2, new Vector3(-1, 0, -PHI) }, + { 3, new Vector3(1, 0, -PHI) }, + { 4, new Vector3(PHI, 1, 0) }, + { 5, new Vector3(0, PHI, 1) }, + { 6, new Vector3(-1, 0, PHI) }, + { 7, new Vector3(-PHI, -1, 0) }, + { 8, new Vector3(0, -PHI, -1) }, + { 9, new Vector3(PHI, -1, 0) }, + { 10, new Vector3(1, 0, PHI) }, + { 11, new Vector3(0, -PHI, 1) }, }, new List>() ); diff --git a/Assets/UltraCombos.Metamesh/Editor/GoldbergBuilder.cs b/Assets/UltraCombos.Metamesh/Editor/GoldbergBuilder.cs index 432c041..c43c8ca 100644 --- a/Assets/UltraCombos.Metamesh/Editor/GoldbergBuilder.cs +++ b/Assets/UltraCombos.Metamesh/Editor/GoldbergBuilder.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; +using System.Linq; using UnityEngine; -using UnityEngine.Rendering; namespace Metamesh { @@ -109,7 +109,15 @@ namespace Metamesh primTri.Build(m, n); var geodesicData = GeodesicData.BuildGeodesicData(primTri); var goldbergData = geodesicData.ToGoldbergPolyhedronData(); - + /* + var nbSharedFaces = geodesicData.sharedNodes; + var nbUnsharedFaces = geodesicData.poleNodes; + var adjacentFaces = geodesicData.adjacentFaces; + var nbFaces = nbSharedFaces + nbUnsharedFaces; + var nbFacesAtPole = (nbUnsharedFaces - 12) / 12; + var faceCenters = geodesicData.vertex.Keys.Select(v => v * size).ToArray(); + var faceColors = geodesicData.vertex.Keys.Select(_ => Color.white).ToArray(); + */ var vertexData = CreateGoldbergVertexData(options, goldbergData); return vertexData; }