Changeset 8929 in orxonox.OLD

Timestamp:

Jun 29, 2006, 11:45:59 PM (18 years ago)

Author:

ponder

Message:

• added a clipping plane for removing popping effects
• put the update stuff from terrain::draw to terrain::tick.

Location:

branches/terrain/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• lib/graphics/importer/md3/md3_data.h (modified) (1 diff)
• lib/graphics/importer/terrain/terrain.cc (modified) (7 diffs)
• lib/graphics/importer/terrain/terrain.h (modified) (1 diff)
• lib/graphics/importer/terrain/terrain_page.cc (modified) (1 diff)
• world_entities/playable.cc (modified) (1 diff)
• world_entities/terrain_entity.cc (modified) (2 diffs)
• world_entities/terrain_entity.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

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/md3/md3_data.h

@@ -70 +70 @@
 
 
-
 //! class to store the md2 data in
 class MD3Data : public BaseObject

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

@@ -171 +171 @@
 }
 
+void Terrain::tick( float _dt )
+{
+        for ( unsigned int i = 0; i < buffers.size(); ++i )
+                broker->release( buffers[i].vbIdentifier, buffers[i].ibIdentifier );
+        buffers.clear();        
+        pTerrainPage page = NULL;
+        //Extract the frustum planes out of the modelview matrix.
+        frustum->extractPlanes();       
+        // Lets see which pages are visible.
+        determineVisiblePages( root );
+        int wantedLeft, wantedRight, wantedBottom, wantedTop, minLOD;
+        pTerrainPage neighbor = NULL;
+        page = activePages;
+        bool dirty;
+        current = 0;
+        BufferInfo bi;
+        broker->acquire( bi.vbIdentifier, bi.ibIdentifier );
+        buffers.push_back( bi );
+        int dirtyRounds = 0;
+        do {
+                dirtyRounds++;
+                dirty = false;
+                page = activePages;
+                while ( page ) {
+                        if ( !page->isActive() ) {
+                                pTerrainPage tmp = page;
+                                page = tmp->getNext();
+                                tmp->setVisibility( false );
+                                continue;
+                        }
+                        wantedLeft = wantedRight = wantedBottom = wantedTop = page->getWantedLOD();
+                        if ( ( neighbor = page->getLeft() ) && ( neighbor->isActive() ) ) 
+                                wantedLeft = neighbor->getWantedLOD();
+                        if ( ( neighbor = page->getRight() ) && ( neighbor->isActive() ) ) 
+                                wantedRight = neighbor->getWantedLOD();
+                        if ( ( neighbor = page->getTop() ) && ( neighbor->isActive() ) ) 
+                                wantedTop = neighbor->getWantedLOD();
+                        if ( ( neighbor = page->getBottom() ) && ( neighbor->isActive() ) ) 
+                                wantedBottom = neighbor->getWantedLOD();                        
+                
+                        minLOD = std::min( std::min( wantedBottom, wantedTop ), 
+                                std::min( wantedLeft, wantedRight ) );  
+                        if ( minLOD < page->getWantedLOD()-1 ) {
+                                page->setWantedLOD( minLOD+1 );
+                                dirty = true;
+                        }       
+                        page = page->getNext();
+                }
+        } while ( dirty );
+        
+        page = activePages;
+        while ( page ) {
+                assert( page->isActive() );
+                page->updateTesselation();
+                page = page->getNext();
+        }
+        //If there is some data in the buffer, we need to upload the data
+        //into the vram...
+        if ( buffers[current].numIndices != 0 ) {
+                BufferInfo bi = buffers[current];       
+                glBindBufferARB( GL_ARRAY_BUFFER_ARB, bi.vbIdentifier );
+                glBufferDataARB( GL_ARRAY_BUFFER_ARB, MAX_VERTICES*sizeof( Vertex ), 
+                        vertices, GL_DYNAMIC_DRAW_ARB );
+                glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, bi.ibIdentifier );
+                glBufferDataARB( GL_ELEMENT_ARRAY_BUFFER_ARB, MAX_INDICES*sizeof( short ), 
+                        indices, GL_DYNAMIC_DRAW_ARB );
+        }       
+}
 void Terrain::draw( )
 {
+        pTerrainPage page = NULL;
         glGetError();
-        pTerrainPage page = NULL;
-        frustum->extractPlanes();
+        /*pTerrainPage page = NULL;
+        frustum->extractPlanes();*/
+        Plane far = frustum->getPlane( Frustum::FAR );
+        //Due to some reason, the OpenGL implementors chose the plane equation
+        //to an array of doubles. So we will make them happy.
+        double farPlane[] = { far.n.x, far.n.y, far.n.z, far.d };
+        glEnable( GL_CLIP_PLANE0 );
+        glClipPlane( GL_CLIP_PLANE0, farPlane );
         glPushAttrib( GL_ALL_ATTRIB_BITS );
         glPushClientAttrib( GL_CLIENT_VERTEX_ARRAY_BIT );
@@ -198 +273 @@
         cullCount = 0;
         
-        // Lets see which pages are visible.
+        /*// Lets see which pages are visible.
         determineVisiblePages( root );
         int wantedLeft, wantedRight, wantedBottom, wantedTop, minLOD;
@@ -256 +331 @@
                 glBufferDataARB( GL_ELEMENT_ARRAY_BUFFER_ARB, MAX_INDICES*sizeof( short ), 
                         indices, GL_DYNAMIC_DRAW_ARB );
-        }
+        }*/
         glEnable( GL_BLEND );
         glDepthFunc( GL_LEQUAL );
@@ -312 +387 @@
                         page = page->getNext();
                 }
-                activatedCount = 0; deactivatedCount = 0;
-        }
-        
-        for ( unsigned int i = 0; i < buffers.size(); ++i )
-                broker->release( buffers[i].vbIdentifier, buffers[i].ibIdentifier );
-                
-        buffers.clear();
-                
+        }
+                        
         glClientActiveTextureARB( GL_TEXTURE1_ARB );    
         glActiveTextureARB( GL_TEXTURE1_ARB );
@@ -329 +398 @@
         glPopAttrib();
         glPopClientAttrib();
+        glDisable( GL_CLIP_PLANE0 );
 }
 
@@ -429 +499 @@
                 //not the whole cross products needs to be calculated. Grab yourself
                 //pen and paper :)
-                _normal.x = -dZ*( alt[0] - alt[1] );                            
-                _normal.y = -dZ*dX;
-                _normal.z =  dX*( alt[2] - alt[1] );
+                _normal.x =  dZ*( alt[0] - alt[1] );                            
+                _normal.y =  dZ*dX;
+                _normal.z = -dX*( alt[2] - alt[1] );
         }
         else {
@@ -442 +512 @@
                 //not the whole cross products needs to be calculated. Grab yourself
                 //pen and paper :)
-                _normal.x =  dZ*( alt[2] - alt[1] );                            
-                _normal.y = -dZ*dX;
-                _normal.z = -dX*( alt[0] - alt[1] );
+                _normal.x = -dZ*( alt[2] - alt[1] );                            
+                _normal.y =  dZ*dX;
+                _normal.z =  dX*( alt[0] - alt[1] );
         }
 }

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

@@ -117 +117 @@
                 
                 void build();
-                
+                void tick( float _dt );
                 inline void setActiveList( pTerrainPage _page )
                 {

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

@@ -138 +138 @@
                 float d = distance.length();
                 
-                assert( d > 0.000001f );
                 float err =  errors[i].diff / d ;
                 

branches/terrain/src/world_entities/playable.cc

@@ -67 +67 @@
 
   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
-
+        this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_TERRAIN );
   registerVar( new SynchronizeableInt( &score, &score, "score" ) );
   registerVar( new SynchronizeableBool( &bFire, &bFire, "bFire", PERMISSION_OWNER));

branches/terrain/src/world_entities/terrain_entity.cc

@@ -101 +101 @@
 {
   this->setClassID( CL_TERRAIN, "TerrainEntity");
-  this->toList(OM_ENVIRON_NOTICK);
+  this->toList(OM_ENVIRON);
   this->toReflectionList();
 
@@ -200 +200 @@
 
 
-
+void TerrainEntity::tick( float _dt ) { if ( terrain ) terrain->tick( _dt ); }
 
 void TerrainEntity::draw () const

branches/terrain/src/world_entities/terrain_entity.h

@@ -47 +47 @@
                 void getAltitude( Vector& _position, Vector& _normal );
                 virtual void draw() const;
-
+                virtual void tick( float _dt );
         public:
         

branches/terrain/src/world_entities/world_entity.cc

@@ -427 +427 @@
     return false;
 
+
   // get a collision event
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();