Changeset 4147 in orxonox.OLD for orxonox/branches

Timestamp:

May 10, 2005, 5:27:40 PM (20 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: some debug information outpur, code beautifullizer

Location:

orxonox/branches/md2_loader/src

Files:

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

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

@@ -63 +63 @@
       for(int whichVertex = 0; whichVertex < 3; whichVertex++)
         {
+          printf("now drawing vertex %i of face nr: %i\n", whichVertex, j);
           int index = pObject->pFaces[j].vertIndex[whichVertex];
           int index2 = pObject->pFaces[j].coordIndex[whichVertex];
+          printf("using index: %i, %i\n", index, index2);
           /* we invert the normals since the md2 file format uses different style */
-          glNormal3f(-pObject->pNormals[ index ].x, -pObject->pNormals[ index ].y, -pObject->pNormals[ index ].z);
-          if(pObject->pTexVerts) 
+          glNormal3f(-pObject->pNormals[index].x, -pObject->pNormals[index].y, -pObject->pNormals[index].z);
+
+          if( pObject->pTexVerts) 
             {
               glTexCoord2f(pObject->pTexVerts[ index2 ].x, pObject->pTexVerts[ index2 ].y);
@@ -166 +169 @@
   /* reading all frame data */
   fseek(this->pFile, this->header.offsetFrames, SEEK_SET);
-  for(int i = 0; i < this->header.numFrames; i++)
+  for( int i = 0; i < this->header.numFrames; i++)
     {
       tMd2AliasFrame *pFrame = (tMd2AliasFrame *) buffer;
@@ -179 +182 @@
          and negate z axis 
       */
-      for(int j = 0; j < this->header.numVertices; j++)
+      for( int j = 0; j < this->header.numVertices; j++)
         {
           pVertices[j].vertex[0] = pFrame->aliasVertices[j].vertex[0] * pFrame->scale[0] + pFrame->translate[0];

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

@@ -12 +12 @@
         512 frames. The maximal vetices count is set to 2048 verteces, not enough?
         You just have to change the MD2_MAX_* values if it doesn't fit your purposes...
+
+        Surface Culling is fully implemented in md2 models: quake2 uses front face culling.
 */
 
@@ -36 +38 @@
 struct tMd2Header
 { 
-   int ident;                                   //!< This is used to identify the file
-   int version;                                 //!< The version number of the file (Must be 8)
+   int ident;                           //!< This is used to identify the file
+   int version;                         //!< The version number of the file (Must be 8)
+    
+   int skinWidth;                       //!< The skin width in pixels
+   int skinHeight;                      //!< The skin height in pixels
+   int frameSize;                       //!< The size in bytes the frames are
    
-   int skinWidth;                               //!< The skin width in pixels
-   int skinHeight;                              //!< The skin height in pixels
-   int frameSize;                               //!< The size in bytes the frames are
-   
-   int numSkins;                                //!< The number of skins associated with the model
-   int numVertices;                             //!< The number of vertices (constant for each frame)
+   int numSkins;                        //!< The number of skins associated with the model
+   int numVertices;                     //!< The number of vertices (constant for each frame)
    int numTexCoords;                    //!< The number of texture coordinates
    int numTriangles;                    //!< The number of faces (polygons)
    int numGlCommands;                   //!< The number of gl commands
-   int numFrames;                               //!< The number of animation frames
+   int numFrames;                       //!< The number of animation frames
    
-   int offsetSkins;                             //!< The offset in the file for the skin data
+   int offsetSkins;                     //!< The offset in the file for the skin data
    int offsetTexCoords;                 //!< The offset in the file for the texture data
    int offsetTriangles;                 //!< The offset in the file for the face data
    int offsetFrames;                    //!< The offset in the file for the frames data
    int offsetGlCommands;                //!< The offset in the file for the gl commands data
-   int offsetEnd;                               //!< The end of the file offset
+   int offsetEnd;                       //!< The end of the file offset
 };
 
@@ -147 +149 @@
   
   FILE *pFile;  
-  tMd2Header header;                                        //!< The header data
-  tMd2Skin *pSkins;                                             //!< The skin data
-  tMd2TexCoord *pTexCoords;                             //!< The texture coordinates
-  tMd2Face *pTriangles;                                 //!< Face index information
-  tMd2Frame *pFrames;                                       //!< The frames of animation (vertices)
+  tMd2Header header;                          //!< The header data
+  tMd2Skin *pSkins;                           //!< The skin data
+  tMd2TexCoord *pTexCoords;                   //!< The texture coordinates
+  tMd2Face *pTriangles;                       //!< Face index information
+  tMd2Frame *pFrames;                         //!< The frames of animation (vertices)
 };
 

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

@@ -953 +953 @@
 
   /* TESTGING TESTING TESTING */
-  //this->md2Model->draw(this->model);
+  this->md2Model->draw(this->model);
   
   glCallList (objectList);