[gef3d-commits] r238 - trunk/org.eclipse.draw3d/src/java/org/eclipse/dra

[genie@xxxxxxxxxxx]

Author: jvonpilgrim
Date: 2009-08-05 08:36:54 -0400 (Wed, 05 Aug 2009)
New Revision: 238

Modified:
   trunk/org.eclipse.draw3d/src/java/org/eclipse/draw3d/AbstractSurface.java
   trunk/org.eclipse.draw3d/src/java/org/eclipse/draw3d/ISurface.java
Log:
- fixed bug when calculating location of feedback figure
- removed ISurface.getWorldDimension(..), seems needless

Modified: trunk/org.eclipse.draw3d/src/java/org/eclipse/draw3d/AbstractSurface.java
===================================================================
--- trunk/org.eclipse.draw3d/src/java/org/eclipse/draw3d/AbstractSurface.java	2009-08-05 12:36:51 UTC (rev 237)
+++ trunk/org.eclipse.draw3d/src/java/org/eclipse/draw3d/AbstractSurface.java	2009-08-05 12:36:54 UTC (rev 238)
@@ -238,24 +238,26 @@
 		return result;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.draw3d.ISurface#getWorldDimension(org.eclipse.draw2d.geometry.Dimension,
-	 *      org.eclipse.draw3d.geometry.Vector3f)
-	 */
-	public Vector3f getWorldDimension(Dimension i_surface, Vector3f io_result) {
+//	Does not work like this, origin must be transformed as well and difference
+//	must be calculated.
+//	/**
+//	 * {@inheritDoc}
+//	 * 
+//	 * @see org.eclipse.draw3d.ISurface#getWorldDimension(org.eclipse.draw2d.geometry.Dimension,
+//	 *      org.eclipse.draw3d.geometry.Vector3f)
+//	 */
+//	public Vector3f getWorldDimension(Dimension i_surface, Vector3f io_result) {
+//
+//		Point p = Draw3DCache.getPoint();
+//		try {
+//			p.x = i_surface.width;
+//			p.y = i_surface.height;
+//			return getWorldLocation(p, io_result);
+//		} finally {
+//			Draw3DCache.returnPoint(p);
+//		}
+//	}
 
-		Point p = Draw3DCache.getPoint();
-		try {
-			p.x = i_surface.width;
-			p.y = i_surface.height;
-			return getWorldLocation(p, io_result);
-		} finally {
-			Draw3DCache.returnPoint(p);
-		}
-	}
-
 	/**
 	 * {@inheritDoc}
 	 * 

Modified: trunk/org.eclipse.draw3d/src/java/org/eclipse/draw3d/ISurface.java
===================================================================
--- trunk/org.eclipse.draw3d/src/java/org/eclipse/draw3d/ISurface.java	2009-08-05 12:36:51 UTC (rev 237)
+++ trunk/org.eclipse.draw3d/src/java/org/eclipse/draw3d/ISurface.java	2009-08-05 12:36:54 UTC (rev 238)
@@ -146,16 +146,17 @@
 	 */
 	public Vector3f getSurfaceLocation3D(IVector3f i_world, Vector3f io_result);
 
-	/**
-	 * Returns the world dimensions of the given dimension specified in 2D
-	 * surface coordinates.
-	 * 
-	 * @param i_surface the 2D surface coordinates of the dimension
-	 * @param io_result the result vector, if <code>null</code>, a new vector
-	 *            will be created
-	 * @return the result vector
-	 */
-	public Vector3f getWorldDimension(Dimension i_surface, Vector3f io_result);
+//	Seems needless
+//	/**
+//	 * Returns the world dimensions of the given dimension specified in 2D
+//	 * surface coordinates.
+//	 * 
+//	 * @param i_surface the 2D surface coordinates of the dimension
+//	 * @param io_result the result vector, if <code>null</code>, a new vector
+//	 *            will be created
+//	 * @return the result vector
+//	 */
+//	public Vector3f getWorldDimension(Dimension i_surface, Vector3f io_result);
 
 	/**
 	 * Returns the world coordinates of the given point specified in 3D surface