Disabling branch creation prevented connections

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / scenegraph / TurnComponent.java

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java
index a1374def587c857a3b0327cba4510891896838be..cd490a5d38aa9b7965e6f9b2daf3a9cf5d5f2bc3 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java
@@ -9,6 +9,7 @@ import org.simantics.g3d.math.MathTools;
 import org.simantics.g3d.property.annotations.GetPropertyValue;
 import org.simantics.g3d.property.annotations.SetPropertyValue;
 import org.simantics.g3d.scenegraph.base.ParentNode;
+import org.simantics.g3d.tools.NodeTools;
 import org.simantics.objmap.graph.annotations.DynamicGraphType;
 import org.simantics.objmap.graph.annotations.GetType;
 import org.simantics.objmap.graph.annotations.RelatedGetValue;
@@ -79,8 +80,12 @@ public class TurnComponent extends PipelineComponent {
                }
        }
        
-       @RelatedGetValue(Plant3D.URIs.HasTurnAngle)
        public Double getTurnAngle() {
+           return getControlPoint().getTurnAngle();
+       }
+       
+       @RelatedGetValue(Plant3D.URIs.HasTurnAngle)
+       public Double _getTurnAngle() {
            if (!getControlPoint().asFixedAngle())
                return null;
                return getControlPoint().getTurnAngle();
@@ -192,4 +197,38 @@ public class TurnComponent extends PipelineComponent {
                else
                        return new double[]{1.0,0.0,0.0};
        }
+       
+       /**
+        * Turn is a section of a circle; this method returns center of that circle.
+        * @return
+        */
+       public Vector3d getCenterPosition() {
+           // getPosition() is control point position, located outside of turn
+        // we need to calculate position in the middle of the turn
+        double t = Math.tan((Math.PI - getControlPoint().getTurnAngle()) * 0.5);
+        double tr = getTurnRadius();
+        double R = 0.0;
+        if (t > MathTools.NEAR_ZERO)
+            R = tr / t;
+        Vector3d localC = new Vector3d(-R, 0.0, -tr);
+        // worldC is center of a circle
+        Vector3d worldC = NodeTools.getWorldPosition(this,localC);
+        return worldC;
+       }
+       
+       /**
+        * Returns position in the middle of turn component
+        * @return
+        */
+       public Vector3d getMiddlePosition() {
+           Vector3d pos = getWorldPosition();
+           Vector3d worldC = getCenterPosition();
+           
+           // calculate vector from center to edge, which is middle of the turn
+        pos.sub(worldC);
+        pos.normalize();
+        pos.scale(getTurnRadius());
+        pos.add(worldC);
+        return pos;
+       }
 }