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

Timestamp:

Jul 24, 2006, 1:46:23 PM (18 years ago)

Author:

bensch

Message:

renamings

Location:

branches/terrain/src/world_entities

Files:

• terrain_entity.cc (modified) (10 diffs)
• terrain_entity.h (modified) (1 diff)

branches/terrain/src/world_entities/terrain_entity.cc

@@ -32 +32 @@
 #include "state.h"
 
-using namespace std;
-
-CREATE_FACTORY( TerrainEntity, CL_TERRAIN );
+CREATE_FACTORY( TerrainEntity, CL_TERRAIN_ENTITY );
 
 /**
@@ -41 +39 @@
 TerrainEntity::TerrainEntity (const TiXmlElement* root)
 {
-        this->init();
-
-
-        if( root != NULL)
-                this->loadParams(root);
-        terrain->build( );
+  this->init();
+
+
+  if( root != NULL)
+    this->loadParams(root);
+  terrain->build( );
 }
 
@@ -60 +58 @@
   this->init();
 
-  if (fileName.rfind(".obj" ) != -1 || fileName.rfind(".OBJ") != -1 )
+  if (fileName.rfind(".obj" ) != std::string::npos || fileName.rfind(".OBJ") != std::string::npos )
   {
     this->loadModel(fileName);
@@ -100 +98 @@
 void TerrainEntity::init()
 {
-  this->setClassID( CL_TERRAIN, "TerrainEntity");
+  this->setClassID( CL_TERRAIN_ENTITY, "TerrainEntity");
   this->toList(OM_ENVIRON);
   this->toReflectionList();
@@ -115 +113 @@
 void TerrainEntity::loadParams(const TiXmlElement* root)
 {
-        WorldEntity::loadParams( root );
-
-        LoadParam(root, "scale", this, TerrainEntity, setScale)
-                .describe("The scale in x,y,z direction");
-        
-        LoadParam( root, "light_map", this, TerrainEntity, loadLightmap )
-                .describe("The name of the lightmap.");
-                
-        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() );
-                        }       
-                        else
-                                PRINTF(0)( "loaded %s\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 );
-                                        if ( !info->alpha )     
-                                                PRINTF(0)( "%s not found\n", alphamap.c_str() );
-                                        else
-                                                PRINTF(0)( "loaded %s\n", alphamap.c_str() );
-                                }
-                }       
-                terrain->addMaterialLayer( info );
-                layer = (TiXmlElement*)layer->NextSibling( "material_layer" );
-        }
+  WorldEntity::loadParams( root );
+
+  LoadParam(root, "scale", this, TerrainEntity, setScale)
+  .describe("The scale in x,y,z direction");
+
+  LoadParam( root, "light_map", this, TerrainEntity, loadLightmap )
+  .describe("The name of the lightmap.");
+
+  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 )
+    {
+      std::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() );
+      }
+      else
+        PRINTF(0)( "loaded %s\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" ) )
+      {
+        std::string alphamap( alpha->Attribute( "file" ) );
+        info->alpha = (Texture*)manager->load( alphamap,
+                                               IMAGE, RP_GAME, (int)GL_TEXTURE_2D );
+        if ( !info->alpha )
+          PRINTF(0)( "%s not found\n", alphamap.c_str() );
+        else
+          PRINTF(0)( "loaded %s\n", alphamap.c_str() );
+      }
+    }
+    terrain->addMaterialLayer( info );
+    layer = (TiXmlElement*)layer->NextSibling( "material_layer" );
+  }
 }
 
 void TerrainEntity::setScale(float x, float y, float z)
 {
-        terrain->setScale( Vector( x, y, z ) );
+  terrain->setScale( Vector( x, y, z ) );
 }
 
 void TerrainEntity::loadElevationmap( const std::string& _eleFile )
 {
-        terrain->setHeightmap( _eleFile );
+  terrain->setHeightmap( _eleFile );
 }
 
 void TerrainEntity::loadLightmap( const std::string& _lightFile )
 {
-        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() );
-                
-        }       
+  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() );
+
+  }
 }
 
@@ -210 +216 @@
 void TerrainEntity::draw () const
 {
-        glMatrixMode( GL_MODELVIEW );
-        glPushMatrix();
-
-   glTranslatef( this->getAbsCoor().x,
-                 this->getAbsCoor().y,
-                 this->getAbsCoor().z );
-
-        Vector cam = State::getCameraNode()->getAbsCoor();
-        
-        if ( this->terrain ) {
-                terrain->setCameraPosition( cam ); 
-                terrain->draw( );
-        }
-        glPopMatrix();
+  glMatrixMode( GL_MODELVIEW );
+  glPushMatrix();
+
+  glTranslatef( this->getAbsCoor().x,
+                this->getAbsCoor().y,
+                this->getAbsCoor().z );
+
+  Vector cam = State::getCameraNode()->getAbsCoor();
+
+  if ( this->terrain )
+  {
+    terrain->setCameraPosition( cam );
+    terrain->draw( );
+  }
+  glPopMatrix();
 
 
@@ -231 +238 @@
 void TerrainEntity::buildDebugTerrainEntity(DebugTerrainEntity debugTerrainEntity)
 {
-        terrain->build( );
+  terrain->build( );
   /*
   // if the TerrainEntity is the TerrainEntity of Dave
@@ -255 +262 @@
       for (int j = 0; j<sizeZ-1;j+=1)
         //height[i][j] = rand()/20046 + (j-25)*(j-25)/30;
-#ifdef __WIN32__
+  #ifdef __WIN32__
         height[i][j]=(sin((float)j/3)*rand()*i/182400)*.5;
-#else
+  #else
         height[i][j]=(sin((float)j/3)*rand()*(long)i/6282450500.0)*.5;
-#endif
+  #endif
 
     //Die Huegel ein wenig glaetten
@@ -369 +376 @@
     glEndList();
   }
-        */
+  */
   if (debugTerrainEntity == TERRAINENTITY_BENSCH)
   {
@@ -405 +412 @@
 void TerrainEntity::getAltitude( Vector& _position, Vector& _normal )
 {
-        Vector  altitude( _position.x-getAbsCoor().x, 0.0f, _position.z-getAbsCoor().z ), 
-                        normal( 0.0f, 0.0f, 0.0f );
-        if ( terrain ) 
-                        terrain->getAltitude( altitude, normal );
-                        
-        _position.y = altitude.y+getAbsCoor().y;
-        _normal.z = normal.z; _normal.y = normal.y; _normal.z = normal.z;       
+  Vector        altitude( _position.x-getAbsCoor().x, 0.0f, _position.z-getAbsCoor().z ),
+  normal( 0.0f, 0.0f, 0.0f );
+  if ( terrain )
+    terrain->getAltitude( altitude, normal );
+
+  _position.y = altitude.y+getAbsCoor().y;
+  _normal.z = normal.z; _normal.y = normal.y; _normal.z = normal.z;
 }
 
 float TerrainEntity::getHeight( float x, float z )
 {
-        Vector  altitude( x-getAbsCoor().x, 0.0f, z-getAbsCoor().z ), 
-                        normal( 0.0f, 0.0f, 0.0f );
-        if ( terrain )
-                terrain->getAltitude( altitude, normal );
-                
+  Vector        altitude( x-getAbsCoor().x, 0.0f, z-getAbsCoor().z ),
+  normal( 0.0f, 0.0f, 0.0f );
+  if ( terrain )
+    terrain->getAltitude( altitude, normal );
+
   return altitude.y+getAbsCoor().y;
 }

branches/terrain/src/world_entities/terrain_entity.h

@@ -27 +27 @@
 {
 
-        public:
-                TerrainEntity(const TiXmlElement* root = NULL);
-                TerrainEntity(const std::string& fileName);
-                TerrainEntity(DebugTerrainEntity debugTerrainEntity);
-                virtual ~TerrainEntity();
+  public:
+    TerrainEntity(const TiXmlElement* root = NULL);
+    TerrainEntity(const std::string& fileName);
+    TerrainEntity(DebugTerrainEntity debugTerrainEntity);
+    virtual ~TerrainEntity();
 
-                void init();
-                virtual void loadParams(const TiXmlElement* root);
+    void init();
+    virtual void loadParams(const TiXmlElement* root);
 
-                void loadVegetation(const std::string& vegetationFile);
+    void loadVegetation(const std::string& vegetationFile);
 
-                void loadElevationmap( const std::string& _eleFile );
-                void loadLightmap(const std::string& _lightFile );
-                void setScale( float x, float y, float z );
+    void loadElevationmap( const std::string& _eleFile );
+    void loadLightmap(const std::string& _lightFile );
+    void setScale( float x, float y, float z );
 
-                void buildDebugTerrainEntity(DebugTerrainEntity debugTerrainEntity);
+    void buildDebugTerrainEntity(DebugTerrainEntity debugTerrainEntity);
 
-                float getHeight(float x, float y);
-                void getAltitude( Vector& _position, Vector& _normal );
-                virtual void draw() const;
-                virtual void tick( float _dt );
-        public:
-        
-        private:
-                 Model*                 vegetation;
-                 int                    objectList;
-                 Terrain*                               terrain;
-                 Vector                 TerrainEntityScale;
+    float getHeight(float x, float y);
+    void getAltitude( Vector& _position, Vector& _normal );
+    virtual void draw() const;
+    virtual void tick( float _dt );
+  public:
+
+  private:
+    Model*                      vegetation;
+    int                         objectList;
+    Terrain*                            terrain;
+    Vector                      TerrainEntityScale;
 };