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

Timestamp:

Jun 23, 2006, 11:29:40 AM (19 years ago)

Author:

ponder

Message:

• Finally, I got the terrain working completly. What a hard work… It took me lots and lots of hours to remove all bugs in the tesselation routines.

Location:

branches/terrain/src/world_entities

Files:

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

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( "maps/gras_128.jpg" ), GL_TEXTURE_2D, 1 );     
+        mat->setDiffuseMap( std::string( "pictures/debug.png" ), GL_TEXTURE_2D, 1 );    
         terrain->addMaterial( mat );
 }
@@ -382 +382 @@
   }
 }
+void TerrainEntity::getAltitude( Vector& _position, Vector& _normal )
+{
+        Triple  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 )

branches/terrain/src/world_entities/terrain_entity.h

@@ -45 +45 @@
 
                 float getHeight(float x, float y);
+                void getAltitude( Vector& _position, Vector& _normal );
                 virtual void draw() const;