Changeset 361 for experimental/distortionNG/extViewer.cpp

Timestamp:

Apr 22, 2012, 4:51:35 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/extViewer.cpp (modified) (3 diffs)

experimental/distortionNG/extViewer.cpp

@@ -41 +41 @@
         // Add help for command-line options here
     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");
+    arguments.getApplicationUsage()->addCommandLineOption("--blend","Set up viewer for simple intensity map blending.");
+
+        std::string distortionSetFilename = "";
+        std::string intensityMapFilename = "";
+        while( arguments.read("--blend",intensityMapFilename) ) {}
+        while( arguments.read("--distort",distortionSetFilename) ) {}
+
+        if( !intensityMapFilename.empty() )
+        {
+                OSG_ALWAYS<<"Pure blendmap setup with : "<<intensityMapFilename<<std::endl;
+                setUpIntensityMapBlending(intensityMapFilename);
+        }
+        else if( !distortionSetFilename.empty() )
+        {
+                OSG_ALWAYS<<"Set up distortion by loaded distortionSet: "<<distortionSetFilename<<std::endl;
+
+                osg::Object* distSet = osgDB::readObjectFile( distortionSetFilename );
+                if( distSet != NULL )
+                {
+                        OSG_ALWAYS<<"read distortionSet success"<<std::endl;
+                        setUpViewForManualDistortion(static_cast<osgViewer::DistortionSet*>(distSet));
+                }
+                else
+                {
+                        OSG_ALWAYS<<"read distortionSet failed"<<std::endl;
+                }
+        }       
+        
 }
 
@@ -236 +261 @@
 
         addSlave(camera.get(), _distortionSet->getProjectionOffset(), _distortionSet->getViewOffset() );
+
     }
 
@@ -332 +358 @@
     stateset->setTextureAttributeAndModes(_distortionSet->getTexUnitIntensityMap(), intensityMapTexture, osg::StateAttribute::ON);
 
-        // create shaders for blending
+        // create shader for blending
         osg::Program* IntensityMapProgram = new osg::Program;
         IntensityMapProgram->setName( "intensityMapBlending" );
-        osg::Shader* fShader = osg::Shader::readShaderFile( osg::Shader::FRAGMENT, "shader.frag" ); 
-        fShader->setName("intensityMapFragShader");
-
-        if ( fShader )
-        {
-                IntensityMapProgram->addShader( fShader );
+        osg::Shader* shaderIntensityMap = osg::Shader::readShaderFile( osg::Shader::FRAGMENT, "shaderIntensityMap.frag" ); 
+        shaderIntensityMap->setName("shaderIntensityMap");
+        _distortionSet->setShaderIntensityMap( shaderIntensityMap );
+
+        if ( shaderIntensityMap )
+        {
+                IntensityMapProgram->addShader( shaderIntensityMap );
                 stateset->addUniform( new osg::Uniform("sceneTexture", (int)_distortionSet->getTexUnitScene()) );
                 stateset->addUniform( new osg::Uniform("intensityMapTexture", (int)_distortionSet->getTexUnitIntensityMap()) );