From: Reino Ruusu <reino.ruusu@semantum.fi>
Date: Fri, 13 Mar 2020 16:25:30 +0000 (+0200)
Subject: Fix issues in offset calculations in directed path legs
X-Git-Tag: v1.43.0~31
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=47edf45b081e0b06aa8839a39098edba737b162f;p=simantics%2F3d.git

Fix issues in offset calculations in directed path legs

gitlab #111

Change-Id: Ia430f5c602c8dca0522493ab42a8f925f159ccf6
---

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 776d38ab..e930b8d6 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
@@ -381,10 +381,43 @@ public class PipingRules {
 
 	}
 
+	/**
+	 * Calculate offset based on a given fixed component direction.
+	 * 
+	 * The desired component direction is provided as an input to this method,
+	 * unlike the direction vector that is calculated by calculateOffset.
+	 * 
+	 * The returned offset vector is always perpendicular to the given direction
+	 * vector.
+	 * 
+	 * @param startPoint Start point of leg
+	 * @param endPoint   End point of leg
+	 * @param start      Starting component of leg
+	 * @param list       Inline components between start and end
+	 * @param end        Ending component of leg
+	 * @param dir        Direction at which the offset is calculated
+	 * @param offset     A vector object to receive the offset vector values
+	 * @return True if offsets are present
+	 */
 	public static boolean calculateDirectedOffset(Vector3d startPoint, Vector3d endPoint, PipeControlPoint start, ArrayList<PipeControlPoint> list, PipeControlPoint end, Vector3d dir, Vector3d offset) {
 		return calculateOffset(startPoint, endPoint, start, list, end, dir, offset, true);
 	}
 
+	/**
+	 * Calculate offset and direction vectors for a path leg so that the given chain
+	 * of components starts and ends at the given coordinates
+	 * 
+	 * The returned direction and offset vectors are perpendicular to each other.
+	 * 
+	 * @param startPoint Start point of the leg
+	 * @param endPoint   End point of the leg
+	 * @param start      Starting component of the leg
+	 * @param list       Inline components between start and end
+	 * @param end        Ending component of the leg
+	 * @param dir        A vector object to receive the component direction vector
+	 * @param offset     A vector object to receive the offset vector
+	 * @return True if offsets are present
+	 */
 	public static boolean calculateOffset(Vector3d startPoint, Vector3d endPoint, PipeControlPoint start, ArrayList<PipeControlPoint> list, PipeControlPoint end, Vector3d dir, Vector3d offset) {
 		return calculateOffset(startPoint, endPoint, start, list, end, dir, offset, false);
 	}
@@ -397,8 +430,11 @@ public class PipingRules {
 		} else {
 			Vector3d sp = new Vector3d(startPoint);
 			Point3d ep = new Point3d(endPoint);
-			dir.set(ep);
-			dir.sub(sp);
+			if (!directed) {
+				dir.set(ep);
+				dir.sub(sp);
+			}
+			
 			double l = dir.lengthSquared(); 
 			if (l > MathTools.NEAR_ZERO)
 				dir.scale(1.0/Math.sqrt(l));
@@ -1080,15 +1116,19 @@ public class PipingRules {
 		
 		Point3d otherPosition = new Point3d(dcpStart ? u.endPoint : u.startPoint);
 		if (u.hasOffsets) {
-			Vector3d dir = new Vector3d(), offset = new Vector3d();
+			Vector3d dir = dcp.getDirection(dcpStart ? Direction.NEXT : Direction.PREVIOUS);
+			if (!dcpStart)
+				dir.negate();
+			
+			Vector3d offset = new Vector3d();
 			calculateDirectedOffset(u.startPoint, u.endPoint, u.start, u.list, u.end, dir, offset);
 			u.dir = dir;
 			u.offset = offset;
 			
 			if (dcpStart)
-				otherPosition.add(offset);
-			else
 				otherPosition.sub(offset);
+			else
+				otherPosition.add(offset);
 		}
 
 		double mu[] = new double[2];
@@ -1236,7 +1276,7 @@ public class PipingRules {
 		Point3d position1 = new Point3d(u.startPoint);
 		Point3d position2 = new Point3d(u.endPoint);
 		
-		Vector3d dir = new Vector3d(), offset = new Vector3d();
+		Vector3d dir = u.start.getDirection(Direction.NEXT), offset = new Vector3d();
 		calculateDirectedOffset(new Vector3d(position1), new Vector3d(position2), u.start, u.list, u.end, dir, offset);
 		
 		Point3d position1offset = new Point3d(position1);