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=8f1b9a88bb6b7bf72ea20f866453deea1b76cc2b;hb=refs%2Fchanges%2F08%2F3908%2F2;hp=72ef4e687a0f378d24400f94ff79405585c61179;hpb=95c5f67fd62229c761fd322ff7505114d3fc986a;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 72ef4e68..8f1b9a88 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
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 import javax.vecmath.AxisAngle4d;
 import javax.vecmath.Matrix3d;
@@ -379,9 +380,10 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	}
 
 	public void setLength(double l) {
-		if (Double.isInfinite(l) || Double.isNaN(l)) {
+		if (this.length == l)
+			return;
+		if (Double.isInfinite(l) || Double.isNaN(l))
 			return;
-		}
 		if (Math.abs(this.length-l) < MathTools.NEAR_ZERO)
 			return;
 		this.length = l;
@@ -429,6 +431,8 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		}
 		if (this.turnAngle != null && Math.abs(this.turnAngle-turnAngle) < MathTools.NEAR_ZERO)
 			return;
+		if (Objects.equals(this.turnAngle, turnAngle))
+			return;
 		this.turnAngle = turnAngle;
 		firePropertyChanged("turnAngle");
 	}
@@ -446,6 +450,8 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		}
 		if (this.offset != null && Math.abs(this.offset-offset) < MathTools.NEAR_ZERO)
 			return;
+		if (Objects.equals(this.offset, offset))
+			return;
 		this.offset = offset;
 		firePropertyChanged("offset");
 	}
@@ -456,11 +462,15 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		}
 		if (this.rotationAngle != null && Math.abs(this.rotationAngle-rotationAngle) < MathTools.NEAR_ZERO)
 			return;
+		if (Objects.equals(rotationAngle, rotationAngle))
+			return;
 		this.rotationAngle = rotationAngle;
 		firePropertyChanged("rotationAngle");
 	}
 
 	public void setReversed(Boolean reversed) {
+		if (this.reversed == reversed)
+			return;
 		this.reversed = reversed;
 		firePropertyChanged("reversed");
 	}
@@ -584,11 +594,16 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 
 		final P3DRootNode root = getRoot();
 		Vector3d up = root != null ? new Vector3d(root.getUpVector()) : new Vector3d(0.0, 1.0, 0.0);
-		double a = up.angle(getPathLegEndpointVector());
+		final Vector3d legDir = getPathLegEndpointVector();
+		double a = up.angle(legDir);
 		if (a < 0.1 || (Math.PI - a) < 0.1) {
 			// Rotate components
 			up.set(up.getY(), up.getZ(), up.getX());
 		}
+		
+		// Project up vector into a normal of the leg direction before applying to 'dir'
+		MathTools.mad(up, legDir, -legDir.dot(up)/legDir.lengthSquared());
+		up.normalize();
 
 		return getControlPointOrientationQuat(dir, up, angle);
 	}
@@ -1598,7 +1613,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 			component._setWorldPosition(getWorldPosition());
 		updateSubPoint();
 	}
-
+	
 	private void updateSubPoint() {
 		if (isOffset()) {
 			if (next == null && previous == null) {