Changeset 9564 for OpenSceneGraph/trunk/examples/osgcompositeviewer/osgcompositeviewer.cpp

Timestamp:

01/28/09 10:26:44 (4 years ago)

Author:

robert

Message:

From Paul Melis, remove redundent spaces

Files:

• OpenSceneGraph/trunk/examples/osgcompositeviewer/osgcompositeviewer.cpp (modified) (11 diffs)

OpenSceneGraph/trunk/examples/osgcompositeviewer/osgcompositeviewer.cpp

@@ -45 +45 @@
 // class to handle events with a pick
 class PickHandler : public osgGA::GUIEventHandler {
-public: 
+public:
 
     PickHandler():
         _mx(0.0f),
         _my(0.0f) {}
-        
+
     ~PickHandler() {}
-    
+
     bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa)
     {
         osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
         if (!view) return false;
-        
+
         switch(ea.getEventType())
         {
@@ -79 +79 @@
         return false;
     }
-    
+
     void pick(osgViewer::View* view, float x, float y)
     {
@@ -92 +92 @@
             node = (nodePath.size()>=1)?nodePath[nodePath.size()-1]:0;
             parent = (nodePath.size()>=2)?dynamic_cast<osg::Group*>(nodePath[nodePath.size()-2]):0;
-        }        
+        }
 
         // now we try to decorate the hit node by the osgFX::Scribe to show that its been "picked"
@@ -120 +120 @@
 
     }
-    
+
     float _mx, _my;
 
@@ -131 +131 @@
     // use an ArgumentParser object to manage the program arguments.
     osg::ArgumentParser arguments(&argc,argv);
-    
+
     // read the scene from the list of file specified commandline args.
     osg::ref_ptr<osg::Node> scene = osgDB::readNodeFiles(arguments);
@@ -139 +139 @@
     // construct the viewer.
     osgViewer::CompositeViewer viewer(arguments);
-    
-    
-
-    
+
+
+
+
     if (arguments.read("-1"))
     {
         {
             osgViewer::View* view = new osgViewer::View;
+            view->setName("Single view");
             view->setSceneData(osgDB::readNodeFile("fountain.osg"));
-            
+
             view->addEventHandler( new osgViewer::StatsHandler );
-            
+
             view->setUpViewAcrossAllScreens();
             view->setCameraManipulator(new osgGA::TrackballManipulator);
@@ -175 +176 @@
             view->addEventHandler( statesetManipulator.get() );
         }
-        
+
         // view two
         {
@@ -184 +185 @@
             view->setSceneData(scene.get());
             view->setCameraManipulator(new osgGA::TrackballManipulator);
-            
+
             view->addEventHandler( new osgViewer::StatsHandler );
 
-            
+
             // add the handler for doing the picking
             view->addEventHandler(new PickHandler());
         }
     }
-    
+
 
     if (arguments.read("-3") || viewer.getNumViews()==0)
-    {    
+    {
 
         osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
-        if (!wsi) 
+        if (!wsi)
         {
             osg::notify(osg::NOTICE)<<"Error, no WindowSystemInterface available, cannot create windows."<<std::endl;
@@ -246 +247 @@
 
             view->addEventHandler( statesetManipulator.get() );
-            
+
             view->addEventHandler( new osgViewer::StatsHandler );
             view->addEventHandler( new osgViewer::HelpHandler );
@@ -263 +264 @@
             view->getCamera()->setGraphicsContext(gc.get());
             view->setCameraManipulator(new osgGA::TrackballManipulator);
-            
+
             // add the handler for doing the picking
             view->addEventHandler(new PickHandler());
-            
+
         }
 
@@ -284 +285 @@
     }
 
-    
+
     while (arguments.read("-s")) { viewer.setThreadingModel(osgViewer::CompositeViewer::SingleThreaded); }
     while (arguments.read("-g")) { viewer.setThreadingModel(osgViewer::CompositeViewer::CullDrawThreadPerContext); }
     while (arguments.read("-c")) { viewer.setThreadingModel(osgViewer::CompositeViewer::CullThreadPerCameraDrawThreadPerContext); }
- 
+
      // run the viewer's main frame loop
      return viewer.run();