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=ac76be8b25f373f1e133cb1c2860b52433343548;hb=refs%2Fchanges%2F04%2F3104%2F1;hp=fc78f1b97647efc3cfceb510a6bfd9010240f026;hpb=c17574943c09c562588136dbbc8585d6615b3a49;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 fc78f1b9..ac76be8b 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
@@ -7,6 +7,7 @@ import java.util.List;
 
 import javax.vecmath.AxisAngle4d;
 import javax.vecmath.Matrix3d;
+import javax.vecmath.Point3d;
 import javax.vecmath.Quat4d;
 import javax.vecmath.Tuple3d;
 import javax.vecmath.Vector3d;
@@ -1013,7 +1014,19 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 					if (currentNext.isVariableLength() && currentPrev.isVariableLength()) {
 						// we have to join them into single variable length component.
 						additionalRemove = currentPrev;
-						//currentPrev.remove();
+						// combine lengths and set the location of remaining control point to the center.
+						Point3d ps = new Point3d();
+					    Point3d pe = new Point3d();
+					    Point3d ns = new Point3d();
+                        Point3d ne = new Point3d();
+						currentPrev.getInlineControlPointEnds(ps, pe);
+						currentNext.getInlineControlPointEnds(ns, ne);
+						double l = currentPrev.getLength() + currentNext.getLength();
+						Vector3d cp = new Vector3d();
+						cp.add(ps, ne);
+						cp.scale(0.5);
+						currentNext.setLength(l);
+						currentNext.setWorldPosition(cp);
 					}
 				} else {
 					// FIXME : pipe run must be split into two parts, since the control point structure is no more continuous.