X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.proconf.g3d%2Fsrc%2Forg%2Fsimantics%2Fproconf%2Fg3d%2Fscenegraph%2FShapeNode.java;h=d345b8b416be11b73b7039b6c4bf3d0aa5e7ea1c;hb=15af86b4ca7eb7e85cfdad040c8438c6910a7272;hp=3369b5ead95e7afacde03555ca0ac9b7e646e181;hpb=8e0be29176259b3290fb364c37167df44f63f4c6;p=simantics%2F3d.git

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ShapeNode.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ShapeNode.java
index 3369b5ea..d345b8b4 100644
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ShapeNode.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ShapeNode.java
@@ -29,6 +29,8 @@ import org.simantics.proconf.g3d.animation.ConstantInterpolator;
 import org.simantics.proconf.g3d.animation.ScalarInterpolator;
 import org.simantics.proconf.g3d.animation.SlerpInterpolator;
 import org.simantics.proconf.g3d.animation.TCBInterpolator;
+import org.simantics.proconf.g3d.base.AppearanceProvider;
+import org.simantics.proconf.g3d.base.AppearanceProviderRegistry;
 import org.simantics.proconf.g3d.base.AppearanceTools;
 import org.simantics.proconf.g3d.base.G3DTools;
 import org.simantics.proconf.g3d.base.GeometryProvider;
@@ -226,7 +228,7 @@ public class ShapeNode extends AbstractGraphicsNode implements Animatable, IGeom
 
             
             G3DNode shape = getG3DNode(graph);
-            if (renderStates == null)
+            //if (renderStates == null)
             	updateAppearance(shape);
 
             if (isVisible()) {
@@ -258,9 +260,9 @@ public class ShapeNode extends AbstractGraphicsNode implements Animatable, IGeom
     }
     
     protected void updateAppearance(IEntity shape) {
-    	Collection<IEntity> appearanceResource;
-        if ((appearanceResource = shape.getRelatedObjects(Resources.g3dResource.HasAppearance)) != null && appearanceResource.size() > 0) {
-            renderStates = AppearanceTools.getAppearance(new Appearance(shape.getGraph(),appearanceResource.iterator().next().getResource()), editor.getRenderingComponent().getDisplaySystem().getRenderer());
+    	AppearanceProvider provider = AppearanceProviderRegistry.getAppearanceProvider(shape);
+        if (provider != null) {
+            renderStates = provider.getAppearanceFromResource(shape, editor.getRenderingComponent().getDisplaySystem().getRenderer());
         } else {
         	renderStates = getMaterial();
         }