Changeset 4163 in orxonox.OLD for orxonox/branches

Timestamp:

May 11, 2005, 10:30:39 AM (20 years ago)

Author:

patrick

Message:

orxonox/branches/md2_model: yea! animation now works , orxonox now supports md2 loading and md2 animation playing. There is still a lot of work to do: cleaning up code and tie it closer to the orxonox framework

Location:

orxonox/branches/md2_loader/src

Files:

• lib/graphics/importer/md2Model.cc (modified) (2 diffs)
• lib/graphics/importer/md2Model.h (modified) (3 diffs)
• world_entities/test_entity.cc (modified) (2 diffs)

orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.cc

@@ -97 +97 @@
 {
   /* stretch the time with animation speed (and make seconds out of it) */
-  float t = this->dtS / (1000.0f / kAnimationSpeed);
-        
-  if ( unlikely(this->dtS >= (1000.0f / kAnimationSpeed)) )
+  //float t = this->dtS / kAnimationSpeed;
+        
+  if ( unlikely(this->localTime*1000.0 >=  1000.0/kAnimationSpeed) )
+    {
       pModel->currentFrame = nextFrame;
-  return t;
+      printf("changing frame\n");
+      this->localTime = 0.0f;
+    }
+  printf("t = %f\n", this->localTime);
+  return (this->localTime/kAnimationSpeed);
 }
 
@@ -109 +114 @@
   /* TEMP TEMP TEMP: save the current step length */
   this->dtS = dtS;
+  this->localTime += dtS;
 }
 

orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.h

@@ -33 +33 @@
 
 //! This stores the speed of the animation between each key frame - currently conflicting with the animation framework
-#define kAnimationSpeed                 5.0f
+#define kAnimationSpeed                 12.0f
 
 //! This holds the header information that is read in at the beginning of the file: id software definition
@@ -126 +126 @@
 
   void tick(float dtS);
-  
+
+  void animate(/*float time*/ t3DModel *pModel);
 private:
-  void animate(/*float time*/ t3DModel *pModel);
   void processLightning();
   void interpolate(CVector3* vertlist);
@@ -135 +135 @@
 
   float dtS;
+  float localTime;
 };
 

orxonox/branches/md2_loader/src/world_entities/test_entity.cc

@@ -45 +45 @@
 
 
-void TestEntity::tick (float time) {}
+void TestEntity::tick (float time) 
+{
+  this->md2Model->tick(time);
+}
 
 
@@ -70 +73 @@
   /* TESTGING TESTING TESTING */
   this->material->select();
-  this->md2Model->draw(this->model);
+  //this->md2Model->draw(this->model);
+  this->md2Model->animate(this->model);
 
   glPopMatrix();