Changeset 2176 for GTP/trunk/Lib/Vis/Preprocessing/src/Vector3.h

Timestamp:

02/28/07 19:38:47 (17 years ago)

Author:

mattausch

Message:

removed using namespace std from .h

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Vector3.h (modified) (13 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Vector3.h

@@ -3 +3 @@
 
 #include <iostream>
-//using namespace std;
+//
 #include <math.h>
 #include "common.h"
 
+//using std::ostream;
+//using std::istream;
 
 namespace GtpVisibilityPreprocessor {
@@ -14 +16 @@
 class Vector2;
 
-
-// HACK of returning vector components as array fields.
+// HACK of returning std::vector components as array fields.
 // NOT guarrantied to work with some strange variable allignment !
 #define __VECTOR_HACK
@@ -39 +40 @@
   Vector3(const Vector3 &v) { x = v.x; y = v.y; z = v.z; }
 
-  // Functions to get at the vector components
+  // Functions to get at the std::vector components
   float& operator[] (int inx) {
 #ifndef __VECTOR_HACK
@@ -80 +81 @@
   void SetValue(const float a) { x = y = z = a; }
   
-  // returns the axis, where the vector has the largest value
+  // returns the axis, where the std::vector has the largest value
   int DrivingAxis(void) const;
 
-  // returns the axis, where the vector has the smallest value
+  // returns the axis, where the std::vector has the smallest value
   int TinyAxis(void) const;
 
@@ -95 +96 @@
    }
 
-  // normalizes the vector of unit size corresponding to given vector
+  // normalizes the std::vector of unit size corresponding to given std::vector
   inline void Normalize();
   
-  /** Returns false if this vector has a nan component.
+  /** Returns false if this std::vector has a nan component.
   */
   bool CheckValidity() const;
@@ -109 +110 @@
      In fact it tries v x (0,0,1) an if the result is too small,
      it definitely does v x (0,1,0). It will always work for
-     non-degenareted vector and is much faster than to use
+     non-degenareted std::vector and is much faster than to use
      TangentVectors.
 
-     @param v(in) The vector we want to find normal for.
-     @return The normal vector to v.
+     @param v(in) The std::vector we want to find normal for.
+     @return The normal std::vector to v.
   */
   friend inline Vector3 ArbitraryNormal(const Vector3 &v); 
@@ -140 +141 @@
   void RightHandedBase(Vector3& U, Vector3& V) const;
 
-  /// Transforms a vector to the global coordinate frame.
+  /// Transforms a std::vector to the global coordinate frame.
   /**
     Given a local coordinate frame (U,V,N) (i.e. U,V,N are 
     the x,y,z axes of the local coordinate system) and
-    a vector 'loc' in the local coordiante system, this
-    function returns a the coordinates of the same vector
+    a std::vector 'loc' in the local coordiante system, this
+    function returns a the coordinates of the same std::vector
     in global frame (i.e. frame (1,0,0), (0,1,0), (0,0,1).
   */
@@ -153 +154 @@
           const Vector3& N);
   
-  /// Transforms a vector to a local coordinate frame.
+  /// Transforms a std::vector to a local coordinate frame.
   /**
     Given a local coordinate frame (U,V,N) (i.e. U,V,N are 
     the x,y,z axes of the local coordinate system) and
-    a vector 'loc' in the global coordiante system, this
-    function returns a the coordinates of the same vector
+    a std::vector 'loc' in the global coordiante system, this
+    function returns a the coordinates of the same std::vector
     in the local frame.
   */
@@ -166 +167 @@
           const Vector3& N);
 
-  /// the magnitude=size of the vector
+  /// the magnitude=size of the std::vector
   friend inline float Magnitude(const Vector3 &v);
-  /// the squared magnitude of the vector .. for efficiency in some cases
+  /// the squared magnitude of the std::vector .. for efficiency in some cases
   friend inline float SqrMagnitude(const Vector3 &v);
   /// Magnitude(v1-v2)
@@ -175 +176 @@
   friend inline float SqrDistance(const Vector3 &v1, const Vector3 &v2);
 
-  // creates the vector of unit size corresponding to given vector
+  // creates the std::vector of unit size corresponding to given std::vector
   friend inline Vector3 Normalize(const Vector3 &A);
 
-  // Rotate a normal vector.
+  // Rotate a normal std::vector.
   friend Vector3 PlaneRotate(const Matrix4x4 &, const Vector3 &);
 
   // construct view vectors .. DirAt is the main viewing direction
-  // Viewer is the coordinates of viewer location, UpL is the vector.
+  // Viewer is the coordinates of viewer location, UpL is the std::vector.
   friend void ViewVectors(const Vector3 &DirAt, const Vector3 &Viewer,
                                                   const Vector3 &UpL, Vector3 &ViewV,
@@ -224 +225 @@
   friend inline Vector3 CrossProd (const Vector3 &A, const Vector3 &B);
 
-  friend ostream& operator<< (ostream &s, const Vector3 &A);
-  friend istream& operator>> (istream &s, Vector3 &A);
+  friend std::ostream& operator<< (std::ostream &s, const Vector3 &A);
+  friend std::istream& operator>> (std::istream &s, Vector3 &A);
     
   friend void Minimize(Vector3 &min, const Vector3 &candidate);
@@ -477 +478 @@
 
 // Overload << operator for C++-style output
-inline ostream&
-operator<< (ostream &s, const Vector3 &A)
+inline std::ostream&
+operator<< (std::ostream &s, const Vector3 &A)
 {
   return s << "(" << A.x << ", " << A.y << ", " << A.z << ")";
@@ -484 +485 @@
 
 // Overload >> operator for C++-style input
-inline istream&
-operator>> (istream &s, Vector3 &A)
+inline std::istream&
+operator>> (std::istream &s, Vector3 &A)
 {
   char a;