X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d.vtk%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fvtk%2Fawt%2FTranslateAction.java;h=a5edf45d7ce0462bf6b777124b92f60f6a76e13a;hb=HEAD;hp=d7d81331b7c757151f52b8532c3b4bd5aaf771f4;hpb=84132a1d750c45f9161afbd58b78572964e50d26;p=simantics%2F3d.git

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/awt/TranslateAction.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/awt/TranslateAction.java
index d7d81331..a5edf45d 100644
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/awt/TranslateAction.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/awt/TranslateAction.java
@@ -24,6 +24,7 @@ import javax.vecmath.Vector3d;
 import org.simantics.g3d.math.MathTools;
 import org.simantics.g3d.math.Ray;
 import org.simantics.g3d.scenegraph.IG3DNode;
+import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.g3d.scenegraph.structural.IStructuralNode;
 import org.simantics.g3d.vtk.Activator;
 import org.simantics.g3d.vtk.common.VTKNodeMap;
@@ -37,14 +38,14 @@ import vtk.vtkProp;
 public class TranslateAction extends vtkAwtAction{
 	
 	public static final int X = 0;
-    public static final int Y = 1;
-    public static final int Z = 2;
-    public static final int XY = 3;
-    public static final int XZ = 4;
-    public static final int YZ = 5;
-    public static final int P = 6;
+	public static final int Y = 1;
+	public static final int Z = 2;
+	public static final int XY = 3;
+	public static final int XZ = 4;
+	public static final int YZ = 5;
+	public static final int P = 6;
 
-	private VTKNodeMap nodeMap;
+	private VTKNodeMap<?, ? extends INode> nodeMap;
 	//private TranslateGizmo  gizmo = new TranslateGizmo();
 	private TranslateAxisGizmo gizmo = new TranslateAxisGizmo();
 	protected IG3DNode node;
@@ -67,7 +68,7 @@ public class TranslateAction extends vtkAwtAction{
 		return node;
 	}
 	
-	public TranslateAction(InteractiveVtkPanel panel, VTKNodeMap nodeMap) {
+	public TranslateAction(InteractiveVtkPanel panel, VTKNodeMap<?, ? extends INode> nodeMap) {
 		super(panel);
 		setImageDescriptor(Activator.imageDescriptorFromPlugin("com.famfamfam.silk", "icons/arrow_out.png"));
 		setText("Translate");
@@ -93,7 +94,7 @@ public class TranslateAction extends vtkAwtAction{
 	public void deattach() {
 		
 		node = null;
-		nodeMap.commit();
+		nodeMap.commit("Translate");
 		deattachUI();
 		super.deattach();
 		panel.repaint();
@@ -235,31 +236,31 @@ public class TranslateAction extends vtkAwtAction{
 		if (panel.GetRenderer().GetActiveCamera().GetParallelProjection() == 0) {
 			double distance = p.length();
 			p.negate();
-            double fov = panel.GetRenderer().GetActiveCamera().GetViewAngle();
-            float s = (float) (Math.sin(fov) * distance * 0.1); 
+			double fov = panel.GetRenderer().GetActiveCamera().GetViewAngle();
+			float s = (float) (Math.sin(fov) * distance * 0.1); 
 
-            Vector3d scale = new Vector3d(1., 1., 1.);
-            
+			Vector3d scale = new Vector3d(1., 1., 1.);
+			
 //            if (p.x > 0.f)
 //                scale.x = -1.;
 //            if (p.y > 0.f)
 //                scale.y = -1.;
 //            if (p.z > 0.f)
 //                scale.z = -1.;
-            scale.scale(s);
-            gizmo.setScale(scale);
+			scale.scale(s);
+			gizmo.setScale(scale);
 			
 		} else {
 			Vector3d scale = new Vector3d(1.f, 1.f, 1.f);
-            double s = panel.GetRenderer().GetActiveCamera().GetParallelScale() / 5.;
+			double s = panel.GetRenderer().GetActiveCamera().GetParallelScale() / 5.;
 //            if (p.x > 0.f)
 //                scale.x = -1.;
 //            if (p.y > 0.f)
 //                scale.y = -1.;
 //            if (p.z > 0.f)
 //                scale.z = -1.;
-            scale.scale(s);
-            gizmo.setScale(scale);
+			scale.scale(s);
+			gizmo.setScale(scale);
 		}
 		
 		//panel.Render();
@@ -346,31 +347,31 @@ public class TranslateAction extends vtkAwtAction{
 		node.setWorldPosition(pos);
 	}
 	
-	 private double istep = 10.0;
-	 private int decimals = 2;
-	
+	private double istep = 10.0;
+	private int decimals = 2;
+
 	protected Vector3d constaints(Vector3d p, boolean step) {
 		if(!step)
 			return p;
 		switch (index) {
 		case X:
-			 p.x = Math.round(istep * p.x) / istep;
-             BigDecimal bx = new BigDecimal(p.x);
-             bx.setScale(decimals, BigDecimal.ROUND_HALF_UP);
-             p.x = bx.doubleValue();
+			p.x = Math.round(istep * p.x) / istep;
+			BigDecimal bx = new BigDecimal(p.x);
+			bx.setScale(decimals, BigDecimal.ROUND_HALF_UP);
+			p.x = bx.doubleValue();
 			break;
 		case Y:
-			 p.y = Math.round(istep * p.y) / istep;
-             BigDecimal by = new BigDecimal(p.y);
-             by.setScale(decimals, BigDecimal.ROUND_HALF_UP);
-             p.y = by.doubleValue();
+			p.y = Math.round(istep * p.y) / istep;
+			BigDecimal by = new BigDecimal(p.y);
+			by.setScale(decimals, BigDecimal.ROUND_HALF_UP);
+			p.y = by.doubleValue();
 			break;
-			
+
 		case Z:
-			 p.z = Math.round(istep * p.z) / istep;
-             BigDecimal bz = new BigDecimal(p.z);
-             bz.setScale(decimals, BigDecimal.ROUND_HALF_UP);
-             p.z = bz.doubleValue();
+			p.z = Math.round(istep * p.z) / istep;
+			BigDecimal bz = new BigDecimal(p.z);
+			bz.setScale(decimals, BigDecimal.ROUND_HALF_UP);
+			p.z = bz.doubleValue();
 			break;
 		}
 		return p;
@@ -401,85 +402,85 @@ public class TranslateAction extends vtkAwtAction{
 			}
 			normal.normalize();
 			double s[] = new double[1];
-            Vector3d r = new Vector3d();
-            if (MathTools.intersectStraightPlane(ray.pos, ray.dir, p, normal, r)) {
-                r.sub(p);
-                translate.x = r.x;
-                translate.y = r.y;
-                translate.z = r.z;
-            }
-            break;
+			Vector3d r = new Vector3d();
+			if (MathTools.intersectStraightPlane(ray.pos, ray.dir, p, normal, r)) {
+				r.sub(p);
+				translate.x = r.x;
+				translate.y = r.y;
+				translate.z = r.z;
+			}
+			break;
 
-		 case X :
-	            dir = new Vector3d(1.0,0.0,0.0);
-	            if(!worldCoord)
-	            	MathTools.rotate(q, dir, dir);
-	            Vector3d i1 = new Vector3d();
-	            Vector3d i2 = new Vector3d();
-	            s = new double[2];
-	            MathTools.intersectStraightStraight( p, dir,ray.pos, ray.dir, i2, i1,s);
-	            translate.x = s[0];
-	            
-	            break;
-	        case Y :
-	            dir = new Vector3d(0.0,1.0,0.0);
-	            if(!worldCoord)
-	            	MathTools.rotate(q, dir, dir);
-	            i1 = new Vector3d();
-	            i2 = new Vector3d();
-	            s = new double[2];
-	            MathTools.intersectStraightStraight( p, dir,ray.pos, ray.dir, i2, i1,s);
-	            translate.y = s[0];
-	            break;
-	        case Z :
-	            dir = new Vector3d(0.0,0.0,1.0);
-	            if(!worldCoord)
-	            	MathTools.rotate(q, dir, dir);
-	            i1 = new Vector3d();
-	            i2 = new Vector3d();
-	            s = new double[2];
-	            MathTools.intersectStraightStraight( p, dir,ray.pos, ray.dir, i2, i1,s);
-	            translate.z = s[0];
-	            break;
-	        case XY :
-	            normal = new Vector3d(0.0,0.0,1.0);
-	            if(!worldCoord)
-	            	MathTools.rotate(q, normal, normal);
-	            r = new Vector3d();
-	            if (MathTools.intersectStraightPlane(ray.pos, ray.dir, p, normal, r)) {
-	                r.sub(p);
-	                translate.x = r.x;
-	                translate.y = r.y;
-	            }
-	            break;
-	        case XZ :
-	            normal = new Vector3d(0.0,1.0,0.0);
-	            if(!worldCoord)
-	            	MathTools.rotate(q, normal, normal);
-	            r = new Vector3d();
-	            if (MathTools.intersectStraightPlane(ray.pos, ray.dir, p, normal, r)) {
-	                r.sub(p);
-	                translate.x = r.x;
-	                translate.z = r.z;
-	            }
-	            break;
-	        case YZ :
-	            normal = new Vector3d(1.0,0.0,0.0);
-	            if(!worldCoord)
-	            	MathTools.rotate(q, normal, normal);
-	            r = new Vector3d();
-	            if (MathTools.intersectStraightPlane(ray.pos, ray.dir, p, normal, r)) {
-	                r.sub(p);
-	                translate.y = r.y;
-	                translate.z = r.z;
-	            }
-	            break;
-	        default :
-	            
-	            return null;
-	        }
-	        translate.sub(offset);
-	        return translate;
+		case X :
+				dir = new Vector3d(1.0,0.0,0.0);
+				if(!worldCoord)
+					MathTools.rotate(q, dir, dir);
+				Vector3d i1 = new Vector3d();
+				Vector3d i2 = new Vector3d();
+				s = new double[2];
+				MathTools.intersectStraightStraight( p, dir,ray.pos, ray.dir, i2, i1,s);
+				translate.x = s[0];
+				
+				break;
+			case Y :
+				dir = new Vector3d(0.0,1.0,0.0);
+				if(!worldCoord)
+					MathTools.rotate(q, dir, dir);
+				i1 = new Vector3d();
+				i2 = new Vector3d();
+				s = new double[2];
+				MathTools.intersectStraightStraight( p, dir,ray.pos, ray.dir, i2, i1,s);
+				translate.y = s[0];
+				break;
+			case Z :
+				dir = new Vector3d(0.0,0.0,1.0);
+				if(!worldCoord)
+					MathTools.rotate(q, dir, dir);
+				i1 = new Vector3d();
+				i2 = new Vector3d();
+				s = new double[2];
+				MathTools.intersectStraightStraight( p, dir,ray.pos, ray.dir, i2, i1,s);
+				translate.z = s[0];
+				break;
+			case XY :
+				normal = new Vector3d(0.0,0.0,1.0);
+				if(!worldCoord)
+					MathTools.rotate(q, normal, normal);
+				r = new Vector3d();
+				if (MathTools.intersectStraightPlane(ray.pos, ray.dir, p, normal, r)) {
+					r.sub(p);
+					translate.x = r.x;
+					translate.y = r.y;
+				}
+				break;
+			case XZ :
+				normal = new Vector3d(0.0,1.0,0.0);
+				if(!worldCoord)
+					MathTools.rotate(q, normal, normal);
+				r = new Vector3d();
+				if (MathTools.intersectStraightPlane(ray.pos, ray.dir, p, normal, r)) {
+					r.sub(p);
+					translate.x = r.x;
+					translate.z = r.z;
+				}
+				break;
+			case YZ :
+				normal = new Vector3d(1.0,0.0,0.0);
+				if(!worldCoord)
+					MathTools.rotate(q, normal, normal);
+				r = new Vector3d();
+				if (MathTools.intersectStraightPlane(ray.pos, ray.dir, p, normal, r)) {
+					r.sub(p);
+					translate.y = r.y;
+					translate.z = r.z;
+				}
+				break;
+			default :
+				
+				return null;
+			}
+			translate.sub(offset);
+			return translate;
 	}
 	
 }