Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8595 in orxonox.OLD for branches


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/terrain/src/lib/graphics/importer/terrain/buffer_broker.h

    r8570 r8595  
    106106inline void BufferBroker::acquire( GLuint &_vbName, GLuint &_ibName )
    107107{
    108         assert( lastAcquired < capacity );
     108
    109109        int index = capacity-lastAcquired-1;
    110110        _vbName = freeVertexBuffers[index]; _ibName = freeIndexBuffers[index];
  • branches/terrain/src/lib/graphics/importer/terrain/terrain.h

    r8569 r8595  
    8787                        activatedCount = deactivatedCount = 0;
    8888#ifdef USE_VBO
    89                         broker = new BufferBroker( 200, pageSize*pageSize*sizeof( Vertex ),
     89                        broker = new BufferBroker( 400, pageSize*pageSize*sizeof( Vertex ),
    9090                                pageSize*pageSize*sizeof( short )*3 );
    9191#endif                 
  • branches/terrain/src/world_entities/terrain_entity.cc

    r8548 r8595  
    144144        mat->setAmbient( 1.0f, 1.0f, 1.0f );
    145145        mat->setDiffuseMap( _lightFile, GL_TEXTURE_2D, 0 );     
    146         mat->setDiffuseMap( std::string( "pictures/lehm.png" ), GL_TEXTURE_2D, 1 );     
     146        mat->setDiffuseMap( std::string( "maps/gras_128.jpg" ), GL_TEXTURE_2D, 1 );     
    147147        terrain->addMaterial( mat );
    148148}
Note: See TracChangeset for help on using the changeset viewer.