Changeset 8328 in orxonox.OLD for branches/terrain/src/lib

Timestamp:

Jun 12, 2006, 5:17:14 PM (18 years ago)

Author:

ponder

Message:

• Renamed Terrain into TerrainEntity in order to avoid conflicts between the importer/terrain class and the world_entities/terrain.
• Changed TerrainEntity to support the new terrain class.

Location:

branches/terrain/src/lib

Files:

• collision_detection/cd_engine.cc (modified) (2 diffs)
• collision_detection/cd_engine.h (modified) (3 diffs)
• graphics/importer/terrain/frustum.h (modified) (1 diff)
• graphics/importer/terrain/terrain.cc (modified) (9 diffs)
• graphics/importer/terrain/terrain.h (modified) (3 diffs)
• graphics/importer/terrain/terrain_page.cc (modified) (6 diffs)
• graphics/importer/terrain/terrain_page.h (modified) (1 diff)

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

@@ -22 +22 @@
 #include "model.h"
 #include "world_entity.h"
-#include "terrain.h"
+#include "terrain_entity.h"
+
 // #include "player.h"
 
@@ -99 +100 @@
   if( likely( this->terrain != NULL))
   {
-    Quadtree* q = dynamic_cast<Terrain*>(this->terrain)->ssp->getQuadtree();
-//    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
+        //kraus: TODO put collision detection for terrain class here...
+    //Quadtree* q = dynamic_cast<TerrainEntity*>(this->terrain)->ssp->getQuadtree();
+        //QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
   }
   

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

@@ -16 +16 @@
 class WorldEntity;
 class OBBTree;
-class Terrain;
+class TerrainEntity;
 class BspManager;
 //class Player;
@@ -50 +50 @@
   inline void disable(const int options) { int temp = this->state & options; this->state ^= temp; }
 
-  inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
+  inline void setTerrain( TerrainEntity* terrain) { this->terrain = terrain; }
   inline void setBSPModel(BspManager* bspManager) { this->bspManager = bspManager; }
 
@@ -83 +83 @@
   OBBTree*                rootTree;                         //!< for testing purposes a root tree
 
-  Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
+  TerrainEntity*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
   BspManager*             bspManager;
 };

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

@@ -17 +17 @@
 #include "types.h"
 #include "glincl.h"
-
+#include <stdio.h>
 #define m( _row,_col )  _m[_col*4+_row-5]
 
+#define CHECK_GL_ERROR( _d ) do { \
+        GLenum __err = glGetError(); \
+        if ( __err != GL_NO_ERROR ) \
+                printf( "check%s: %s\n", _d, (char*)gluErrorString( __err ) );\
+        }\
+        while ( 0 )
+        
 /** 
  * Code borrowed from Lighthouse 3D 

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

@@ -3 +3 @@
 #include "terrain_page.h"
 #include "glincl.h"
+#include "util/loading/resource_manager.h"
+#include "debug.h"
 
 #ifdef HAVE_SDL_SDL_IMAGE_H
@@ -12 +14 @@
 void Terrain::build()
 {
-        SDL_Surface *tmpData = IMG_Load( heightmapSource.c_str() );
+        ResourceManager *MANAGER = ResourceManager::getInstance();
+        std::string full = MANAGER->getFullName( heightmapSource );
+        SDL_Surface *tmpData = IMG_Load( full.c_str() );
         if ( !tmpData ) {
-                printf( "sorry, can't load!!!\n" );
+                PRINTF(0)( "I' sorry, I can't load %s\n", full.c_str() );
                 return;
         }               
@@ -25 +29 @@
         memcpy( heightfield.data, tmpData->pixels, sizeof(UByte)*dataSize );
         SDL_FreeSurface( tmpData );
-        //TODO: Check for modulo!
+        //TODO: Perform some checks...
         pagesX = (heightfield.width/(pageSize-1) );
         pagesZ = (heightfield.height/(pageSize-1) );
-        tex = new Texture( lightmapSource );
-        
+        tex = (Texture*)MANAGER->load( lightmapSource );
+        
+        //TODO: Determine layer visibility!
         printf( "creating terrain pages ( %d, %d )...", pagesX, pagesZ );
         pages = new pTerrainPage[pagesX*pagesZ];        
@@ -72 +77 @@
         newPage->setPosition( Triple( scale.x*_xOffset, 0.0f, scale.z*_zOffset ) );
         newPage->calculateErrors();
-        
-        //newPage->calculateMinMax();
         return newPage;
 }
@@ -81 +84 @@
 //              through the activePages list is sufficient to remove all invisible 
 //              pages.
+//              DONE
 void Terrain::determineVisiblePages( pTerrainQuad _node )
 {
@@ -111 +115 @@
 void Terrain::draw( )
 {
+        glGetError();
         pTerrainPage page = NULL;
-        
         frustum->extractPlanes();
-        
         glEnableClientState( GL_VERTEX_ARRAY );
+
         glEnableClientState( GL_TEXTURE_COORD_ARRAY ); 
         glEnable( GL_TEXTURE_2D );
         glEnable( GL_DEPTH_TEST );
-        glEnable( GL_CULL_FACE );
-
-        
+        glDisable( GL_CULL_FACE );
         glBindTexture( GL_TEXTURE_2D, tex->getTexture() );
         glDisable( GL_LIGHTING );
-
         glEnable( GL_COLOR_MATERIAL );
         glColor3f( 1.0f, 1.0f, 1.0f );
         cullCount = 0;
-        
         // Lets see which pages are visible.
         determineVisiblePages( root );
@@ -134 +134 @@
         int count = 0;
         page = activePages;     
-        
         while ( page ) {
                 if ( !page->isActive() ) {
                         pTerrainPage tmp = page;
                         page = tmp->getNext();
+                        tmp->setVisibility( false );
                         tmp->deactivate();
+                        deactivatedCount++;
                         continue;
                 }       
@@ -149 +150 @@
                 page = page->getNext();
         }
-        
         //printf( "%d pages activated, %d pages deactivated\n", activatedCount, deactivatedCount );
         activatedCount = 0; deactivatedCount = 0;
-        //float percentage = (float)cullCount/(float)(pagesX*pagesZ)*100.0f;
+        float percentage = (float)cullCount/(float)(pagesX*pagesZ)*100.0f;
         //printf( "culled %f%% terrain pages away\n",  percentage );
 }
@@ -205 +205 @@
                 for ( int z = 0; z < _height; ++z ) {
                         pTerrainPage page = getPage( _x0+x, _z0+z );
-                        page->chooseLOD( );
-                        page->show( );
+                        page->setVisibility( true );                    
+                        page->chooseLOD();
+
                 }
         }

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

@@ -67 +67 @@
         
                 void getAltitude( Triple& _alt, Triple& _normal );
+                
                 void showPages( int _x0, int _z0, int _width, int _height );
                                         
@@ -106 +107 @@
                 inline float getAltitude( int _x, int _z ) const;
                 
-                inline void setLightmap( std::string &_lightmap )
+                inline void setLightmap( const std::string &_lightmap )
                 {
                         lightmapSource = _lightmap;
                 }
-                inline void setHeightmap( std::string &_heightmap ) 
+                inline void setHeightmap( const std::string &_heightmap ) 
                 { 
                         heightmapSource = _heightmap; 
@@ -180 +181 @@
 inline float Terrain::getAltitude( int _x, int _z ) const
 {
-        if ( _x > heightfield.width || _z > heightfield.height )
-                return 0.0f;
         return heightfield.data[heightfield.pitch*_z+_x]/255.0f;        
 }

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

@@ -10 +10 @@
  
         ### File Specific:
-        main programmer: Marco Biasini
+        main-programmer: Marco Biasini
  
  */
@@ -19 +19 @@
 #include <math.h>
 
-#define CHECK_GL_ERROR() do { \
+#define CHECK_GL_ERROR( _d ) do { \
         GLenum __err = glGetError(); \
         if ( __err != GL_NO_ERROR ) \
-                printf( (char*)gluErrorString( __err ) );\
+                printf( "check%s: %s\n", _d, (char*)gluErrorString( __err ) );\
         }\
         while ( 0 )
@@ -77 +77 @@
 void TerrainPage::activate()
 {
+        
         pTerrainPage list = owner->getActiveList();
         next = list;
@@ -202 +203 @@
         int stride = 1 << _lod;
         for ( int z = 0; z < owner->getPageSize()-stride; z+=stride ) {
-                if ( z > 0 ) {
-                        
+                if ( z > 0 ) {                  
                         //Connect the two rows together by inserting the last index of last row
                         //and the first index of the next row two times. This will produce two
@@ -278 +278 @@
 void TerrainPage::draw( )
 {
-        
+        //These give an error
         assert( glIsEnabled( GL_VERTEX_ARRAY ) );
         assert( !glIsEnabled( GL_NORMAL_ARRAY ) );
-        assert( isVisible ); assert( numIndices );
+        assert( isVisible ); assert( numIndices > 0 );
+        assert( active );
         active = false;
+        CHECK_GL_ERROR( "1" );  
         glVertexPointer( 3, GL_FLOAT, 0, vertices );
         glTexCoordPointer( 2, GL_FLOAT, 0, coords );    
@@ -290 +292 @@
         if ( owner->debug() )
                 drawBox( );
-        
-        CHECK_GL_ERROR();
+                
+        CHECK_GL_ERROR( "2" );  
 }
 

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

@@ -247 +247 @@
                         show( );
                 }
+                active = true;
         }
         else {