Changeset 8293 in orxonox.OLD for trunk/src/lib

Timestamp:

Jun 8, 2006, 11:11:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the osX-branche back here
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/osx . -r7763:HEAD

conflicts resolved, and everything is working as expected (or at least i hope so )

Location:

trunk/src/lib

Files:

• graphics/Makefile.am (modified) (1 diff)
• graphics/importer/md2Model.cc (modified) (10 diffs)
• graphics/importer/texture.cc (modified) (2 diffs)
• graphics/spatial_separation/quadtree.cc (modified) (1 diff)
• math/vector.h (modified) (1 diff)
• sound/ogg_player.cc (modified) (4 diffs)
• sound/sound_buffer.cc (modified) (2 diffs)
• util/file.cc (modified) (1 diff)

trunk/src/lib/graphics/Makefile.am

@@ -56 +56 @@
 
 
-SUBDIRS = importer \
-          spatial_separation
-
+SUBDIRS =       importer \
+                spatial_separation
 EXTRA_DIST =

trunk/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 )
+#define BULK_CONV16( _ptr, _num ) do { \
+        short  _cnt = _num;\
+        short* _iptr = (short*)_ptr;\
+        for( int _l = 0; _l<_cnt; ++_l )\
+                _iptr[_l] = SDL_SwapLE16( _iptr[_l] );\
+} while( 0 )
+#else
+#define BULK_CONV( _ptr, _num )
+#define BULK_CONV16( _ptr, _num )
+#endif  
 
 /********************************************************************************
@@ -80 +103 @@
   /* 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");
@@ -92 +118 @@
   this->setAnim(STAND);
 
-  this->debug();
+  //this->debug();
 
     //write the modelinfo information
@@ -99 +125 @@
   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 +386 @@
 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 +473 @@
   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 +481 @@
     }
 
-  this->fileName =fileName;
+  this->fileName = fileName;
   /* got the data: map it to locals */
   this->numFrames = this->header->numFrames;
@@ -468 +500 @@
   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_CONV16( this->pTriangles, this->numTriangles*sizeof(sTriangle)/2 );
+
   /*  read in texture coordinates */
   fseek(pFile, this->header->offsetTexCoords, SEEK_SET);
   fread(this->pTexCoor, sizeof(sTexCoor), this->numTexCoor, pFile);
-
+        BULK_CONV16( this->pTexCoor, this->numTexCoor*sizeof(sTexCoor)/2 );
 
   for(int i = 0; i < this->numFrames; ++i)
     {
       frame = (sFrame*)(buffer + this->header->frameSize * i);
+                        //Convert the translate and scale Vec3D if needed.
+                        BULK_CONV( frame, 6 );
+                        BULK_CONV( frame->pVertices, 3 );
       pVertex = this->pVertices + this->numVertices  * i;
       pNormals = this->pLightNormals + this->numVertices * i;

trunk/src/lib/graphics/importer/texture.cc

@@ -21 +21 @@
 #include "compiler.h"
 
-// INCLUDING SDL_Image
-#ifdef HAVE_SDL_IMAGE_H
+#ifdef HAVE_SDL_SDL_H
+#include <SDL/SDL_image.h>
+#include <SDL/SDL_endian.h>
+#include <SDL/SDL_byteorder.h>
+#else
+#include <SDL_endian.h>
 #include <SDL_image.h>
+#include <SDL_byteorder.h>
+#endif
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+/*
+ * On the BIG_ENDIAN architecture, the 24 and 32bit bitmaps have
+ * different masks. If you don't do this distinction properly, 
+ * you will get weird-looking textures.
+ */
+Uint32 alphaMask[] = {
+        0xFF000000,
+        0x00FF0000,
+        0x0000FF00,
+        0x000000FF,
+};
+
+Uint32 opaqueMask[] = {
+        0x00FF0000,
+        0x0000FF00,
+        0x000000FF,
+        0xFF000000
+};
 #else
-#include <SDL/SDL_image.h>
+/*
+ * On the LIL_ENDIAN architecture everything is fine and easy. The 24
+ * and 32bit bitmaps have the same masks.
+ */
+Uint32 alphaMask[] = {
+        0x000000FF,
+        0x0000FF00,
+        0x00FF0000,
+        0xFF000000,
+};
+
+Uint32 *opaqueMask = alphaMask;
+
 #endif
-
 
 TextureData::TextureData()
@@ -251 +287 @@
   Uint32 saved_flags;
   Uint8  saved_alpha;
-
   hasAlpha = false;
   int pixelDepth = 24;
 
+        Uint32* mask = opaqueMask;
+        
   /* Save the alpha blending attributes */
   saved_flags = surface->flags&(SDL_SRCALPHA | SDL_RLEACCELOK);
   saved_alpha = surface->format->alpha;
-  if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA )
+  if ( saved_flags & SDL_SRCALPHA )
   {
     SDL_SetAlpha(surface, 0, 0);
     hasAlpha = true;
     pixelDepth = 32;
-  }
-
+                mask = alphaMask;
+  }
+                
   retSurface = SDL_CreateRGBSurface(SDL_HWSURFACE,
                                     surface->w, surface->h,
                                     pixelDepth,
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
-                                    0x000000FF,
-                                    0x0000FF00,
-                                    0x00FF0000,
-                                    0xFF000000
-#else
-                                    0xFF000000,
-                                    0x00FF0000,
-                                    0x0000FF00,
-                                    0x000000FF
-#endif
-                                   );
+                                                                                                                                                mask[0], mask[1], mask[2], mask[3] );
   if ( retSurface == NULL )
     return NULL;

trunk/src/lib/graphics/spatial_separation/quadtree.cc

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

trunk/src/lib/math/vector.h

@@ -93 +93 @@
   Vector getNormalized() const;
   Vector abs();
+
   /** @param toVec nears this Vector to... @param t how much to advance (0.0: not at all; 1.0: fully) */
   inline void slerpTo(const Vector& toVec, float t) { *this + (toVec - *this) * t; };

trunk/src/lib/sound/ogg_player.cc

@@ -31 +31 @@
 
 #include "debug.h"
+
+#ifdef HAVE_SDL_SDL_H
+
+#include <SDL/SDL.h>
+#include <SDL/SDL_endian.h>
+
+#else
+
+#include <SDL.h>
+#include <SDL_endian.h>
+
+#endif
 
 namespace OrxSound
@@ -151 +163 @@
   bool OggPlayer::play()
   {
-    if (!(this->state & OggPlayer::FileOpened))
+    /*if (!(this->state & OggPlayer::FileOpened))
       return false;
 
@@ -161 +173 @@
     if (this->musicThreadID == NULL)
       return ((this->musicThreadID = SDL_CreateThread(OggPlayer::musicThread, (void*)this)) != NULL);
-    return true;
+    return true;*/
   }
 
@@ -385 +397 @@
     if(size == 0)
       return false;
-
+/*#ifdef SDL_BIG_ENDIAN
+                        int cnt = wavLength/2;
+                        Uint16* wavBufferAsShorts = ( Uint16* )wavBuffer;
+                        for ( int i = 0; i < cnt; ++i, ++wavBufferAsShorts )
+                                *wavBufferAsShorts = SDL_Swap16( *wavBufferAsShorts );
+#endif*/
     alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
     if (DEBUG_LEVEL >= 3)

trunk/src/lib/sound/sound_buffer.cc

@@ -22 +22 @@
 #include "sdlincl.h"
 #include <cassert>
-
+#ifdef HAVE_SDL_SDL_H
+#include <SDL/SDL.h>
+#include <SDL/SDL_endian.h>
+#else
+#include <SDL.h>
+#include <SDL_endian.h>
+#endif
 namespace OrxSound
 {
@@ -67 +73 @@
       return false;
     }
-
-    alBufferData(this->bufferID, SoundBuffer::sdlAudioSpecToAlFormat(&wavSpec), wavBuffer, wavLength, wavSpec.freq);
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+                if ( !( wavSpec.format == AUDIO_U8 || wavSpec.format == AUDIO_S8 ) ) {
+                        int cnt = wavLength/2;
+                        Uint16* wavBufferAsShorts = ( Uint16* )wavBuffer;
+                        for ( int i = 0; i < cnt; ++i, ++wavBufferAsShorts )
+                                *wavBufferAsShorts = SDL_Swap16( *wavBufferAsShorts );
+                }
+#endif
+    alBufferData(this->bufferID, SoundBuffer::sdlAudioSpecToAlFormat(&wavSpec), 
+                        wavBuffer, wavLength, wavSpec.freq);
+                        
     SDL_FreeWAV(wavBuffer);
     if (SoundEngine::checkError("Could not load Wave file", __LINE__))

trunk/src/lib/util/file.cc

@@ -23 +23 @@
 #include <fstream>
 
-#ifdef __unix__
+#ifdef __unix__ 
 #include <unistd.h>
 #elif __WIN32__ || _MS_DOS_
 #include <dir.h>
 #else
-#include <direct.h>
+//#include <direct.h>
 #endif