Changeset 9147 in orxonox.OLD for branches/terrain/src/lib/graphics/importer/terrain/terrain.cc

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/lib/graphics/importer/terrain/terrain.cc (modified) (3 diffs)

branches/terrain/src/lib/graphics/importer/terrain/terrain.cc

@@ -97 +97 @@
         pTerrainPage newPage = new TerrainPage( const_cast<Terrain*>( this ), _xOffset, _zOffset );
         newPage->setScale( scale );     
-        newPage->setPosition( Triple( scale.x*_xOffset, 0.0f, scale.z*_zOffset ) );
+        newPage->setPosition( Vector( scale.x*_xOffset, 0.0f, scale.z*_zOffset ) );
         newPage->calculateErrors();
         return newPage;
@@ -248 +248 @@
         //Due to some reason, the OpenGL implementors chose the plane equation
         //to an array of doubles. So we will make them happy.
-        double farPlane[] = { far.n.x, far.n.y, far.n.z, far.d };
+        double farPlane[] = { far.n.x, far.n.y, far.n.z, far.k };
         glEnable( GL_CLIP_PLANE0 );
         glClipPlane( GL_CLIP_PLANE0, farPlane );
@@ -419 +419 @@
 }
 
-void Terrain::getAltitude( Triple& _alt, Triple& _normal )
+void Terrain::getAltitude( Vector& _alt, Vector& _normal )
 {
         float xScaled = _alt.x / scale.x, zScaled = _alt.z / scale.z;