Changeset 8748 in orxonox.OLD for branches/terrain/src/lib/graphics/importer

Timestamp:

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

Author:

ponder

Message:

Small changes to help debug

Location:

branches/terrain/src/lib/graphics/importer/terrain

Files:

• terrain.cc (modified) (2 diffs)
• terrain.h (modified) (2 diffs)
• terrain_page.cc (modified) (1 diff)

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;  
 }