Changeset 4213 in orxonox.OLD

Timestamp:

May 18, 2005, 2:10:56 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: some more code improvements, no correct rendering yet

Location:

orxonox/branches/md2_loader/src

Files:

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

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

@@ -603 +603 @@
 
 
+void MD2Model2::tick(float time)
+{
+  this->animationState.localTime += time;
+}
+
 void MD2Model2::draw()
 {
+  if( likely(this->animationState.localTime > 0.0))
+    this->animate();
+
   glPushMatrix();
   /* rotate because id software uses another orientation then the openGL default */
@@ -663 +671 @@
 
 
-void MD2Model2::animate(float time)
-{
-  this->animationState.localTime += time;
-
+void MD2Model2::animate()
+{
   if( this->animationState.localTime - this->animationState.lastTime > (1.0f / this->animationState.fps))
     {

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

@@ -193 +193 @@
   void tick(float dtS);
 
-  void animate(float time);  
+
 private:
-
+  void animate();  
   void processLighting();
   void interpolate(sVec3D* verticesList);

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

@@ -33 +33 @@
   this->md2Model2->loadModel("../data/models/tris.md2");
   this->md2Model2->loadSkin("../data/models/tris.pcx");
-  this->md2Model2->animate(0);
 }
 
@@ -43 +42 @@
 void TestEntity::tick (float time) 
 {
-  //this->md2Model->tick(time);
+  this->md2Model2->tick(time);
 }