Changeset 4212 in orxonox.OLD

Timestamp:

May 18, 2005, 2:06:17 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_model: fixed some segfaults, model doesnt get rendered correctly yet

Location:

orxonox/branches/md2_loader/src

Files:

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

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

@@ -511 +511 @@
   
   this->textureID = 0;
-  this->scaleFactor = 1.0f;
-
-  //this->setAnim(0);
+  this->scaleFactor = 0.1f;
+
+  this->setAnim(0);
 }
 
@@ -568 +568 @@
   for(int i = 0; i < this->numFrames; ++i)
     {
+      /*
+        faster but evt. buggy
       frame = (sFrame*)(buffer + header.frameSize * i); 
       pVertex = this->pVertices + this->numVertices  * i;
       pNormals = this->pLightNormals + this->numVertices * i;
+      */
+      frame = (sFrame *)&buffer[header.frameSize * i];
+      pVertex = &this->pVertices[this->numVertices * i];
+      pNormals = &this->pLightNormals[this->numVertices * i];
 
       for(int j = 0; j < this->numVertices; ++j)
@@ -623 +629 @@
 
   currVec = &this->pVertices[this->numVertices * this->animationState.currentFrame];
-  nextVec = &this->pVertices[this->numVertices * this->animationState.currentFrame];
-
+  nextVec = &this->pVertices[this->numVertices * this->animationState.nextFrame];
+
+  //printf("currVec: %f, %f, %f\n", currVec[0][0], currVec[0][1], currVec[0][2]);
+  //printf("nextVec: %f, %f, %f\n", nextVec[0], nextVec[1], nextVec[2]);
+  
   for(int i = 0; i < this->numFrames; ++i)
     {
@@ -697 +706 @@
      
   this->processLighting();
-  //this->interpolate(verticesList);
+  this->interpolate(verticesList);
   this->material->select();
 

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

@@ -193 +193 @@
   void tick(float dtS);
 
+  void animate(float time);  
 private:
-  void animate(float time);  
+
   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);
 }