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

Timestamp:

Jun 23, 2006, 3:22:53 PM (18 years ago)

Author:

ponder

Message:

• A few more properties can be specified in the .oxw file for the terrain.
• several material-layers can be rendered now.
• there is still one crack appearing now and then.. need to isolate it and send him to hell.

File:

• branches/terrain/src/world_entities/terrain_entity.cc (modified) (4 diffs)

branches/terrain/src/world_entities/terrain_entity.cc

@@ -115 +115 @@
 void TerrainEntity::loadParams(const TiXmlElement* root)
 {
-        WorldEntity::loadParams(root);
+        WorldEntity::loadParams( root );
 
         LoadParam(root, "scale", this, TerrainEntity, setScale)
                 .describe("The scale in x,y,z direction");
         
-        LoadParam( root, "lightmap", this, TerrainEntity, loadLightmap )
+        LoadParam( root, "light_map", this, TerrainEntity, loadLightmap )
                 .describe("The name of the lightmap.");
                 
-        LoadParam( root, "elevationmap", this, TerrainEntity, loadElevationmap )
+        LoadParam( root, "elevation_map", this, TerrainEntity, loadElevationmap )
                 .describe( "The name of the elevation map. Must be an 8bit image" );
-                
+        ResourceManager *manager = ResourceManager::getInstance();
+        TiXmlElement * layer = (TiXmlElement*)root->FirstChild( "material_layer" );             
+        while ( layer ) {
+                LayerInfo *info = new LayerInfo();
+                TiXmlElement *detail = (TiXmlElement*)layer->FirstChild( "detail_map" );
+                if ( detail ) {
+                        string detailmap( detail->Attribute( "file" ) );
+                        info->detail = (Texture*)manager->load( detailmap, 
+                                IMAGE, RP_GAME, (int)GL_TEXTURE_2D );                   
+                        if ( !info->detail ) {
+                                PRINTF(0)( "%s not found\n", detailmap.c_str() );
+                        }       
+                        TiXmlElement *repeat = (TiXmlElement*)detail->FirstChild( "repeat" );
+                        if ( repeat ) {
+                                repeat->QueryFloatAttribute( "x", &info->repeatX );
+                                repeat->QueryFloatAttribute( "z", &info->repeatZ );                             
+                        }
+                }
+                else {
+                        PRINTF(0)( "Please specify a detail-map" );
+                }
+                TiXmlElement *alpha = (TiXmlElement*)layer->FirstChild( "alpha" );
+                if ( alpha ) {
+                                if ( !alpha->Attribute( "full" ) ) {
+                                        string alphamap( alpha->Attribute( "file" ) );
+                                        info->alpha = (Texture*)manager->load( alphamap, 
+                                                IMAGE, RP_GAME, (int)GL_TEXTURE_2D );
+                                }
+                }       
+                terrain->addMaterialLayer( info );
+                layer = (TiXmlElement*)layer->NextSibling( "material_layer" );
+        }
 }
 
@@ -140 +171 @@
 void TerrainEntity::loadLightmap( const std::string& _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/debug.png" ), GL_TEXTURE_2D, 1 );    
-        terrain->addMaterial( mat );
+        ResourceManager *manager = ResourceManager::getInstance();
+        Texture *lightmap = (Texture*)manager->load( _lightFile, 
+                IMAGE, RP_GAME, (int)GL_TEXTURE_2D );   
+        if ( lightmap ) 
+                terrain->setLightmap( lightmap );
+        else
+                PRINTF(0)("no lightmap %s\n", _lightFile.c_str() );
 }
 
@@ -173 +205 @@
         glPushMatrix();
 
-  /* translate */
    glTranslatef( this->getAbsCoor().x,
                  this->getAbsCoor().y,
@@ -184 +215 @@
                 terrain->draw( );
         }
-
         glPopMatrix();
-  /*
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glLoadIdentity();
-    Vector camera =   State::getCameraNode()->getAbsCoor(); // Go on here ..........!!!
-
-    float height =    heightMap->getHeight(camera.x, camera.z);
-
-    glEnable (GL_COLOR_MATERIAL) ;
-    glBegin(GL_QUADS);            // Draw The Cube Using quads
-    glColor3f(0.0f,1.0f,0.0f);  // Color Blue
-    glVertex3f(camera.x + 63.0f,TerrainEntity->getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Right Of The Quad (Top)
-    glVertex3f(camera.x-63.0f, getHeight(camera.x+63.0f, camera.z-10.0f)+13.0f,camera.z-10.0f);      // Top Left Of The Quad (Top)
-    glVertex3f(camera.x-63.0f, getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Left Of The Quad (Top)
-    glVertex3f(camera.x+ 63.0f, getHeight(camera.x+63.0f, camera.z+10.0f)+13.0f, camera.z+10.0f);      // Bottom Right Of The Quad (Top)
-    glEnd();                      // End Drawing The Plan
-
-    glPopMatrix();*/
+
 
 }