Changeset 13041 for OpenSceneGraph/trunk/src/osgSim/DOFTransform.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgSim/DOFTransform.cpp (modified) (20 diffs)

OpenSceneGraph/trunk/src/osgSim/DOFTransform.cpp

@@ -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.
 */
@@ -30 +30 @@
     _previousTraversalNumber(osg::UNINITIALIZED_FRAME_NUMBER),
     _previousTime(0.0),
-    _limitationFlags(0), 
-    _animationOn(false), 
+    _limitationFlags(0),
+    _animationOn(false),
     _increasingFlags(0xffff),
     _multOrder(PRH)
@@ -60 +60 @@
     _multOrder(dof._multOrder)
 {
-    if (_animationOn) setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);            
+    if (_animationOn) setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);
 }
 
@@ -77 +77 @@
 
             _previousTraversalNumber = nv.getTraversalNumber();
-            _previousTime = newTime; 
+            _previousTime = newTime;
         }
     }
@@ -90 +90 @@
 
     //now the current matrix:
-    osg::Matrix current; 
+    osg::Matrix current;
     current.makeTranslate(getCurrentTranslate());
 
@@ -147 +147 @@
     else
     {
-        matrix = l2w;    
-    }
-    
+        matrix = l2w;
+    }
+
     return true;
 }
@@ -160 +160 @@
 
     //now the current matrix:
-    osg::Matrix current; 
+    osg::Matrix current;
     current.makeTranslate(-getCurrentTranslate());
 
@@ -227 +227 @@
     if (_limitationFlags & ROTATION_ROLL_LIMIT_BIT)
     {
-        //if we have min == max, it is efective constrain, so don't change 
+        //if we have min == max, it is efective constrain, so don't change
         if(_minHPR[2] != _maxHPR[2])
         {
@@ -235 +235 @@
             if(_currentHPR[2] < _minHPR[2])
             {
-                _currentHPR[2] = _minHPR[2]; 
+                _currentHPR[2] = _minHPR[2];
                 //force increasing flag to 1
                 _increasingFlags |= this_flag;
@@ -284 +284 @@
             unsigned short this_flag = (unsigned short)1<<5;//heading
 
-            if(_currentHPR[0] < _minHPR[0]) 
+            if(_currentHPR[0] < _minHPR[0])
             {
                 _currentHPR[0] = _minHPR[0];
                 _increasingFlags |= this_flag;
             }
-            else if(_currentHPR[0] > _maxHPR[0]) 
+            else if(_currentHPR[0] > _maxHPR[0])
             {
                 _currentHPR[0] = _maxHPR[0];
@@ -319 +319 @@
                 _increasingFlags |= this_flag;
             }
-            else if(_currentTranslate[2] > _maxTranslate[2]) 
+            else if(_currentTranslate[2] > _maxTranslate[2])
             {
                 _currentTranslate[2] = _maxTranslate[2];
@@ -343 +343 @@
                 _increasingFlags |= this_flag;
             }
-            else if(_currentTranslate[1] > _maxTranslate[1]) 
+            else if(_currentTranslate[1] > _maxTranslate[1])
             {
                 _currentTranslate[1] = _maxTranslate[1];
@@ -362 +362 @@
             unsigned short this_flag = (unsigned short)1;
 
-            if(_currentTranslate[0] < _minTranslate[0]) 
+            if(_currentTranslate[0] < _minTranslate[0])
             {
                 _currentTranslate[0] = _minTranslate[0];
                 _increasingFlags |= this_flag;
             }
-            else if(_currentTranslate[0] > _maxTranslate[0]) 
+            else if(_currentTranslate[0] > _maxTranslate[0])
             {
                 _currentTranslate[0] = _maxTranslate[0];
@@ -373 +373 @@
             }
         }
-    }    
+    }
     else
     {
@@ -388 +388 @@
     {
         if(_minScale[2] != _maxScale[2])
-        {            
+        {
             _currentScale[2] = scale[2];
             unsigned short this_flag = (unsigned short)1<<8;
 
-            if(_currentScale[2] < _minScale[2]) 
+            if(_currentScale[2] < _minScale[2])
             {
                 _currentScale[2] = _minScale[2];
                 _increasingFlags |= this_flag;
             }
-            else if(_currentScale[2] > _maxScale[2]) 
+            else if(_currentScale[2] > _maxScale[2])
             {
                 _currentScale[2] = _maxScale[2];
@@ -416 +416 @@
             unsigned short this_flag = (unsigned short)1<<7;
 
-            if(_currentScale[1] < _minScale[1]) 
+            if(_currentScale[1] < _minScale[1])
             {
                 _currentScale[1] = _minScale[1];
                 _increasingFlags |= this_flag;
             }
-            else if(_currentScale[1] > _maxScale[1]) 
+            else if(_currentScale[1] > _maxScale[1])
             {
                 _currentScale[1] = _maxScale[1];
@@ -440 +440 @@
             unsigned short this_flag = (unsigned short)1<<6;
 
-            if(_currentScale[0] < _minScale[0]) 
+            if(_currentScale[0] < _minScale[0])
             {
                 _currentScale[0] = _minScale[0];
                 _increasingFlags |= this_flag;
             }
-            else if(_currentScale[0] > _maxScale[0]) 
+            else if(_currentScale[0] > _maxScale[0])
             {
                 _currentScale[0] = _maxScale[0];
@@ -463 +463 @@
 {
     if (_animationOn == do_animate) return;
-    
+
     int delta = 0;
 
@@ -470 +470 @@
 
     _animationOn = do_animate;
-    
+
     if (_animationOn) setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+delta);
 }
@@ -535 +535 @@
 
     updateCurrentScale(new_value);
-    
-}
+
+}