X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2Fcontrolpoint%2FPipeControlPoint.java;fp=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2Fcontrolpoint%2FPipeControlPoint.java;h=abd899ac23ae0af43f07b3020894fa29b9b0bfc9;hb=2c16b9949ab2b8cdbdbff7bbda91eb862b1176ed;hp=8616e70352815a50256a1b16e32afdbe1c52c787;hpb=3f17b6e42935927f12683fc26ecd5808bf66cde6;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
index 8616e703..abd899ac 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
@@ -529,26 +529,34 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 			return getControlPointOrientationQuat(dir, turnAxis, angle);
 		}
 	}
+	
+	public Quat4d getControlPointOrientationQuat(Vector3d dir, double angle, boolean reversed) {
+	    if (turnAxis == null) {
+            if (dir.lengthSquared() > MathTools.NEAR_ZERO)
+                dir.normalize();
+            Quat4d q =  getControlPointOrientationQuat(dir, angle);
+            if (reversed) {
+                Quat4d q2 = new Quat4d();
+                q2.set(new AxisAngle4d(MathTools.Y_AXIS, Math.PI));
+                q.mulInverse(q2);
+            }
+            return q;
+        } else {
+            if (dir.lengthSquared() > MathTools.NEAR_ZERO)
+                dir.normalize();
+            return getControlPointOrientationQuat(dir, turnAxis, angle);
+        }
+	}
 
 	public Quat4d getControlPointOrientationQuat(double angle, boolean reversed) {
 
 		if (turnAxis == null) {
 			Vector3d dir = getPathLegDirection(Direction.NEXT);
-			if (dir.lengthSquared() > MathTools.NEAR_ZERO)
-				dir.normalize();
-			Quat4d q =  getControlPointOrientationQuat(dir, angle);
-			if (reversed) {
-				Quat4d q2 = new Quat4d();
-				q2.set(new AxisAngle4d(MathTools.Y_AXIS, Math.PI));
-				q.mulInverse(q2);
-			}
-			return q;
+			return getControlPointOrientationQuat(dir, angle, reversed);
 		} else {
 			Vector3d dir = getPathLegDirection(Direction.PREVIOUS);
 			dir.negate();
-			if (dir.lengthSquared() > MathTools.NEAR_ZERO)
-				dir.normalize();
-			return getControlPointOrientationQuat(dir, turnAxis, angle);
+			return getControlPointOrientationQuat(dir, angle, reversed);
 		}
 	}