Changeset 10114 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Dec 19, 2006, 11:55:26 PM (18 years ago)

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/lib/graphics/importer/md2

Files:

• md2Model.cc (modified) (11 diffs)
• resource_md2.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/md2/md2Model.cc

@@ -92 +92 @@
   rebuildInfo();
 
-  //this->debug();
+  this->debug();
 }
 
@@ -99 +99 @@
 {
   this->init();
+
+  this->scaleFactor = model.scaleFactor;
+
   this->rebuildInfo();
 }
@@ -104 +107 @@
 MD2Model& MD2Model::operator=(const MD2Model& md2model)
 {
+  this->init();
+  this->scaleFactor = md2model.scaleFactor;
   this->data = md2model.data;
   this->rebuildInfo();
@@ -141 +146 @@
   this->data = MD2Data::Pointer(new MD2Data(modelFileName, skinFileName, scale));
   this->rebuildInfo();
+
+  // init the animation - do not remove
+  this->tick( 0.01);
+
+  return true;
 }
 
@@ -268 +278 @@
 /**
  * @brief draws the model: interface for all other classes out in the world
- * @todo make it const and virtual
- * FIXME
  */
 void MD2Model::draw() const
@@ -313 +321 @@
       glNormal3fv(anorms[this->data->pLightNormals[pCommands[2]]]);
       glVertex3fv(this->verticesList[pCommands[2]]);
+//       printf("vertex: %f, %f, %f\n", this->verticesList[pCommands[2]][0], this->verticesList[pCommands[2]][1], this->verticesList[pCommands[2]][2]);
     }
     glEnd();
@@ -325 +334 @@
 {
   //static sVec3D this->verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
-  int* pCommands = this->data->pGLCommands;
+  //  int* pCommands = this->data->pGLCommands;
   /* some face culling stuff */
   //   glPushAttrib(GL_POLYGON_BIT);
@@ -428 +437 @@
   PRINT(0)("=  Number of Frames: \t%i\n", this->data->header->numFrames);
   PRINT(0)("=  Height, Width:\t%i, %i\n", this->data->header->skinHeight, this->data->header->skinWidth);
-  //PRINT(0)("=  Pointer to the data object: %p\n", this->data);
+  PRINT(0)("=  DATA:\n");
+  PRINT(0)("=  Number of references to data: %i\n", this->data.count());
   PRINT(0)("===================================================\n\n");
 }
@@ -452 +462 @@
   this->loadModel(modelFileName);
   this->loadSkin(skinFileName);
+
+  PRINTF(0)("model %s, skin %s\n", modelFileName.c_str(), skinFileName.c_str());
 }
 
@@ -570 +582 @@
   delete [] buffer;
   fclose(pFile);
+
+  return true;
 }
 
@@ -592 +606 @@
   this->material.setIllum(3);
   this->material.setAmbient(1.0, 1.0, 1.0);
-}
+
+  return true;
+}

trunk/src/lib/graphics/importer/md2/resource_md2.cc

@@ -20 +20 @@
     PRINTF(0)("NOT FOUND MD2: %s\n", modelName.c_str());
     std::string modelFileName = this->Resource::locateFile(modelName);
-    //std::string skinFileName = this->Resource::locateFile(skinName);
+    std::string skinFileName = this->Resource::locateFile(skinName);
+    PRINTF(0)("NEW %s::%s\n", modelName.c_str(), modelFileName.c_str());
     this->MD2Model::load(modelFileName, skinName, scale);
-    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), keepLevel, this->MD2Model::dataPointer()));
+    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinFileName, scale), keepLevel, this->MD2Model::dataPointer()));
   }