Changeset 403 for experimental/distortionNG/main.cpp

Timestamp:

Jul 22, 2012, 6:11:10 PM (12 years ago)

Author:

Torben Dannhauer

Message:

placebo Manipulator added to allow to use manipulators together with directly set Viewer matrix

File:

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

experimental/distortionNG/main.cpp

@@ -38 +38 @@
 #include "DistortionManipulator.h"
 #include "DistortionSetupStrategyProjectSyntropy.h"
+#include "PlaceboManipulator.h"
 
 int main(int argc, char** argv)
@@ -73 +74 @@
     keyswitchManipulator->addMatrixManipulator( '3', "Drive", new osgGA::DriveManipulator() );
     keyswitchManipulator->addMatrixManipulator( '4', "Terrain", new osgGA::TerrainManipulator() );
+        keyswitchManipulator->addMatrixManipulator( '5', "Placebo", new osgGA::PlaceboManipulator() );
 
     std::string pathfile;
-    char keyForAnimationPath = '5';
+    char keyForAnimationPath = '6';
     while (arguments.read("-p",pathfile))
     {
@@ -95 +97 @@
 
         DistortionSetupStrategyProjectSyntropy* psStrategy = new DistortionSetupStrategyProjectSyntropy();
-        psStrategy->setDistortionInputFiles( "./resources/ProjectSyntropy/Vertices/warpmap_1.csv",
-                                                                                //"./resources/ProjectSyntropy/TexCoords/warpmap_1.csv",
-                                                                                "./resources/ProjectSyntropy/blending_1.bmp",
-                                                                                "./resources/ProjectSyntropy/Vertices/frustum_1.csv" );
+        psStrategy->setDistortionInputFiles( "./resources/ProjectSyntropy/example2/warpmap_1.csv",
+                                                                                "./resources/ProjectSyntropy/example2/blending_1.bmp",
+                                                                                "./resources/ProjectSyntropy/example2/frustum_1.csv" );
         distortionManip->setDistortionSetupStrategy( psStrategy );
         viewer.addEventHandler(distortionManip);