Changeset 377

Timestamp:

Jun 14, 2012, 2:43:38 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionSetupStrategy.h (modified) (1 diff)
• DistortionSetupStrategyProjectSyntropy.cpp (modified) (8 diffs)
• DistortionSetupStrategyProjectSyntropy.h (modified) (1 diff)

experimental/distortionNG/DistortionSetupStrategy.h

@@ -37 +37 @@
         virtual void delegateDistortionSetup(osgViewer::DistortionSet* distortionSet)=0;
 
-        enum distortionType { VERTEXDISTORTION, TEXCOORDDISTORTION, COMBINEDDISTORTION};
+        enum distortionType { VERTEXDISTORTION, TEXCOORDDISTORTION, COMBINEDDISTORTION, UNDEFINED};
 
 protected:

experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp

@@ -25 +25 @@
 DistortionSetupStrategyProjectSyntropy::DistortionSetupStrategyProjectSyntropy()
 {
-        _switchDistortionTypeVortexToTexcoords=false;
-
-        _intensityMapFilename="./resources/ProjectSyntropy/blending_1.bmp";
-
-        _frustumVortexDistortionFilename="./resources/ProjectSyntropy/Vertices/frustum_1.csv";
-        _frustumTexcoordDistortionFilename="./resources/ProjectSyntropy/TexCoords/frustum_1.csv";
-
-        _meshVortexDistortionFilename="./resources/ProjectSyntropy/Vertices/warpmap_1.csv";
-        _meshTexcoordDistortionFilename="./resources/ProjectSyntropy/TexCoords/warpmap_1.csv";
-
+        _blendmapFilename = "";
+        _frustumFilename = "";
+        _distortionFilename = "";
+        _distortionType = DistortionSetupStrategy::UNDEFINED;
 
         _distortionInitialized=false;
@@ -41 +35 @@
 DistortionSetupStrategyProjectSyntropy::~DistortionSetupStrategyProjectSyntropy()
 {
+
 }
 
 void DistortionSetupStrategyProjectSyntropy::setDistortionInputFiles( std::string distortionFile, std::string blendmapFile, std::string frustumFile, DistortionSetupStrategy::distortionType type)
 {
-
+        _distortionType = type;
+        _blendmapFilename = blendmapFile;
+        _frustumFilename = frustumFile;
+        _distortionFilename = distortionFile;
 }
 
@@ -213 +211 @@
 
                                 // Insertion of Values U and V (corresponding to values[2],values[3] in a temporary Array
-                                // which is returned and merged into distortionSet later 
-                                if(_switchDistortionTypeVortexToTexcoords)
+                                // which is returned and merged into distortionSet later
+ 
+                                if((_distortionType==TEXCOORDDISTORTION) || (_distortionType==COMBINEDDISTORTION))
                                 {
                                         tempVec2.set(values[2],values[3]);
                                         meshPointsVec2->push_back(tempVec2);
                                 }
-                                else
+                                if((_distortionType==VERTEXDISTORTION) || (_distortionType==COMBINEDDISTORTION))
                                 {
                                         tempVec3.set(values[2]*displayWidth,values[3]*displayHeight,0.0);
@@ -251 +250 @@
         }
 
+        if(     _distortionType == DistortionSetupStrategy::UNDEFINED || _blendmapFilename.empty() || _frustumFilename.empty() || _distortionFilename.empty() )
+        {
+                OSG_ALWAYS<<"DistortionSetupStrategyProjectSyntropy::delegateDistortionSetup : You have not specified the imput filenames and distortion type!"<<std::endl;
+                return;
+        }
+
         //OSG_ALWAYS<<"drin"<<std::endl;
 
-        if (_distortionInitialized==false)
+        if (_distortionInitialized==false )
         {
 
@@ -261 +266 @@
 
                 osg::Image* intensityMap=NULL;
-                intensityMap=osgDB::readImageFile(_intensityMapFilename);
+                intensityMap=osgDB::readImageFile(_blendmapFilename);
                 osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
                 if (!wsi)
@@ -293 +298 @@
                 double zNear=0.1, zFar=100.0;
 
-                if(_switchDistortionTypeVortexToTexcoords)      readFrustumFromCSVFile(_frustumTexcoordDistortionFilename, numFrustumValues, frustumValues);
-                else                                            readFrustumFromCSVFile(_frustumVortexDistortionFilename, numFrustumValues, frustumValues);
-
+                readFrustumFromCSVFile(_frustumFilename, numFrustumValues, frustumValues);
+                
                 osg::Matrixd viewOffset=osg::Matrixd();
                 osg::Matrixd projectionOffset=osg::Matrixd();
@@ -308 +312 @@
 
                 //Frustum Parameters: Left, Right, Bottom, Top, zNear, zFar
+                //Alternative: viewer->camera->setprojectionmatrixasfrustum?
                 projectionOffset.makeFrustum(osg::inDegrees(frustumValues[6]), osg::inDegrees(frustumValues[7]), osg::inDegrees(frustumValues[8]), osg::inDegrees(frustumValues[9]), zNear, zFar);
 
@@ -349 +354 @@
                         //*******************************************************************************************//
 
-
                         int distortionMeshRows=0, distortionMeshColumns=0;
-                        if(_switchDistortionTypeVortexToTexcoords)      readMeshDimensionsFromCSVFile(_meshTexcoordDistortionFilename, &distortionMeshRows, &distortionMeshColumns);
-                        else                                            readMeshDimensionsFromCSVFile(_meshVortexDistortionFilename, &distortionMeshRows, &distortionMeshColumns);
+
+                        readMeshDimensionsFromCSVFile(_distortionFilename, &distortionMeshRows, &distortionMeshColumns);
 
                         distortionSet->setDistortionMeshRows(distortionMeshRows);
                         distortionSet->setDistortionMeshColumns(distortionMeshColumns);
 
-
-
                         osg::Vec2Array* distortionMeshVec2 = new osg::Vec2Array;
                         osg::Vec3Array* distortionMeshVec3 = new osg::Vec3Array;
 
-                        if(_switchDistortionTypeVortexToTexcoords)
-                        {
-                                readMeshPointsFromCSVFile(_meshTexcoordDistortionFilename, distortionMeshVec2, distortionMeshVec3, width, height);
+                        if((_distortionType==TEXCOORDDISTORTION) || (_distortionType==COMBINEDDISTORTION))
+                        {
+                                readMeshPointsFromCSVFile(_distortionFilename, distortionMeshVec2, distortionMeshVec3, width, height);
                                 distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->setTexCoordArray(0,distortionMeshVec2);
                         }
-                        else
-                        {
-                                readMeshPointsFromCSVFile(_meshVortexDistortionFilename, distortionMeshVec2, distortionMeshVec3, width, height);
+
+                        if((_distortionType==VERTEXDISTORTION) || (_distortionType==COMBINEDDISTORTION))
+                        {
+                                readMeshPointsFromCSVFile(_distortionFilename, distortionMeshVec2, distortionMeshVec3, width, height);
                                 distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->setVertexArray(distortionMeshVec3);
 

experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.h

@@ -44 +44 @@
 
         bool _distortionInitialized;                            //Is Distortion already initialized?
-        bool _switchDistortionTypeVortexToTexcoords;            //Indicates if Texcoord- (true) or Vortexdistortion (false) is selected
+        DistortionSetupStrategy::distortionType _distortionType; //might be VERTEXDISTORTION, TEXCOORDDISTORTION, COMBINEDDISTORTION or UNDEFINED...
+        std::string _blendmapFilename;
+        std::string _frustumFilename;
+        std::string _distortionFilename;
 
-        //Paths of Blending/Warping related Files
-        std::string _intensityMapFilename;
-
-        std::string _frustumVortexDistortionFilename;
-        std::string _frustumTexcoordDistortionFilename;
-
-        std::string _meshVortexDistortionFilename;
-        std::string _meshTexcoordDistortionFilename;
 };