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

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/types.h (modified) (7 diffs)

branches/terrain/src/lib/graphics/importer/terrain/types.h

@@ -26 +26 @@
 #define SAVE_DELETE( _a ) if ( _a ) { delete _a; _a = NULL; }
 
-struct Triple
-{
-  Triple( float _x, float _y, float _z )
-  {
-    x = _x; y = _y; z = _z;
-  }
-  Triple() { x = y = z = 0.0f; }
-  inline float length() const
-    { return sqrt( x*x+y*y+z*z ); }
-  float x, y, z;
-};
-
 struct TexCoord
 {
@@ -54 +42 @@
 {
 
-  ABox( Triple _min, Triple _max)
+  ABox( Vector _min, Vector _max)
   {
     corner = _min;
@@ -64 +52 @@
   ABox()
   {
-    corner = Triple( 0.0f, 0.0f, 0.0f );
+    corner = Vector( 0.0f, 0.0f, 0.0f );
     x = y = z = 0.0f;
   }
-  inline void set( const Triple& _min, const Triple& _max )
+  inline void set( const Vector& _min, const Vector& _max )
   {
     setMin( _min ); setMax( _max );
   }
-  inline void setMax( const Triple& _max )
+  inline void setMax( const Vector& _max )
   {
     x = _max.x-corner.x;
@@ -77 +65 @@
     z = _max.z-corner.z;
   }
-  inline void setMin( const Triple& _min )
+  inline void setMin( const Vector& _min )
   {
     corner = _min;
   }
-  inline Triple vertexP( const Triple& _normal ) const
+  inline Vector vertexP( const Vector& _normal ) const
   {
-    Triple res = corner;
+    Vector res = corner;
     if ( _normal.x > 0 )
       res.x+= x;
@@ -93 +81 @@
     return res;
   }
-  inline Triple vertexN( const Triple& _normal ) const
+  inline Vector vertexN( const Vector& _normal ) const
   {
-    Triple res = corner;
+    Vector res = corner;
     if ( _normal.x < 0 )
       res.x+= x;
@@ -106 +94 @@
 
   }
-inline Triple min() const { return Triple(corner); }
-  inline Triple max() const { return Triple( corner.x+x, corner.y+y, corner.z+z ); }
-  Triple corner;
+inline Vector min() const { return Vector(corner); }
+  inline Vector max() const { return Vector( corner.x+x, corner.y+y, corner.z+z ); }
+  Vector corner;
   float x, y, z;
 
@@ -115 +103 @@
 // struct Plane
 // {
-//   Plane() { n = Triple( 0.0f, 1.0f, 0.0f ); d = 0.0f; }
+//   Plane() { n = Vector( 0.0f, 1.0f, 0.0f ); d = 0.0f; }
 //   inline void setCoefficients( float _nx, float _ny, float _nz, float _d )
 //   {
-//     n = Triple( _nx, _ny, _nz );
+//     n = Vector( _nx, _ny, _nz );
 //     float l = n.length();
 //     n.x /= l; n.y/=l; n.z/=l;
 //     d = _d/l;
 //   }
-//   inline float distance( const Triple& _point ) const
+//   inline float distance( const Vector& _point ) const
 //   {
 //     return _point.x*n.x+_point.y*n.y+_point.z*n.z+d;
 //   }
-//   Triple n;
+//   Vector n;
 //   float d;
 // };