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

OpenSceneGraph/trunk/src/osgViewer/ViewerEventHandlers.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.
 */
@@ -78 +78 @@
     osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
     if (!view) return false;
-    
+
     osgViewer::ViewerBase* viewer = view->getViewerBase();
 
@@ -161 +161 @@
     osg::GraphicsContext::WindowingSystemInterface    *wsi = osg::GraphicsContext::getWindowingSystemInterface();
 
-    if (wsi == NULL) 
+    if (wsi == NULL)
     {
         OSG_NOTICE << "Error, no WindowSystemInterface available, cannot toggle window fullscreen." << std::endl;
@@ -207 +207 @@
     osg::GraphicsContext::WindowingSystemInterface    *wsi = osg::GraphicsContext::getWindowingSystemInterface();
 
-    if (wsi == NULL) 
+    if (wsi == NULL)
     {
         OSG_NOTICE << "Error, no WindowSystemInterface available, cannot toggle window fullscreen." << std::endl;
@@ -317 +317 @@
     osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
     if (!view) return false;
-    
+
     osgViewer::ViewerBase* viewerBase = view->getViewerBase();
     osgViewer::Viewer* viewer = dynamic_cast<Viewer*>(viewerBase);
@@ -357 +357 @@
                     OSG_NOTICE<<"Threading model 'SingleThreaded' selected."<<std::endl;
                     break;
-#if 1                    
+#if 1
                 case(osgViewer::ViewerBase::AutomaticSelection):
                     viewerBase->setThreadingModel(osgViewer::ViewerBase::SingleThreaded);
                     OSG_NOTICE<<"Threading model 'SingleThreaded' selected."<<std::endl;
-#else                    
+#else
                 case(osgViewer::ViewerBase::AutomaticSelection):
                     viewerBase->setThreadingModel(viewer->suggestBestThreadingModel());
@@ -448 +448 @@
         {
             const osg::Matrixd& m = view->getCamera()->getInverseViewMatrix();
-            double animationPathTime = osg::Timer::instance()->delta_s(_animStartTime, time);            
+            double animationPathTime = osg::Timer::instance()->delta_s(_animStartTime, time);
             _animPath->insert(animationPathTime, osg::AnimationPath::ControlPoint(m.getTrans(), m.getRotate()));
             _delta = 0.0f;
@@ -460 +460 @@
         }
         else _delta += delta;
-        
+
         return true;
     }
@@ -479 +479 @@
                     _animStartTime = osg::Timer::instance()->tick();
                     _animPath = new osg::AnimationPath();
-                    
+
                     if (!_filename.empty())
                     {
@@ -490 +490 @@
                         }
                         ss << "."<<osgDB::getFileExtension(_filename);
-                        
+
                         OSG_NOTICE << "Recording camera path to file " << ss.str() << std::endl;
                         _fout.open( ss.str().c_str() );
@@ -548 +548 @@
                 {
                      if (_animPath.valid() && !_animPath->empty())
-                     {                    
+                     {
                         _animPathManipulator = new osgGA::AnimationPathManipulator(_animPath.get());
                         _animPathManipulator->home(ea,aa);
@@ -563 +563 @@
                      }
                 }
-                
+
                 // The user has requested to STOP playback.
                 else
@@ -574 +574 @@
 
                 return true;
-            }        
+            }
 
             break;
@@ -637 +637 @@
         usage.addKeyboardMouseBinding(ostr.str(),"Increase LODScale.");
     }
-    
+
     {
         std::ostringstream ostr;
@@ -654 +654 @@
     osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
     if (!view) return false;
-    
+
     osgViewer::ViewerBase* viewer = view->getViewerBase();
 
@@ -661 +661 @@
         return false;
     }
-    
+
     if (ea.getHandled()) return false;
 
@@ -730 +730 @@
 }
 
-bool InteractiveImageHandler::computeIntersections(osgViewer::View* view, float x,float y, const osg::NodePath& nodePath, osgUtil::LineSegmentIntersector::Intersections& intersections,osg::Node::NodeMask traversalMask) const 
+bool InteractiveImageHandler::computeIntersections(osgViewer::View* view, float x,float y, const osg::NodePath& nodePath, osgUtil::LineSegmentIntersector::Intersections& intersections,osg::Node::NodeMask traversalMask) const
 {
     float local_x, local_y = 0.0;
@@ -819 +819 @@
         osg::Vec2 tc(0.5f,0.5f);
 
-        // use the nearest intersection                 
+        // use the nearest intersection
         const osgUtil::LineSegmentIntersector::Intersection& intersection = *(intersections.begin());
         osg::Drawable* drawable = intersection.drawable.get();
@@ -844 +844 @@
                 if (texcoords_Vec2Array)
                 {
-                    // we have tex coord array so now we can compute the final tex coord at the point of intersection.                                
+                    // we have tex coord array so now we can compute the final tex coord at the point of intersection.
                     osg::Vec2 tc1 = (*texcoords_Vec2Array)[i1];
                     osg::Vec2 tc2 = (*texcoords_Vec2Array)[i2];
@@ -894 +894 @@
 {
     if (ea.getHandled()) return false;
-    
+
     if (!_image) return false;
 
@@ -918 +918 @@
             int x,y;
             bool sendKeyEvent = mousePosition(view, nv, ea, x, y);
-        
+
             if (sendKeyEvent)
             {
                 return _image->sendKeyEvent(ea.getKey(), ea.getEventType()==osgGA::GUIEventAdapter::KEYDOWN);
-            }          
+            }
             break;
         }
@@ -960 +960 @@
     }
 
-    // Make sure the texture does not rescale the image because 
+    // Make sure the texture does not rescale the image because
     // it thinks it should still be the previous size...
     if (_texture.valid())