Bug 801: Remove Vertex.Factory from AffineTransform ; Add AABBox tranformed resize.

2 files changed, 8 insertions, 8 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/geom/Outline.java b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
index b299524c0..5f6dd028f 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Outline.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
@@ -87,7 +87,7 @@ public class Outline implements Cloneable, Comparable<Outline> {
         }
         vertices.add(position, vertex);
         if(!dirtyBBox) {
-            bbox.resize(vertex.getX(), vertex.getY(), vertex.getZ());
+            bbox.resize(vertex.getCoord());
         }
     }
 
@@ -187,12 +187,12 @@ public class Outline implements Cloneable, Comparable<Outline> {
     /**
      * Return a transformed instance with all vertices are copied and transformed.
      */
-    public final Outline transform(AffineTransform t) {
+    public final Outline transform(final AffineTransform t, final Vertex.Factory<? extends Vertex> vertexFactory) {
         final Outline newOutline = new Outline();
         final int vsize = vertices.size();
         for(int i=0; i<vsize; i++) {
             final Vertex v = vertices.get(i);
-            newOutline.addVertex(t.transform(v, null));
+            newOutline.addVertex(t.transform(v, vertexFactory.create()));
         }
         newOutline.closed = this.closed;
         return newOutline;
@@ -202,7 +202,7 @@ public class Outline implements Cloneable, Comparable<Outline> {
         dirtyBBox = false;
         bbox.reset();
         for (int i=0; i<vertices.size(); i++) {
-            bbox.resize(vertices.get(i).getCoord(), 0);
+            bbox.resize(vertices.get(i).getCoord());
         }
     }
 
diff --git a/src/jogl/classes/com/jogamp/graph/geom/Triangle.java b/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
index e353dd061..593d9cb24 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
@@ -67,11 +67,11 @@ public class Triangle {
     /**
      * Returns a transformed a clone of this instance using the given AffineTransform.
      */
-    public Triangle transform(AffineTransform t) {
+    public Triangle transform(final AffineTransform t, final Vertex.Factory<? extends Vertex> vertexFactory) {
         final Triangle tri = new Triangle(id, boundaryEdges, boundaryVertices);
-        tri.vertices[0] = t.transform(vertices[0], null);
-        tri.vertices[1] = t.transform(vertices[1], null);
-        tri.vertices[2] = t.transform(vertices[2], null);
+        tri.vertices[0] = t.transform(vertices[0], vertexFactory.create());
+        tri.vertices[1] = t.transform(vertices[1], vertexFactory.create());
+        tri.vertices[2] = t.transform(vertices[2], vertexFactory.create());
         return tri;
     }