Changeset 4787 in orxonox.OLD

Timestamp:

Jul 5, 2005, 2:06:19 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: changes on the md2model - now it loads also the triangle information, but not used yet

Location:

orxonox/trunk/src

Files:

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

orxonox/trunk/src/lib/graphics/importer/abstract_model.h

@@ -68 +68 @@
 typedef struct
 {
-  short            indexToVertices[3];   //!< index to the verteces of the triangle
-  short            indexToTexCoor[3];    //!< index to the texture coordinates
+  unsigned short   indexToVertices[3];   //!< index to the verteces of the triangle
+  unsigned short   indexToTexCoor[3];    //!< index to the texture coordinates
 } sTriangle;
 

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

@@ -82 +82 @@
   /* this creates the data container via ressource manager */
   this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, (void*)skinFileName);
+  if( unlikely(this->data == NULL))
+    PRINTF(0)("The model was not found, MD2Model Loader finished abnormaly. Update the data-repos\n");
+  
   this->scaleFactor = this->data->scaleFactor;
-
   this->setAnim(BOOM);
 }
@@ -355 +357 @@
   this->pGLCommands = new int[this->numGLCommands];
   this->pLightNormals = new int[this->numVertices * this->numFrames];
+  this->pTriangles = new sTriangle[this->numTriangles];
   buffer = new char[this->numFrames * this->header->frameSize];
+
+  /*
+  TriangleList = new stTriangleIndice[md2Header.numTriangles];
+
+  // Next extract the data by moving to the spot in the data where the triangle data start.
+  stTriangleIndice *pTriList;
+
+  // Get the data.
+  pTriList = (stTriangleIndice*)&buffer[md2Header.offsetTriangles];
+
+  // Now we pretty much store the data in our TriangleList object.
+  for(i = 0; i < md2Header.numTriangles; i++)
+    {
+      TriangleList[i].triIndex[0] = pTriList[i].triIndex[0];
+      TriangleList[i].triIndex[1] = pTriList[i].triIndex[1];
+      TriangleList[i].triIndex[2] = pTriList[i].triIndex[2];
+      TriangleList[i].texCoordIndex[0] = pTriList[i].texCoordIndex[0];
+      TriangleList[i].texCoordIndex[1] = pTriList[i].texCoordIndex[1];
+      TriangleList[i].texCoordIndex[2] = pTriList[i].texCoordIndex[2];
+    }
+  */
+
+  
+
 
   /* read frame data from the file to a temp buffer */
@@ -363 +390 @@
   fseek(pFile, this->header->offsetGlCommands, SEEK_SET);
   fread(this->pGLCommands, sizeof(int), this->numGLCommands, pFile);
+  /* triangle list */
+  fseek(pFile, this->header->offsetTriangles, SEEK_SET);
+  fread(this->pTriangles, sizeof(sTriangle), this->numTriangles, pFile);
 
   for(int i = 0; i < this->numFrames; ++i)

orxonox/trunk/src/lib/graphics/importer/md2Model.h

@@ -122 +122 @@
 
   sVec3D*            pVertices;             //!< pointer to the vertices data block
+  sTriangle*         pTriangles;            //!< pointer to the triangles data
   int*               pGLCommands;           //!< pointer to the gllist data block
   int*               pLightNormals;         //!< pointer to the light normals

orxonox/trunk/src/world_entities/test_entity.cc

@@ -32 +32 @@
 
 //   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
-  this->md2Model = new MD2Model("models/ogro.md2", "maps/ogro.pcx");
+  this->md2Model = new MD2Model("models/tris.md2", "maps/tris.pcx");
   this->obbTree = new OBBTree(15, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);