Changeset 8439 in orxonox.OLD for branches/bsp_model/src/world_entities

Timestamp:

Jun 15, 2006, 1:50:54 AM (18 years ago)

Author:

patrick

Message:

bsp: md3 model data read in as it seams correctly. no drawing yet! interactive model introduced

Location:

branches/bsp_model/src/world_entities

Files:

• creatures/md2_creature.cc (modified) (1 diff)
• test_entity.cc (modified) (4 diffs)

branches/bsp_model/src/world_entities/creatures/md2_creature.cc

@@ -256 +256 @@
   if( this->bJump && likely(this->getModel(0) != NULL))
   {
-    ((MD2Model*)this->getModel(0))->setAnim(JUMP);
+    ((MD2Model*)this->getModel(0))->setAnimation(JUMP);
   }
   else if( this->bFire && likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != ATTACK) ((MD2Model*)this->getModel(0))->setAnim(ATTACK);
+    if( ((MD2Model*)this->getModel(0))->getAnim() != ATTACK) ((MD2Model*)this->getModel(0))->setAnimation(ATTACK);
   }
   else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != RUN) ((MD2Model*)this->getModel(0))->setAnim(RUN);
+    if( ((MD2Model*)this->getModel(0))->getAnim() != RUN) ((MD2Model*)this->getModel(0))->setAnimation(RUN);
   }
   else if (likely(this->getModel(0) != NULL))
   {
-    if( ((MD2Model*)this->getModel(0))->getAnim() != STAND) ((MD2Model*)this->getModel(0))->setAnim(STAND);
+    if( ((MD2Model*)this->getModel(0))->getAnim() != STAND) ((MD2Model*)this->getModel(0))->setAnimation(STAND);
   }
 

branches/bsp_model/src/world_entities/test_entity.cc

@@ -26 +26 @@
 
 #include "test_entity.h"
-#include "stdincl.h"
-#include "model.h"
+
+
+#include "interactive_model.h"
 #include "md2/md2Model.h"
-#include "obb_tree.h"
+
 #include "state.h"
 
@@ -90 +91 @@
 {
   if( likely(this->getModel(0) != NULL))
-    ((MD2Model*)this->getModel(0))->setAnim(animationIndex, animPlaybackMode);
+    ((InteractiveModel*)this->getModel(0))->setAnimation(animationIndex, animPlaybackMode);
 }
 
@@ -97 +98 @@
 {
   if( likely(this->getModel(0) != NULL))
-    ((MD2Model*)this->getModel(0))->tick(time);
+    ((InteractiveModel*)this->getModel(0))->tick(time);
 
 }
@@ -122 +123 @@
 
   this->bDeath = true;
-  float anim;
   int randi = (int)(5.0f * (float)rand()/(float)RAND_MAX);