Changeset 371 for experimental

Timestamp:

Jun 1, 2012, 9:23:50 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (3 diffs)
• DistortionManipulator.h (modified) (2 diffs)
• DistortionSetupStrategy.cpp (added)
• DistortionSetupStrategy.h (added)
• ReaderWriterDist.cpp (modified) (1 diff)
• ReaderWriterDist.h (modified) (1 diff)
• distortionNG.vcproj (modified) (2 diffs)
• main.cpp (modified) (3 diffs)

experimental/distortionNG/DistortionManipulator.cpp

@@ -27 +27 @@
 #include <osgDB/WriteFile>
 
+#include "DistortionSetupStrategy.h"
+
 using namespace osg;
 using namespace osgViewer;
@@ -38 +40 @@
         activeManualSetupMode = DISTORTION;
         activeVisualizationMode = NONE;
+
+        _delegatedDistortionSetupStrategy = NULL;
 
         _highlighter = NULL;
@@ -250 +254 @@
                 case(osgGA::GUIEventAdapter::FRAME):
                 {
-                        if ( activeSetupMode == DELEGATED)
-                        {
-                                OSG_ALWAYS<<"Todo: Calling delegated class!"<<std::endl;
+                        if ( activeSetupMode == DELEGATED && _delegatedDistortionSetupStrategy.valid())
+                        {
+                                OSG_ALWAYS<<"Calling delegated class.."<<std::endl;
+                                _delegatedDistortionSetupStrategy->delegateDistortionSetup(_distortionSet);
+                                OSG_ALWAYS<<"..done"<<std::endl;
                         }
                         break;

experimental/distortionNG/DistortionManipulator.h

@@ -28 +28 @@
 #include <osgText/Text>
 
+#include "DistortionSetupStrategy.h"
 #include "DistortionSet.h"
 
@@ -84 +85 @@
 
         osg::ref_ptr<DistortionSet> _distortionSet;
-
+        osg::ref_ptr<DistortionSetupStrategy> _delegatedDistortionSetupStrategy;
 
         osg::ref_ptr<osg::Geometry> _highlighter;

experimental/distortionNG/ReaderWriterDist.cpp

@@ +1 @@
+/* osgVisual test. distortionNG, experimental.
+*
+*  Permission is hereby granted, free of charge, to any person obtaining a copy
+*  of this software and associated documentation files (the "Software"), to deal
+*  in the Software without restriction, including without limitation the rights
+*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+*  copies of the Software, and to permit persons to whom the Software is
+*  furnished to do so, subject to the following conditions:
+*
+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+*  THE SOFTWARE.
+*/
+
 #include "ReaderWriterDist.h"
 #include <osg/KdTree>

experimental/distortionNG/ReaderWriterDist.h

@@ +1 @@
+/* osgVisual test. distortionNG, experimental.
+*
+*  Permission is hereby granted, free of charge, to any person obtaining a copy
+*  of this software and associated documentation files (the "Software"), to deal
+*  in the Software without restriction, including without limitation the rights
+*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+*  copies of the Software, and to permit persons to whom the Software is
+*  furnished to do so, subject to the following conditions:
+*
+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+*  THE SOFTWARE.
+*/
+
 #pragma once
-
-
 
 #include <osg/Notify>

experimental/distortionNG/distortionNG.vcproj

@@ -342 +342 @@
                         </File>
                         <File
+                                RelativePath=".\DistortionSetupStrategy.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\extViewer.cpp"
                                 >
@@ -364 +368 @@
                         </File>
                         <File
+                                RelativePath=".\DistortionSetupStrategy.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\extViewer.h"
                                 >

experimental/distortionNG/main.cpp

@@ -57 +57 @@
 
 // ---- test plugin read / write
-
         //osgDB::writeObjectFile( *_distortionSet, "distortionset.dist" );
         _distortionSet = NULL;
         _distortionSet = dynamic_cast<osgViewer::DistortionSet*>( osgDB::readObjectFile( "distortionset.dist" ) );
-                
-
 // ------------ Test ende -----------
 
@@ -198 +195 @@
  *                                                                              Grundfunktionen:
  *                                                      [done]          - Key to Show Distortion Mesh / Intensity Map / none
- *                                                                              - Key to Save distortion Container  - via osgDB::writeObjectFile(const osg::Object& object, const std::string& filename, const Options* options). osgDB & registry determines and loads the approriate plugin bythe file ending (.dist).
- *                                                      [.]             - Key to toggle MANUAL mode between blending und distortion setup
+ *                                                      [done]          - Key to Save distortion Container  - via osgDB::writeObjectFile(const osg::Object& object, const std::string& filename, const Options* options). osgDB & registry determines and loads the approriate plugin bythe file ending (.dist).
+ *                                                      [.]                     - Key to toggle MANUAL mode between blending und distortion setup
  *                                                      [done]          - Key to toggle distortion setup: 
  *                                                                                              DISABLED distortion/blending modifications are forbidden (ggfs. beim Verlassen von DISABLED ggf. auf singleThreaded wechseln und beim aktivieren von DISABLED wieder auf das alte threadingmodel. Alternativ  die data variance des meshes/Blendmap beeinflussen)
@@ -221 +218 @@
  * 
  * Plugin fertigstellen
- * save funktion des manipulators via osgDB::writeObjectFile fertig stellen
  * extViewer::setUpViewForManualDistortion(std::string distFile)
  * Load Funktion vom osgViewer (ersatzweise Anfangs in der main.cpp) fertigstellen : -dist <distFile> weiterreichen and extViewer::setUpViewForManualDistortion(std::string distFile)