X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2Fcontrolpoint%2FPipeControlPoint.java;h=22c58ddb160be1a1f43303b34e63d1dd3614bc17;hb=8b06e290cf681e2157824428395988063686e7b3;hp=ecaeb7ae7c41d2b70017d4de433dfac968270ecc;hpb=3b5c59eca31e9db10c1a1dc6d244d6fd4f3578a2;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 ecaeb7ae..22c58ddb 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
@@ -283,6 +283,12 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		return reversed;
 	}
 	
+	public boolean _getReversed() {
+	    if (reversed == null)
+	        return false;
+        return reversed;
+    }
+	
 	public void setTurnAngle(Double turnAngle) {
 		if (Double.isInfinite(turnAngle) || Double.isNaN(turnAngle)) {
 			return;
@@ -320,7 +326,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	
 	public void setReversed(Boolean reversed) {
 		this.reversed = reversed;
-		firePropertyChanged("rotationAngle");
+		firePropertyChanged("reversed");
 	}
 	
 	public Vector3d getSizeChangeOffsetVector(Vector3d dir) {
@@ -466,28 +472,59 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 			return q1;
 	    }
 	
-	public Vector3d getDirection() {
-		return getDirectedControlPointDirection();
+	public Vector3d getDirection(Direction direction) {
+	    if (isDirected())
+	        return getDirectedControlPointDirection();
+	    if (isTurn() && isFixed()) {
+	        if (direction == Direction.NEXT) {
+	            if (previous != null) {
+    	            PipeControlPoint pcp = this;
+                    Vector3d dir = new Vector3d();
+                    dir.sub(pcp.getWorldPosition(),previous.getWorldPosition());
+                    if (dir.lengthSquared() > MathTools.NEAR_ZERO)
+                         dir.normalize();
+                    Quat4d q = getControlPointOrientationQuat(dir, pcp.getRotationAngle() != null ? pcp.getRotationAngle() : 0.0);
+                    AxisAngle4d aa = new AxisAngle4d(MathTools.Y_AXIS,pcp.getTurnAngle() == null ? 0.0 : pcp.getTurnAngle());
+                    Quat4d q2 = MathTools.getQuat(aa);
+                    Vector3d v = new Vector3d(1.,0.,0.);
+                    Vector3d offset = new Vector3d();
+                    MathTools.rotate(q2, v, offset);
+                    MathTools.rotate(q, offset, dir);
+                    return dir;
+	            }
+	        } else {
+	            if (next != null) {
+    	            PipeControlPoint pcp = this;
+                    Vector3d dir = new Vector3d();
+                    dir.sub(next.getWorldPosition(),pcp.getWorldPosition());
+                    if (dir.lengthSquared() > MathTools.NEAR_ZERO)
+                         dir.normalize();
+                    Quat4d q = getControlPointOrientationQuat(dir, pcp.getRotationAngle() != null ? pcp.getRotationAngle() : 0.0);
+                    AxisAngle4d aa = new AxisAngle4d(MathTools.Y_AXIS,pcp.getTurnAngle() == null ? 0.0 : pcp.getTurnAngle());
+                    Quat4d q2 = MathTools.getQuat(aa);
+                    Vector3d v = new Vector3d(1.,0.,0.);
+                    Vector3d offset = new Vector3d();
+                    MathTools.rotate(q2, v, offset);
+                    MathTools.rotate(q, offset, dir);
+                    return dir;
+	            }
+	        }
+	    }
+	    return null;
 	}
 	
-	
-	
-	
-	
-
-	
 	public void insert(PipeControlPoint previous, PipeControlPoint next) {
 		// inserting an offsetpoint is error, 
 		if (isDualSub())
-			throw new RuntimeException();
+			throw new RuntimeException("Dual sub points cannot be inserted.");
 		// size change control point cannot be inserted this way, because it ends PipeRun
 		if (isSizeChange())
-			throw new RuntimeException();
+			throw new RuntimeException("Size change points cannot be inserted.");
 		PipeRun piperun = previous.getPipeRun();
 		// and just to make sure that control point structure is not corrupted
 		if (getPipeRun() != null) {
 			if (piperun != getPipeRun() || piperun != next.getPipeRun())
-				throw new RuntimeException();
+				throw new RuntimeException("All controls points must be located on the same pipe run");
 		} else {
 			piperun.addChild(this);
 		}
@@ -623,14 +660,14 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 				v.sub(next.getWorldPosition(),pcp.getWorldPosition());
 				return v;
 			} else {
-				if (isVariableAngle())
-					throw new RuntimeException("Cannot calculate path leg direction for unconnected variable angle control point");
 				if (previous == null) {
 					if (!isDirected())
 						throw new RuntimeException("Cannot calculate path leg direction for unconnected control point");
 					return getDirectedControlPointDirection();
 					
 				} else {
+				    if (isVariableAngle())
+	                    throw new RuntimeException("Cannot calculate path leg direction for unconnected variable angle control point");
 					if (isInline()) {
 						PipeControlPoint pcp = this;
 						if (pcp.isDualSub()) {
@@ -645,6 +682,8 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 						Vector3d v = new Vector3d();
 						v.sub(getWorldPosition(),previous.getWorldPosition());
 						return v;
+					} else if (isTurn() && isFixed() && !_getReversed()) {
+					   return getDirection(Direction.NEXT);
 					}
 					throw new RuntimeException("Missing implementation");
 				}
@@ -658,8 +697,6 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 				v.sub(previous.getWorldPosition(),pcp.getWorldPosition());
 				return v;
 			} else {
-				if (isVariableAngle())
-					throw new RuntimeException("Cannot calculate path leg direction for unconnected variable angle control point");
 				if (next == null)  {
 					if (!isDirected())
 						throw new RuntimeException("Cannot calculate path leg direction for unconnected control point");
@@ -667,7 +704,9 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 					v.negate();
 					return v;
 				} else {
-					if (isInline()) {
+				    if (isVariableAngle())
+	                    throw new RuntimeException("Cannot calculate path leg direction for unconnected variable angle control point");
+	                if (isInline()) {
 						PipeControlPoint pcp = this;
 						if (pcp.isDualInline()) {
 							pcp = pcp.getSubPoint().get(0);
@@ -683,7 +722,9 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 						Vector3d v = new Vector3d();
 						v.sub(getWorldPosition(),next.getWorldPosition());
 						return v;
-					}
+					} else if (isTurn() && isFixed() && _getReversed()) {
+					    return getDirection(Direction.PREVIOUS);
+                    }
 					throw new RuntimeException("Missing implementation");
 				}
 			}