Changeset 403

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

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (1 diff)
• PlaceboManipulator.cpp (added)
• PlaceboManipulator.h (added)
• distortionNG.vcproj (modified) (2 diffs)
• main.cpp (modified) (3 diffs)
• resources/ProjectSyntropy/TexCoords (deleted)
• resources/ProjectSyntropy/Vertices (deleted)
• resources/ProjectSyntropy/blending_1.bmp (deleted)
• resources/ProjectSyntropy/example1 (added)
• resources/ProjectSyntropy/example1/blending_1.bmp (added)
• resources/ProjectSyntropy/example1/frustum_1.csv (added)
• resources/ProjectSyntropy/example1/texccords_warpmap_1.csv (added)
• resources/ProjectSyntropy/example1/vertex_warpmap_1.csv (added)
• resources/ProjectSyntropy/example2/example_info.txt (added)

experimental/distortionNG/DistortionManipulator.cpp

@@ -84 +84 @@
 bool DistortionManipulator::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa, osg::Object* obj, osg::NodeVisitor* nv)
 {
-
-
         switch(ea.getEventType())
     {

experimental/distortionNG/distortionNG.vcproj

@@ -357 +357 @@
                                 >
                         </File>
+                        <File
+                                RelativePath=".\PlaceboManipulator.cpp"
+                                >
+                        </File>
                 </Filter>
                 <Filter
@@ -383 +387 @@
                                 >
                         </File>
+                        <File
+                                RelativePath=".\PlaceboManipulator.h"
+                                >
+                        </File>
                 </Filter>
                 <Filter

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);