Changeset 8595 in orxonox.OLD

Timestamp:

Jun 20, 2006, 12:20:44 AM (18 years ago)

Author:

ponder

Message:

BufferBroker needs an update. Its broken!

Location:

branches/terrain/src

Files:

• lib/graphics/importer/terrain/buffer_broker.h (modified) (1 diff)
• lib/graphics/importer/terrain/terrain.h (modified) (1 diff)
• world_entities/terrain_entity.cc (modified) (1 diff)

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

@@ -106 +106 @@
 inline void BufferBroker::acquire( GLuint &_vbName, GLuint &_ibName )
 {
-        assert( lastAcquired < capacity );
+
         int index = capacity-lastAcquired-1;
         _vbName = freeVertexBuffers[index]; _ibName = freeIndexBuffers[index];

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

@@ -87 +87 @@
                         activatedCount = deactivatedCount = 0;
 #ifdef USE_VBO
-                        broker = new BufferBroker( 200, pageSize*pageSize*sizeof( Vertex ), 
+                        broker = new BufferBroker( 400, pageSize*pageSize*sizeof( Vertex ), 
                                 pageSize*pageSize*sizeof( short )*3 );
 #endif                  

branches/terrain/src/world_entities/terrain_entity.cc

@@ -144 +144 @@
         mat->setAmbient( 1.0f, 1.0f, 1.0f );
         mat->setDiffuseMap( _lightFile, GL_TEXTURE_2D, 0 );     
-        mat->setDiffuseMap( std::string( "pictures/lehm.png" ), GL_TEXTURE_2D, 1 );     
+        mat->setDiffuseMap( std::string( "maps/gras_128.jpg" ), GL_TEXTURE_2D, 1 );     
         terrain->addMaterial( mat );
 }