Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/cfg/Camera.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/osgPlugins/cfg/Camera.cpp (modified) (19 diffs)

OpenSceneGraph/trunk/src/osgPlugins/cfg/Camera.cpp

@@ -23 +23 @@
 using namespace osgProducer;
 
-Camera::Camera( void ) 
+Camera::Camera( void )
 {
     _index = 0;
@@ -47 +47 @@
     _lens->setAutoAspect(true);
     _rs = new RenderSurface;
-    
+
     _clear_color[0] = 0.2f;
     _clear_color[1] = 0.2f;
     _clear_color[2] = 0.4f;
     _clear_color[3] = 1.0f;
-    
+
     _focal_distance = 1.0;
-    
+
     _shareLens = true;
     _shareView = true;
@@ -107 +107 @@
 //     _bottom       = -0.5;
 //     _top          =  0.5;
-    
+
     // Setting of the frustum which are appropriate for
     // a monitor which is 26cm high, 50cm distant from the
@@ -138 +138 @@
 }
 
-void Camera::Lens::setPerspective( double hfov,   double vfov, 
+void Camera::Lens::setPerspective( double hfov,   double vfov,
                        double nearClip,   double farClip )
 {
@@ -148 +148 @@
     _farClip  = farClip;
 
-    _left   = -_nearClip * tan(_hfov/2.0); 
-    _right  =  _nearClip * tan(_hfov/2.0); 
+    _left   = -_nearClip * tan(_hfov/2.0);
+    _right  =  _nearClip * tan(_hfov/2.0);
     _bottom = -_nearClip * tan(_vfov/2.0);
     _top    =  _nearClip * tan(_vfov/2.0);
@@ -157 +157 @@
 }
 
-void Camera::Lens::setFrustum( double left,   double right, 
-                                  double bottom, double top, 
+void Camera::Lens::setFrustum( double left,   double right,
+                                  double bottom, double top,
                    double nearClip,   double farClip )
 {
@@ -172 +172 @@
 }
 
-void Camera::Lens::setOrtho( double left, double right, 
-               double bottom, double top, 
+void Camera::Lens::setOrtho( double left, double right,
+               double bottom, double top,
                double nearClip, double farClip )
 {
@@ -202 +202 @@
     zNear = _matrix[14] / (_matrix[10]-1.0);
     zFar = _matrix[14] / (1.0+_matrix[10]);
-    
+
     left = zNear * (_matrix[8]-1.0) / _matrix[0];
     right = zNear * (1.0+_matrix[8]) / _matrix[0];
@@ -221 +221 @@
     zNear = (_matrix[14]+1.0) / _matrix[10];
     zFar = (_matrix[14]-1.0) / _matrix[10];
-    
+
     left = -(1.0+_matrix[12]) / _matrix[0];
     right = (1.0-_matrix[12]) / _matrix[0];
@@ -321 +321 @@
                     const float bottom, const float top )
 {
-    _projrectLeft   = left;    
-    _projrectRight  = right;    
-    _projrectBottom = bottom;    
-    _projrectTop    = top;    
+    _projrectLeft   = left;
+    _projrectRight  = right;
+    _projrectBottom = bottom;
+    _projrectTop    = top;
 }
 
@@ -336 +336 @@
 }
 
-void Camera::setProjectionRectangle( int x, int y, unsigned int width, unsigned int height ) 
+void Camera::setProjectionRectangle( int x, int y, unsigned int width, unsigned int height )
 {
     int _x, _y;
@@ -410 +410 @@
 
 
-void Camera::clear( void ) 
+void Camera::clear( void )
 {
 #if 0
     if( !_initialized ) _initialize();
-    int x, y; 
+    int x, y;
     unsigned int w, h;
     getProjectionRectangle( x, y, w, h );
@@ -565 +565 @@
                 matrix[ 8] += -xshear;
                 matrix[ 9] += -yshear;
-            } 
+            }
             else
             {
@@ -613 +613 @@
     _done = true;
 #endif
-    
+
     Thread::cancel();
-    return 0;    
+    return 0;
 }
 
@@ -641 +641 @@
 
         _frameBarrier->block();
-        
+
         if (_done) break;
 
@@ -660 +660 @@
         advance();
     }
-    
+
     // printf("Exiting Camera::run cleanly\n");
 }
@@ -676 +676 @@
 }
 
-bool Camera::removePreDrawCallback( Callback *cb ) 
+bool Camera::removePreDrawCallback( Callback *cb )
 {
     return _removeCallback( preDrawCallbacks, cb );
 }
 
-bool Camera::removePostDrawCallback( Callback *cb ) 
+bool Camera::removePostDrawCallback( Callback *cb )
 {
     return _removeCallback( postDrawCallbacks, cb );
@@ -744 +744 @@
         _init();
 
-    PipeTimer::instance()->begin( _pipeStatsNames[id][_pipeStatsDoubleBufferIndex] ); 
-    _pipeStatsSetMask[_pipeStatsDoubleBufferIndex] |= (1<<id); 
-}
-
-void Camera::FrameTimeStampSet::endPipeTimer() 
-{ 
+    PipeTimer::instance()->begin( _pipeStatsNames[id][_pipeStatsDoubleBufferIndex] );
+    _pipeStatsSetMask[_pipeStatsDoubleBufferIndex] |= (1<<id);
+}
+
+void Camera::FrameTimeStampSet::endPipeTimer()
+{
     if( !_initialized )
         return;
@@ -771 +771 @@
 
 const Camera::FrameTimeStampSet &Camera::getFrameStats()
-{ 
-    return _frameStamps; 
+{
+    return _frameStamps;
 }
 #endif