Changeset 8748 in orxonox.OLD

Timestamp:

Jun 23, 2006, 5:07:04 PM (18 years ago)

Author:

ponder

Message:

Small changes to help debug

Location:

branches/terrain

Files:

• acinclude.m4 (modified) (1 diff)
• src/lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• src/lib/graphics/importer/terrain/terrain.cc (modified) (2 diffs)
• src/lib/graphics/importer/terrain/terrain.h (modified) (2 diffs)
• src/lib/graphics/importer/terrain/terrain_page.cc (modified) (1 diff)
• src/world_entities/terrain_entity.cc (modified) (1 diff)

branches/terrain/acinclude.m4

@@ -303 +303 @@
       if test -e ${_lua_lib_directory}/liblua.a  || test -e ${_lua_lib_directory}/liblua.dylib ; then
         LUA_LIB_DIRECTORY=${_lua_lib_directory}
-        LDFLAGS="${LDFLAGS} -L${LUA_LIB_DIRECTORY} -llualib"
+        LDFLAGS="${LDFLAGS} -L${LUA_LIB_DIRECTORY} -llualib -ldl"
         break
       fi

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

@@ -124 +124 @@
       for( entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++ )
                 {
-                                Vector pos( (*entityIterator)->getAbsCoor() );
+                                /*Vector pos( (*entityIterator)->getAbsCoor() );
                                 Vector normal;
                                 float height = pos.y;
@@ -131 +131 @@
                                         ( *entityIterator )->registerCollision( 
                                                 *entityIterator, terrain, pos, normal );
-                                }
+                                }*/
       }
         }

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

@@ -26 +26 @@
         heightfield.pitch = tmpData->pitch;
         int dataSize = heightfield.pitch*heightfield.height;
-        heightfield.data = new UByte[dataSize];
-        memcpy( heightfield.data, tmpData->pixels, sizeof(UByte)*dataSize );
+        heightfield.data = new Uint8[dataSize];
+        memcpy( heightfield.data, tmpData->pixels, sizeof(Uint8)*dataSize );
         SDL_FreeSurface( tmpData );
         //TODO: Perform some checks... size, bits and so on
@@ -323 +323 @@
 inline Uint8 getAlpha( const SDL_Surface *_s, int _x, int _y )
 {
-        printf( "getalpha: %d, %d\n", _x, _y );
     int bpp = _s->format->BytesPerPixel;
     Uint8 *p = (Uint8 *)_s->pixels + _y*_s->pitch + _x * bpp;

branches/terrain/src/lib/graphics/importer/terrain/terrain.h

@@ -165 +165 @@
                  * Creates the quad tree structure for fast culling of the terrain pages.
                  */             
-                pTerrainQuad createQuadTree( int _x0, int _z0, int _x1, int _z1, int _depth = 0 );
+                pTerrainQuad createQuadTree( int _x0, int _z0, 
+                        int _x1, int _z1, int _depth = 0 );
                 
                 /**
@@ -206 +207 @@
 inline float Terrain::getAltitude( int _x, int _z ) const
 {
-        if ( _x < 0 || _x > heightfield.width || _z < 0 || _z > heightfield.height )
+        if ( _x < 0 || _x >= heightfield.width || _z < 0 || _z >= heightfield.height ) {
                 return 0.0f;
+                printf( "outside!\n" );
+        }       
         return heightfield.data[heightfield.pitch*_z+_x]/255.0f;        
 }

branches/terrain/src/lib/graphics/importer/terrain/terrain_page.cc

@@ -783 +783 @@
                         hasfull = true;
         }       
-        printf( "setting layer %d vis to %d\n", _lv );  
         layerVisibility[_layer] = _lv;  
 }

branches/terrain/src/world_entities/terrain_entity.cc

@@ -176 +176 @@
         if ( lightmap ) 
                 terrain->setLightmap( lightmap );
-        else
+        else {
                 PRINTF(0)("no lightmap %s\n", _lightFile.c_str() );
+                
+        }       
 }