X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.proconf.g3d%2Fsrc%2Forg%2Fsimantics%2Fproconf%2Fg3d%2Fscenegraph%2FParameterizedModelNode.java;h=1eb29bb41c72f50ba7ff9132ba24aa1705fff632;hb=1a25726897311e0277de2476c40bf2ae7c93ed86;hp=511a2fa9b5b16ff805728a0272046091c939112b;hpb=ef97fbd29eb1b561ef7fa5a3bf581618abfaa2b2;p=simantics%2F3d.git diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ParameterizedModelNode.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ParameterizedModelNode.java index 511a2fa9..1eb29bb4 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ParameterizedModelNode.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ParameterizedModelNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 VTT Technical Research Centre of Finland and others. + * Copyright (c) 2007- VTT Technical Research Centre of Finland. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -20,7 +20,7 @@ import org.simantics.db.ContextGraph; import org.simantics.db.Graph; import org.simantics.db.Resource; import org.simantics.equation.solver.Solver; -import org.simantics.g2d.stubs.anim.Animation; +import org.simantics.animation.stubs.Animation; import org.simantics.layer0.utils.Property; import org.simantics.layer0.utils.IEntity; import org.simantics.layer0.utils.EntityFactory; @@ -29,7 +29,7 @@ import org.simantics.proconf.g3d.Resources; import org.simantics.proconf.g3d.base.ThreeDimensionalEditorBase; import org.simantics.proconf.g3d.stubs.G3DModel; import org.simantics.proconf.g3d.stubs.G3DNode; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; /** * IGraphicsNode for parameterized models. Implementation assumes that G3DNode itself does not contain @@ -125,8 +125,8 @@ public class ParameterizedModelNode extends ModelNode { solver.pushToGraph(graph); Collection animations = model.getAnimation(); for (Animation animation : animations) { - Collection interpolators = animation.getInterpolator(); - for (org.simantics.g2d.stubs.anim.Interpolator interpolator : interpolators) { + Collection interpolators = animation.getInterpolator(); + for (org.simantics.animation.stubs.Interpolator interpolator : interpolators) { IEntity target = interpolator.getTarget(); // check all model properties for (Property p : modelProperties) {