Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/terrain/src/world_entities/terrain_entity.cc

    r9140 r9147  
    2525#include "model.h"
    2626#include "network_game_manager.h"
    27 
     27#include "vector.h"
    2828#include "material.h"
    2929
     
    167167void TerrainEntity::setScale(float x, float y, float z)
    168168{
    169         terrain->setScale( Triple( x, y, z ) );
     169        terrain->setScale( Vector( x, y, z ) );
    170170}
    171171
     
    220220       
    221221        if ( this->terrain ) {
    222                 terrain->setCameraPosition( Triple( cam.x, cam.y, cam.z ) );
     222                terrain->setCameraPosition( cam );
    223223                terrain->draw( );
    224224        }
     
    405405void TerrainEntity::getAltitude( Vector& _position, Vector& _normal )
    406406{
    407         Triple  altitude( _position.x-getAbsCoor().x, 0.0f, _position.z-getAbsCoor().z ),
     407        Vector  altitude( _position.x-getAbsCoor().x, 0.0f, _position.z-getAbsCoor().z ),
    408408                        normal( 0.0f, 0.0f, 0.0f );
    409409        if ( terrain )
     
    416416float TerrainEntity::getHeight( float x, float z )
    417417{
    418         Triple  altitude( x-getAbsCoor().x, 0.0f, z-getAbsCoor().z ),
     418        Vector  altitude( x-getAbsCoor().x, 0.0f, z-getAbsCoor().z ),
    419419                        normal( 0.0f, 0.0f, 0.0f );
    420420        if ( terrain )
Note: See TracChangeset for help on using the changeset viewer.