Changeset 372

Timestamp:

Jun 1, 2012, 9:57:13 PM (13 years ago)

Author:

Torben Dannhauer

Message:

Alpha version of the strategy pattern to separate the delegated DistortionSetup? algorithms from the main software.

Location:

experimental/distortionNG

Files:

• DistortionManipulator.h (modified) (1 diff)
• DistortionSetupStrategy.h (modified) (1 diff)
• DistortionSetupStrategyProjectSyntropy.cpp (added)
• DistortionSetupStrategyProjectSyntropy.h (added)
• distortionNG.vcproj (modified) (2 diffs)
• distortionset.dist (added)
• main.cpp (modified) (2 diffs)

experimental/distortionNG/DistortionManipulator.h

@@ -66 +66 @@
         void setDistortionSet(DistortionSet* ds) {_distortionSet = ds;}
 
-        
+        void setDistortionSetupStrategy(DistortionSetupStrategy* strategy)      {_delegatedDistortionSetupStrategy = strategy;}
 
 private:

experimental/distortionNG/DistortionSetupStrategy.h

@@ -34 +34 @@
 public:
         DistortionSetupStrategy();
-        ~DistortionSetupStrategy();
+        virtual ~DistortionSetupStrategy();
         virtual void delegateDistortionSetup(osgViewer::DistortionSet* distortionSet)=0;
 

experimental/distortionNG/distortionNG.vcproj

@@ -346 +346 @@
                         </File>
                         <File
+                                RelativePath=".\DistortionSetupStrategyProjectSyntropy.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\extViewer.cpp"
                                 >
@@ -372 +376 @@
                         </File>
                         <File
+                                RelativePath=".\DistortionSetupStrategyProjectSyntropy.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\extViewer.h"
                                 >

experimental/distortionNG/main.cpp

@@ -37 +37 @@
 
 #include "DistortionManipulator.h"
+#include "DistortionSetupStrategyProjectSyntropy.h"
 
 int main(int argc, char** argv)
@@ -92 +93 @@
 
         // Add the distortion manipulator
-        viewer.addEventHandler(new osgViewer::DistortionManipulator(_distortionSet));
+        osgViewer::DistortionManipulator* distortionManip = new osgViewer::DistortionManipulator(_distortionSet);
+        distortionManip->setDistortionSetupStrategy( new DistortionSetupStrategyProjectSyntropy() );
+        viewer.addEventHandler(distortionManip);
 
     // add the state manipulator