Changeset 394 for experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.h

Timestamp:

Jun 30, 2012, 8:56:16 PM (12 years ago)

Author:

Torben Dannhauer

Message:

vertex- and texcoord warping works now :)

File:

• experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.h (modified) (1 diff)

experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.h

@@ -35 +35 @@
         ~DistortionSetupStrategyProjectSyntropy();
         void delegateDistortionSetup(osgViewer::DistortionSet* distortionSet);
-        void setDistortionInputFiles( std::string vertexDistortionFile, std::string texCoordDistortionFile, std::string blendmapFile, std::string frustumFile, DistortionSetupStrategy::distortionType type);
+        void setDistortionInputFiles(std::string distortionFile, std::string blendmapFile, std::string frustumFile);
 private:
         //Functions related to CSV-File-Reading
         int readFrustumFromCSVFile(std::string filePath, int numValues, float* frustumValues);
         int readMeshDimensionsFromCSVFile(std::string filePath, int* meshRows, int* meshColumns);
-        int readMeshPointsFromCSVFile(std::string filePath, osg::Vec2Array* tmpMesh);
+        int readMeshPointsFromCSVFile(std::string filePath, osg::Vec4Array* tmpMesh);
 
         bool _distortionInitialized;                            //Is Distortion already initialized?
-        DistortionSetupStrategy::distortionType _distortionType; //might be VERTEXDISTORTION, TEXCOORDDISTORTION, COMBINEDDISTORTION or UNDEFINED...
         std::string _blendmapFilename;
         std::string _frustumFilename;
-        std::string _vertexDistortionFilename;
-        std::string _texCoordDistortionFilename;
-
+        std::string _distortionFilename;
 };