Commit: 7513088f18b0a7ff36708fd1f2885f9fdb5f6258 - MikuMikuStudio (git)

Main repository of MikuMikuStudio

Commit MetaInfo

• Revision: 7513088f18b0a7ff36708fd1f2885f9fdb5f6258 (tree)
• Time: 2003-09-16 07:20:28
• Author: mojomonkey <mojomonkey@75d0...>
• Commiter: mojomonkey

Log Message

changed animation. Now requires a call to update to match all other models.

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@90 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

Change Summary

• modified: src/jme/entity/Entity.java
• modified: src/jme/geometry/model/md3/Md3Model.java
• modified: src/test/general/TestMain.java

Incremental Difference

--- a/src/jme/entity/Entity.java
+++ b/src/jme/entity/Entity.java
@@ -40,6 +40,7 @@ import jme.exception.MonkeyGLException;
 import jme.exception.MonkeyRuntimeException;
 import jme.geometry.Geometry;
 import jme.geometry.bounding.BoundingVolume;
+import jme.geometry.model.Model;
 import jme.math.Vector;
 import jme.physics.PhysicsModule;
 import jme.entity.camera.Frustum;
@@ -65,7 +66,7 @@ import org.lwjgl.opengl.Window;
  * <code>Entity</code> to represent something abstract.
  * 
  * @author Mark Powell
- * @version $Id: Entity.java,v 1.9 2003-09-10 20:32:59 mojomonkey Exp $
+ * @version $Id: Entity.java,v 1.10 2003-09-15 22:20:28 mojomonkey Exp $
  */
 public class Entity implements EntityInterface {
     
@@ -317,6 +318,12 @@ public class Entity implements EntityInterface {
      * <code>update</code> updates the state of the entity. 
      */
     public void update(float time) {
+        //if the geometry is of type model it should be updated.
+        if(null != geometry) {
+            if(geometry instanceof Model) {
+                ((Model)geometry).update(time);
+            }
+        }
         if(null != physics) {
             physics.update(time);
             physics.updatePosition(position);

--- a/src/jme/geometry/model/md3/Md3Model.java
+++ b/src/jme/geometry/model/md3/Md3Model.java
@@ -54,7 +54,7 @@ import jme.utility.LoggingSystem;
 import jme.utility.StringUtils;
 import jme.exception.MonkeyGLException;
 import jme.exception.MonkeyRuntimeException;
-import jme.geometry.Geometry;
+import jme.geometry.model.Model;
 
 import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.Window;
@@ -96,9 +96,9 @@ import org.lwjgl.opengl.Window;
  * 
  * 
  * @author Mark Powell
- * @version $Id: Md3Model.java,v 1.11 2003-09-10 20:32:59 mojomonkey Exp $
+ * @version $Id: Md3Model.java,v 1.12 2003-09-15 22:20:27 mojomonkey Exp $
  */
-public class Md3Model implements Geometry {
+public class Md3Model implements Model {
     /**
      * LOWER defines the legs section of the model.
      */
@@ -275,15 +275,23 @@ public class Md3Model implements Geometry {
         //set the desired color
         GL.glColor4f(r, g, b, a);
 
-        //Update the leg and torso animations
-        updateModel(lower);
-        updateModel(upper);
-
         //start rendering with the legs first.
         drawLink(lower);
         //set culling back to GL.GL_BACK
         DisplaySystem.getDisplaySystem().cullMode(GL.GL_BACK, true);
     }
+    
+    /**
+     * <code>update</code> updates the position of the model's vertices
+     * to allow for animation.
+     * @param time the time between frames.
+     */
+    public void update(float time) {
+        updateModel(lower);
+        updateModel(upper);
+
+    
+    }
 
     /**
      * <code>setTorsoAnimation</code> sets the current animation of the 
@@ -1754,4 +1762,6 @@ public class Md3Model implements Geometry {
          */
         Md3Tag[] tags;
     }
+
+    
 }
\ No newline at end of file

--- a/src/test/general/TestMain.java
+++ b/src/test/general/TestMain.java
@@ -188,8 +188,8 @@ public class TestMain extends AbstractGame {
 			currentAnimation = 2;
 			((Md3Model) e.getGeometry()).setLegsAnimation("LEGS_RUN");
 		}
-
-	}
+        
+   }
 	protected void render() {
 		GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
 		GL.glLoadIdentity();