Reorganize math code into: com.jogamp.opengl.math and com.jogamp.opengl.math.geom packages

Note: WIP - We may relocate / reorg math package.

Public relocations:

com.jogamp.opengl.util -> com.jogamp.opengl.math
  - FixedPoint
  - FloatUtil

com.jogamp.graph.math -> com.jogamp.opengl.math
  - Quaternion
  - VectorUtil

com.jogamp.graph.geom -> com.jogamp.opengl.math.geom
  - AABBox

VectorUtil:
  Introducing Vert2fImmutable and Vert3fImmutable interfaces, allowing graph Vertex instances
  to be used 'graph' agnostic and to document 2d/3d use-cases.

9 files changed, 16 insertions, 1157 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
index e60fba02b..a3749788b 100755
--- a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
@@ -32,11 +32,11 @@ import java.util.Collections;
 
 import com.jogamp.graph.curve.tess.Triangulation;
 import com.jogamp.graph.curve.tess.Triangulator;
-import com.jogamp.graph.geom.AABBox;
 import com.jogamp.graph.geom.Outline;
 import com.jogamp.graph.geom.Triangle;
 import com.jogamp.graph.geom.Vertex;
-import com.jogamp.graph.math.VectorUtil;
+import com.jogamp.opengl.math.VectorUtil;
+import com.jogamp.opengl.math.geom.AABBox;
 
 
 /** A Generic shape objects which is defined by a list of Outlines.
diff --git a/src/jogl/classes/com/jogamp/graph/curve/Region.java b/src/jogl/classes/com/jogamp/graph/curve/Region.java
index af15f9dc4..8b6d000fa 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/Region.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/Region.java
@@ -31,9 +31,9 @@ import java.util.ArrayList;
 
 import jogamp.opengl.Debug;
 
-import com.jogamp.graph.geom.AABBox;
 import com.jogamp.graph.geom.Triangle;
 import com.jogamp.graph.geom.Vertex;
+import com.jogamp.opengl.math.geom.AABBox;
 
 /** Abstract Outline shape GL representation
  *  define the method an OutlineShape(s) is
diff --git a/src/jogl/classes/com/jogamp/graph/font/Font.java b/src/jogl/classes/com/jogamp/graph/font/Font.java
index e2b3fe5d7..64a3a3e6c 100644
--- a/src/jogl/classes/com/jogamp/graph/font/Font.java
+++ b/src/jogl/classes/com/jogamp/graph/font/Font.java
@@ -27,7 +27,7 @@
  */
 package com.jogamp.graph.font;
 
-import com.jogamp.graph.geom.AABBox;
+import com.jogamp.opengl.math.geom.AABBox;
 
 /**
  * Interface wrapper for font implementation.
diff --git a/src/jogl/classes/com/jogamp/graph/geom/AABBox.java b/src/jogl/classes/com/jogamp/graph/geom/AABBox.java
deleted file mode 100644
index 87f084919..000000000
--- a/src/jogl/classes/com/jogamp/graph/geom/AABBox.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-package com.jogamp.graph.geom;
-
-import com.jogamp.graph.math.VectorUtil;
-
-/**
- * Axis Aligned Bounding Box. Defined by two 3D coordinates (low and high)
- * The low being the the lower left corner of the box, and the high being the upper 
- * right corner of the box.
- * 
- */
-public class AABBox implements Cloneable {
-    private float[] low = new float[3];
-    private float[] high = new float[3];
-    private float[] center = new float[3];
-
-    /** Create a Axis Aligned bounding box (AABBox) 
-     * where the low and and high MAX float Values.
-     */
-    public AABBox() {
-        reset();
-    }
-
-    /** Create an AABBox specifying the coordinates 
-     * of the low and high
-     * @param lx min x-coordinate
-     * @param ly min y-coordnate
-     * @param lz min z-coordinate
-     * @param hx max x-coordinate
-     * @param hy max y-coordinate
-     * @param hz max z-coordinate
-     */
-    public AABBox(float lx, float ly, float lz,
-            float hx, float hy, float hz)
-    {
-        reset();
-        resize(lx, ly, lz);
-        resize(hx, hy, hz);
-
-        computeCenter();
-    }
-    
-    /** Create a AABBox defining the low and high
-     * @param low min xyz-coordinates
-     * @param high max xyz-coordinates
-     */
-    public AABBox(float[] low, float[] high) {
-        reset();
-        resize(low[0],low[1],low[2]);
-        resize(high[0],high[1],high[2]);
-
-        computeCenter();
-    }
-
-    /** resets this box to the inverse low/high, allowing the next {@link #resize(float, float, float)} command to hit. */
-    public final void reset() {
-        setLow(Float.MAX_VALUE,Float.MAX_VALUE,Float.MAX_VALUE);
-        setHigh(-1*Float.MAX_VALUE,-1*Float.MAX_VALUE,-1*Float.MAX_VALUE);
-        center[0] = 0f;
-        center[1] = 0f;
-        center[2] = 0f;
-    }
-    
-    /** Get the max xyz-coordinates
-     * @return a float array containing the max xyz coordinates
-     */
-    public final float[] getHigh() {
-        return high;
-    }
-    
-    private final void setHigh(float hx, float hy, float hz) {
-        this.high[0] = hx;
-        this.high[1] = hy;
-        this.high[2] = hz;
-    }
-    
-    /** Get the min xyz-coordinates
-     * @return a float array containing the min xyz coordinates
-     */
-    public final float[] getLow() {
-        return low;
-    }
-    
-    private final void setLow(float lx, float ly, float lz) {
-        this.low[0] = lx;
-        this.low[1] = ly;
-        this.low[2] = lz;
-    }
-
-    /** Resize the AABBox to encapsulate another AABox
-     * @param newBox AABBox to be encapsulated in
-     */
-    public final void resize(AABBox newBox) {
-        float[] newLow = newBox.getLow();
-        float[] newHigh = newBox.getHigh();
-
-        /** test low */
-        if (newLow[0] < low[0])
-            low[0] = newLow[0];
-        if (newLow[1] < low[1])
-            low[1] = newLow[1];
-        if (newLow[2] < low[2])
-            low[2] = newLow[2];
-
-        /** test high */
-        if (newHigh[0] > high[0])
-            high[0] = newHigh[0];
-        if (newHigh[1] > high[1])
-            high[1] = newHigh[1];
-        if (newHigh[2] > high[2])
-            high[2] = newHigh[2];
-
-        computeCenter();
-    }
-
-    private final void computeCenter() {
-        center[0] = (high[0] + low[0])/2;
-        center[1] = (high[1] + low[1])/2;
-        center[2] = (high[2] + low[2])/2;
-    }
-
-    /** Resize the AABBox to encapsulate the passed
-     * xyz-coordinates. 
-     * @param x x-axis coordinate value
-     * @param y y-axis coordinate value
-     * @param z z-axis coordinate value
-     */
-    public final void resize(float x, float y, float z) {    
-        /** test low */
-        if (x < low[0])
-            low[0] = x;
-        if (y < low[1])
-            low[1] = y;
-        if (z < low[2])
-            low[2] = z;
-
-        /** test high */
-        if (x > high[0])
-            high[0] = x;
-        if (y > high[1])
-            high[1] = y;
-        if (z > high[2])
-            high[2] = z;
-        
-        computeCenter();
-    }
-
-    /** Resize the AABBox to encapsulate the passed
-     * xyz-coordinates. 
-     * @param xyz xyz-axis coordinate values
-     * @param offset of the array
-     */
-    public final void resize(float[] xyz, int offset) {
-        resize(xyz[0+offset], xyz[1+offset], xyz[2+offset]);
-    }
-
-    /** Check if the x & y coordinates are bounded/contained
-     *  by this AABBox
-     * @param x  x-axis coordinate value
-     * @param y  y-axis coordinate value
-     * @return true if  x belong to (low.x, high.x) and
-     * y belong to (low.y, high.y)
-     */
-    public final boolean contains(float x, float y) {
-        if(x<low[0] || x>high[0]){
-            return false;
-        }
-        if(y<low[1]|| y>high[1]){
-            return false;
-        }
-        return true;
-    }
-    
-    /** Check if the xyz coordinates are bounded/contained
-     *  by this AABBox.
-     * @param x x-axis coordinate value
-     * @param y y-axis coordinate value
-     * @param z z-axis coordinate value
-     * @return true if  x belong to (low.x, high.x) and
-     * y belong to (low.y, high.y) and  z belong to (low.z, high.z)
-     */
-    public final boolean contains(float x, float y, float z) {
-        if(x<low[0] || x>high[0]){
-            return false;
-        }
-        if(y<low[1]|| y>high[1]){
-            return false;
-        }
-        if(z<low[2] || z>high[2]){
-            return false;
-        }
-        return true;
-    }
-    
-    /** Check if there is a common region between this AABBox and the passed
-     *     2D region irrespective of z range
-     * @param x lower left x-coord
-     * @param y lower left y-coord
-     * @param w width
-     * @param h hight
-     * @return true if this AABBox might have a common region with this 2D region
-     */
-    public final boolean intersects(float x, float y, float w, float h) {
-        if (w <= 0 || h <= 0) {
-            return false;
-        }
-        
-        final float _w = getWidth();
-        final float _h = getHeight();        
-        if (_w <= 0 || _h <= 0) {
-            return false;
-        }
-        
-        final float x0 = getMinX();
-        final float y0 = getMinY();
-        return (x + w > x0 &&
-                y + h > y0 &&
-                x < x0 + _w &&
-                y < y0 + _h);
-    }
-
-    
-    /** Get the size of the Box where the size is represented by the 
-     * length of the vector between low and high.
-     * @return a float representing the size of the AABBox
-     */
-    public final float getSize() {
-        return VectorUtil.computeLength(low, high);
-    }
-
-    /**Get the Center of the AABBox
-     * @return the xyz-coordinates of the center of the AABBox
-     */
-    public final float[] getCenter() {
-        return center;
-    }
-
-    /** Scale the AABBox by a constant
-     * @param size a constant float value
-     */
-    public final void scale(float size) {
-        float[] diffH = new float[3];
-        diffH[0] = high[0] - center[0];
-        diffH[1] = high[1] - center[1];
-        diffH[2] = high[2] - center[2];
-        
-        diffH = VectorUtil.scale(diffH, size);
-        
-        float[] diffL = new float[3];
-        diffL[0] = low[0] - center[0];
-        diffL[1] = low[1] - center[1];
-        diffL[2] = low[2] - center[2];
-        
-        diffL = VectorUtil.scale(diffL, size);
-        
-        high = VectorUtil.vectorAdd(center, diffH);
-        low = VectorUtil.vectorAdd(center, diffL);
-    }
-
-    public final float getMinX() {
-        return low[0];
-    }
-    
-    public final float getMinY() {
-        return low[1];
-    }
-    
-    public final float getWidth(){
-        return high[0] - low[0];
-    }
-    
-    public final float getHeight() {
-        return high[1] - low[1];
-    }
-    
-    public final float getDepth() {
-        return high[2] - low[2];
-    }
-    
-    public final AABBox clone() {
-        return new AABBox(this.low, this.high);
-    }
-    
-    public final boolean equals(Object obj) {
-        if( obj == this ) {
-            return true;
-        }
-        if( null == obj || !(obj instanceof AABBox) ) {
-            return false;
-        }
-        final AABBox other = (AABBox) obj; 
-        return VectorUtil.checkEquality(low, other.low) &&          
-               VectorUtil.checkEquality(high, other.high) ;
-    }
-    
-    public final String toString() {
-        return "[ "+low[0]+"/"+low[1]+"/"+low[1]+" .. "+high[0]+"/"+high[0]+"/"+high[0]+", ctr "+
-                    center[0]+"/"+center[1]+"/"+center[1]+" ]";
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/graph/geom/Outline.java b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
index 5030488cc..12c45860b 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Outline.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
@@ -30,7 +30,8 @@ package com.jogamp.graph.geom;
 import java.util.ArrayList;
 
 import com.jogamp.graph.geom.Vertex;
-import com.jogamp.graph.math.VectorUtil;
+import com.jogamp.opengl.math.VectorUtil;
+import com.jogamp.opengl.math.geom.AABBox;
 
 
 
diff --git a/src/jogl/classes/com/jogamp/graph/geom/Vertex.java b/src/jogl/classes/com/jogamp/graph/geom/Vertex.java
index 3080f32cc..e3df86de1 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Vertex.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Vertex.java
@@ -27,10 +27,12 @@
  */
 package com.jogamp.graph.geom;
 
+import com.jogamp.opengl.math.Vert3fImmutable;
+
 /**
  * A Vertex with custom memory layout using custom factory. 
  */
-public interface Vertex extends Cloneable {
+public interface Vertex extends Vert3fImmutable, Cloneable {
 
     public static interface Factory <T extends Vertex> {
         T create();
@@ -47,20 +49,12 @@ public interface Vertex extends Cloneable {
      */
     void setCoord(float[] coordsBuffer, int offset, int length);
     
-    float[] getCoord();
-
     void setX(float x);
 
     void setY(float y);
 
     void setZ(float z);
 
-    float getX();
-
-    float getY();
-
-    float getZ();
-
     boolean isOnCurve();
 
     void setOnCurve(boolean onCurve);
diff --git a/src/jogl/classes/com/jogamp/graph/geom/opengl/SVertex.java b/src/jogl/classes/com/jogamp/graph/geom/opengl/SVertex.java
index 9dade17e9..97e438b63 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/opengl/SVertex.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/opengl/SVertex.java
@@ -28,7 +28,7 @@
 package com.jogamp.graph.geom.opengl;
 
 import com.jogamp.graph.geom.Vertex;
-import com.jogamp.graph.math.VectorUtil;
+import com.jogamp.opengl.math.VectorUtil;
 
 /** A Simple Vertex Implementation. Where the coordinates, and other attributes are
  * float based, and the coordinates and texture coordinates are saved in two float arrays.
@@ -88,6 +88,12 @@ public class SVertex implements Vertex {
         System.arraycopy(coordsBuffer, offset, coord, 0, length);
     }
         
+    @Override
+    public int getCoordCount() {
+        return 3;
+    }
+    
+    @Override
     public final float[] getCoord() {
         return coord;
     }
diff --git a/src/jogl/classes/com/jogamp/graph/math/Quaternion.java b/src/jogl/classes/com/jogamp/graph/math/Quaternion.java
deleted file mode 100755
index cbdf52dff..000000000
--- a/src/jogl/classes/com/jogamp/graph/math/Quaternion.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-package com.jogamp.graph.math;
-
-import com.jogamp.opengl.FloatUtil;
-
-
-public class Quaternion {
-    protected float x,y,z,w;
-
-    public Quaternion(){
-
-    }
-    
-    public Quaternion(float x, float y, float z, float w) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.w = w;
-    }
-    
-    /** Constructor to create a rotation based quaternion from two vectors
-     * @param vector1
-     * @param vector2
-     */
-    public Quaternion(float[] vector1, float[] vector2) 
-    {
-        float theta = (float)FloatUtil.acos(dot(vector1, vector2));
-        float[] cross = cross(vector1,vector2);
-        cross = normalizeVec(cross);
-
-        this.x = (float)FloatUtil.sin(theta/2)*cross[0];
-        this.y = (float)FloatUtil.sin(theta/2)*cross[1];
-        this.z = (float)FloatUtil.sin(theta/2)*cross[2];
-        this.w = (float)FloatUtil.cos(theta/2);
-        this.normalize();
-    }
-    
-    /** Transform the rotational quaternion to axis based rotation angles
-     * @return new float[4] with ,theta,Rx,Ry,Rz
-     */
-    public float[] toAxis()
-    {
-        float[] vec = new float[4];
-        float scale = (float)FloatUtil.sqrt(x * x + y * y + z * z);
-        vec[0] =(float) FloatUtil.acos(w) * 2.0f;
-        vec[1] = x / scale;
-        vec[2] = y / scale;
-        vec[3] = z / scale;
-        return vec;
-    }
-    
-    /** Normalize a vector
-     * @param vector input vector
-     * @return normalized vector
-     */
-    private float[] normalizeVec(float[] vector)
-    {
-        float[] newVector = new float[3];
-
-        float d = FloatUtil.sqrt(vector[0]*vector[0] + vector[1]*vector[1] + vector[2]*vector[2]);
-        if(d> 0.0f)
-        {
-            newVector[0] = vector[0]/d;
-            newVector[1] = vector[1]/d;
-            newVector[2] = vector[2]/d;
-        }
-        return newVector;
-    }
-    /** compute the dot product of two points
-     * @param vec1 vector 1
-     * @param vec2 vector 2
-     * @return the dot product as float
-     */
-    private float dot(float[] vec1, float[] vec2)
-    {
-        return (vec1[0]*vec2[0] + vec1[1]*vec2[1] + vec1[2]*vec2[2]);
-    }
-    /** cross product vec1 x vec2
-     * @param vec1 vector 1
-     * @param vec2 vecttor 2
-     * @return the resulting vector
-     */
-    private float[] cross(float[] vec1, float[] vec2)
-    {
-        float[] out = new float[3];
-
-        out[0] = vec2[2]*vec1[1] - vec2[1]*vec1[2];
-        out[1] = vec2[0]*vec1[2] - vec2[2]*vec1[0];
-        out[2] = vec2[1]*vec1[0] - vec2[0]*vec1[1];
-
-        return out;
-    }
-    public float getW() {
-        return w;
-    }
-    public void setW(float w) {
-        this.w = w;
-    }
-    public float getX() {
-        return x;
-    }
-    public void setX(float x) {
-        this.x = x;
-    }
-    public float getY() {
-        return y;
-    }
-    public void setY(float y) {
-        this.y = y;
-    }
-    public float getZ() {
-        return z;
-    }
-    public void setZ(float z) {
-        this.z = z;
-    }
-
-    /** Add a quaternion
-     * @param q quaternion
-     */
-    public void add(Quaternion q)
-    {
-        x+=q.x;
-        y+=q.y;
-        z+=q.z;
-    }
-    
-    /** Subtract a quaternion
-     * @param q quaternion
-     */
-    public void subtract(Quaternion q)
-    {
-        x-=q.x;
-        y-=q.y;
-        z-=q.z;
-    }
-    
-    /** Divide a quaternion by a constant
-     * @param n a float to divide by
-     */
-    public void divide(float n)
-    {
-        x/=n;
-        y/=n;
-        z/=n;
-    }
-    
-    /** Multiply this quaternion by 
-     * the param quaternion
-     * @param q a quaternion to multiply with
-     */
-    public void mult(Quaternion q)
-    {
-        float w1 = w*q.w - x*q.x - y*q.y - z*q.z;
-
-        float x1 = w*q.x + x*q.w + y*q.z - z*q.y;
-        float y1 = w*q.y - x*q.z + y*q.w + x*q.x;
-        float z1 = w*q.z + x*q.y - y*q.x + y*q.w;
-
-        w = w1;
-        x = x1;
-        y = y1;
-        z = z1; 
-    }
-    
-    /** Multiply a quaternion by a constant
-     * @param n a float constant
-     */
-    public void mult(float n)
-    {
-        x*=n;
-        y*=n;
-        z*=n;
-    }
-    
-    /** Normalize a quaternion required if  
-     *  to be used as a rotational quaternion
-     */
-    public void normalize()
-    {
-        float norme = (float)FloatUtil.sqrt(w*w + x*x + y*y + z*z);
-        if (norme == 0.0f)
-        {
-            w = 1.0f; 
-            x = y = z = 0.0f;
-        }
-        else
-        {
-            float recip = 1.0f/norme;
-
-            w *= recip;
-            x *= recip;
-            y *= recip;
-            z *= recip;
-        }
-    }
-    
-    /** Invert the quaternion If rotational, 
-     * will produce a the inverse rotation
-     */
-    public void inverse()
-    {
-        float norm = w*w + x*x + y*y + z*z;
-
-        float recip = 1.0f/norm;
-
-        w *= recip;
-        x = -1*x*recip;
-        y = -1*y*recip;
-        z = -1*z*recip;
-    }
-    
-    /** Transform this quaternion to a
-     * 4x4 column matrix representing the rotation
-     * @return new float[16] column matrix 4x4 
-     */
-    public float[] toMatrix()
-    {
-        float[] matrix = new float[16];
-        matrix[0] = 1.0f - 2*y*y - 2*z*z;
-        matrix[1] = 2*x*y + 2*w*z;
-        matrix[2] = 2*x*z - 2*w*y;
-        matrix[3] = 0;
-
-        matrix[4] = 2*x*y - 2*w*z;
-        matrix[5] = 1.0f - 2*x*x - 2*z*z;
-        matrix[6] = 2*y*z + 2*w*x;
-        matrix[7] = 0;
-
-        matrix[8]  = 2*x*z + 2*w*y;
-        matrix[9]  = 2*y*z - 2*w*x;
-        matrix[10] = 1.0f - 2*x*x - 2*y*y;
-        matrix[11] = 0;
-
-        matrix[12] = 0;
-        matrix[13] = 0;
-        matrix[14] = 0;
-        matrix[15] = 1;
-        return matrix;
-    }
-    
-    /** Set this quaternion from a Sphereical interpolation
-     *  of two param quaternion, used mostly for rotational animation
-     * @param a initial quaternion
-     * @param b target quaternion
-     * @param t float between 0 and 1 representing interp.
-     */
-    public void slerp(Quaternion a,Quaternion b, float t)
-    {
-        float omega, cosom, sinom, sclp, sclq;
-        cosom = a.x*b.x + a.y*b.y + a.z*b.z + a.w*b.w;
-        if ((1.0f+cosom) > FloatUtil.E) {
-            if ((1.0f-cosom) > FloatUtil.E) {
-                omega = (float)FloatUtil.acos(cosom);
-                sinom = (float)FloatUtil.sin(omega);
-                sclp = (float)FloatUtil.sin((1.0f-t)*omega) / sinom;
-                sclq = (float)FloatUtil.sin(t*omega) / sinom;
-            }
-            else {
-                sclp = 1.0f - t;
-                sclq = t;
-            }
-            x = sclp*a.x + sclq*b.x;
-            y = sclp*a.y + sclq*b.y;
-            z = sclp*a.z + sclq*b.z;
-            w = sclp*a.w + sclq*b.w;
-        }
-        else {
-            x =-a.y;
-            y = a.x;
-            z =-a.w;
-            w = a.z;
-            sclp = FloatUtil.sin((1.0f-t) * FloatUtil.PI * 0.5f);
-            sclq = FloatUtil.sin(t * FloatUtil.PI * 0.5f);
-            x = sclp*a.x + sclq*b.x;
-            y = sclp*a.y + sclq*b.y;
-            z = sclp*a.z + sclq*b.z;
-        }
-    }
-    
-    /** Check if this quaternion is empty, ie (0,0,0,1)
-     * @return true if empty, false otherwise
-     */
-    public boolean isEmpty()
-    {
-        if (w==1 && x==0 && y==0 && z==0)
-            return true;
-        return false;
-    }
-    
-    /** Check if this quaternion represents an identity
-     * matrix, for rotation.
-     * @return true if it is an identity rep., false otherwise
-     */
-    public boolean isIdentity()
-    {
-        if (w==0 && x==0 && y==0 && z==0)
-            return true;
-        return false;
-    }
-    
-    /** compute the quaternion from a 3x3 column matrix
-     * @param m 3x3 column matrix 
-     */
-    public void setFromMatrix(float[] m) {
-        float T= m[0] + m[4] + m[8] + 1;
-        if (T>0){
-            float S = 0.5f / (float)FloatUtil.sqrt(T);
-            w = 0.25f / S;
-            x = ( m[5] - m[7]) * S;
-            y = ( m[6] - m[2]) * S;
-            z = ( m[1] - m[3] ) * S;
-        }
-        else{
-            if ((m[0] > m[4])&(m[0] > m[8])) { 
-                float S = FloatUtil.sqrt( 1.0f + m[0] - m[4] - m[8] ) * 2f; // S=4*qx 
-                w = (m[7] - m[5]) / S;
-                x = 0.25f * S;
-                y = (m[3] + m[1]) / S; 
-                z = (m[6] + m[2]) / S; 
-            } 
-            else if (m[4] > m[8]) { 
-                float S = FloatUtil.sqrt( 1.0f + m[4] - m[0] - m[8] ) * 2f; // S=4*qy
-                w = (m[6] - m[2]) / S;
-                x = (m[3] + m[1]) / S; 
-                y = 0.25f * S;
-                z = (m[7] + m[5]) / S; 
-            } 
-            else { 
-                float S = FloatUtil.sqrt( 1.0f + m[8] - m[0] - m[4] ) * 2f; // S=4*qz
-                w = (m[3] - m[1]) / S;
-                x = (m[6] + m[2]) / S; 
-                y = (m[7] + m[5]) / S; 
-                z = 0.25f * S;
-            } 
-        }
-    }
-    
-    /** Check if the the 3x3 matrix (param) is in fact 
-     * an affine rotational matrix
-     * @param m 3x3 column matrix
-     * @return true if representing a rotational matrix, false otherwise
-     */
-    public boolean isRotationMatrix(float[] m) {
-        double epsilon = 0.01; // margin to allow for rounding errors
-        if (FloatUtil.abs(m[0]*m[3] + m[3]*m[4] + m[6]*m[7]) > epsilon) return false;
-        if (FloatUtil.abs(m[0]*m[2] + m[3]*m[5] + m[6]*m[8]) > epsilon) return false;
-        if (FloatUtil.abs(m[1]*m[2] + m[4]*m[5] + m[7]*m[8]) > epsilon) return false;
-        if (FloatUtil.abs(m[0]*m[0] + m[3]*m[3] + m[6]*m[6] - 1) > epsilon) return false;
-        if (FloatUtil.abs(m[1]*m[1] + m[4]*m[4] + m[7]*m[7] - 1) > epsilon) return false;
-        if (FloatUtil.abs(m[2]*m[2] + m[5]*m[5] + m[8]*m[8] - 1) > epsilon) return false;
-        return (FloatUtil.abs(determinant(m)-1) < epsilon);
-    }
-    private float determinant(float[] m) {
-          return m[0]*m[4]*m[8] + m[3]*m[7]*m[2] + m[6]*m[1]*m[5] - m[0]*m[7]*m[5] - m[3]*m[1]*m[8] - m[6]*m[4]*m[2];
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/graph/math/VectorUtil.java b/src/jogl/classes/com/jogamp/graph/math/VectorUtil.java
deleted file mode 100755
index 540e901b8..000000000
--- a/src/jogl/classes/com/jogamp/graph/math/VectorUtil.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-package com.jogamp.graph.math;
-
-import java.util.ArrayList;
-
-
-import com.jogamp.graph.geom.Vertex;
-import com.jogamp.opengl.FloatUtil;
-
-public class VectorUtil {
-
-    public enum Winding {
-        CW(-1), CCW(1);
-
-        public final int dir;
-
-        Winding(int dir) {
-            this.dir = dir;
-        }
-    } 
-
-    public static final int COLLINEAR = 0;
-
-    /** compute the dot product of two points
-     * @param vec1 vector 1
-     * @param vec2 vector 2
-     * @return the dot product as float
-     */
-    public static float dot(float[] vec1, float[] vec2)
-    {
-        return (vec1[0]*vec2[0] + vec1[1]*vec2[1] + vec1[2]*vec2[2]);
-    }
-    /** Normalize a vector
-     * @param vector input vector
-     * @return normalized vector
-     */
-    public static float[] normalize(float[] vector)
-    {
-        float[] newVector = new float[3];
-
-        float d = FloatUtil.sqrt(vector[0]*vector[0] + vector[1]*vector[1] + vector[2]*vector[2]);
-        if(d> 0.0f)
-        {
-            newVector[0] = vector[0]/d;
-            newVector[1] = vector[1]/d;
-            newVector[2] = vector[2]/d;
-        }
-        return newVector;
-    }
-
-    /** Scales a vector by param
-     * @param vector input vector
-     * @param scale constant to scale by
-     * @return scaled vector
-     */
-    public static float[] scale(float[] vector, float scale)
-    {
-        float[] newVector = new float[3];
-
-        newVector[0] = vector[0]*scale;
-        newVector[1] = vector[1]*scale;
-        newVector[2] = vector[2]*scale;
-        return newVector;
-    }
-
-    /** Adds to vectors
-     * @param v1 vector 1
-     * @param v2 vector 2
-     * @return v1 + v2
-     */
-    public static float[] vectorAdd(float[] v1, float[] v2)
-    {
-        float[] newVector = new float[3];
-
-        newVector[0] = v1[0] + v2[0];
-        newVector[1] = v1[1] + v2[1];
-        newVector[2] = v1[2] + v2[2];
-        return newVector;
-    }
-
-    /** cross product vec1 x vec2
-     * @param vec1 vector 1
-     * @param vec2 vecttor 2
-     * @return the resulting vector
-     */
-    public static float[] cross(float[] vec1, float[] vec2)
-    {
-        float[] out = new float[3];
-
-        out[0] = vec2[2]*vec1[1] - vec2[1]*vec1[2];
-        out[1] = vec2[0]*vec1[2] - vec2[2]*vec1[0];
-        out[2] = vec2[1]*vec1[0] - vec2[0]*vec1[1];
-
-        return out;
-    }
-
-    /** Column Matrix Vector multiplication
-     * @param colMatrix column matrix (4x4)
-     * @param vec vector(x,y,z)
-     * @return result new float[3] 
-     */
-    public static float[] colMatrixVectorMult(float[] colMatrix, float[] vec)
-    {
-        float[] out = new float[3];
-
-        out[0] = vec[0]*colMatrix[0] + vec[1]*colMatrix[4] + vec[2]*colMatrix[8] + colMatrix[12]; 
-        out[1] = vec[0]*colMatrix[1] + vec[1]*colMatrix[5] + vec[2]*colMatrix[9] + colMatrix[13]; 
-        out[2] = vec[0]*colMatrix[2] + vec[1]*colMatrix[6] + vec[2]*colMatrix[10] + colMatrix[14]; 
-
-        return out;
-    }
-
-    /** Matrix Vector multiplication
-     * @param rawMatrix column matrix (4x4)
-     * @param vec vector(x,y,z)
-     * @return result new float[3] 
-     */
-    public static float[] rowMatrixVectorMult(float[] rawMatrix, float[] vec)
-    {
-        float[] out = new float[3];
-
-        out[0] = vec[0]*rawMatrix[0] + vec[1]*rawMatrix[1] + vec[2]*rawMatrix[2] + rawMatrix[3]; 
-        out[1] = vec[0]*rawMatrix[4] + vec[1]*rawMatrix[5] + vec[2]*rawMatrix[6] + rawMatrix[7]; 
-        out[2] = vec[0]*rawMatrix[8] + vec[1]*rawMatrix[9] + vec[2]*rawMatrix[10] + rawMatrix[11]; 
-
-        return out;
-    }
-
-    /** Calculate the midpoint of two values
-     * @param p1 first value
-     * @param p2 second vale
-     * @return midpoint
-     */
-    public static float mid(float p1, float p2)
-    {
-        return (p1+p2)/2.0f;
-    }
-    /** Calculate the midpoint of two points
-     * @param p1 first point
-     * @param p2 second point
-     * @return midpoint
-     */
-    public static float[] mid(float[] p1, float[] p2)
-    {
-        float[] midPoint = new float[3];
-        midPoint[0] = (p1[0] + p2[0])*0.5f;
-        midPoint[1] = (p1[1] + p2[1])*0.5f;
-        midPoint[2] = (p1[2] + p2[2])*0.5f;
-
-        return midPoint;
-    }
-    /** Compute the norm of a vector
-     * @param vec vector
-     * @return vorm
-     */
-    public static float norm(float[] vec)
-    {
-        return FloatUtil.sqrt(vec[0]*vec[0] + vec[1]*vec[1] + vec[2]*vec[2]);
-    }
-    /** Compute distance between 2 points
-     * @param p0 a ref point on the line
-     * @param vec vector representing the direction of the line
-     * @param point the point to compute the relative distance of
-     * @return distance float
-     */
-    public static float computeLength(float[] p0, float[] point)
-    {
-        float[] w = new float[]{point[0]-p0[0],point[1]-p0[1],point[2]-p0[2]};
-
-        float distance = FloatUtil.sqrt(w[0]*w[0] + w[1]*w[1] + w[2]*w[2]);
-
-        return distance;
-    }
-
-    /**Check equality of 2 vec3 vectors
-     * @param v1 vertex 1
-     * @param v2 vertex 2
-     * @return
-     */
-    public static boolean checkEquality(float[] v1, float[] v2)
-    {
-        if(Float.compare(v1[0], v2[0]) == 0 &&
-                Float.compare(v1[1], v2[1]) == 0 &&
-                Float.compare(v1[2], v2[2]) == 0 )
-            return true;
-        return false;
-    }
-
-    /**Check equality of 2 vec2 vectors
-     * @param v1 vertex 1
-     * @param v2 vertex 2
-     * @return
-     */
-    public static boolean checkEqualityVec2(float[] v1, float[] v2)
-    {
-        if(Float.compare(v1[0], v2[0]) == 0 && 
-                Float.compare(v1[1], v2[1]) == 0)
-            return true;
-        return false;
-    }
-
-    /** Compute the determinant of 3 vectors
-     * @param a vector 1
-     * @param b vector 2
-     * @param c vector 3
-     * @return the determinant value
-     */
-    public static float computeDeterminant(float[] a, float[] b, float[] c)
-    {
-        float area = a[0]*b[1]*c[2] + a[1]*b[2]*c[0] + a[2]*b[0]*c[1] - a[0]*b[2]*c[1] - a[1]*b[0]*c[2] - a[2]*b[1]*c[0];
-        return area;
-    }
-
-    /** Check if three vertices are colliniear
-     * @param v1 vertex 1
-     * @param v2 vertex 2
-     * @param v3 vertex 3
-     * @return true if collinear, false otherwise
-     */
-    public static boolean checkCollinear(float[] v1, float[] v2, float[] v3)
-    {
-        return (computeDeterminant(v1, v2, v3) == VectorUtil.COLLINEAR);
-    }
-
-    /** Compute Vector
-     * @param v1 vertex 1
-     * @param v2 vertex2 2
-     * @return Vector V1V2
-     */
-    public static float[] computeVector(float[] v1, float[] v2)
-    {
-        float[] vector = new float[3];
-        vector[0] = v2[0] - v1[0];
-        vector[1] = v2[1] - v1[1];
-        vector[2] = v2[2] - v1[2];
-        return vector;
-    }
-
-    /** Check if vertices in triangle circumcircle
-     * @param a triangle vertex 1
-     * @param b triangle vertex 2
-     * @param c triangle vertex 3
-     * @param d vertex in question
-     * @return true if the vertex d is inside the circle defined by the 
-     * vertices a, b, c. from paper by Guibas and Stolfi (1985).
-     */
-    public static boolean inCircle(Vertex a, Vertex b, Vertex c, Vertex d){
-        return (a.getX() * a.getX() + a.getY() * a.getY()) * triArea(b, c, d) -
-        (b.getX() * b.getX() + b.getY() * b.getY()) * triArea(a, c, d) +
-        (c.getX() * c.getX() + c.getY() * c.getY()) * triArea(a, b, d) -
-        (d.getX() * d.getX() + d.getY() * d.getY()) * triArea(a, b, c) > 0;
-    }
-
-    /** Computes oriented area of a triangle
-     * @param a first vertex
-     * @param b second vertex
-     * @param c third vertex
-     * @return compute twice the area of the oriented triangle (a,b,c), the area
-     * is positive if the triangle is oriented counterclockwise.
-     */
-    public static float triArea(Vertex a, Vertex b, Vertex c){
-        return (b.getX() - a.getX()) * (c.getY() - a.getY()) - (b.getY() - a.getY())*(c.getX() - a.getX());
-    }
-
-    /** Check if a vertex is in triangle using 
-     * barycentric coordinates computation. 
-     * @param a first triangle vertex
-     * @param b second triangle vertex
-     * @param c third triangle vertex
-     * @param p the vertex in question
-     * @return true if p is in triangle (a, b, c), false otherwise.
-     */
-    public static boolean vertexInTriangle(float[] a, float[]  b, float[]  c, float[]  p){
-        // Compute vectors        
-        float[] ac = computeVector(a, c); //v0
-        float[] ab = computeVector(a, b); //v1
-        float[] ap = computeVector(a, p); //v2
-
-        // Compute dot products
-        float dot00 = dot(ac, ac);
-        float dot01 = dot(ac, ab);
-        float dot02 = dot(ac, ap);
-        float dot11 = dot(ab, ab);
-        float dot12 = dot(ab, ap);
-
-        // Compute barycentric coordinates
-        float invDenom = 1 / (dot00 * dot11 - dot01 * dot01);
-        float u = (dot11 * dot02 - dot01 * dot12) * invDenom;
-        float v = (dot00 * dot12 - dot01 * dot02) * invDenom;
-
-        // Check if point is in triangle
-        return (u >= 0) && (v >= 0) && (u + v < 1);
-    }
-
-    /** Check if points are in ccw order
-     * @param a first vertex
-     * @param b second vertex
-     * @param c third vertex
-     * @return true if the points a,b,c are in a ccw order
-     */
-    public static boolean ccw(Vertex a, Vertex b, Vertex c){
-        return triArea(a,b,c) > 0;
-    }
-
-    /** Compute the winding of given points
-     * @param a first vertex
-     * @param b second vertex
-     * @param c third vertex
-     * @return Winding
-     */
-    public static Winding getWinding(Vertex a, Vertex b, Vertex c) {
-        return triArea(a,b,c) > 0 ? Winding.CCW : Winding.CW ;
-    }
-
-    /** Computes the area of a list of vertices to check if ccw
-     * @param vertices
-     * @return positive area if ccw else negative area value
-     */
-    public static float area(ArrayList<Vertex> vertices) {
-        int n = vertices.size();
-        float area = 0.0f;
-        for (int p = n - 1, q = 0; q < n; p = q++)
-        {
-            float[] pCoord = vertices.get(p).getCoord();
-            float[] qCoord = vertices.get(q).getCoord();
-            area += pCoord[0] * qCoord[1] - qCoord[0] * pCoord[1];
-        }
-        return area;
-    }
-
-    /** Compute the  general winding of the vertices
-     * @param vertices array of Vertices
-     * @return CCW or CW {@link Winding}
-     */
-    public static Winding getWinding(ArrayList<Vertex> vertices) {
-        return area(vertices) >= 0 ? Winding.CCW : Winding.CW ;
-    }
-
-
-    /** Compute intersection between two segments
-     * @param a vertex 1 of first segment
-     * @param b vertex 2 of first segment
-     * @param c vertex 1 of second segment
-     * @param d vertex 2 of second segment
-     * @return the intersection coordinates if the segments intersect, otherwise 
-     * returns null 
-     */
-    public static float[] seg2SegIntersection(Vertex a, Vertex b, Vertex c, Vertex d) {
-        float determinant = (a.getX()-b.getX())*(c.getY()-d.getY()) - (a.getY()-b.getY())*(c.getX()-d.getX());
-
-        if (determinant == 0) 
-            return null;
-
-        float alpha = (a.getX()*b.getY()-a.getY()*b.getX());
-        float beta = (c.getX()*d.getY()-c.getY()*d.getY());
-        float xi = ((c.getX()-d.getX())*alpha-(a.getX()-b.getX())*beta)/determinant;
-        float yi = ((c.getY()-d.getY())*alpha-(a.getY()-b.getY())*beta)/determinant;
-
-        float gamma = (xi - a.getX())/(b.getX() - a.getX());
-        float gamma1 = (xi - c.getX())/(d.getX() - c.getX());
-        if(gamma <= 0 || gamma >= 1) return null;
-        if(gamma1 <= 0 || gamma1 >= 1) return null;
-
-        return new float[]{xi,yi,0};
-    }
-
-    /** Compute intersection between two lines
-     * @param a vertex 1 of first line
-     * @param b vertex 2 of first line
-     * @param c vertex 1 of second line
-     * @param d vertex 2 of second line
-     * @return the intersection coordinates if the lines intersect, otherwise 
-     * returns null 
-     */
-    public static float[] line2lineIntersection(Vertex a, Vertex b, Vertex c, Vertex d) {
-        float determinant = (a.getX()-b.getX())*(c.getY()-d.getY()) - (a.getY()-b.getY())*(c.getX()-d.getX());
-
-        if (determinant == 0) 
-            return null;
-
-        float alpha = (a.getX()*b.getY()-a.getY()*b.getX());
-        float beta = (c.getX()*d.getY()-c.getY()*d.getY());
-        float xi = ((c.getX()-d.getX())*alpha-(a.getX()-b.getX())*beta)/determinant;
-        float yi = ((c.getY()-d.getY())*alpha-(a.getY()-b.getY())*beta)/determinant;
-
-        return new float[]{xi,yi,0};
-    }
-
-    /** Check if a segment intersects with a triangle
-     * @param a vertex 1 of the triangle
-     * @param b vertex 2 of the triangle
-     * @param c vertex 3 of the triangle
-     * @param d vertex 1 of first segment
-     * @param e vertex 2 of first segment
-     * @return true if the segment intersects at least one segment of the triangle, false otherwise
-     */
-    public static boolean tri2SegIntersection(Vertex a, Vertex b, Vertex c, Vertex d, Vertex e){
-        if(seg2SegIntersection(a, b, d, e) != null)
-            return true;
-        if(seg2SegIntersection(b, c, d, e) != null)
-            return true;
-        if(seg2SegIntersection(a, c, d, e) != null)
-            return true;
-
-        return false;
-    }
-}