Changeset 8715 in orxonox.OLD for branches/terrain/src

Timestamp:

Jun 22, 2006, 1:51:50 PM (19 years ago)

Author:

ponder

Message:

• Added special checks for macosx to acinclude.m4 and configure.ac. This sucks
• Reapplied the endianness checks to the md2_model file. They got lost during the merge operation.
• Tried to do the collision detection for the ground. But somehow it doesn't work. Perhaps an offset will do.

Location:

branches/terrain/src/lib

Files:

• collision_detection/cd_engine.cc (modified) (2 diffs)
• graphics/effects/volfog_effect.cc (modified) (2 diffs)
• graphics/graphics_engine.cc (modified) (1 diff)
• graphics/importer/Makefile.am (modified) (1 diff)
• graphics/importer/md2/md2Model.cc (modified) (5 diffs)

branches/terrain/src/lib/collision_detection/cd_engine.cc

@@ -24 +24 @@
 #include "model.h"
 #include "world_entity.h"
-#include "terrain.h"
+#include "terrain_entity.h"
 // #include "player.h"
 
@@ -104 +104 @@
   std::list<WorldEntity*>::iterator entityIterator;
   const std::list<BaseObject*>* bspList = ClassList::getList(CL_BSP_ENTITY);
-  if( bspList == NULL)
-    return;
+  if( bspList != NULL) {
 
-  // for all bsp managers check all entities
-  for( bspIterator = bspList->begin(); bspIterator != bspList->end(); bspIterator++) {
-      for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
-      {
-//         PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassName());
-        (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
+        // for all bsp managers check all entities
+        for( bspIterator = bspList->begin(); bspIterator != bspList->end(); bspIterator++) {
+        for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
+        {
+//               PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassName());
+                (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
+        }
+        }
+        }
+        const std::list<BaseObject*>* tl = ClassList::getList( CL_TERRAIN );
+  std::list<BaseObject*>::const_iterator ti;    
+        if ( tl == NULL )
+                return;
+        for ( ti = tl->begin(); ti != tl->end(); ++ti ) {
+                        TerrainEntity* terrain = dynamic_cast<TerrainEntity*>( *ti );
+      for( entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++ )
+                {
+                                const Vector& pos = (*entityIterator)->getAbsCoor();
+                                
+                                float height = terrain->getHeight( pos.x, pos.z );
+                                printf( "pos.y-height: %f\n", pos.y-height );
+                                if ( height > pos.y ) {
+                                        (*entityIterator)->setAbsCoor( pos.x, height, pos.z );
+                                }
       }
-  }
+        }
 }
 

branches/terrain/src/lib/graphics/effects/volfog_effect.cc

@@ -30 +30 @@
 //#include <GL/glext.h> //OpenGL Extensions
 //#include <GL/glxext.h> // GLX Extensions
-
+#ifndef __APPLE__
 #ifndef GL_EXT_fog_coord
 #define GL_EXT_fog_coord 1
@@ -45 +45 @@
 PFNGLFOGCOORDDVEXTPROC glFogCoorddvEXT = 0;
 PFNGLFOGCOORDPOINTEREXTPROC glFogCoordPointerEXT = 0;
-
+#endif
 
 using namespace std;

branches/terrain/src/lib/graphics/graphics_engine.cc

@@ -298 +298 @@
   }
 
-  glEnable(GL_CULL_FACE);
-  glCullFace(GL_FRONT);
+
 }
 

branches/terrain/src/lib/graphics/importer/Makefile.am

@@ -38 +38 @@
                            md3/md3_data.cc \
                            md3/md3_tag.cc \
-                           \ 
+                           \
                            terrain/terrain.cc \
                            terrain/terrain_quad.cc \

branches/terrain/src/lib/graphics/importer/md2/md2Model.cc

@@ -17 +17 @@
 #include "md2Model.h"
 #include "material.h"
-
+#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 "debug.h"
 #include "util/loading/resource_manager.h"
@@ -66 +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
 
 /********************************************************************************
@@ -442 +465 @@
   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 +473 @@
     }
 
-  this->fileName =fileName;
+  this->fileName = fileName;
   /* got the data: map it to locals */
   this->numFrames = this->header->numFrames;
@@ -468 +492 @@
   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;