Changeset 350

Timestamp:

Apr 21, 2012, 4:53:52 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (2 diffs)
• DistortionSet.cpp (modified) (2 diffs)
• DistortionSet.h (modified) (4 diffs)
• extViewer.cpp (modified) (9 diffs)
• extViewer.h (modified) (2 diffs)
• main.cpp (modified) (2 diffs)

experimental/distortionNG/DistortionManipulator.cpp

@@ -141 +141 @@
 
 
-                                OSG_ALWAYS<<"KEY_KP_7 : activeVisualizationMode is now "<<activeVisualizationMode<<std::endl;
+                                OSG_ALWAYS<<"KEY_KP_7 : activeVisualizationMode is now "<<activeVisualizationMode<<std::endl<<std::endl;
                                 return(true);
                         }
@@ -225 +225 @@
 {
                 OSG_ALWAYS<<"ToDo: showIntensityMap(bool) is now "<<show<<std::endl;
-}
+
+                if(_distortionSet.valid())
+                        _distortionSet->setShowIntensityMapOnly(show);
+}

experimental/distortionNG/DistortionSet.cpp

@@ -24 +24 @@
 DistortionSet::DistortionSet()
 {
+        _distortionMeshRows = 1;
+        _distortionMeshColumns = 1;
+        //GLenum _meshType;
+        
+        _intensityMap = NULL;
+        _texUnitScene = 0;
+        _texUnitIntensityMap = 1;
+
+        _viewOffset = osg::Matrixd::identity();
+        _projectionOffset = osg::Matrixd::identity();
+
+        _showIntesityMapMapOnly = false;
 }
 
@@ -49 +61 @@
         ADD_MATRIX_SERIALIZER( ViewOffset, osg::Matrix() );     //osg::Matrix _viewOffset;
         ADD_MATRIX_SERIALIZER( ProjectionOffset, osg::Matrix() );       //osg::Matrix _projectionOffset;
+
+        ADD_BOOL_SERIALIZER( ShowIntensityMapOnly, false );     //bool _showIntesityMapMapOnly
 }

experimental/distortionNG/DistortionSet.h

@@ -37 +37 @@
                 _texUnitIntensityMap(ds._texUnitIntensityMap),
                 _viewOffset(ds._viewOffset),
-                _projectionOffset(ds._projectionOffset){}
+                _projectionOffset(ds._projectionOffset),
+                _showIntesityMapMapOnly(ds._showIntesityMapMapOnly){}
 
         DistortionSet();
         virtual ~DistortionSet();
 
+        // Working access
+        osg::Image* getIntensityMap()  { return _intensityMap; }        // Also for manipulating the intensity map
+        bool& getShowIntensityMapOnlyAsRef()    { return _showIntesityMapMapOnly;}
+
+
+
+        // Serializer Access
         void setDistortionMeshRows(int distortionMeshRows)              { _distortionMeshRows = distortionMeshRows; }
         int getDistortionMeshRows() const       { return _distortionMeshRows; }
@@ -52 +60 @@
 
         void setIntensityMap(osg::Image* intensityMap)          { _intensityMap = intensityMap; }
-        const osg::Image* getIntensityMap() const       { return _intensityMap; }       // for serializers
-        osg::Image* getIntensityMap()  { return _intensityMap; }        // for manipulating the intensity map
+        const osg::Image* getIntensityMap() const       { return _intensityMap; }
+
 
         void setTexUnitScene(unsigned int texUnitScene)         { _texUnitScene = texUnitScene; }
@@ -67 +75 @@
         const osg::Matrixd& getProjectionOffset() const { return _projectionOffset; }
 
+        void setShowIntensityMapOnly(bool show) {_showIntesityMapMapOnly = show;}
+        bool getShowIntensityMapOnly() const    { return _showIntesityMapMapOnly;}
+
+
 private:
         int _distortionMeshRows;
@@ -79 +91 @@
         osg::Matrixd _projectionOffset;
 
-
+        bool _showIntesityMapMapOnly;   // Intensity Blending is done by a frag shader. To control it on runtime, the uniform must be bound to a central variable.
 };
 

experimental/distortionNG/extViewer.cpp

@@ -57 +57 @@
 }
 
-//static osg::Texture2D* loadTexture( const std::string& fileName )
-//{
-//    std::string foundFileName = osgDB::findDataFile(fileName);
-//    if (foundFileName.length() != 0 )
-//    {
-//        // load distortion map texture file
-//        osg::Image* image = osgDB::readImageFile(foundFileName);
-//        if (image)
-//        {
-//                      osg::Texture2D* texture = new osg::Texture2D;
-//            texture->setImage(image);
-//                      texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
-//                      texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
-//                      texture->setWrap(osg::Texture::WRAP_S,osg::Texture::CLAMP_TO_EDGE);
-//                      texture->setWrap(osg::Texture::WRAP_T,osg::Texture::CLAMP_TO_EDGE);
-//            return texture;
-//        }
-//    }
-//
-//    OSG_NOTIFY(osg::WARN) << "File \"" << fileName << "\" not found." << std::endl;
-//
-//    return NULL;
-//}
-
-//static osg::TextureRectangle* loadTextureRect( const std::string& fileName )
-//{
-//    std::string foundFileName = osgDB::findDataFile(fileName);
-//    if (foundFileName.length() != 0 )
-//    {
-//        // load distortion map texture file
-//        osg::Image* image = osgDB::readImageFile(foundFileName);
-//        if (image)
-//        {
-//                      osg::TextureRectangle* texture = new osg::TextureRectangle;
-//            texture->setImage(image);
-//            texture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR);
-//            texture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR);
-//            texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::CLAMP_TO_EDGE);
-//            texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::CLAMP_TO_EDGE);
-//            return texture;
-//        }
-//    }
-//
-//    OSG_NOTIFY(osg::WARN) << "File \"" << fileName << "\" not found." << std::endl;
-//
-//    return NULL;
-//}
-
 static osg::Geometry* createMesh(const osg::Vec3& origin, const osg::Vec3& widthVector, const osg::Vec3& heightVector, unsigned int columns, unsigned int rows, osg::Image* intensityMap, bool applyIntensityMapAsColours, const osg::Matrix& projectorMatrix)
 {
@@ -199 +151 @@
 }
 
+
 void extViewer::setUpViewForManualDistortion(unsigned int screenNum, osg::Image* intensityMap, const osg::Matrixd& projectorMatrix)
 {
-        OSG_INFO<<"View::setUpViewForManualDistortion(sn="<<screenNum<<", im="<<intensityMap<<")"<<std::endl;
+        OSG_INFO<<"View::setUpViewForManualDistortion(sn="<<screenNum<<")"<<std::endl;
+
+        // Create DistortionSet
+        _distortionSet = new osgViewer::DistortionSet();
+        _distortionSet->setIntensityMap( intensityMap );
+        _distortionSet->setDistortionMeshRows( 20 );
+        _distortionSet->setDistortionMeshColumns( 20 );
+
+
+
 
     osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
@@ -233 +195 @@
     traits->sharedContext = 0;
 
-        bool applyIntensityMapAsColours = false;
-
         osg::ref_ptr<osg::GraphicsContext> gc = osg::GraphicsContext::createGraphicsContext(traits.get());
     if (!gc)
@@ -302 +262 @@
         // StateSet to contain the Texture StateAttribute.
             osg::StateSet* stateset = geode->getOrCreateStateSet();
-        stateset->setTextureAttributeAndModes(0, sceneTexture,osg::StateAttribute::ON);
+        stateset->setTextureAttributeAndModes(_distortionSet->getTexUnitScene(), sceneTexture,osg::StateAttribute::ON);
         stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
 
@@ -309 +269 @@
         stateset->setTextureAttributeAndModes(0, texmat, osg::StateAttribute::ON);
 
-                // If the intensityMap is used but not applyIntensityMapAsColours: Apply intensityMap as intensityMapTexture on unit 1
-                if (!applyIntensityMapAsColours && intensityMap)
-                        setUpIntensityMapBlending(stateset, intensityMap, screenNum, 0, 1);     
-
-                osg::Geometry* distortionMesh = createMesh(osg::Vec3(0.0f,0.0f,0.0f), osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,height,0.0f), 20, 20, intensityMap, applyIntensityMapAsColours, projectorMatrix);
+                setUpIntensityMapBlending(_distortionSet, stateset, screenNum);
+
+                osg::Geometry* distortionMesh = createMesh(osg::Vec3(0.0f,0.0f,0.0f), osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,height,0.0f), 20, 20, _distortionSet->getIntensityMap(), false, projectorMatrix);
                 geode->addDrawable(distortionMesh);
 
@@ -347 +305 @@
                 camera->setCullingMode( mode & (~osg::CullSettings::SMALL_FEATURE_CULLING) );
 
-                // Create DistortionSet
-                _distortionSet = new osgViewer::DistortionSet();
-                _distortionSet->setIntensityMap( intensityMap );
-
-
                 // Add the distortionHandler
                 osgViewer::DistortionManipulator* distManip = new osgViewer::DistortionManipulator();
@@ -364 +317 @@
 }
 
-void extViewer::setUpIntensityMapBlending(osg::StateSet* stateset, osg::Image* intensityMap, unsigned int screenNum, int rttSceneTextureUnit, int intensityMapTextureUnit)
-{
-        if(stateset == NULL || intensityMap == NULL)
+void extViewer::setUpIntensityMapBlending(osgViewer::DistortionSet* distSet, osg::StateSet* stateset, unsigned int screenNum)
+{
+        osg::Image* intensityMap = _distortionSet->getIntensityMap();
+        if(intensityMap == NULL)        return;
+
+        if(stateset == NULL)
         {
                 OSG_NOTICE<<"Error, no intensityMap or stateset for intensityMapBlending specified."<<std::endl;
@@ -400 +356 @@
         intensityMapTexture->setWrap(osg::Texture::WRAP_T,osg::Texture::CLAMP_TO_EDGE);
 
-    stateset->setTextureAttributeAndModes(intensityMapTextureUnit, intensityMapTexture, osg::StateAttribute::ON);
+    stateset->setTextureAttributeAndModes(_distortionSet->getTexUnitIntensityMap(), intensityMapTexture, osg::StateAttribute::ON);
 
         // create shaders for blending
@@ -411 +367 @@
         {
                 distortProgram->addShader( fShader );
-                stateset->addUniform( new osg::Uniform("sceneTexture", rttSceneTextureUnit) );
-                stateset->addUniform( new osg::Uniform("intensityMapTexture", intensityMapTextureUnit) );
+                //stateset->addUniform( new osg::Uniform("sceneTexture", _distortionSet->getTexUnitScene()) );
+                //stateset->addUniform( new osg::Uniform("intensityMapTexture", _distortionSet->getTexUnitIntensityMap()) );
+                stateset->addUniform( new osg::Uniform("sceneTexture", 0 ) );
+                stateset->addUniform( new osg::Uniform("intensityMapTexture", 1 ) );
                 stateset->setAttributeAndModes(distortProgram, osg::StateAttribute::ON);
         }
 }
+
+void extViewer::setUpIntensityMapBlending(std::string intensityMap)
+{
+        // Try to load intensityMap
+        osg::Image* intMap = osgDB::readImageFile(intensityMap);
+        if (!intMap)
+        {
+                osg::notify(osg::WARN) << "Quitting, couldn't find intensity map: " << intensityMap << std::endl;
+                return;
+        } 
+
+        // Create DistortionSet
+        _distortionSet = new osgViewer::DistortionSet();
+        _distortionSet->setIntensityMap( intMap );
+        _distortionSet->setDistortionMeshRows( 1 );
+        _distortionSet->setDistortionMeshColumns( 1 );
+        _distortionSet->setTexUnitScene( 0 );
+        _distortionSet->setTexUnitIntensityMap( 1 );
+
+        // Todo: call setupDistortion/Blendung to perform the blending
+}

experimental/distortionNG/extViewer.h

@@ -23 +23 @@
 #include "DistortionSet.h"
 
+#include <string>
 
 class extViewer : public osgViewer::Viewer
@@ -38 +39 @@
         void setUpViewForManualDistortion(unsigned int screenNum=0, osg::Image* intensityMap=0, const osg::Matrixd& projectorMatrix = osg::Matrixd());
 
-                void setUpIntensityMapBlending(osg::StateSet* stateset, osg::Image* intensityMap, unsigned int screenNum=0, int rttSceneTextureUnit=0, int intensityMapTextureUnit=1);
+                void setUpIntensityMapBlending(osgViewer::DistortionSet* distSet, osg::StateSet* stateset, unsigned int screenNum=0);
+                void setUpIntensityMapBlending(std::string intensityMap);
 
                 osgViewer::DistortionSet* getDistortionSet()    {return _distortionSet;}

experimental/distortionNG/main.cpp

@@ -136 +136 @@
  * Layout vom Distortion System
  * 
- * Das distortion systme unterstüzt verzerrungen ,die pro kanal auhc nur eine camera verwenden.
- * Verzerrungen, die das Bild je Kanal aus mehreren Cams zusammensetzen um Views>=180° zu erreichen werden nicht unterstützt da hierfür das Camera Setup nötig wäre, welches nicht im distortion-Container gespeichert wird (Sonderfall, zu speziell für das Dist-Framework)
+ * Das distortion System unterstützt Verzerrungen, die pro Kanal jeweils nur eine camera verwenden.
+ * Verzerrungen, die das Bild je Kanal aus mehreren Cams zusammensetzen um Views>=180° zu erreichen werden nicht unterstützt da hierfür ein Camera Setup nötig wäre, welches nicht im distortion-Container gespeichert wird (Sonderfall, zu speziell für das Dist-Framework)
  * 
  * 
@@ -156 +156 @@
  *                                                                              
  *                                                                              need to add setter/getter as well as the serializer macros.
- * 
+ *                                                                              
+ *                                                                              Besitz: Da osgViewer distSets ohne Manipulationsmöglichkeit konsumieren können soll, muss der COntainer vom Vierwer verwaltet werden.
  * 
  * osgViewer                                                    load and apply distortion (apply via setupDistortion(...)