Changeset 345 for experimental/distortionNG/DistortionSet.h

Timestamp:

Apr 18, 2012, 10:04:27 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/DistortionSet.h (modified) (2 diffs)

experimental/distortionNG/DistortionSet.h

@@ -21 +21 @@
 #include <osg/Image>
 #include <osg/Matrixd>
-#include <osg/PrimitiveSet>
 
 namespace osgViewer {
@@ -44 +43 @@
 
         void setDistortionMeshRows(int distortionMeshRows)              { _distortionMeshRows = distortionMeshRows; }
-        int getDistortionMeshRows() const       { return(_distortionMeshRows); }
+        int getDistortionMeshRows() const       { return _distortionMeshRows; }
 
         void setDistortionMeshColumns(int distortionMeshColumns)                { _distortionMeshColumns = distortionMeshColumns; }
-        int getDistortionMeshColumns() const    { return(_distortionMeshColumns); }
+        int getDistortionMeshColumns() const    { return _distortionMeshColumns; }
+
+        void setMeshType(GLenum meshType) { _meshType = meshType; }
+    inline GLenum getMeshType() const { return _meshType; }
 
         void setIntensityMap(osg::Image* intensityMap)          { _intensityMap = intensityMap; }
-        const osg::Image* getIntensityMap() const       { return(_intensityMap); }
+        const osg::Image* getIntensityMap() const       { return _intensityMap; }
 
         void setTexUnitScene(unsigned int texUnitScene)         { _texUnitScene = texUnitScene; }
-        unsigned int getTexUnitScene() const    { return(_texUnitScene); }
+        unsigned int getTexUnitScene() const    { return _texUnitScene; }
 
         void setTexUnitIntensityMap(unsigned int texUnitIntensityMap)   { _texUnitIntensityMap = texUnitIntensityMap; }
-        unsigned int getTexUnitIntensityMap() const     { return(_texUnitIntensityMap); }
+        unsigned int getTexUnitIntensityMap() const     { return _texUnitIntensityMap; }
 
         void setViewOffset(const osg::Matrixd& viewOffset)      { _viewOffset = viewOffset; }
-        const osg::Matrixd& getViewOffset() const       { return(_viewOffset); }
+        const osg::Matrixd& getViewOffset() const       { return _viewOffset; }
 
         void setProjectionOffset(const osg::Matrixd& projectionOffset)          { _projectionOffset = projectionOffset; }
-        const osg::Matrixd& getProjectionOffset() const { return(_projectionOffset); }
+        const osg::Matrixd& getProjectionOffset() const { return _projectionOffset; }
 
 private:
         int _distortionMeshRows;
         int _distortionMeshColumns;
-        //osg::PrimitiveSet::Mode _MeshType
+        GLenum _meshType;
         
         osg::ref_ptr<osg::Image> _intensityMap;