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=c5d780c36b8d5f2dc3b4d0abf5642410509614f3;hb=a899aac9dd52296206f302a20a8e7bae2501cf2c;hp=8b1455ca2980a8f4927b291299efff2102d5606f;hpb=f346390a5a8cd4262a9aa68951e55d504d412549;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 8b1455ca..c5d780c3 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
@@ -147,6 +147,11 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	public boolean isInline() {
 		return type == PointType.INLINE;
 	}
+	
+	public boolean asPathLegEnd() {
+	    // Ends and Turns are path leg ends by default, but also unconnected inline are path leg ends.
+	    return isPathLegEnd() || getNext() == null || getPrevious() == null;
+	}
 
 	/**
 	 * True for end components, if control point defines absolute position direction, which rules cannot modify. 
@@ -343,6 +348,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
         if (MathTools.createRotation(dirOutN, dirOut, dir, aa)) {
             setRotationAngle(aa.angle);
             setTurnAngle(angle);
+            if (DEBUG) System.out.println("convertToFixed " + dir + " " + dirOut + " " +dirOutN + " " +angle + " "+ aa.angle);
         }
 	}
 
@@ -523,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);
 		}
 	}
 
@@ -1214,7 +1228,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 			} else if (currentNext != null) {
 				if (currentNext.isDualInline()) {
 					PipeControlPoint sccp = currentNext;
-					PipeControlPoint ocp = getDualSub();
+					PipeControlPoint ocp = currentNext.getDualSub();
 					if (ocp == null) {
 						throw new RuntimeException("Removing PipeControlPoint " + this+ " structure damaged, no offset control point");
 					}