Changeset 361 for experimental/distortionNG/main.cpp

Timestamp:

Apr 22, 2012, 4:51:35 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

experimental/distortionNG/main.cpp

@@ -56 +56 @@
         viewer.setUpViewForManualDistortion(_distortionSet, 0);
    
-        //viewer.setUpIntensityMapBlending("intensitymap.png");
 
         // set up the camera manipulators.
@@ -88 +87 @@
     // add the state manipulator
     viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) );
-
+        //viewer.addEventHandler( new osgGA::StateSetManipulator);
+        
     // add the stats handler
     viewer.addEventHandler(new osgViewer::StatsHandler);
@@ -118 +118 @@
                 if(!rootnode)
                 {
-                        osg::notify(osg::WARN)<<"Warning: no valid data loaded, please specify a database on the command line."<<std::endl;
+                        OSG_WARN<<"Warning: no valid data loaded, please specify a database on the command line."<<std::endl;
                         return 1;
                 }
     }
-        viewer.setSceneData( rootnode );
-        
+
         // run the viewers main loop
         return viewer.run();
@@ -150 +149 @@
  * modul                                                                Funktionen / Description
  * 
- * [postponed] plugin .dist                             load / Save distContainers                                      loads and saves via serializers the distortion container from/to file. Can potentially be replaced by a simple extension alias to osgt|b|x
- * 
+ * [postponed] plugin .dist                             load / Save distContainers                                      loads and saves via serializers the distortion container from/to file.
+ *  
  * 
  * [done] Distortion Container                                  Beinhaltet die folgenden Distortion Details:
@@ -174 +173 @@
  * distortionManipulator                                abgeleitet von osgGA::GUIEventHandler
  *                                                                              Grundfunktionen:
- *                                                      [done|.|.]      - Key to Show Distortion Mesh / Intensity Map / none
+ *                                                      [done]          - Key to Show Distortion Mesh / Intensity Map / none
  *                                                                              - Key to Save distortion Container  - via plugin
  *                                                      [.]             - Key to toggle MANUAL mode between blending und distortion setup
@@ -199 +198 @@
  * speichern des containers in ein .dist file
  * Laden des Containers.
- * osgviewer setup fit machen: simple distortion ( nur rows, colums und optional blendmap ist angegeben
- * shaderwechsel funktioniert, so dass die reine blendmap angezeigt werden kann.
  * reset distortion funktioniert.
  * statesetmanipulator muss auf die scene, nicht auf mesh losgehen.