Changeset 8648 in orxonox.OLD

Timestamp:

Jun 20, 2006, 8:44:18 PM (18 years ago)

Author:

ponder

Message:

Disabled depth test for the skybox. Its not necessary. And this way we make sure, that the sky is always
behind everything

Location:

branches/terrain/src

Files:

• lib/graphics/importer/terrain/terrain.cc (modified) (7 diffs)
• lib/graphics/importer/terrain/terrain_page.cc (modified) (5 diffs)
• lib/graphics/importer/terrain/terrain_page.h (modified) (1 diff)
• world_entities/camera.cc (modified) (2 diffs)
• world_entities/skybox.cc (modified) (1 diff)

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

@@ -51 +51 @@
                                 x > 0                   ? getPage( x-1, z+0 ) : NULL,
                                 x < pagesX-1    ? getPage( x+1, z+0 ) : NULL, 
-                                z > 0                   ? getPage( x+0, z-1 ) : NULL,
-                                z < pagesZ-1    ? getPage( x+0, z+1 ) : NULL );
+                                z < pagesZ-1    ? getPage( x+0, z+1 ) : NULL,
+                                z > 0                   ? getPage( x+0, z-1 ) : NULL );
         
         printf( "looks good\n" );
@@ -69 +69 @@
                 node->setChildren( NULL, NULL, NULL, NULL );
         }
-        else {
-                assert( ( _x0 % 2 ) == 0 ); 
-                assert( ( _x1 % 2 ) == 0 ); 
-                assert( ( _z0 % 2 ) == 0 ); 
-                assert( ( _z1 % 2 ) == 0 );             
+        else {  
                 node = new TerrainQuad( this, _x0, _z0, _x1, _z1 );
                 node->setChildren( 
@@ -200 +196 @@
         broker->acquire( bi.vbIdentifier, bi.ibIdentifier );
         buffers.push_back( bi );
+        int dirtyRounds = 0;
         do {
+                dirtyRounds++;
                 dirty = false;
                 page = activePages;
@@ -211 +209 @@
                         }
                         wantedLeft = wantedRight = wantedBottom = wantedTop = page->getWantedLOD();
-                        if ( ( neighbor = page->getLeft() ) ) 
+                        if ( ( neighbor = page->getLeft() ) && ( neighbor->isActive() ) ) 
                                 wantedLeft = neighbor->getWantedLOD();
-                        if ( ( neighbor = page->getRight() ) ) 
+                        if ( ( neighbor = page->getRight() ) && ( neighbor->isActive() ) ) 
                                 wantedRight = neighbor->getWantedLOD();
-                        if ( ( neighbor = page->getTop() ) ) 
+                        if ( ( neighbor = page->getTop() ) && ( neighbor->isActive() ) ) 
                                 wantedTop = neighbor->getWantedLOD();
-                        if ( ( neighbor = page->getBottom() ) ) 
+                        if ( ( neighbor = page->getBottom() ) && ( neighbor->isActive() ) ) 
                                 wantedBottom = neighbor->getWantedLOD();                        
                 
@@ -224 +222 @@
                         if ( minLOD < page->getWantedLOD()-1 ) {
                                 page->setWantedLOD( minLOD+1 );
-                                //dirty = true;
+                                dirty = true;
                         }       
                         page = page->getNext();
                 }
         } while ( dirty );
+        printf( "dirtyrounds: %d\n", dirtyRounds );
         page = activePages;
         
@@ -247 +246 @@
                         indices, GL_DYNAMIC_DRAW_ARB );
         }
-        s = 500.0f;
+        s = 200.0f;
+        glPushAttrib( GL_COLOR_BUFFER_BIT );
         for ( unsigned int i = 0; i < materials.size(); ++i ) {
                 page = activePages;     
@@ -308 +308 @@
         glDisableClientState( GL_TEXTURE_COORD_ARRAY ); 
         glEnable( GL_LIGHTING );
+        glMatrixMode( GL_TEXTURE );
+        glLoadIdentity();
+        glPopAttrib();
 }
 

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

@@ -98 +98 @@
                 _adapt[TP_RIGHT] = ( wantedLOD - right->getWantedLOD() ) > 0;
                 
-        if ( top && top->isVisible) 
+        if ( top && top->isVisible ) 
                 _adapt[TP_TOP] = ( wantedLOD - top->getWantedLOD() ) > 0;                               
                 
@@ -128 +128 @@
                 wantedLOD = TerrainPage::MAX_LODS-1;
         }       
-        // Calculate the tween factor. The calculation is different if LOD is 0
-        // 
-        if ( wantedLOD > 0 ) {
-                
-        }
-        else {
-                
-        }
         return wantedLOD;
 }
@@ -244 +236 @@
 {
         
-        bool    leftChanged     = ( left && left->isVisible ) && ( left->wantedLOD != left->currentLOD ),
-                        rightChanged    = ( right && right->isVisible ) && ( right->wantedLOD != right->currentLOD ),
-                        topChanged              = ( top && top->isVisible ) && ( top->wantedLOD != currentLOD ),
-                        bottomChanged   = ( bottom && bottom->isVisible ) && ( bottom->wantedLOD != bottom->currentLOD ),
+        bool    leftChanged     = ( left && left->isActive() ) &&
+                                ( left->wantedLOD != left->currentLOD ),
+                        rightChanged    = ( right && right->isActive() ) && 
+                                ( right->wantedLOD != right->currentLOD ),
+                        topChanged              = ( top && top->isActive() ) && 
+                                ( top->wantedLOD != currentLOD ),
+                        bottomChanged   = ( bottom && bottom->isActive() ) && 
+                                ( bottom->wantedLOD != bottom->currentLOD ),
                         iChanged                =  wantedLOD != currentLOD;
                                 
@@ -518 +514 @@
         int zStart = 0, zEnd = owner->getPageSize()-stride;
         
-        if ( adapt[TP_TOP] ) {
+        if ( adapt[TP_BOTTOM] ) {
                 tesselateRow( 0, stride / 2, stride, adapt[TP_LEFT], adapt[TP_RIGHT] );
                 zStart+= stride;
         }
         
-        if ( adapt[TP_BOTTOM] )
+        if ( adapt[TP_TOP] )
                 zEnd-= stride;
                 
@@ -530 +526 @@
         
 
-        if ( adapt[TP_BOTTOM] ) {
-                
-        addAgain( );
-        addIndex( getIndex( 0, owner->getPageSize()-1-stride ) );
-        
-        tesselateRow( owner->getPageSize()-1-stride, stride / 2, stride, adapt[TP_LEFT], adapt[TP_RIGHT] );
+        if ( adapt[TP_TOP] ) {
+                addAgain( );
+                addIndex( getIndex( 0, owner->getPageSize()-1-stride ) );
+                tesselateRow( owner->getPageSize()-1-stride, stride / 2, 
+                        stride, adapt[TP_LEFT], adapt[TP_RIGHT] );
         }
         

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

@@ -210 +210 @@
                         return true;
                 }
-                
                 inline void setWantedLOD( int _lod )
                 {

branches/terrain/src/world_entities/camera.cc

@@ -36 +36 @@
   this->setFovy(60.0);
   this->setAspectRatio(1.2f);
-  this->setClipRegion( .1, 80.0f );
+  this->setClipRegion( .1, 40.0f );
 
   this->setViewMode(Camera::ViewNormal);
@@ -83 +83 @@
 {
   this->nearClip = nearClip;
-  this->farClip = farClip;
+  this->farClip = 400.0f;//farClip;
 }
 

branches/terrain/src/world_entities/skybox.cc

@@ -230 +230 @@
 //   glPushAttrib(GL_LIGHTING_BIT);
   glDisable(GL_LIGHTING);
-
+  glDisable( GL_DEPTH_TEST );   
   glDisable(GL_FOG);