Changeset 8548 in orxonox.OLD for branches/terrain/src/world_entities

Timestamp:

Jun 16, 2006, 11:35:49 PM (19 years ago)

Author:

ponder

Message:

• Added multitexturing support to the terrain-class.
• The lightmap gets screwed up and I don't know why…

Location:

branches/terrain/src/world_entities

Files:

• camera.cc (modified) (1 diff)
• terrain_entity.cc (modified) (1 diff)

branches/terrain/src/world_entities/camera.cc

@@ -34 +34 @@
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW5);
 
-  this->setFovy(90);
+  this->setFovy(60.0);
   this->setAspectRatio(1.2f);
-  this->setClipRegion( .1, 100.0f );
+  this->setClipRegion( .1, 80.0f );
 
   this->setViewMode(Camera::ViewNormal);

branches/terrain/src/world_entities/terrain_entity.cc

@@ -140 +140 @@
 void TerrainEntity::loadLightmap( const std::string& _lightFile )
 {
-        terrain->setLightmap( _lightFile );
+        Material *mat = new Material( "TERR_LM" );
+        mat->setDiffuse( 1.0f, 1.0f, 1.0f );
+        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 );     
+        terrain->addMaterial( mat );
 }