X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2Fcontrolpoint%2FPipingRules.java;h=be66cf1441954cdebad851999b4b58c96599b7c4;hb=8b06e290cf681e2157824428395988063686e7b3;hp=ea8a512bcd8d0aac247d0df0881286e5dfdb6b75;hpb=294f1dcbec34369945b1631efa195b783cbed89d;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java
index ea8a512b..be66cf14 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java
@@ -442,12 +442,28 @@ public class PipingRules {
 		updatePathLeg(new UpdateStruct2(start, startPoint, list, end, endPoint, dir, offset, hasOffsets, iter, reversed, toRemove, updated), lengthChange);
 
 	}
-
+	
+	private static boolean asDirected(PipeControlPoint pcp, Direction direction) {
+	    if (pcp.isDirected())
+	        return true;
+	    if (pcp.isTurn() && pcp.isFixed()) {
+	       if (!pcp._getReversed())
+	           return direction == Direction.NEXT;
+	       else
+	           return direction == Direction.PREVIOUS;
+	    }
+	    return false;
+	}
+	
+	private static Vector3d direction(PipeControlPoint pcp, Direction direction) {
+	    return pcp.getDirection(direction);
+	}
+ 
 	private static void updatePathLeg(UpdateStruct2 u, PathLegUpdateType lengthChange) throws Exception {
 		int directed = 0;
-		if (u.start.isDirected())
+		if (asDirected(u.start, Direction.NEXT))
 			directed++;
-		if (u.end.isDirected())
+		if (asDirected(u.end, Direction.PREVIOUS))
 			directed++;
 		switch (directed) {
 		case 0:
@@ -467,7 +483,7 @@ public class PipingRules {
 		if (DEBUG)
 			System.out.println("PipingRules.updateFreePipeRun " + u + " " + lengthChange);
 		checkExpandPathLeg(u, lengthChange);
-		if (u.start.isInline() || u.end.isInline())
+		if (u.start.isInline() || u.end.isInline() || u.start.isFixed() || u.end.isFixed())
 			processPathLeg(u, true, false);
 	}
 
@@ -789,7 +805,7 @@ public class PipingRules {
 		boolean dcpStart = false;
 		boolean inlineEnd = false;
 		Vector3d position;
-		if (u.start.isDirected()) {
+		if (asDirected(u.start, Direction.NEXT)) {
 			dcp = u.start;
 			other = u.end;
 			position = u.startPoint;
@@ -807,7 +823,7 @@ public class PipingRules {
 			inlineEnd = u.start.isInline();
 		}
 
-		Vector3d directedDirection = dcp.getDirection();
+		Vector3d directedDirection = direction(dcp, dcpStart ? Direction.NEXT : Direction.PREVIOUS);
 		Point3d directedEndPoint = new Point3d(u.endPoint);
 		if (u.hasOffsets)
 			directedEndPoint.add(u.offset);
@@ -828,6 +844,8 @@ public class PipingRules {
 		double distance = t.length();
 		boolean aligned = (distance < ALLOWED_OFFSET);
 		if (aligned) {
+		    if (u.start.isInline() || u.end.isInline() || u.start.isFixed() || u.end.isFixed())
+	            processPathLeg(u, true, false);
 			checkExpandPathLeg(u, lengthChange, inlineEnd);
 			
 		} else {
@@ -944,8 +962,8 @@ public class PipingRules {
 		position1offset.sub(u.offset);
 		Point3d position2offset = new Point3d(position2);
 		position2offset.add(u.offset);
-		Vector3d dir1 = dcp1.getDirection();
-		Vector3d dir2 = dcp2.getDirection();
+		Vector3d dir1 = direction(dcp1, Direction.NEXT);
+		Vector3d dir2 = direction(dcp2, Direction.PREVIOUS);
 		Vector3d p1 = MathTools.closestPointOnStraight(position1offset, position2, dir2);
 		Vector3d p2 = MathTools.closestPointOnStraight(position2offset, position1, dir1);
 		double d1 = position1.distance(new Point3d(p1));
@@ -1476,8 +1494,11 @@ public class PipingRules {
 		double angle = 0.0;
 		if (angleO != null)
 			angle = angleO;
-
-		Quat4d q = pcp.getControlPointOrientationQuat(angle);
+		Boolean reversedO = pcp.getReversed();
+		boolean reversed = false;
+		if (reversedO != null)
+			reversed = reversedO;
+		Quat4d q = pcp.getControlPointOrientationQuat(angle, reversed);
 		pcp.setWorldOrientation(q);
 	}
 
@@ -1513,12 +1534,43 @@ public class PipingRules {
 	private static double updateTurnControlPointTurn(PipeControlPoint tcp, PipeControlPoint prev, PipeControlPoint next) {
 		if (DEBUG)
 			System.out.println("PipingTools.updateTurnControlPointTurn()" + tcp);
-		if (next == null || prev == null)
-			return Math.PI; // FIXME : argh
-		Vector3d middlePoint = tcp.getWorldPosition();
-		Vector3d nextPoint = next.getWorldPosition();
-		Vector3d prevPoint = prev.getWorldPosition();
-		return updateTurnControlPointTurn(tcp, middlePoint, prevPoint, nextPoint);
+		
+		if (!tcp.isFixed()) {
+		    if (next == null || prev == null)
+	            return Math.PI; // FIXME : argh
+    		Vector3d middlePoint = tcp.getWorldPosition();
+    		Vector3d nextPoint = next.getWorldPosition();
+    		Vector3d prevPoint = prev.getWorldPosition();
+    		return updateTurnControlPointTurn(tcp, middlePoint, prevPoint, nextPoint);
+		} else {
+		    Vector3d dir;
+		    if (!tcp._getReversed()) {
+    		    if (prev == null)
+    	            return Math.PI; // FIXME : argh
+    		    
+    		    Vector3d middlePoint = tcp.getWorldPosition();
+    		    Vector3d prevPoint = prev.getWorldPosition();
+    		    dir = new Vector3d();
+    		    dir.sub(middlePoint, prevPoint);        
+    		   
+		    } else {
+		        if (next == null)
+                    return Math.PI; // FIXME : argh
+                
+                Vector3d middlePoint = tcp.getWorldPosition();
+                Vector3d nextPoint = next.getWorldPosition();
+                dir = new Vector3d();
+                dir.sub(nextPoint,middlePoint);
+		    }
+		    dir.normalize();
+            
+            Quat4d q = PipeControlPoint.getControlPointOrientationQuat(dir, tcp.getRotationAngle() != null ? tcp.getRotationAngle() : 0.0);
+            Vector3d v = new Vector3d();
+            MathTools.rotate(q, MathTools.Y_AXIS,v);
+            tcp.setTurnAxis(v);
+            tcp.setWorldOrientation(q);
+            return tcp.getTurnAngle();
+		}
 	}
 
 	/**