--- trunk/src/math/Vector.hpp	2004/10/14 23:28:09	76
+++ trunk/src/math/Vector.hpp	2004/10/19 04:21:07	102
@@ -85,11 +85,17 @@ namespace oopse {
                 
                 return *this;
             }
+
+            template<typename T>
+            inline Vector(const T& s){
+                for (unsigned int i = 0; i < Dim; i++)
+                    data_[i] = s;
+            }
             
             /** Constructs and initializes a Vector from an array */            
             inline Vector( double* v) {
-		for (unsigned int i = 0; i < Dim; i++)
-		    data_[i] = v[i];
+                for (unsigned int i = 0; i < Dim; i++)
+                    data_[i] = v[i];
             }
 
             /** 
@@ -159,9 +165,8 @@ namespace oopse {
              
             /** Negates the value of this vector in place. */           
             inline void negate() {
-                data_[0] = -data_[0];
-                data_[1] = -data_[1];
-                data_[2] = -data_[2];
+                for (unsigned int i = 0; i < Dim; i++)
+                    data_[i] = -data_[i];
             }
 
             /**
@@ -179,8 +184,8 @@ namespace oopse {
             * @param v1 the other vector
             */
             inline void add( const Vector<Real, Dim>& v1 ) {
-            	for (unsigned int i = 0; i < Dim; i++)
-		    data_[i] += v1.data_[i];
+            for (unsigned int i = 0; i < Dim; i++)
+                data_[i] += v1.data_[i];
                 }
 
             /**
@@ -189,8 +194,8 @@ namespace oopse {
             * @param v2 the second vector
             */
             inline void add( const Vector<Real, Dim>& v1, const Vector<Real, Dim>& v2 ) {
-            	for (unsigned int i = 0; i < Dim; i++)
-		    data_[i] = v1.data_[i] + v2.data_[i];
+                for (unsigned int i = 0; i < Dim; i++)
+                    data_[i] = v1.data_[i] + v2.data_[i];
             }
 
             /**
@@ -217,18 +222,18 @@ namespace oopse {
             * @param s the scalar value
             */
             inline void mul( double s ) {
-            	for (unsigned int i = 0; i < Dim; i++)
+                for (unsigned int i = 0; i < Dim; i++)
                    data_[i] *= s;
             }
 
             /**
             * Sets the value of this vector to the scalar multiplication of vector v1  
             * (*this = s * v1).
+            * @param v1 the vector            
             * @param s the scalar value
-            * @param v1 the vector
             */
-            inline void mul( double s, const Vector<Real, Dim>& v1 ) {
-            	for (unsigned int i = 0; i < Dim; i++)
+            inline void mul( const Vector<Real, Dim>& v1, double s) {
+                for (unsigned int i = 0; i < Dim; i++)
                     data_[i] = s * v1.data_[i];
             }
 
@@ -237,7 +242,7 @@ namespace oopse {
             * @param s the scalar value
             */             
             inline void div( double s) {
-            	for (unsigned int i = 0; i < Dim; i++)            
+                for (unsigned int i = 0; i < Dim; i++)            
                     data_[i] /= s;
             }
 
@@ -247,7 +252,7 @@ namespace oopse {
             * @param s the scalar value
             */                         
             inline void div( const Vector<Real, Dim>& v1, double s ) {
-            	for (unsigned int i = 0; i < Dim; i++)
+                for (unsigned int i = 0; i < Dim; i++)
                     data_[i] = v1.data_[i] / s;
             }
 
@@ -287,7 +292,7 @@ namespace oopse {
              * Returns the squared length of this vector.
              * @return the squared length of this vector
              */
-             inline double lengthSquared() {
+             inline double lengthSquare() {
                 return dot(*this, *this);
             }
             
@@ -296,19 +301,33 @@ namespace oopse {
                 double len;
 
                 len = length();
+                
+                //if (len < oopse:epsilon)
+                //  throw();
+                
                 *this /= len;
             }
+
+            /**
+             * Tests if this vector is normalized
+             * @return true if this vector is normalized, otherwise return false
+             */
+            inline bool isNormalized() const
+            {
+                return lengthSquare() == 1.0;
+            }           
             
         protected:
-            double data_[3];
+            double data_[Dim];
         
     };
 
     /** unary minus*/
     template<typename Real, unsigned int Dim>    
     inline Vector<Real, Dim> operator -(const Vector<Real, Dim>& v1){
-        Vector tmp(v1);
-        return tmp.negate();
+        Vector<Real, Dim> tmp(v1);
+        tmp.negate();
+        return tmp;
     }
 
     /**
@@ -347,7 +366,7 @@ namespace oopse {
     template<typename Real, unsigned int Dim>                 
     Vector<Real, Dim> operator * ( const Vector<Real, Dim>& v1, double s) {       
         Vector<Real, Dim> result;
-        result.mul(s, v1);
+        result.mul(v1,s);
         return result;           
     }
     
@@ -360,7 +379,7 @@ namespace oopse {
     template<typename Real, unsigned int Dim>
     Vector<Real, Dim> operator * ( double s, const Vector<Real, Dim>& v1 ) {
         Vector<Real, Dim> result;
-        result.mul(s, v1);
+        result.mul(v1, s);
         return result;           
     }
 
@@ -378,26 +397,6 @@ namespace oopse {
     }
     
     /**
-     * Returns the  value of division of a vector by a scalar. 
-     * @return  the vaule of scalar division of this vector
-     * @param s the scalar value
-     * @param v1 the source vector
-     */
-    template<typename Real, unsigned int Dim>        
-    inline Vector<Real, Dim> operator /( double s, const Vector<Real, Dim>& v1 ) {
-        Vector<Real, Dim> result;
-        result.div( v1,s);
-        return result;           
-    }
-
-    /** fuzzy comparson */
-    template<typename Real, unsigned int Dim>        
-    inline bool epsilonEqual( const Vector<Real, Dim>& v1, const Vector<Real, Dim>& v2 ) {
-
-    }
-
-    
-    /**
      * Returns the dot product of two Vectors
      * @param v1 first vector
      * @param v2 second vector
@@ -405,13 +404,13 @@ namespace oopse {
      */
     template<typename Real, unsigned int Dim>    
     inline Real dot( const Vector<Real, Dim>& v1, const Vector<Real, Dim>& v2 ) {
-		Real tmp;
-		tmp = 0;
+        Real tmp;
+        tmp = 0;
 
-		for (unsigned int i = 0; i < Dim; i++)
-			tmp += v1[i] + v2[i];
-		
-		return tmp;
+        for (unsigned int i = 0; i < Dim; i++)
+            tmp += v1[i] + v2[i];
+
+        return tmp;
     }
 
     /**
@@ -442,8 +441,9 @@ namespace oopse {
      * Write to an output stream
      */
     template<typename Real, unsigned int Dim>
-    std::ostream &operator<< ( std::ostream& o, const Vector<Real, Dim>& v1 ) {
-        
+    std::ostream &operator<< ( std::ostream& o, const Vector<Real, Dim>& v) {
+
+        o << "[" << v[0] << ", " << v[1] << ", " << v[2] << "]" << endl;
         return o;        
     }