X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FP3DRootNode.java;h=93f4ecf27d4be74d4e67ade02c20a983a884eda1;hb=refs%2Fchanges%2F88%2F4288%2F1;hp=5b7fe274c0b509dcba87151505d3794054a60e15;hpb=3f2597b685effc8f262143ea487f5391824930e1;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/P3DRootNode.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/P3DRootNode.java
index 5b7fe274..93f4ecf2 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/P3DRootNode.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/P3DRootNode.java
@@ -27,7 +27,9 @@ import vtk.vtkProp;
 @GraphType(Plant3D.URIs.Plant)
 public class P3DRootNode extends ParentNode<INode> implements IG3DNode, NodeMapProvider<Resource, vtkProp, INode> {
 	
-	
+	// Vertical direction that determines the interpretation of rotation angle origin
+	protected Vector3d upVector = new Vector3d(0.0, 1.0, 0.0);
+
 	@RelatedElementsAdd(Plant3D.URIs.children)
 	public void addChild(INode node) {
 	//public void addChild(IP3DVisualNode node) {
@@ -139,6 +141,10 @@ public class P3DRootNode extends ParentNode<INode> implements IG3DNode, NodeMapP
 		throw new NodeException("Cannot set root node orientation");
 	}
 	
+	/**
+	 * Get a unique name in the Plant3D model with a given prefix followed by
+	 * an underscore and number.
+	 */
 	public String getUniqueName(String prefix) {
 		Set<String> names = new HashSet<String>();
 		for (INode node : getChild()) {
@@ -146,6 +152,8 @@ public class P3DRootNode extends ParentNode<INode> implements IG3DNode, NodeMapP
 				continue;
 			IP3DVisualNode n = (IP3DVisualNode)node;
 			names.add(n.getName());
+			if (node instanceof P3DParentNode)
+				((P3DParentNode<?>) node).getComponentNames(names);
 		}
 		int i = 1;
 		while (true) {
@@ -157,11 +165,10 @@ public class P3DRootNode extends ParentNode<INode> implements IG3DNode, NodeMapP
 	}
 
 	
-	@SuppressWarnings("rawtypes")
 	@Override
-	public Object getAdapter(Class adapter) {
-		if (NodeMap.class == adapter)
-			return nodeMap;
+	public <T> T getAdapter(Class<T> adapter) {
+		if (adapter.isAssignableFrom(NodeMap.class))
+			return adapter.cast(nodeMap);
 		return null;
 	}
 	
@@ -184,4 +191,8 @@ public class P3DRootNode extends ParentNode<INode> implements IG3DNode, NodeMapP
 	public TurnComponent createTurn() {
 		return new TurnComponent();
 	}
+
+	public Vector3d getUpVector() {
+		return upVector;
+	}
 }