Changeset 353 for experimental/distortionNG/main.cpp

Timestamp:

Apr 21, 2012, 9:49:26 PM (13 years ago)

Author:

Torben Dannhauer

Message:

DistortionManipulator? is working (alpha stadium)

File:

• experimental/distortionNG/main.cpp (modified) (2 diffs)

experimental/distortionNG/main.cpp

@@ -47 +47 @@
         osg::Image* intMap = osgDB::readImageFile("intensitymap.png");
         if (!intMap)
-        {
-                osg::notify(osg::WARN) << "Couldn't find intensity map, quiting." << std::endl;
-                return -1;
-        } 
+                osg::notify(osg::WARN) << "Couldn't find intensity map, skip intensityMap setup." << std::endl;
+
         // Create DistortionSet
         osg::ref_ptr<osgViewer::DistortionSet> _distortionSet = new osgViewer::DistortionSet();
@@ -62 +60 @@
 
         // set up the camera manipulators.
+    osg::ref_ptr<osgGA::KeySwitchMatrixManipulator> keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
+
+    keyswitchManipulator->addMatrixManipulator( '1', "Trackball", new osgGA::TrackballManipulator() );
+    keyswitchManipulator->addMatrixManipulator( '2', "Flight", new osgGA::FlightManipulator() );
+    keyswitchManipulator->addMatrixManipulator( '3', "Drive", new osgGA::DriveManipulator() );
+    keyswitchManipulator->addMatrixManipulator( '4', "Terrain", new osgGA::TerrainManipulator() );
+
+    std::string pathfile;
+    char keyForAnimationPath = '5';
+    while (arguments.read("-p",pathfile))
     {
-        osg::ref_ptr<osgGA::KeySwitchMatrixManipulator> keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
-
-        keyswitchManipulator->addMatrixManipulator( '1', "Trackball", new osgGA::TrackballManipulator() );
-        keyswitchManipulator->addMatrixManipulator( '2', "Flight", new osgGA::FlightManipulator() );
-        keyswitchManipulator->addMatrixManipulator( '3', "Drive", new osgGA::DriveManipulator() );
-        keyswitchManipulator->addMatrixManipulator( '4', "Terrain", new osgGA::TerrainManipulator() );
-
-        std::string pathfile;
-        char keyForAnimationPath = '5';
-        while (arguments.read("-p",pathfile))
+        osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
+        if (apm || !apm->valid()) 
         {
-            osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
-            if (apm || !apm->valid()) 
-            {
-                unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
-                keyswitchManipulator->addMatrixManipulator( keyForAnimationPath, "Path", apm );
-                keyswitchManipulator->selectMatrixManipulator(num);
-                ++keyForAnimationPath;
-            }
+            unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
+            keyswitchManipulator->addMatrixManipulator( keyForAnimationPath, "Path", apm );
+            keyswitchManipulator->selectMatrixManipulator(num);
+            ++keyForAnimationPath;
         }
-
-        viewer.setCameraManipulator( keyswitchManipulator.get() );
     }
 
+        // Add keyswitch manipulator for multiple scene controls-
+    viewer.setCameraManipulator( keyswitchManipulator.get() );
+
         // Add the distortion manipulator
-        osgViewer::DistortionManipulator* distManip = new osgViewer::DistortionManipulator();
-        distManip->setDistortionSet(_distortionSet);
-        viewer.addEventHandler(distManip);
+        viewer.addEventHandler(new osgViewer::DistortionManipulator(_distortionSet));
 
     // add the state manipulator