org.simantics.proconf.animation -> org.simantics.animation

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/dev@6744 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.proconf.g3d/META-INF/MANIFEST.MF b/org.simantics.proconf.g3d/META-INF/MANIFEST.MF
index 75a57e01e1dcf53e1d7bfc34dd98023711e90fa8..53b8505ffd4a0fb379632fecca888a28e6ab84ce 100644 (file)
--- a/org.simantics.proconf.g3d/META-INF/MANIFEST.MF
+++ b/org.simantics.proconf.g3d/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui,
  com.jme.eclipse,
  org.simantics.proconf.image,
  org.eclipse.ui.views,
- org.simantics.proconf.animation,
  org.simantics.db,
  org.simantics.layer0.stubs,
  org.simantics.layer0.utils,
@@ -25,7 +24,8 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.equation,
  org.simantics.proconf.browsing,
  org.eclipse.ui.forms,
- org.eclipse.core.expressions
+ org.eclipse.core.expressions,
+ org.simantics.animation
 Eclipse-LazyStart: true
 Export-Package: org.simantics.proconf.g3d.actions,
  org.simantics.proconf.g3d.animation,

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/Resources.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/Resources.java
index 17231ff232c9700c0af02a260ad0194565de9462..f0cacb41a13d193c3a2997e16249557bd1d14dfb 100644 (file)
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/Resources.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/Resources.java
@@ -13,8 +13,8 @@ package org.simantics.proconf.g3d;
 import org.simantics.db.Graph;\r
 import org.simantics.equation.stubs.EquationResource;\r
 import org.simantics.g2d.stubs.anim.AnimationResource;\r
-import org.simantics.proconf.animation.curve.CurveBuilder;\r
-import org.simantics.proconf.animation.curve.CurveBuilderImpl;\r
+import org.simantics.animation.curve.CurveBuilder;\r
+import org.simantics.animation.curve.CurveBuilderImpl;\r
 import org.simantics.proconf.g3d.base.G3DTools;\r
 import org.simantics.proconf.g3d.stubs.G3DResource;\r
 \r

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/animation/SlerpInterpolator.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/animation/SlerpInterpolator.java
index 581836c0ea36958aa365de0766e23a517fcc0022..33e565c9f99410ba6ee4637276acf5324dd39504 100644 (file)
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/animation/SlerpInterpolator.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/animation/SlerpInterpolator.java
@@ -17,7 +17,7 @@ import org.simantics.proconf.g3d.base.VecmathJmeTools;
 \r
 import com.jme.scene.Node;\r
 \r
-import org.simantics.proconf.animation.curve.SlerpCurve;\r
+import org.simantics.animation.curve.SlerpCurve;\r
 \r
 \r
 public class SlerpInterpolator implements Interpolator{\r

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/animation/TCBInterpolator.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/animation/TCBInterpolator.java
index e40d63d0c2d0d1a2c7875052bada3c226c5a4024..063b0a62b42bcfef6389ec6434d03a57c44b3f67 100644 (file)
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/animation/TCBInterpolator.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/animation/TCBInterpolator.java
@@ -10,7 +10,7 @@
  *******************************************************************************/\r
 package org.simantics.proconf.g3d.animation;\r
 \r
-import org.simantics.proconf.animation.curve.TCBCurve;\r
+import org.simantics.animation.curve.TCBCurve;\r
 \r
 \r
 public class TCBInterpolator extends AbstractScalarInterpolator{\r

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 ef89c3a45dbcaae931b199ecb619f49379f2f58e..7c89be4db402d77191a429ba7e7ed3c0d5a40d9e 100644 (file)
--- 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
@@ -18,8 +18,8 @@ import javax.vecmath.AxisAngle4d;
 import javax.vecmath.Quat4d;\r
 \r
 import org.simantics.g2d.stubs.anim.Interpolator;\r
-import org.simantics.proconf.animation.curve.SlerpCurve;\r
-import org.simantics.proconf.animation.curve.TCBCurve;\r
+import org.simantics.animation.curve.SlerpCurve;\r
+import org.simantics.animation.curve.TCBCurve;\r
 import org.simantics.proconf.g3d.Resources;\r
 import org.simantics.proconf.g3d.animation.Animatable;\r
 import org.simantics.proconf.g3d.animation.Animation;\r