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

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/Matrixf (modified) (21 diffs)

OpenSceneGraph/trunk/include/osg/Matrixf

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 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.
 */
@@ -27 +27 @@
 {
     public:
-    
+
         typedef float value_type;
         typedef double other_value_type;
@@ -66 +66 @@
             return *this;
         }
-        
+
         Matrixf& operator = (const Matrixd& other);
 
@@ -78 +78 @@
             for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr[i];
         }
-        
+
         inline void set(double const * const ptr)
         {
@@ -89 +89 @@
                  value_type a20, value_type a21, value_type a22,value_type a23,
                  value_type a30, value_type a31, value_type a32,value_type a33);
-                  
+
         value_type * ptr() { return (value_type*)_mat; }
         const value_type * ptr() const { return (const value_type *)_mat; }
@@ -102 +102 @@
 
         void makeIdentity();
-        
+
         void makeScale( const Vec3f& );
         void makeScale( const Vec3d& );
         void makeScale( value_type, value_type, value_type );
-        
+
         void makeTranslate( const Vec3f& );
         void makeTranslate( const Vec3d& );
         void makeTranslate( value_type, value_type, value_type );
-        
+
         void makeRotate( const Vec3f& from, const Vec3f& to );
         void makeRotate( const Vec3d& from, const Vec3d& to );
@@ -117 +117 @@
         void makeRotate( value_type angle, value_type x, value_type y, value_type z );
         void makeRotate( const Quat& );
-        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);
 
-        
-        /** decompose the matrix into translation, rotation, scale and scale orientation.*/        
+
+        /** decompose the matrix into translation, rotation, scale and scale orientation.*/
         void decompose( osg::Vec3f& translation,
-                        osg::Quat& rotation, 
-                        osg::Vec3f& scale, 
+                        osg::Quat& rotation,
+                        osg::Vec3f& scale,
                         osg::Quat& so ) const;
 
-        /** decompose the matrix into translation, rotation, scale and scale orientation.*/        
+        /** decompose the matrix into translation, rotation, scale and scale orientation.*/
         void decompose( osg::Vec3d& translation,
-                        osg::Quat& rotation, 
-                        osg::Vec3d& scale, 
+                        osg::Quat& rotation,
+                        osg::Vec3d& scale,
                         osg::Quat& so ) const;
 
@@ -243 +243 @@
         bool invert_4x4( const Matrixf& rhs);
 
-        /** ortho-normalize the 3x3 rotation & scale matrix */ 
-        void orthoNormalize(const Matrixf& rhs); 
+        /** ortho-normalize the 3x3 rotation & scale matrix */
+        void orthoNormalize(const Matrixf& rhs);
 
         //basic utility functions to create new matrices
@@ -259 +259 @@
         inline static Matrixf rotate( value_type angle, const Vec3f& axis);
         inline static Matrixf rotate( value_type angle, const Vec3d& axis);
-        inline static Matrixf rotate( value_type angle1, const Vec3f& axis1, 
+        inline static Matrixf rotate( value_type angle1, const Vec3f& axis1,
                                       value_type angle2, const Vec3f& axis2,
                                       value_type angle3, const Vec3f& axis3);
-        inline static Matrixf rotate( value_type angle1, const Vec3d& axis1, 
+        inline static Matrixf rotate( value_type angle1, const Vec3d& axis1,
                                       value_type angle2, const Vec3d& axis2,
                                       value_type angle3, const Vec3d& axis3);
         inline static Matrixf rotate( const Quat& quat);
         inline static Matrixf inverse( const Matrixf& matrix);
-        inline static Matrixf orthoNormal(const Matrixf& matrix); 
-        
+        inline static Matrixf orthoNormal(const Matrixf& matrix);
+
         /** Create an orthographic projection matrix.
           * See glOrtho for further details.
@@ -339 +339 @@
         void setTrans( const Vec3f& v );
         void setTrans( const Vec3d& v );
-        
-        inline Vec3d getTrans() const { return Vec3d(_mat[3][0],_mat[3][1],_mat[3][2]); } 
-        
+
+        inline Vec3d getTrans() const { return Vec3d(_mat[3][0],_mat[3][1],_mat[3][2]); }
+
         inline Vec3d getScale() const {
-          Vec3d x_vec(_mat[0][0],_mat[1][0],_mat[2][0]); 
-          Vec3d y_vec(_mat[0][1],_mat[1][1],_mat[2][1]); 
-          Vec3d z_vec(_mat[0][2],_mat[1][2],_mat[2][2]); 
-          return Vec3d(x_vec.length(), y_vec.length(), z_vec.length()); 
-        }
-        
+          Vec3d x_vec(_mat[0][0],_mat[1][0],_mat[2][0]);
+          Vec3d y_vec(_mat[0][1],_mat[1][1],_mat[2][1]);
+          Vec3d z_vec(_mat[0][2],_mat[1][2],_mat[2][2]);
+          return Vec3d(x_vec.length(), y_vec.length(), z_vec.length());
+        }
+
         /** apply a 3x3 transform of v*M[0..2,0..2]. */
         inline static Vec3f transform3x3(const Vec3f& v,const Matrixf& m);
@@ -385 +385 @@
         inline void postMultRotate( const Quat& q );
 
-        inline void operator *= ( const Matrixf& other ) 
+        inline void operator *= ( const Matrixf& other )
         {    if( this == &other ) {
                 Matrixf temp(other);
                 postMult( temp );
             }
-            else postMult( other ); 
+            else postMult( other );
         }
 
@@ -430 +430 @@
             _mat[3][3]*=rhs;
             return *this;
-        }  
+        }
 
         /** Divide by scalar. */
@@ -462 +462 @@
             _mat[3][3]/=rhs;
             return *this;
-        }          
+        }
 
         /** Binary vector add. */
@@ -483 +483 @@
                 _mat[3][1] + rhs._mat[3][1],
                 _mat[3][2] + rhs._mat[3][2],
-                _mat[3][3] + rhs._mat[3][3]);                         
+                _mat[3][3] + rhs._mat[3][3]);
         }
 
@@ -508 +508 @@
             _mat[3][3] += rhs._mat[3][3];
             return *this;
-        }            
+        }
 
     protected:
@@ -518 +518 @@
 {
     public:
-    
+
         RefMatrixf():Object(false), Matrixf() {}
         RefMatrixf( const Matrixf& other) : Object(false), Matrixf(other) {}
@@ -528 +528 @@
             Matrixf::value_type a20, Matrixf::value_type a21, Matrixf::value_type a22, Matrixf::value_type a23,
             Matrixf::value_type a30, Matrixf::value_type a31, Matrixf::value_type a32, Matrixf::value_type a33):
-            Object(false), 
+            Object(false),
             Matrixf(a00, a01, a02, a03,
                    a10, a11, a12, a13,
@@ -534 +534 @@
                    a30, a31, a32, a33) {}
 
-        virtual Object* cloneType() const { return new RefMatrixf(); } 
+        virtual Object* cloneType() const { return new RefMatrixf(); }
         virtual Object* clone(const CopyOp&) const { return new RefMatrixf(*this); }
         virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const RefMatrixf*>(obj)!=NULL; }
         virtual const char* libraryName() const { return "osg"; }
         virtual const char* className() const { return "Matrix"; }
-        
-        
+
+
     protected:
-    
+
         virtual ~RefMatrixf() {}
 };
@@ -611 +611 @@
     return m;
 }
-inline Matrixf Matrixf::rotate( value_type angle1, const Vec3f& axis1, 
+inline Matrixf Matrixf::rotate( value_type angle1, const Vec3f& axis1,
                               value_type angle2, const Vec3f& axis2,
                               value_type angle3, const Vec3f& axis3)
@@ -619 +619 @@
     return m;
 }
-inline Matrixf Matrixf::rotate( value_type angle1, const Vec3d& axis1, 
+inline Matrixf Matrixf::rotate( value_type angle1, const Vec3d& axis1,
                               value_type angle2, const Vec3d& axis2,
                               value_type angle3, const Vec3d& axis3)
@@ -651 +651 @@
   Matrixf m;
   m.orthoNormalize(matrix);
-  return m; 
+  return m;
 }