Changeset 13041 for OpenSceneGraph/trunk/src/osg/AutoTransform.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osg/AutoTransform.cpp (modified) (12 diffs)

OpenSceneGraph/trunk/src/osg/AutoTransform.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.
 */
@@ -59 +59 @@
     _side(pat._side)
 {
-//    setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);            
+//    setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);
 }
 
 void AutoTransform::setAutoRotateMode(AutoRotateMode mode)
-{ 
-    _autoRotateMode = mode; 
-    _firstTimeToInitEyePoint = true; 
+{
+    _autoRotateMode = mode;
+    _firstTimeToInitEyePoint = true;
     _cachedMode = CACHE_DIRTY;
     updateCache();
@@ -94 +94 @@
     }
     else _cachedMode = _autoRotateMode;
-    
+
     _side = _axis^_normal;
-    _side.normalize();   
+    _side.normalize();
 }
 
 void AutoTransform::setScale(const Vec3d& scale)
 {
-    _scale = scale; 
+    _scale = scale;
     if (_scale.x()<_minimumScale) _scale.x() = _minimumScale;
     if (_scale.y()<_minimumScale) _scale.y() = _minimumScale;
     if (_scale.z()<_minimumScale) _scale.z() = _minimumScale;
-    
+
     if (_scale.x()>_maximumScale) _scale.x() = _maximumScale;
     if (_scale.y()>_maximumScale) _scale.y() = _maximumScale;
     if (_scale.z()>_maximumScale) _scale.z() = _maximumScale;
-    
-    _matrixDirty=true; 
+
+    _matrixDirty=true;
     dirtyBound();
 }
@@ -118 +118 @@
 {
     if (_matrixDirty) computeMatrix();
-    
+
     if (_referenceFrame==RELATIVE_RF)
     {
@@ -156 +156 @@
 {
     if (!_matrixDirty) return;
-    
+
     _cachedMatrix.makeRotate(_rotation);
     _cachedMatrix.postMultTranslate(_position);
     _cachedMatrix.preMultScale(_scale);
     _cachedMatrix.preMultTranslate(-_pivotPoint);
-    
+
     _matrixDirty = false;
 }
@@ -167 +167 @@
 void AutoTransform::accept(NodeVisitor& nv)
 {
-    if (nv.validNodeMask(*this)) 
+    if (nv.validNodeMask(*this))
     {
         // if app traversal update the frame count.
@@ -191 +191 @@
                 }
 
-                osg::Vec3d eyePoint = cs->getEyeLocal(); 
-                osg::Vec3d localUp = cs->getUpLocal(); 
+                osg::Vec3d eyePoint = cs->getEyeLocal();
+                osg::Vec3d localUp = cs->getUpLocal();
                 osg::Vec3d position = getPosition();
 
@@ -216 +216 @@
                         doUpdate = true;
                     }
-                    else if (projection != _previousProjection) 
-                    {
-                        doUpdate = true;
-                    }                
-                    else if (position != _previousPosition) 
-                    { 
-                        doUpdate = true; 
-                    } 
+                    else if (projection != _previousProjection)
+                    {
+                        doUpdate = true;
+                    }
+                    else if (position != _previousPosition)
+                    {
+                        doUpdate = true;
+                    }
                 }
                 _firstTimeToInitEyePoint = false;
 
                 if (doUpdate)
-                {            
+                {
 
                     if (getAutoScaleToScreen())
@@ -235 +235 @@
 
                         if (_autoScaleTransitionWidthRatio>0.0)
-                        { 
+                        {
                             if (_minimumScale>0.0)
                             {
                                 double j = _minimumScale;
-                                double i = (_maximumScale<DBL_MAX) ? 
+                                double i = (_maximumScale<DBL_MAX) ?
                                             _minimumScale+(_maximumScale-_minimumScale)*_autoScaleTransitionWidthRatio :
                                             _minimumScale*(1.0+_autoScaleTransitionWidthRatio);
@@ -264 +264 @@
                                 if (size>p) size = _maximumScale;
                                 else if (size>m) size = a + b*size + c*(size*size);
-                            }        
+                            }
                         }
-                        
+
                         setScale(size);
                     }
@@ -276 +276 @@
                         osg::Vec3d scale;
                         osg::Quat so;
-                        
+
                         cs->getModelViewMatrix()->decompose( translation, rotation, scale, so );
 
@@ -351 +351 @@
                                 break;
                             }
-                            case(ROTATE_TO_AXIS): // need to implement 
+                            case(ROTATE_TO_AXIS): // need to implement
                             {
                                 float ev_side = ev*_side;