Changeset 145 for osgVisual/src

Timestamp:

Nov 1, 2010, 7:23:10 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/src

Files:

• distortion/visual_distortion.cpp (modified) (4 diffs)
• vista2D/visual_vista2D.cpp (modified) (1 diff)

osgVisual/src/distortion/visual_distortion.cpp

@@ -19 +19 @@
 using namespace osgVisual;
 
-visual_distortion::visual_distortion(osgViewer::Viewer* viewer_, osg::ArgumentParser& arguments_) : viewer(viewer_), arguments(arguments_)
+visual_distortion::visual_distortion(osgViewer::Viewer* viewer_, osg::ArgumentParser& arguments_, std::string configFileName) : viewer(viewer_), arguments(arguments_)
 {
         OSG_NOTIFY (osg::ALWAYS ) << "visual_distortion instantiated." << std::endl;
@@ -41 +41 @@
 bool visual_distortion::processCommandlineparameters()
 {
+        // Distortion files.
         arguments.getApplicationUsage()->addCommandLineOption("-C <channelname>","Setup the channel name, this is the preset for blendmap, distortionmap and camera configuration file.");
+    arguments.getApplicationUsage()->addCommandLineOption("--distortionmap","Set a distortion map file name.");
+    arguments.getApplicationUsage()->addCommandLineOption("--blendmap","Set a blend map file name.");
+
+        // Render implementation.
+        arguments.getApplicationUsage()->addCommandLineOption("--shaderDistortion","Use OpenGL shader for distortion and blending.");
         arguments.getApplicationUsage()->addCommandLineOption("--fbo","Use Frame Buffer Object for render to texture, where supported.");
     arguments.getApplicationUsage()->addCommandLineOption("--fb","Use FrameBuffer for render to texture.");
     arguments.getApplicationUsage()->addCommandLineOption("--pbuffer","Use Pixel Buffer for render to texture, where supported.");
     arguments.getApplicationUsage()->addCommandLineOption("--window","Use a seperate Window for render to texture.");
-    arguments.getApplicationUsage()->addCommandLineOption("--width","Set the width of the render to texture.");
-    arguments.getApplicationUsage()->addCommandLineOption("--height","Set the height of the render to texture.");
+
+        // Texture
+    arguments.getApplicationUsage()->addCommandLineOption("--width","Set the width of the render to texture.");         // used for all render implementations
+    arguments.getApplicationUsage()->addCommandLineOption("--height","Set the height of the render to texture.");       // used for all render implementations
+
+        // Texture Rectangle?
     arguments.getApplicationUsage()->addCommandLineOption("--texture-rectangle","Use osg::TextureRectangle for doing the render to texure to.");
-    arguments.getApplicationUsage()->addCommandLineOption("--distortionmap","Set a distortion map file name.");
-    arguments.getApplicationUsage()->addCommandLineOption("--blendmap","Set a blend map file name.");
-    arguments.getApplicationUsage()->addCommandLineOption("--shaderDistortion","Use OpenGL shader for distortion and blending.");
+
+        // HDR?
+    arguments.getApplicationUsage()->addCommandLineOption("--hdr","Render distortion as HDR.");
+
         arguments.getApplicationUsage()->addKeyboardMouseBinding("d", "Toggle Distortion.");
 
@@ -162 +173 @@
 {
         // Copy Main Camera's matrixes to the PRE_RENDER Camera.
-        std::cout << "distortion updatecallback" << std::endl;
+        //std::cout << "distortion updatecallback" << std::endl;
         sceneCamera->setViewMatrix( viewer->getCamera()->getViewMatrix() );
         sceneCamera->setProjectionMatrix( viewer->getCamera()->getProjectionMatrix() );
@@ -345 +356 @@
         camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
         camera->setViewMatrix(osg::Matrix::identity());
-        //camera->setProjectionMatrixAsOrtho2D(0,viewer->getCamera()->getViewport()->width(),0,viewer->getCamera()->getViewport()->height());
+        //sceneCamera->setProjectionMatrixAsOrtho2D(0,viewer->getCamera()->getViewport()->width(),0,viewer->getCamera()->getViewport()->height());
                 camera->setProjectionMatrixAsOrtho2D(0,1280,0,1024);
+                /** \todo: use screen size dynamically */
 
         // set the camera to render before the main camera.

osgVisual/src/vista2D/visual_vista2D.cpp

@@ -66 +66 @@
    // matrix. Positions described under this node will equate to
    // pixel coordinates.
-   vista2DProjectionMatrix->setMatrix(osg::Matrix::ortho2D(0,1600,0,900));
+   vista2DProjectionMatrix->setMatrix(osg::Matrix::ortho2D(0,1600,0,900)); /** todo: use screen size dynamically. */
   
    // For the HUD model view matrix use an identity matrix: