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=124e54bb15761dc7451c63c5a9a4fd3af70335e5;hb=bf8d749e159470552b86484450b8b227b7985559;hp=c5bf29ddd5798d06175f9e6c6d90e6f078e16cf7;hpb=aa75048b8c434e4fa9b076443e8812932d09a59a;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 c5bf29dd..124e54bb 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
@@ -791,9 +791,15 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	}
 	
 	/**
-	 * Returns direction vector. 
+	 * Returns direction vector pointing towards an adjacent component for
+	 * directed control points or turn control points with one open end. 
 	 * 
-	 * For directed control points, always returns outwards pointing vector.
+	 * Always returns an outwards pointing vector.
+	 * 
+	 * For any other type of component, the return value is null.
+	 * 
+	 * For turn components this only return a non-null value for the unconnected
+	 * end of the component. 
 	 * 
 	 * @param direction
 	 * @return normalized vector, or null
@@ -837,6 +843,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
                     Vector3d offset = new Vector3d();
                     MathTools.rotate(q2, v, offset);
                     MathTools.rotate(q, offset, dir);
+                    dir.negate();
                     dir.normalize();
                     return dir;
                 }
@@ -1614,6 +1621,21 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		updateSubPoint();
 	}
 
+	public void orientToDirection(Vector3d dir) {
+		Double angleO = getRotationAngle();
+		double angle = 0.0;
+		if (angleO != null)
+			angle = angleO;
+		boolean reversed = _getReversed();
+		Quat4d q = null;
+		if (dir != null) {
+		    q = getControlPointOrientationQuat(dir, angle, reversed);
+		} else {
+		    q = getControlPointOrientationQuat(angle, reversed);
+		}
+		setWorldOrientation(q);
+	}
+
 	@Override
 	public String toString() {
 		return getClass().getName() + "@" + Integer.toHexString(hashCode());