Changeset 8439 in orxonox.OLD

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

Files:

• defs/class_id.h (modified) (1 diff)
• lib/graphics/importer/Makefile.am (modified) (2 diffs)
• lib/graphics/importer/interactive_model.cc (added)
• lib/graphics/importer/interactive_model.h (added)
• lib/graphics/importer/md2/md2Model.cc (modified) (2 diffs)
• lib/graphics/importer/md2/md2Model.h (modified) (3 diffs)
• lib/graphics/importer/md3/md3_data.cc (modified) (1 diff)
• lib/graphics/importer/md3/md3_model.h (modified) (3 diffs)
• world_entities/creatures/md2_creature.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (4 diffs)

branches/bsp_model/src/defs/class_id.h

@@ -291 +291 @@
   CL_STATIC_MODEL               =    0x00902000,
   CL_VERTEX_ARRAY_MODEL         =    0x00904000,
+  CL_INTERACTIVE_MODEL          =    0x00908000,        ///FIXME: is this ok bensch?
 
   // Models

branches/bsp_model/src/lib/graphics/importer/Makefile.am

@@ -5 +5 @@
 
 libORXimporter_a_SOURCES = model.cc \
+                           interactive_model.cc \
                            md_model_structure.cc \
                            vertex_array_model.cc \
@@ -39 +40 @@
 noinst_HEADERS = \
                 model.h \
+                interactive_model.h \
                 md_model_structure.cc \
                 tc.h \

branches/bsp_model/src/lib/graphics/importer/md2/md2Model.cc

@@ -90 +90 @@
   this->animationState.type = STAND;
   this->animationState.numPlays = 1;
-  this->setAnim(STAND);
+  this->setAnimation(STAND);
 
   this->debug();
@@ -164 +164 @@
   the animation types can be looked up in the animationType table
 */
-void MD2Model::setAnim(int type, int animPlayback)
+void MD2Model::setAnimation(int type, int animPlayback)
 {
   if( (type < 0) || (type > MAX_ANIMATIONS) )

branches/bsp_model/src/lib/graphics/importer/md2/md2Model.h

@@ -21 +21 @@
 #include "base_object.h"
 
-#include "model.h"
+#include "interactive_model.h"
 #include "material.h"
 
@@ -147 +147 @@
 
 //! This is a MD2 Model class
-class MD2Model : public Model {
+class MD2Model : public InteractiveModel {
 
 public:
@@ -157 +157 @@
 
 
-  void setAnim(int type, int animPlayback = MD2_ANIM_LOOP);
+  virtual void setAnimation(int type, int animPlayback = MD2_ANIM_LOOP);
   /**  returns the current animation @returns animation type */
   inline int MD2Model::getAnim() { return this->animationState.type; }

branches/bsp_model/src/lib/graphics/importer/md3/md3_data.cc

@@ -381 +381 @@
     this->meshes[mesh]->normals[i].vertexNormal[0] = vc->vertexNormal[0];
     this->meshes[mesh]->normals[i].vertexNormal[1] = vc->vertexNormal[1];
+
+    delete vc;
   }
 

branches/bsp_model/src/lib/graphics/importer/md3/md3_model.h

@@ -10 +10 @@
 
 #include <string>
-#include "model.h"
+#include "interactive_model.h"
 
 
@@ -19 +19 @@
 class MD3Data;
 
-class MD3Model : public Model
+class MD3Model : public InteractiveModel
 {
 
@@ -26 +26 @@
     ~MD3Model();
 
+    virtual void tick(float dt) {}
+    virtual void setAnimation(int animNum, int playbackMode = 0) {}
 
   private:

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);