Changeset 345 for experimental/distortionNG

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionSet.cpp (modified) (1 diff)
• DistortionSet.h (modified) (2 diffs)
• extViewer.cpp (modified) (2 diffs)
• main.cpp (modified) (1 diff)

experimental/distortionNG/DistortionSet.cpp

@@ -40 +40 @@
         ADD_INT_SERIALIZER( DistortionMeshColumns, 1 ); //int _distortionMeshColumns;
 
-        // Missing serializer macro for PrimitiveMeshType
-        //osg::PrimitiveSet::Mode _MeshType
+    ADD_GLENUM_SERIALIZER( MeshType, GLenum, GL_QUAD_STRIP );  //osg::PrimitiveSet::Mode _MeshType
         
-        ADD_IMAGE_SERIALIZER( IntensityMap, osg::Image, NULL );  // _image      //osg::ref_ptr<osg::Image> _intensityMap;
+        ADD_IMAGE_SERIALIZER( IntensityMap, osg::Image, NULL );  //osg::ref_ptr<osg::Image> _intensityMap;
 
         ADD_UINT_SERIALIZER( TexUnitScene, 0 ); //unsigned int _texUnitScene;

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;

experimental/distortionNG/extViewer.cpp

@@ -23 +23 @@
     arguments.getApplicationUsage()->addCommandLineOption("--distort","load distortion file and set up geometrical distortion for viewer. This includes blending");
     arguments.getApplicationUsage()->addCommandLineOption("--blend","Set up viewer vor simple blending CullDrawThreadPerContext threading model for viewer.");
+
+        osgDB::Registry::instance()->addFileExtensionAlias("dist", "osgt");
 }
 
@@ -153 +155 @@
         for ( unsigned int row=0; row<rows-1; row++ )   // each strip consists of two affected vertex rows, so we need only row-1 strips.
         {
-                osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(GL_QUAD_STRIP, columns*2);   // columns*2 = number of involved vertices for this strip.
+                osg::ref_ptr<osg::DrawElementsUInt> de = new osg::DrawElementsUInt(osg::PrimitiveSet::QUAD_STRIP, columns*2);   // columns*2 = number of involved vertices for this strip.
                 for ( unsigned int col=0; col<columns; col++ )
                 {

experimental/distortionNG/main.cpp

@@ -143 +143 @@
  * modul                                                                Funktionen / Description
  * 
- * plugin .dist                                                 load / Save distContainers                                      loads and saves via serializers the distortion container from/to file.
+ * [postponed] plugin .dist                             load / Save distContainers                                      loads and saves via serializers the distortion container from/to file. Can potentially be replaced by a simple extension alias to osgt|b|x
  * 
  * 
- * Distortion Container                                 Beinhaltet die folgenden Distortion Details:
+ * [done] Distortion Container                                  Beinhaltet die folgenden Distortion Details:
  *                                                                              - Blendmap (osgImage) 
  *                                                                              - Mesh Dimensions (rows, columns)
- *                                                                              - Mesh Type (osg::PrimitiveSet::QUAD_STRIP, ...)
+ *                                                                              - Mesh Type (GLenum QUAD_STRIP, ...)
  *                                                                              - textureUnit for Scene RTT (z.B.: 0)
  *                                                                              - textureUnit for blendmap (z.B.: 1)