works with newest vvecmath library (TODO improve usage of stored/mutable vectors)

Author: miho

build.gradle

@@ -64,8 +64,8 @@ dependencies {
 
     compile group: 'eu.mihosoft.ext.org.fxyz', name: 'extfxyz', version: '0.4'
     compile group: 'eu.mihosoft.ext.org.fxyz', name: 'extfxyz', version: '0.4', classifier: 'sources'
-    compile group: 'eu.mihosoft.vvecmath', name: 'vvecmath', version: '0.3.3'
-    compile group: 'eu.mihosoft.vvecmath', name: 'vvecmath', version: '0.3.3', classifier: 'sources'
+    compile group: 'eu.mihosoft.vvecmath', name: 'vvecmath', version: '0.3.6'
+    compile group: 'eu.mihosoft.vvecmath', name: 'vvecmath', version: '0.3.6', classifier: 'sources'
     compile 'org.slf4j:slf4j-simple:1.6.1'
 }
 

src/main/java/eu/mihosoft/jcsg/Cylinder.java

@@ -150,8 +150,8 @@ public List<Polygon> toPolygons() {
         final Vector3d axisZ = ray.normalized();
         boolean isY = (Math.abs(axisZ.y()) > 0.5);
         final Vector3d axisX = Vector3d.xyz(isY ? 1 : 0, !isY ? 1 : 0, 0).
-                cross(axisZ).normalized();
-        final Vector3d axisY = axisX.cross(axisZ).normalized();
+                crossed(axisZ).normalized();
+        final Vector3d axisY = axisX.crossed(axisZ).normalized();
         Vertex startV = new Vertex(s, axisZ.negated());
         Vertex endV = new Vertex(e, axisZ.normalized());
         List<Polygon> polygons = new ArrayList<>();

src/main/java/eu/mihosoft/jcsg/Extrude.java

@@ -205,7 +205,7 @@ public static boolean isCCW(Polygon polygon) {
     private static double normalizedX(Vector3d v1, Vector3d v2) {
         Vector3d v2MinusV1 = v2.minus(v1);
 
-        return v2MinusV1.dividedBy(v2MinusV1.magnitude()).times(Vector3d.X_ONE).x();
+        return v2MinusV1.divided(v2MinusV1.magnitude()).times(Vector3d.X_ONE).x();
     }
 
 //    public static void main(String[] args) {

src/main/java/eu/mihosoft/jcsg/Plane.java

@@ -94,7 +94,7 @@ public Plane(Vector3d normal, double dist) {
      * @return a plane
      */
     public static Plane createFromPoints(Vector3d a, Vector3d b, Vector3d c) {
-        Vector3d n = b.minus(a).cross(c.minus(a)).normalized();
+        Vector3d n = b.minus(a).crossed(c.minus(a)).normalized();
         return new Plane(n, n.dot(a));
     }
 

src/main/java/eu/mihosoft/jcsg/Polygon.java

@@ -279,7 +279,7 @@ public Polygon translate(Vector3d v) {
         Vector3d c = this.vertices.get(2).pos;
 
         // TODO plane update correct?
-        this._csg_plane.normal = b.minus(a).cross(c.minus(a));
+        this._csg_plane.normal = b.minus(a).crossed(c.minus(a));
 
         this.plane = eu.mihosoft.vvecmath.Plane.
                 fromPointAndNormal(centroid(), _csg_plane.normal);
@@ -322,7 +322,7 @@ public Polygon transform(Transform transform) {
         Vector3d b = this.vertices.get(1).pos;
         Vector3d c = this.vertices.get(2).pos;
 
-        this._csg_plane.normal = b.minus(a).cross(c.minus(a)).normalized();
+        this._csg_plane.normal = b.minus(a).crossed(c.minus(a)).normalized();
         this._csg_plane.dist = this._csg_plane.normal.dot(a);
 
         this.plane = eu.mihosoft.vvecmath.Plane.

src/main/java/eu/mihosoft/jcsg/samples/FractalStructure.java

@@ -148,10 +148,10 @@ public FractalStructure(Vector3d groundCenter, Vector3d topCenter,
                     && Math.abs(orthoVecToRotAxis2.dot(rotationAxis)) < orthoThreshhold) {
                 this.orthoVecToRotAxis2 = orthoVecToRotAxis2.normalized();
             } else {
-                this.orthoVecToRotAxis2 = rotationAxis.cross(this.orthoVecToRotAxis1).normalized();
+                this.orthoVecToRotAxis2 = rotationAxis.crossed(this.orthoVecToRotAxis1).normalized();
             }
         } else {
-            this.orthoVecToRotAxis2 = rotationAxis.cross(this.orthoVecToRotAxis1).normalized();
+            this.orthoVecToRotAxis2 = rotationAxis.crossed(this.orthoVecToRotAxis1).normalized();
         }
 
         // x, y, z
@@ -445,7 +445,7 @@ private ArrayList<FractalStructure> createSubStructures() {
                 helpCenterPoint = connectionLineVectorNormalized.times(j).plus(connectionLineVectorNormalized.times(stepSizeOnConnectionLineHalf)).plus(centerGroundPoint).plus(correctionInRotationAxisDirection);
 
                 if (secondOrthoVec == null) {
-                    secondOrthoVec = connectionLineVectorNormalized.cross(helpCenterPoint.minus(helpEdgePoint));
+                    secondOrthoVec = connectionLineVectorNormalized.crossed(helpCenterPoint.minus(helpEdgePoint));
                 }
 
                 // prevent that the last cross connactions from bottom left to top right has a to above end point in the top plane