segment is a struct now, so old code was changing copy!

EnvyKong · Dec 9, 2016 · 60ba83b · 60ba83b
1 parent 5850c8a
commit 60ba83b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git a/curve/CurveUtils.cs b/curve/CurveUtils.cs
@@ -66,16 +66,14 @@ public static bool FindClosestRayIntersection(ICurve c, double segRadius, Ray3d
             if (c.Closed)
                 throw new InvalidOperationException("CurveUtils.FindClosestRayIntersection doesn't support closed curves yet");
 
-            DistRay3Segment3 dist = new DistRay3Segment3(ray, new Segment3d(Vector3d.Zero, Vector3d.Zero) );
-
             rayT = double.MaxValue;
             int nNearSegment = -1;
             //double fNearSegT = 0.0;
 
             int N = c.VertexCount;
             for (int i = 0; i < N-1; ++i) {
-                dist.Segment.SetEndpoints(c.GetVertex(i), c.GetVertex(i + 1));
-                dist.Reset();
+                DistRay3Segment3 dist = new DistRay3Segment3(ray,
+                    new Segment3d(c.GetVertex(i), c.GetVertex(i + 1)));
 
                 // raycast to line bounding-sphere first (is this going ot be faster??)
                 double fSphereHitT;

diff --git a/queries/DistLine3Ray3.cs b/queries/DistLine3Ray3.cs
@@ -34,13 +34,6 @@ public DistLine3Ray3(Ray3d ray, Line3d Line)
             this.ray = ray; this.line = Line;
         }
 
-        // have to do this if you are changing Ray/Line yourself and want to reuse this object
-        public void Reset()
-        {
-            DistanceSquared = -1.0f;
-        }
-
-
         static public double MinDistance(Ray3d r, Line3d s)
         {
             return new DistLine3Ray3(r, s).Get();

diff --git a/queries/DistRay3Ray3.cs b/queries/DistRay3Ray3.cs
@@ -34,13 +34,6 @@ public DistRay3Ray3(Ray3d ray1, Ray3d ray2)
             this.ray1 = ray1; this.ray2 = ray2;
         }
 
-        // have to do this if you are changing Ray/Segment yourself and want to reuse this object
-        public void Reset()
-        {
-            DistanceSquared = -1.0f;
-        }
-
-
         static public double MinDistance(Ray3d r1, Ray3d r2) {
             return new DistRay3Ray3(r1, r2).Get();
         }

diff --git a/queries/DistRay3Segment3.cs b/queries/DistRay3Segment3.cs
@@ -34,11 +34,6 @@ public DistRay3Segment3(Ray3d ray, Segment3d segment)
             this.ray = ray; this.segment = segment;
         }
 
-        // have to do this if you are changing Ray/Segment yourself and want to reuse this object
-        public void Reset() {
-            DistanceSquared = -1.0f;
-        }
-
 
         static public double MinDistance(Ray3d r, Segment3d s) {
             return new DistRay3Segment3(r, s).Get();