Changeset 13041 for OpenSceneGraph/trunk/include/osg/Quat

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osg/Quat (modified) (21 diffs)

OpenSceneGraph/trunk/include/osg/Quat

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -71 +71 @@
         }
 
-        inline Quat( value_type angle1, const Vec3f& axis1, 
+        inline Quat( value_type angle1, const Vec3f& axis1,
                      value_type angle2, const Vec3f& axis2,
                      value_type angle3, const Vec3f& axis3)
@@ -78 +78 @@
         }
 
-        inline Quat( value_type angle1, const Vec3d& axis1, 
+        inline Quat( value_type angle1, const Vec3d& axis1,
                      value_type angle2, const Vec3d& axis2,
                      value_type angle3, const Vec3d& axis3)
@@ -123 +123 @@
             _v[3]=w;
         }
-        
+
         inline void set(const osg::Vec4f& v)
         {
@@ -139 +139 @@
             _v[3]=v.w();
         }
-        
+
         void set(const Matrixf& matrix);
-        
+
         void set(const Matrixd& matrix);
-        
+
         void get(Matrixf& matrix) const;
 
         void get(Matrixd& matrix) const;
-        
+
 
         inline value_type & operator [] (int i) { return _v[i]; }
@@ -163 +163 @@
 
         /** return true if the Quat represents a zero rotation, and therefore can be ignored in computations.*/
-        bool zeroRotation() const { return _v[0]==0.0 && _v[1]==0.0 && _v[2]==0.0 && _v[3]==1.0; } 
-
-
-         /* ------------------------------------------------------------- 
-                   BASIC ARITHMETIC METHODS            
+        bool zeroRotation() const { return _v[0]==0.0 && _v[1]==0.0 && _v[2]==0.0 && _v[3]==1.0; }
+
+
+         /* -------------------------------------------------------------
+                   BASIC ARITHMETIC METHODS
         Implemented in terms of Vec4s.  Some Vec4 operators, e.g.
         operator* are not appropriate for quaternions (as
         mathematical objects) so they are implemented differently.
-        Also define methods for conjugate and the multiplicative inverse.            
+        Also define methods for conjugate and the multiplicative inverse.
         ------------------------------------------------------------- */
-        /// Multiply by scalar 
+        /// Multiply by scalar
         inline const Quat operator * (value_type rhs) const
         {
@@ -179 +179 @@
         }
 
-        /// Unary multiply by scalar 
+        /// Unary multiply by scalar
         inline Quat& operator *= (value_type rhs)
         {
@@ -189 +189 @@
         }
 
-        /// Binary multiply 
+        /// Binary multiply
         inline const Quat operator*(const Quat& rhs) const
         {
@@ -198 +198 @@
         }
 
-        /// Unary multiply 
+        /// Unary multiply
         inline Quat& operator*=(const Quat& rhs)
         {
@@ -213 +213 @@
         }
 
-        /// Divide by scalar 
+        /// Divide by scalar
         inline Quat operator / (value_type rhs) const
         {
@@ -220 +220 @@
         }
 
-        /// Unary divide by scalar 
+        /// Unary divide by scalar
         inline Quat& operator /= (value_type rhs)
         {
@@ -231 +231 @@
         }
 
-        /// Binary divide 
+        /// Binary divide
         inline const Quat operator/(const Quat& denom) const
         {
@@ -237 +237 @@
         }
 
-        /// Unary divide 
+        /// Unary divide
         inline Quat& operator/=(const Quat& denom)
         {
@@ -244 +244 @@
         }
 
-        /// Binary addition 
+        /// Binary addition
         inline const Quat operator + (const Quat& rhs) const
         {
@@ -261 +261 @@
         }
 
-        /// Binary subtraction 
+        /// Binary subtraction
         inline const Quat operator - (const Quat& rhs) const
         {
@@ -268 +268 @@
         }
 
-        /// Unary subtraction 
+        /// Unary subtraction
         inline Quat& operator -= (const Quat& rhs)
         {
@@ -297 +297 @@
         }
 
-        /// Conjugate 
+        /// Conjugate
         inline Quat conj () const
-        { 
+        {
              return Quat( -_v[0], -_v[1], -_v[2], _v[3] );
         }
@@ -309 +309 @@
          }
 
-      /* -------------------------------------------------------- 
+      /* --------------------------------------------------------
                METHODS RELATED TO ROTATIONS
         Set a quaternion which will perform a rotation of an
@@ -319 +319 @@
         Not inlined - see the Quat.cpp file for implementation
         -------------------------------------------------------- */
-        void makeRotate( value_type  angle, 
+        void makeRotate( value_type  angle,
                           value_type  x, value_type  y, value_type  z );
         void makeRotate ( value_type  angle, const Vec3f& vec );
         void makeRotate ( value_type  angle, const Vec3d& vec );
 
-        void makeRotate ( value_type  angle1, const Vec3f& axis1, 
+        void makeRotate ( value_type  angle1, const Vec3f& axis1,
                           value_type  angle2, const Vec3f& axis2,
                           value_type  angle3, const Vec3f& axis3);
-        void makeRotate ( value_type  angle1, const Vec3d& axis1, 
+        void makeRotate ( value_type  angle1, const Vec3d& axis1,
                           value_type  angle2, const Vec3d& axis2,
                           value_type  angle3, const Vec3d& axis3);
@@ -343 +343 @@
             are co-incident or opposite in direction.*/
         void makeRotate( const Vec3d& vec1, const Vec3d& vec2 );
-    
+
         void makeRotate_original( const Vec3d& vec1, const Vec3d& vec2 );
 
@@ -358 +358 @@
         As t goes from 0 to 1, the Quat object goes from "from" to "to". */
         void slerp   ( value_type  t, const Quat& from, const Quat& to);
-               
+
         /** Rotate a vector by this quaternion.*/
         Vec3f operator* (const Vec3f& v) const
         {
             // nVidia SDK implementation
-            Vec3f uv, uuv; 
+            Vec3f uv, uuv;
             Vec3f qvec(_v[0], _v[1], _v[2]);
             uv = qvec ^ v;
-            uuv = qvec ^ uv; 
-            uv *= ( 2.0f * _v[3] ); 
-            uuv *= 2.0f; 
+            uuv = qvec ^ uv;
+            uv *= ( 2.0f * _v[3] );
+            uuv *= 2.0f;
             return v + uv + uuv;
         }
-               
+
         /** Rotate a vector by this quaternion.*/
         Vec3d operator* (const Vec3d& v) const
         {
             // nVidia SDK implementation
-            Vec3d uv, uuv; 
+            Vec3d uv, uuv;
             Vec3d qvec(_v[0], _v[1], _v[2]);
             uv = qvec ^ v;
-            uuv = qvec ^ uv; 
-            uv *= ( 2.0f * _v[3] ); 
-            uuv *= 2.0f; 
+            uuv = qvec ^ uv;
+            uv *= ( 2.0f * _v[3] );
+            uuv *= 2.0f;
             return v + uv + uuv;
         }
-        
+
     protected:
-    
+
 };    // end of class prototype
 
 }    // end of namespace
 
-#endif 
+#endif