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

Timestamp:

Jul 4, 2006, 3:45:43 PM (18 years ago)

Author:

ponder

Message:

To rid of the triple and plane struct in types.h. now using the generic ones

File:

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

branches/terrain/src/world_entities/terrain_entity.cc

@@ -25 +25 @@
 #include "model.h"
 #include "network_game_manager.h"
-
+#include "vector.h"
 #include "material.h"
 
@@ -167 +167 @@
 void TerrainEntity::setScale(float x, float y, float z)
 {
-        terrain->setScale( Triple( x, y, z ) );
+        terrain->setScale( Vector( x, y, z ) );
 }
 
@@ -220 +220 @@
         
         if ( this->terrain ) {
-                terrain->setCameraPosition( Triple( cam.x, cam.y, cam.z ) ); 
+                terrain->setCameraPosition( cam ); 
                 terrain->draw( );
         }
@@ -405 +405 @@
 void TerrainEntity::getAltitude( Vector& _position, Vector& _normal )
 {
-        Triple  altitude( _position.x-getAbsCoor().x, 0.0f, _position.z-getAbsCoor().z ), 
+        Vector  altitude( _position.x-getAbsCoor().x, 0.0f, _position.z-getAbsCoor().z ), 
                         normal( 0.0f, 0.0f, 0.0f );
         if ( terrain ) 
@@ -416 +416 @@
 float TerrainEntity::getHeight( float x, float z )
 {
-        Triple  altitude( x-getAbsCoor().x, 0.0f, z-getAbsCoor().z ), 
+        Vector  altitude( x-getAbsCoor().x, 0.0f, z-getAbsCoor().z ), 
                         normal( 0.0f, 0.0f, 0.0f );
         if ( terrain )