refactoring (part 1)

Author: miho

.gitignore

@@ -1,6 +1,4 @@
-/.nb-gradle/private/
 /build/
 /.gradle/
-/bin/
-/.classpath
-/.project
+/.idea/
+/.nb-gradle/

build.gradle

@@ -26,6 +26,9 @@ mainClassName = mainClass
 repositories {
     mavenCentral()
     jcenter()
+    maven {
+        url 'https://dl.bintray.com/miho/VVecMath'
+    }
 }
 
 // javadoc is way too strict for my taste.
@@ -62,7 +65,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: 'java3d', name: 'vecmath', version: '1.3.1'
+    compile group: 'eu.mihosoft.vvecmath', name: 'vvecmath', version: '0.3'
+    compile group: 'eu.mihosoft.vvecmath', name: 'vvecmath', version: '0.3', classifier: 'sources'
     compile 'org.slf4j:slf4j-simple:1.6.1'
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,4 +1,4 @@
-#Tue Nov 08 17:36:28 CET 2016
+#Fri Feb 03 02:51:41 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -3,7 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package eu.mihosoft.vrl.v3d;
+package eu.mihosoft.jcsg;
+
+import eu.mihosoft.vvecmath.Vector3d;
 
 /**
  * Bounding box for CSGs.
@@ -26,15 +28,15 @@ public class Bounds {
      * @param max max x,y,z values
      */
     public Bounds(Vector3d min, Vector3d max) {
-        this.center = new Vector3d(
-                (max.x + min.x) / 2,
-                (max.y + min.y) / 2,
-                (max.z + min.z) / 2);
+        this.center = Vector3d.xyz(
+                (max.x() + min.x()) / 2,
+                (max.y() + min.y()) / 2,
+                (max.z() + min.z()) / 2);
 
-        this.bounds = new Vector3d(
-                Math.abs(max.x - min.x),
-                Math.abs(max.y - min.y),
-                Math.abs(max.z - min.z));
+        this.bounds = Vector3d.xyz(
+                Math.abs(max.x() - min.x()),
+                Math.abs(max.y() - min.y()),
+                Math.abs(max.z() - min.z()));
 
         this.min = min.clone();
         this.max = max.clone();
@@ -105,9 +107,9 @@ public boolean contains(Vertex v) {
      * {@code false} otherwise
      */
     public boolean contains(Vector3d v) {
-        boolean inX = min.x <= v.x && v.x <= max.x;
-        boolean inY = min.y <= v.y && v.y <= max.y;
-        boolean inZ = min.z <= v.z && v.z <= max.z;
+        boolean inX = min.x() <= v.x() && v.x() <= max.x();
+        boolean inY = min.y() <= v.y() && v.y() <= max.y();
+        boolean inZ = min.z() <= v.z() && v.z() <= max.z();
 
         return inX && inY && inZ;
     }
@@ -148,13 +150,13 @@ public boolean intersects(Polygon p) {
      */
     public boolean intersects(Bounds b) {
 
-        if (b.getMin().x > this.getMax().x || b.getMax().x < this.getMin().x) {
+        if (b.getMin().x() > this.getMax().x() || b.getMax().x() < this.getMin().x()) {
             return false;
         }
-        if (b.getMin().y > this.getMax().y || b.getMax().y < this.getMin().y) {
+        if (b.getMin().y() > this.getMax().y() || b.getMax().y() < this.getMin().y()) {
             return false;
         }
-        if (b.getMin().z > this.getMax().z || b.getMax().z < this.getMin().z) {
+        if (b.getMin().z() > this.getMax().z() || b.getMax().z() < this.getMin().z()) {
             return false;
         }