Changeset 8122 in orxonox.OLD for branches/osx/src/lib/graphics

Timestamp:

Jun 2, 2006, 5:46:11 PM (19 years ago)

Author:

ponder

Message:

Md2loader seems to work

Location:

branches/osx/src/lib/graphics

Files:

• importer/md2Model.cc (modified) (9 diffs)
• importer/texture.cc (modified) (1 diff)
• spatial_separation/quadtree.cc (modified) (1 diff)

branches/osx/src/lib/graphics/importer/md2Model.cc

@@ -14 +14 @@
 
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
-
+#include "config.h"
+#ifdef HAVE_SDL_SDL_H
+#include <SDL/SDL.h>
+#include <SDL/SDL_endian.h>
+#else
+#include <SDL.h>
+#include <SDL_endian.h>
+#endif
 #include "md2Model.h"
 #include "material.h"
@@ -20 +27 @@
 #include "debug.h"
 #include "util/loading/resource_manager.h"
-
 
 using namespace std;
@@ -67 +73 @@
 
 
+#ifdef SDL_LIL_ENDIAN
+#define BULK_CONV( _ptr, _num ) do { \
+        int  _cnt = _num;\
+        int* _iptr = (int*)_ptr;\
+        for( int _l = 0; _l<_cnt; ++_l )\
+                _iptr[_l] = SDL_SwapLE32( _iptr[_l] );\
+} while( 0 )
+#else
+#define BULK_CONV( _ptr, _num )
+#endif  
 
 /********************************************************************************
@@ -80 +96 @@
   /* this creates the data container via ressource manager */
   if (!modelFileName.empty())
-    this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, skinFileName, scale);
+    this->data = (MD2Data*)ResourceManager::getInstance()->load( 
+                        modelFileName, MD2, RP_GAME, skinFileName, scale);
+                        
+        //When arriving here it is assumed that everything is in the correct byte order.        
   if( unlikely(this->data == NULL))
     PRINTF(0)("The model was not found, MD2Model Loader finished abnormaly. Update the data-repos\n");
@@ -99 +118 @@
   this->pModelInfo.numNormals = 0;
   this->pModelInfo.numTexCoor = this->data->numTexCoor;
+        
   this->pModelInfo.pVertices = (float*)this->data->pVertices;
+                
   this->pModelInfo.pNormals = NULL;
+
   this->pModelInfo.pTexCoor = (float*)this->data->pTexCoor;
-
+        
   // triangle conversion
   this->pModelInfo.pTriangles = new sTriangleExt[this->data->numTriangles];
@@ -357 +379 @@
 void MD2Model::debug()
 {
-  PRINT(0)("\n==========================| MD2Model::debug() |===\n");
-  PRINT(0)("=  Model FileName:\t%s\n", this->data->fileName.c_str());
-  PRINT(0)("=  Skin FileName:\t%s\n", this->data->skinFileName.c_str());
-  PRINT(0)("=  Size in Memory:\t%i Bytes\n", this->data->header->frameSize * this->data->header->numFrames + 64); // 64bytes is the header size
-  PRINT(0)("=  Number of Vertices:\t%i\n", this->data->header->numVertices);
-  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)("===================================================\n\n");
+  //PRINTF(0)("\n==========================| MD2Model::debug() |===\n");
+  PRINTF(0)("=  Model FileName:\t%s\n", this->data->fileName.c_str());
+  PRINTF(0)("=  Skin FileName:\t%s\n", this->data->skinFileName.c_str());
+  PRINTF(0)("=  Size in Memory:\t%i Bytes\n", this->data->header->frameSize * this->data->header->numFrames + 64); // 64bytes is the header size
+  PRINTF(0)("=  Number of Vertices:\t%i\n", this->data->header->numVertices);
+  PRINTF(0)("=  Number of Frames: \t%i\n", this->data->header->numFrames);
+  PRINTF(0)("=  Height, Width:\t%i, %i\n", this->data->header->skinHeight, this->data->header->skinWidth);
+  PRINTF(0)("=  Pointer to the data object: %p\n", this->data);
+  //PRINTF(0)("===================================================\n\n");
 }
 
@@ -442 +464 @@
   this->header = new MD2Header;
   fread(this->header, 1, sizeof(MD2Header), pFile);
+        BULK_CONV( this->header, sizeof(MD2Header)/4 );
   /* check for the header version: make sure its a md2 file :) */
-  if( unlikely(this->header->version != MD2_VERSION) && unlikely(this->header->ident != MD2_IDENT))
+  if( unlikely( this->header->version != MD2_VERSION) && unlikely( this->header->ident != MD2_IDENT))
     {
       PRINTF(1)("Couldn't load file %s: invalid file format: stop loading\n", fileName.c_str());
@@ -449 +472 @@
     }
 
-  this->fileName =fileName;
+  this->fileName = fileName;
   /* got the data: map it to locals */
   this->numFrames = this->header->numFrames;
@@ -468 +491 @@
   fseek(pFile, this->header->offsetFrames, SEEK_SET);
   fread(buffer, this->header->frameSize, this->numFrames, pFile);
+        BULK_CONV( buffer, this->header->frameSize*this->numFrames*sizeof(char)/4 );
   /* read opengl commands */
   fseek(pFile, this->header->offsetGlCommands, SEEK_SET);
+
   fread(this->pGLCommands, sizeof(int), this->numGLCommands, pFile);
+        BULK_CONV( this->pGLCommands, this->numGLCommands );
   /* triangle list */
   fseek(pFile, this->header->offsetTriangles, SEEK_SET);
-  fread(this->pTriangles, sizeof(sTriangle), this->numTriangles, pFile);
+  fread(this->pTriangles, sizeof(sTriangle), this->numTriangles, pFile);        
+        BULK_CONV( this->pTriangles, this->numTriangles*(sizeof(sTriangle)/4) );
+
   /*  read in texture coordinates */
   fseek(pFile, this->header->offsetTexCoords, SEEK_SET);
   fread(this->pTexCoor, sizeof(sTexCoor), this->numTexCoor, pFile);
-
+        BULK_CONV( this->pTexCoor, this->numTexCoor*(sizeof(sTexCoor)/4) );
 
   for(int i = 0; i < this->numFrames; ++i)

branches/osx/src/lib/graphics/importer/texture.cc

@@ -207 +207 @@
                                     surface->w, surface->h,
                                     pixelDepth,
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
+//#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
                                     0x000000FF,
                                     0x0000FF00,
                                     0x00FF0000,
                                     0xFF000000
-#else
-                                    0xFF000000,
+/*#else*/
+                                    /*0xFF000000,
                                     0x00FF0000,
                                     0x0000FF00,
-                                    0x000000FF
-#endif
+                                    0x000000FF*/
+/*#endif*/
                                    );
   if ( retSurface == NULL )

branches/osx/src/lib/graphics/spatial_separation/quadtree.cc

@@ -25 +25 @@
 
 using namespace std;
-
 #define QUADTREE_MATERIAL_COUNT       4