Removed the dependence on DynamicProperties.

MeltyPlayer · Jan 5, 2025 · 65e51c0 · 65e51c0
1 parent 425c495
commit 65e51c0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 64 deletions.
diff --git a/FinModelUtility/Formats/Vrml/Vrml/src/util/DynamicProperties.cs b/FinModelUtility/Formats/Vrml/Vrml/src/util/DynamicProperties.cs
diff --git a/FinModelUtility/Formats/Vrml/Vrml/src/util/EarClipping.cs b/FinModelUtility/Formats/Vrml/Vrml/src/util/EarClipping.cs
@@ -42,23 +42,22 @@ private void CalcNormal_(List<Vector3m> points) {
 
   private void LinkAndAddToList_(Polygon polygon, List<Vector3m> points) {
     ConnectionEdge prev = null, first = null;
-    Dictionary<Vector3m, Vector3m> pointsHashSet
-        = new Dictionary<Vector3m, Vector3m>();
+    Dictionary<Vector3m, (Vector3m, List<ConnectionEdge>)> pointsHashSet = new();
     int pointCount = 0;
     for (int i = 0; i < points.Count; i++) {
       // we don't wanna have duplicates
       Vector3m p0;
+      List<ConnectionEdge> incidentEdges;
       if (pointsHashSet.ContainsKey(points[i])) {
-        p0 = pointsHashSet[points[i]];
+        (p0, incidentEdges) = pointsHashSet[points[i]];
       } else {
         p0 = points[i];
-        pointsHashSet.Add(p0, p0);
-        List<ConnectionEdge> list = new List<ConnectionEdge>();
-        p0.DynamicProperties.AddProperty(PropertyConstants.IncidentEdges, list);
+        incidentEdges = new List<ConnectionEdge>();
+        pointsHashSet.Add(p0, (p0, incidentEdges));
         pointCount++;
       }
 
-      ConnectionEdge current = new ConnectionEdge(p0, polygon);
+      ConnectionEdge current = new(p0, polygon, incidentEdges);
 
       first = (i == 0) ? current : first; // remember first
 
@@ -185,6 +184,8 @@ private List<ConnectionEdge> FindNonConvexPoints_(Polygon p) {
 }
 
 internal class ConnectionEdge {
+  public List<ConnectionEdge> IncidentEdges { get; } = new();
+
   protected bool Equals(ConnectionEdge other) {
     return this.next_.Origin.Equals(other.next_.Origin) &&
            this.Origin.Equals(other.Origin);
@@ -207,27 +208,21 @@ public override int GetHashCode() {
     }
   }
 
-  internal Vector3m Origin { get; set; }
+  internal Vector3m Origin { get; }
   internal ConnectionEdge prev_;
   internal ConnectionEdge next_;
   internal Polygon Polygon { get; set; }
 
-  public ConnectionEdge(Vector3m p0, Polygon parentPolygon) {
+  public ConnectionEdge(Vector3m p0, Polygon parentPolygon, List<ConnectionEdge> incidentEdges) {
     this.Origin = p0;
     this.Polygon = parentPolygon;
-    this.AddIncidentEdge(this);
+    this.IncidentEdges = incidentEdges;
+    this.IncidentEdges.Add(this);
   }
 
   public override string ToString() {
     return "Origin: " + this.Origin + " Next: " + this.next_.Origin;
   }
-
-  internal void AddIncidentEdge(ConnectionEdge next) {
-    var list
-        = (List<ConnectionEdge>) this.Origin.DynamicProperties.GetValue(
-            PropertyConstants.IncidentEdges);
-    list.Add(next);
-  }
 }
 
 internal class Polygon {
@@ -249,9 +244,7 @@ internal IEnumerable<ConnectionEdge> GetPolygonCirculator() {
   internal void Remove(ConnectionEdge cur) {
     cur.prev_.next_ = cur.next_;
     cur.next_.prev_ = cur.prev_;
-    var incidentEdges =
-        (List<ConnectionEdge>) cur.Origin.DynamicProperties.GetValue(
-            PropertyConstants.IncidentEdges);
+    var incidentEdges = cur.IncidentEdges;
     int index = incidentEdges.FindIndex(x => x.Equals(cur));
     Debug.Assert(index >= 0);
     incidentEdges.RemoveAt(index);

diff --git a/FinModelUtility/Formats/Vrml/Vrml/src/util/Vector3m.cs b/FinModelUtility/Formats/Vrml/Vrml/src/util/Vector3m.cs
@@ -3,8 +3,6 @@
 namespace vrml.util;
 
 public class Vector3m {
-  internal DynamicProperties DynamicProperties = new DynamicProperties();
-
   public Vector3m(ERational x, ERational y, ERational z) {
     this.X = x;
     this.Y = y;