Changeset 5954 for OpenSceneGraph/trunk/examples/osgparticleeffects/osgparticleeffects.cpp

Timestamp:

01/10/07 14:52:22 (6 years ago)

Author:

robert

Message:

Ported following examples to osgViewer:

osgparticleeffects
osgphotoalbum
osgpick
osgpoints
osgpointsprite
osgprecipitation
osgprerender
osgprerendercubemap
osgreflect
osgscalarbar
osgscribe
osgsequence
osgplanets

Files:

• OpenSceneGraph/trunk/examples/osgparticleeffects/osgparticleeffects.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/examples/osgparticleeffects/osgparticleeffects.cpp

@@ -1 @@
-#include <osgProducer/Viewer>
+#include <osgViewer/Viewer>
 
 #include <osg/Group>
@@ -10 +10 @@
 
 #include <osgUtil/Optimizer>
+#include <osgUtil/IntersectVisitor>
 
 #include <osgDB/ReadFile>
@@ -240 +241 @@
             case(osgGA::GUIEventAdapter::PUSH):
             {
-                osgProducer::Viewer* viewer = dynamic_cast<osgProducer::Viewer*>(&aa);
+                osgViewer::Viewer* viewer = dynamic_cast<osgViewer::Viewer*>(&aa);
                 pick(viewer,ea);
             }
@@ -250 +251 @@
     }
 
-    void pick(osgProducer::Viewer* viewer, const osgGA::GUIEventAdapter& ea)
+    void pick(osgViewer::Viewer* viewer, const osgGA::GUIEventAdapter& ea)
     {
         osg::Group* root = dynamic_cast<osg::Group*>(viewer->getSceneData());       
         if (!root) return;
 
-        osgUtil::IntersectVisitor::HitList hlist;
-        if (viewer->computeIntersections(ea.getX(),ea.getY(),hlist))
+        osgUtil::LineSegmentIntersector::Intersections intersections;
+        if (viewer->computeIntersections(ea.getX(),ea.getY(),intersections))
         {
-            osgUtil::Hit& hit = hlist.front();
+            const osgUtil::LineSegmentIntersector::Intersection& hit = *intersections.begin();
 
             bool handleMovingModels = false;
-            const osg::NodePath& nodePath = hit.getNodePath();
+            const osg::NodePath& nodePath = hit.nodePath;
             for(osg::NodePath::const_iterator nitr=nodePath.begin();
                 nitr!=nodePath.end();
@@ -318 +319 @@
                 // is found then this needs to be inserted above the hit node, and then the
                 // particle effect can be inserted into this.
-                osg::ref_ptr<osg::Geode> hitGeode = hit.getGeode();
-                osg::Node::ParentList parents = hitGeode->getParents();                
+                osg::ref_ptr<osg::Node> hitNode = hit.nodePath.back();
+                osg::Node::ParentList parents = hitNode->getParents();                
                 osg::Group* insertGroup = 0;
                 unsigned int numGroupsFound = 0;
@@ -347 +348 @@
                         ++itr)
                     {
-                        (*itr)->replaceChild(hit.getGeode(),insertGroup);
+                        (*itr)->replaceChild(hit.nodePath.back(),insertGroup);
                     }
-                    insertGroup->addChild(hitGeode.get());
+                    insertGroup->addChild(hitNode.get());
                     insertGroup->addChild(effectsGroup);
                 }
@@ -424 +425 @@
 //////////////////////////////////////////////////////////////////////////////
 
-int main(int argc, char **argv)
-{
-    // use an ArgumentParser object to manage the program arguments.
-    osg::ArgumentParser arguments(&argc,argv);
-    
-    // set up the usage document, in case we need to print out how to use this program.
-    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates use of particle systems.");
-    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] image_file_left_eye image_file_right_eye");
-    arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
-    
-
+int main(int, char **)
+{
     // construct the viewer.
-    osgProducer::Viewer viewer(arguments);
-
-    // set up the value with sensible default event handlers.
-    viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS);
-
-    // get details on keyboard and mouse bindings used by the viewer.
-    viewer.getUsage(*arguments.getApplicationUsage());
-    
+    osgViewer::Viewer viewer;
+
     // register the pick handler
-    viewer.getEventHandlerList().push_front(new PickHandler());
-
-    // if user request help write it out to cout.
-    if (arguments.read("-h") || arguments.read("--help"))
-    {
-        arguments.getApplicationUsage()->write(std::cout);
-        return 1;
-    }
-
-    // any option left unread are converted into errors to write out later.
-    arguments.reportRemainingOptionsAsUnrecognized();
-
-    // report any errors if they have occured when parsing the program aguments.
-    if (arguments.errors())
-    {
-        arguments.writeErrorMessages(std::cout);
-        return 1;
-    }
+    viewer.addEventHandler(new PickHandler());
     
     osg::Group *root = new osg::Group;
     build_world(root);
-
 
     osgUtil::Optimizer optimizer;
@@ -474 +442 @@
     viewer.setSceneData(root);
         
-    // create the windows and run the threads.
-    viewer.realize();
-
-    // osg::Vec3 center = root->getBound().center();
-    // float radius = root->getBound().radius();
-
-    while( !viewer.done() )
-    {
-        // wait for all cull and draw threads to complete.
-        viewer.sync();
-
-        // insertParticle(root, center, radius);
-
-        // update the scene by traversing it with the the update visitor which will
-        // call all node update callbacks and animations.
-        viewer.update();
-         
-        // fire off the cull and draw traversals of the scene.
-        viewer.frame();
-        
-    }
-    
-    // wait for all cull and draw threads to complete.
-    viewer.sync();
-
-    // run a clean up frame to delete all OpenGL objects.
-    viewer.cleanup_frame();
-
-    // wait for all the clean up frame to complete.
-    viewer.sync();
-
-    return 0;
-}
+    return viewer.run();
+}