Changeset 360 for experimental

Timestamp:

Apr 22, 2012, 12:47:07 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

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

experimental/distortionNG/DistortionSet.cpp

@@ -24 +24 @@
 DistortionSet::DistortionSet()
 {
-        _distortionMeshRows = 1;
-        _distortionMeshColumns = 1;
+        _distortionMeshRows = 2;
+        _distortionMeshColumns = 2;
         //GLenum _meshType;
         

experimental/distortionNG/DistortionSet.h

@@ -23 +23 @@
 #include <osg/Camera>
 #include <osg/Switch>
+#include <osg/Shader>
 
 namespace osgViewer {
@@ -59 +60 @@
 
         osg::Switch* getDistortionInternals()   { return _distortionInternals; }
+
+
 
 

experimental/distortionNG/extViewer.cpp

@@ -255 +255 @@
         stateset->setTextureAttributeAndModes(_distortionSet->getTexUnitScene(), texmat, osg::StateAttribute::ON);
 
-                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, projectorMatrix);
+                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), _distortionSet->getDistortionMeshColumns(), _distortionSet->getDistortionMeshColumns(), projectorMatrix);
                 meshGeode->addDrawable(distortionMesh);
 
@@ -333 +333 @@
 
         // create shaders for blending
-        osg::Program* distortProgram = new osg::Program;
-        distortProgram->setName( "intensityMapBlending" );
+        osg::Program* IntensityMapProgram = new osg::Program;
+        IntensityMapProgram->setName( "intensityMapBlending" );
         osg::Shader* fShader = osg::Shader::readShaderFile( osg::Shader::FRAGMENT, "shader.frag" ); 
         fShader->setName("intensityMapFragShader");
@@ -340 +340 @@
         if ( fShader )
         {
-                distortProgram->addShader( fShader );
+                IntensityMapProgram->addShader( fShader );
                 stateset->addUniform( new osg::Uniform("sceneTexture", (int)_distortionSet->getTexUnitScene()) );
                 stateset->addUniform( new osg::Uniform("intensityMapTexture", (int)_distortionSet->getTexUnitIntensityMap()) );
-                stateset->setAttributeAndModes(distortProgram, osg::StateAttribute::ON);
+                stateset->setAttributeAndModes(IntensityMapProgram, osg::StateAttribute::ON);
         }
 }
@@ -358 +358 @@
 
         // 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
-}
+        osgViewer::DistortionSet* ds = new osgViewer::DistortionSet();
+        ds->setIntensityMap( intMap );
+        ds->setDistortionMeshRows( 2 );
+        ds->setDistortionMeshColumns( 2 );
+        ds->setTexUnitScene( 0 );
+        ds->setTexUnitIntensityMap( 1 );
+
+        setUpViewForManualDistortion(ds);
+}

experimental/distortionNG/extViewer.h

@@ -38 +38 @@
                 /** Convenience method for projection on curved screens using a slave camera rendering scene and a second camera doing distortion correction to present on a nonplaner display.*/
         void setUpViewForManualDistortion(osgViewer::DistortionSet* distSet, unsigned int screenNum=0, const osg::Matrixd& projectorMatrix = osg::Matrixd());
+                //void setUpViewForManualDistortion(unsigned int rows, unsigned int colums, std::string intensityMap="");
+
 
                 void setUpIntensityMapBlending(osgViewer::DistortionSet* distSet, unsigned int screenNum=0);

experimental/distortionNG/main.cpp

@@ -56 +56 @@
         viewer.setUpViewForManualDistortion(_distortionSet, 0);
    
-        
+        //viewer.setUpIntensityMapBlending("intensitymap.png");
 
         // set up the camera manipulators.
@@ -195 +195 @@
  *                                                                      
  * 
- * 
+ * direct to do:
+ * 
+ * speichern des containers in ein .dist file
+ * Laden des Containers.
+ * osgviewer setup fit machen: simple distortion ( nur rows, colums und optional blendmap ist angegeben
+ * shaderwechsel funktioniert, so dass die reine blendmap angezeigt werden kann.
+ * reset distortion funktioniert.
+ * statesetmanipulator muss auf die scene, nicht auf mesh losgehen.
+ * 
+ * Anwenden der distortion auf die Meshknoten oder die texturekoordinaten
+ * 
+ * alternativ: 
+ * - umstellung der koordinaten auf [0-1]
+ * - speichern der hieght und width im container so daß das mesh an andere Bildschirmgrößen angepasst werden kann.
+ 
  * 
 */