Changeset 4189 in orxonox.OLD

Timestamp:

May 15, 2005, 10:59:26 PM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: testing the new md2model, got segfaults yet

Location:

orxonox/branches/md2_loader/src

Files:

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

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

@@ -627 +627 @@
   for(int i = 0; i < this->numFrames; ++i)
     {
+      /*
       verticesList[i][0] = this->pVertices[i + (this->numFrames * this->animationState.currentFrame)][0] * this->scaleFactor;
       verticesList[i][1] = this->pVertices[i + (this->numFrames * this->animationState.currentFrame)][1] * this->scaleFactor;
       verticesList[i][2] = this->pVertices[i + (this->numFrames * this->animationState.currentFrame)][2] * this->scaleFactor;
+      */
+
+      verticesList[i][0] = (currVec[i][0] + this->animationState.interpolationState * (nextVec[i][0] - currVec[i][0])) * this->scaleFactor;
+      verticesList[i][1] = (currVec[i][1] + this->animationState.interpolationState * (nextVec[i][1] - currVec[i][1])) * this->scaleFactor;
+      verticesList[i][2] = (currVec[i][2] + this->animationState.interpolationState * (nextVec[i][2] - currVec[i][2])) * this->scaleFactor;
     }
 }
@@ -637 +643 @@
 void MD2Model2::processLighting()
 {
-  shadeDots = anormsDots[ ((int)(md2Angle*(SHADEDOT_QUANT / 360.0)))&(SHADEDOT_QUANT - 1)];
+  shadeDots = anormsDots[((int)(md2Angle*(SHADEDOT_QUANT / 360.0)))&(SHADEDOT_QUANT - 1)];
 }
 

orxonox/branches/md2_loader/src/story_entities/world.cc

@@ -445 +445 @@
       trackManager->addPoint(Vector(1770, 80, -40));
       trackManager->addPoint(Vector(1800, 100, -40));
-      trackManager->setDuration(10);
+      trackManager->addPoint(Vector(2000, 100, -40));
+      trackManager->setDuration(12);
 
       trackManager->finalize();

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

@@ -28 +28 @@
 TestEntity::TestEntity () : WorldEntity()
 {  
-  this->md2Model = new MD2Model();
+  //this->md2Model = new MD2Model();
 
-  MD2Model2* model2 = new MD2Model2();
-  model2->loadModel("../data/models/tris.md2");
-
-  this->material = new Material("Clown");
-  this->material->setDiffuseMap("../data/models/tris.pcx");
-  this->material->setIllum(3);
-  this->material->setAmbient(1.0, 1.0, 1.0);
+  this->md2Model2 = new MD2Model2();
+  this->md2Model2->loadModel("../data/models/tris.md2");
+  this->md2Model2->loadSkin("../data/models/tris.pcx");
 }
 
@@ -66 +62 @@
   
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-   this->getAbsDir().matrix (matrix);
+  this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);
   
 
   /* TESTGING TESTING TESTING */
-  this->material->select();
+  //this->material->select();
   //this->md2Model->draw(this->model);
-  this->md2Model->animate();
+  //this->md2Model->animate();
+
+  this->md2Model2->draw();
 
   glPopMatrix();

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

@@ -6 +6 @@
 class MD2Loader;
 class MD2Model;
+class MD2Model2;
 struct t3DModel;
 class Material;
@@ -28 +29 @@
   t3DModel* model;
   MD2Model* md2Model;
+  MD2Model2* md2Model2;
   Material* material;