From: luukkainen <luukkainen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 22 Sep 2008 09:20:36 +0000 (+0000)
Subject: org.simantics.proconf.animation -> org.simantics.animation
X-Git-Tag: simantics-1.19.0~20^2~51
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=ca425d23154b16c221f4908531aeeaab97d9d3d1;hp=cadc8b00ccfc78a2177abcf4568e447afd73d503;p=simantics%2F3d.git

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 75a57e01..53b8505f 100644
--- 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 17231ff2..f0cacb41 100644
--- 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;
 import org.simantics.equation.stubs.EquationResource;
 import org.simantics.g2d.stubs.anim.AnimationResource;
-import org.simantics.proconf.animation.curve.CurveBuilder;
-import org.simantics.proconf.animation.curve.CurveBuilderImpl;
+import org.simantics.animation.curve.CurveBuilder;
+import org.simantics.animation.curve.CurveBuilderImpl;
 import org.simantics.proconf.g3d.base.G3DTools;
 import org.simantics.proconf.g3d.stubs.G3DResource;
 
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 581836c0..33e565c9 100644
--- 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;
 
 import com.jme.scene.Node;
 
-import org.simantics.proconf.animation.curve.SlerpCurve;
+import org.simantics.animation.curve.SlerpCurve;
 
 
 public class SlerpInterpolator implements Interpolator{
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 e40d63d0..063b0a62 100644
--- 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 @@
  *******************************************************************************/
 package org.simantics.proconf.g3d.animation;
 
-import org.simantics.proconf.animation.curve.TCBCurve;
+import org.simantics.animation.curve.TCBCurve;
 
 
 public class TCBInterpolator extends AbstractScalarInterpolator{
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 ef89c3a4..7c89be4d 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
@@ -18,8 +18,8 @@ import javax.vecmath.AxisAngle4d;
 import javax.vecmath.Quat4d;
 
 import org.simantics.g2d.stubs.anim.Interpolator;
-import org.simantics.proconf.animation.curve.SlerpCurve;
-import org.simantics.proconf.animation.curve.TCBCurve;
+import org.simantics.animation.curve.SlerpCurve;
+import org.simantics.animation.curve.TCBCurve;
 import org.simantics.proconf.g3d.Resources;
 import org.simantics.proconf.g3d.animation.Animatable;
 import org.simantics.proconf.g3d.animation.Animation;