tweaks

Author: rms80

distance/DistPoint2Circle2.cs

@@ -55,7 +55,7 @@ public double GetSquared()
             // Projection of P-C onto plane is Q-C = P-C - Dot(N,P-C)*N.
             Vector2d PmC = point - circle.Center;
             double lengthPmC = PmC.Length;
-            if (lengthPmC > 0) {
+            if (lengthPmC > MathUtil.Epsilon) {
                 CircleClosest = circle.Center + circle.Radius * PmC / lengthPmC;
                 AllCirclePointsEquidistant = false;
             } else {

distance/DistPoint3Circle3.cs

@@ -56,12 +56,12 @@ public double GetSquared()
             Vector3d PmC = point - circle.Center;
             Vector3d QmC = PmC - circle.Normal.Dot(PmC) * circle.Normal;
             double lengthQmC = QmC.Length;
-            if (lengthQmC > 0) {
+            if (lengthQmC > MathUtil.Epsilon) {
                 CircleClosest = circle.Center + circle.Radius * QmC / lengthQmC;
                 AllCirclePointsEquidistant = false;
             } else {
                 // All circle points are equidistant from P.  Return one of them.
-                CircleClosest = circle.Center + circle.Radius * circle.AxisX;
+                CircleClosest = circle.Center + circle.Radius * circle.PlaneX;
                 AllCirclePointsEquidistant = true;
             }
 

shapes3/Circle3.cs

@@ -12,20 +12,37 @@ public class Circle3d
 
 		public Vector3d Center;
         public Vector3d Normal;
-        public Vector3d AxisX, AxisY;
+        public Vector3d PlaneX, PlaneY;
 		public double Radius;
 		public bool IsReversed;		// use ccw orientation instead of cw
 
-		public Circle3d(Vector3d center, Vector3d axis0, Vector3d axis1, Vector3d normal, double radius)
+		public Circle3d(Vector3d center, double radius, Vector3d axis0, Vector3d axis1, Vector3d normal)
 		{
 			IsReversed = false;
 			Center = center;
             Normal = normal;
-            AxisX = axis0;
-            AxisY = axis1;
+            PlaneX = axis0;
+            PlaneY = axis1;
+			Radius = radius;
+		}
+		public Circle3d(Vector3d center, double radius, Frame3f f, int nNormalAxis = 1)
+		{
+			IsReversed = false;
+			Center = center;
+            Normal = f.GetAxis(nNormalAxis);
+            PlaneX = f.GetAxis((nNormalAxis + 1) % 3);
+            PlaneY = f.GetAxis((nNormalAxis + 2) % 3);
+			Radius = radius;
+		}
+		public Circle3d(Vector3d center, double radius)
+		{
+			IsReversed = false;
+			Center = center;
+            Normal = Vector3d.AxisY;
+            PlaneX = Vector3d.AxisX;
+            PlaneY = Vector3d.AxisZ;
 			Radius = radius;
 		}
-
 
 		public bool IsClosed {
 			get { return true; }
@@ -41,14 +58,14 @@ public Vector3d SampleDeg(double degrees)
         {
             double theta = degrees * MathUtil.Deg2Rad;
             double c = Math.Cos(theta), s = Math.Sin(theta);
-            return Center + c * Radius * AxisX + s * Radius * AxisY;
+            return Center + c * Radius * PlaneX + s * Radius * PlaneY;
         }
 
 		// angle in range [0,2pi] (but works for any value, obviously)
         public Vector3d SampleRad(double radians)
         {
             double c = Math.Cos(radians), s = Math.Sin(radians);
-            return Center + c * Radius * AxisX + s * Radius * AxisY;
+            return Center + c * Radius * PlaneX + s * Radius * PlaneY;
         }
 
 
@@ -61,7 +78,7 @@ public double ParamLength {
 		public Vector3d SampleT(double t) {
 			double theta = (IsReversed) ? -t*MathUtil.TwoPI : t*MathUtil.TwoPI;
 			double c = Math.Cos(theta), s = Math.Sin(theta);
-            return Center + c * Radius * AxisX + s * Radius * AxisY;
+            return Center + c * Radius * PlaneX + s * Radius * PlaneY;
 		}
 
 		public bool HasArcLength { get {return true;} }
@@ -76,7 +93,7 @@ public Vector3d SampleArcLength(double a) {
 			double t = a / ArcLength;
 			double theta = (IsReversed) ? -t*MathUtil.TwoPI : t*MathUtil.TwoPI;
 			double c = Math.Cos(theta), s = Math.Sin(theta);
-            return Center + c * Radius * AxisX + s * Radius * AxisY;
+            return Center + c * Radius * PlaneX + s * Radius * PlaneY;
 		}