error in MeasureD.projectPointTo

BobHanson · BobHanson · commit 75208b88e537 · 2023-07-27T05:17:25.000-04:00
automatically sets v.applet.app to (JavaScript-only) return from main()
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20230606023002 
+20230726212918 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20230606023002 
+20230726212918 
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/MeasureD.java b/sources/net.sf.j2s.java.core/src/javajs/util/MeasureD.java
@@ -113,8 +113,7 @@ public static T3d[] computeHelicalAxis(P3d a, P3d b, Qd dq) {
     //         a'+---------a
     //                r 
 
-    V3d vab = new V3d();
-    vab.sub2(b, a);
+    V3d vab = V3d.newVsub(b, a);
     /*
      * testing here to see if directing the normal makes any difference -- oddly
      * enough, it does not. When n = -n and theta = -theta vab.n is reversed,
@@ -125,7 +124,7 @@ public static T3d[] computeHelicalAxis(P3d a, P3d b, Qd dq) {
     double theta = dq.getTheta();
     V3d n = dq.getNormal();
     double v_dot_n = vab.dot(n);
-    if (Math.abs(v_dot_n) < 0.0001f)
+    if (Math.abs(v_dot_n) < 0.0001)
       v_dot_n = 0;
     V3d va_prime_d = new V3d();
     va_prime_d.cross(vab, n);
@@ -137,7 +136,7 @@ public static T3d[] computeHelicalAxis(P3d a, P3d b, Qd dq) {
       v_dot_n = 2E-45; // allow for perpendicular axis to vab
     vcb.scale(v_dot_n);
     vda.sub2(vcb, vab);
-    vda.scale(0.5f);
+    vda.scale(0.5d);
     va_prime_d.scale(theta == 0 ? 0 : (vda.length() / Math.tan(theta
         / 2 / 180 * Math.PI)));
     V3d r = V3d.newV(va_prime_d);
@@ -152,12 +151,12 @@ public static T3d[] computeHelicalAxis(P3d a, P3d b, Qd dq) {
     P3d pt_b_prime = P3d.newP(pt_a_prime);
     pt_b_prime.add(n);
     theta = computeTorsion(a, pt_a_prime, pt_b_prime, b, true);
-    if (Double.isNaN(theta) || r.length() < 0.0001f)
+    if (Double.isNaN(theta) || r.length() < 0.0001)
       theta = dq.getThetaDirectedV(n); // allow for r = 0
     // anything else is an array
     double residuesPerTurn = Math.abs(theta == 0 ? 0 : 360f / theta);
     double pitch = Math.abs(v_dot_n == 2E-45 ? 0 : n.length()
-        * (theta == 0 ? 1 : 360f / theta));
+        * (theta == 0 ? 1 : 360.0 / theta));
     return new T3d[] { pt_a_prime, n, r, P3d.new3(theta, pitch, residuesPerTurn), pt_b_prime };
   }
 
@@ -1005,7 +1004,7 @@ public static Lst<P3d> getLatticePoints(Lst<P3d> cpts, int h, int k, int l) {
       }
     }
     for (int i = n; --i >= 0;)
-      cpts.removeItemAt(i);
+      cpts.removeItemAt(0);
     return cpts;
   }
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSDummyApplet.java b/sources/net.sf.j2s.java.core/src/swingjs/JSDummyApplet.java
@@ -26,7 +26,7 @@ public Class<?> runMain(JSAppletViewer v, String[] args) {
 	   * @j2sNative
 	   * 
 	   * setTimeout(function(){
-	   *   theClass.$clazz$.main$SA.call(null, args || []);
+	   *   v.applet.app = theClass.$clazz$.main$SA.call(null, args || []) || null;
 	   */
 	   JSUtil.readyCallback(v.appletName, v.fullName, v.applet, v);
 	   /**

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public Class<?> runMain(JSAppletViewer v, String[] args) {`
`26`	`26`	`* @j2sNative`
`27`	`27`	`*`
`28`	`28`	`* setTimeout(function(){`
`29`		`- * theClass.$clazz$.main$SA.call(null, args \|\| []);`
	`29`	`+ * v.applet.app = theClass.$clazz$.main$SA.call(null, args \|\| []) \|\| null;`
`30`	`30`	`*/`
`31`	`31`	`JSUtil.readyCallback(v.appletName, v.fullName, v.applet, v);`
`32`	`32`	`/**`