Changeset 8654 in orxonox.OLD

Timestamp:

Jun 21, 2006, 1:40:52 AM (18 years ago)

Author:

patrick

Message:

bsp: md3 model:

• traced the segfault, animation now gets initialized probperly
• animation code exectued

still no animations tough… gogogo

Location:

branches/bsp_model/src/lib/graphics/importer/md3

Files:

• md3_data.cc (modified) (2 diffs)
• md3_model.cc (modified) (6 diffs)
• md3_model.h (modified) (2 diffs)

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

@@ -37 +37 @@
 MD3Data::MD3Data(const std::string& modelFileName, const std::string& skinFileName, float scale)
 {
-  this->filename = filename;
+  this->filename = modelFileName;
 
   this->parentTagIndex = -1;
@@ -45 +45 @@
   this->animationState.nextFrame = 1;
   this->animationState.interpolationFraction = 0.0f;
+
+  this->animation = NULL;
 
   this->loadModel(modelFileName);

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

@@ -44 +44 @@
     this->bDrawBones = false;
     this->bDrawNormals = false;
+
+    // set the animation
+    this->interpolate(this->md3Data, this->config->getAnimation("Walk"), REWIND, true);
   }
 
@@ -93 +96 @@
       else
         PRINTF(0)("Could not add %s\n", nameLower.c_str());
+
     }
 
@@ -119 +123 @@
   void MD3Model::tick(float time)
   {
+    if(this->md3Data == NULL)
+      return;
 
     this->visit(this->md3Data);
-
     this->tick(time, this->md3Data);
   }
@@ -243 +248 @@
   void MD3Model::draw() const
   {
-    PRINTF(0)("\ndraw========================\n");
     //draw current bone frame
     this->draw(this->md3Data);
@@ -331 +335 @@
   void MD3Model::drawMesh(MD3Mesh* mesh, sVec3D* frame) const
   {
-    PRINTF(0)("drawMesh: %s\n", mesh->header->name);
     Vector tmpVec1, tmpVec2;
 
@@ -556 +559 @@
 
     // visit children
-    std::map<int, MD3Data*>::iterator it = data->sortedMap.begin();
-    while( it != data->sortedMap.end())
-    {
-      this->visit(it->second);
-      it++;
-    }
+//     std::map<int, MD3Data*>::iterator it = data->sortedMap.begin();
+//     while( it != data->sortedMap.end())
+//     {
+//       this->visit(it->second);
+//       it++;
+//     }
   }
 

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

@@ -57 +57 @@
     void tick(float dt, MD3Data* data);
 
+
     void drawMesh(MD3Mesh* mesh, sVec3D* frame) const;
     void drawVertexNormals(sVec3D* frame, MD3Normal* normals) const;
     void drawBoneFrame(MD3BoneFrame* frame) const;
+
 
     MD3BoneFrame* interpolateBoneFrame(MD3Data* data, MD3BoneFrame* currBoneFrame, MD3BoneFrame* nextBoneFrame, float frac);
@@ -66 +68 @@
     float* interpolateTransformation(MD3Data* data, MD3Tag* currFrameTag, MD3Tag* nextFrameTag, float frac, int i);
 
+
+    void interpolate(MD3Data* data, MD3Animation* anim, int op, bool bInterpolate);
+
     void visit(MD3Data* data);
-    void interpolate(MD3Data* data, MD3Animation* anim, int op, bool bInterpolate);
     int next(MD3Data* data, int nr);
     int prev(MD3Data* data, int nr);