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

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

@@ -55 +55 @@
     _offset_sheary(0.0f),
     _postmultiply(false)
-    
+
 {
     _offset_matrix[0] = 1.0; _offset_matrix[1] = 0.0; _offset_matrix[2] = 0.0; _offset_matrix[3] = 0.0;
@@ -61 +61 @@
     _offset_matrix[8] = 0.0; _offset_matrix[9] = 0.0; _offset_matrix[10] = 1.0; _offset_matrix[11] = 0.0;
     _offset_matrix[12] = 0.0; _offset_matrix[13] = 0.0; _offset_matrix[14] = 0.0; _offset_matrix[15] = 1.0;
-    
+
     _threadModelDirective = CameraGroup::getDefaultThreadModel();
 
@@ -75 +75 @@
 void CameraConfig::beginVisual( const char * name )
 {
-    std::pair<std::map<std::string,VisualChooser *>::iterator,bool> res = 
+    std::pair<std::map<std::string,VisualChooser *>::iterator,bool> res =
       _visual_map.insert(std::pair<std::string,VisualChooser *>(std::string(name), new VisualChooser));
     _current_visual_chooser = (res.first)->second;
@@ -104 +104 @@
 {
      if( !_current_visual_chooser.valid() || _can_add_visual_attributes == false )
-     {     
+     {
          std::cerr << "CameraConfig::addVisualAttribute(token,param) : ERROR no current visual\n";
          return;
@@ -158 +158 @@
 void CameraConfig::beginRenderSurface( const char *name )
 {
-    std::pair<std::map<std::string,  osg::ref_ptr<RenderSurface> >::iterator,bool> res = 
+    std::pair<std::map<std::string,  osg::ref_ptr<RenderSurface> >::iterator,bool> res =
       _render_surface_map.insert(std::pair<std::string, osg::ref_ptr< RenderSurface> >(
-                                      std::string(name), 
+                                      std::string(name),
                                       new RenderSurface));
     _current_render_surface = (res.first)->second.get();
@@ -276 +276 @@
 RenderSurface *CameraConfig::getRenderSurface( unsigned int index )
 {
-    if( index >= _render_surface_map.size() ) 
+    if( index >= _render_surface_map.size() )
             return NULL;
     std::map <std::string,  osg::ref_ptr<RenderSurface> >::iterator p;
@@ -282 +282 @@
     unsigned int i = 0;
     for( p = _render_surface_map.begin(); p != _render_surface_map.end(); p++ )
-        if( i++ == index ) 
+        if( i++ == index )
                 break;
     if(  p == _render_surface_map.end() )
@@ -310 +310 @@
 {
     Camera *camera = new Camera;
-    std::pair<std::map<std::string,  osg::ref_ptr<Camera> >::iterator,bool> res = 
+    std::pair<std::map<std::string,  osg::ref_ptr<Camera> >::iterator,bool> res =
       _camera_map.insert(std::pair<std::string, osg::ref_ptr<Camera> >(name, camera));
     _current_camera = (res.first)->second.get();
@@ -448 +448 @@
 const Camera *CameraConfig::getCamera( unsigned int n ) const
 {
-    if( n >= _camera_map.size() ) 
+    if( n >= _camera_map.size() )
             return NULL;
 
@@ -454 +454 @@
     std::map <std::string,  osg::ref_ptr<Camera> >::const_iterator p;
     for( i = 0, p = _camera_map.begin(); p != _camera_map.end(); p++ )
-        if( i++ == n ) 
+        if( i++ == n )
                 break;
     if(  p == _camera_map.end() )
@@ -463 +463 @@
 Camera *CameraConfig::getCamera( unsigned int n )
 {
-    if( n >= _camera_map.size() ) 
+    if( n >= _camera_map.size() )
             return NULL;
 
@@ -469 +469 @@
     std::map <std::string,  osg::ref_ptr<Camera> >::iterator p;
     for( i = 0, p = _camera_map.begin(); p != _camera_map.end(); p++ )
-        if( i++ == n ) 
+        if( i++ == n )
                 break;
     if(  p == _camera_map.end() )
@@ -483 +483 @@
 
 void CameraConfig::addInputAreaEntry( char *renderSurfaceName )
-{    
+{
     osgProducer::RenderSurface *rs = findRenderSurface( renderSurfaceName );
     if( rs == NULL )
@@ -494 +494 @@
 }
 
-void CameraConfig::endInputArea() 
+void CameraConfig::endInputArea()
 {
     _can_add_input_area_entries = false;
 }
 
-void CameraConfig::setInputArea(InputArea *ia) 
-{ 
-    _input_area=ia; 
-}
-
-InputArea *CameraConfig::getInputArea() 
-{ 
-    return _input_area.get(); 
-}
-
-const InputArea *CameraConfig::getInputArea() const 
-{ 
-    return _input_area.get(); 
+void CameraConfig::setInputArea(InputArea *ia)
+{
+    _input_area=ia;
+}
+
+InputArea *CameraConfig::getInputArea()
+{
+    return _input_area.get();
+}
+
+const InputArea *CameraConfig::getInputArea() const
+{
+    return _input_area.get();
 }
 
@@ -532 +532 @@
 }
 
-const std::vector<CameraConfig::StereoSystemCommand> &CameraConfig::getStereoSystemCommands() 
-{ 
-    return _stereoSystemCommands; 
-}
-
-
-CameraConfig::~CameraConfig() 
+const std::vector<CameraConfig::StereoSystemCommand> &CameraConfig::getStereoSystemCommands()
+{
+    return _stereoSystemCommands;
+}
+
+
+CameraConfig::~CameraConfig()
 {
 }
@@ -547 +547 @@
 {
   osg::Matrix m;
-  m.invert(osg::Matrix::rotate( osg::DegreesToRadians(deg), x,y,z)); 
+  m.invert(osg::Matrix::rotate( osg::DegreesToRadians(deg), x,y,z));
   m = m * osg::Matrix(_offset_matrix);
     memcpy( _offset_matrix, m.ptr(), sizeof( osg::Matrix::value_type[16] ));
@@ -555 +555 @@
 {
   osg::Matrix m;
-    m.invert(osg::Matrix::translate( x,y,z)); 
+    m.invert(osg::Matrix::translate( x,y,z));
     m = m * osg::Matrix(_offset_matrix);
     memcpy( _offset_matrix, m.ptr(), sizeof( osg::Matrix::value_type[16] ));
@@ -578 +578 @@
     {
          path = std::string(ptr) + '/' + filename;
-        if( osgDB::fileExists(path)) 
+        if( osgDB::fileExists(path))
             return path;
     }
@@ -585 +585 @@
     //path.clear();
     path = std::string( "/usr/local/share/Producer/Config/") + filename;
-    if( osgDB::fileExists(path) ) 
+    if( osgDB::fileExists(path) )
         return path;
 
     //path.clear();
     path = std::string( "/usr/share/Producer/Config/") + filename;
-    if( osgDB::fileExists(path) ) 
+    if( osgDB::fileExists(path) )
         return path;
 
     // Check local directory
-    if(osgDB::fileExists(filename)) 
+    if(osgDB::fileExists(filename))
         return filename;
 
@@ -636 +636 @@
       std::stringstream sstr; sstr<<"Screen"<<i;
       std::string name = sstr.str();
-      std::pair<std::map<std::string, osg::ref_ptr<Camera> >::iterator,bool> res = 
+      std::pair<std::map<std::string, osg::ref_ptr<Camera> >::iterator,bool> res =
       _camera_map.insert(std::pair<std::string, osg::ref_ptr<Camera> >(name, new Camera));
 
@@ -651 +651 @@
        }
 
-       _render_surface_map.insert(std::pair<std::string, 
+       _render_surface_map.insert(std::pair<std::string,
             osg::ref_ptr<RenderSurface> >( rs->getWindowName(), rs ));
 
@@ -660 +660 @@
 
     return true;
-}        
-
+}
+