Changeset 147

Timestamp:

Nov 7, 2010, 6:23:54 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• resources/distortion/shader.frag (added)
• resources/distortion/shader.vert (added)
• src/distortion/visual_distortion.cpp (modified) (5 diffs)

osgVisual/bin/osgVisualConfig.xml

@@ -2 +2 @@
 <osgvisualconfiguration>
   <module name="distortion" enabled="yes">
-    <distortion channelname="center"></distortion>
+    <!-- XML configuration of the module "distortion"
+      channelname = name of he channel, used to load the distortion- and blendmaps
+      renderimplementation = technique to distort.
+      Available options: 
+          fbo : renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT
+          pbuffer : renderImplementation = osg::Camera::PIXEL_BUFFER
+          pbuffer-rtt :  renderImplementation = osg::Camera::PIXEL_BUFFER_RTT
+          fb : renderImplementation = osg::Camera::FRAME_BUFFER
+          window : renderImplementation = osg::Camera::SEPERATE_WINDOW
+    -->
+    <distortion channelname="center" renderimplemmentation="fbo" hdr="yes">
+      <!-- optional: <distortionmap filename="distmap.png"></distortionmap> -->
+      <!-- optional: <blendmap filename="blendmap.png"></blendmap> -->
+  </distortion>
   </module>
   <module name="sky_silverlining" enabled="yes"></module>

osgVisual/src/distortion/visual_distortion.cpp

@@ -63 +63 @@
     arguments.getApplicationUsage()->addCommandLineOption("--hdr","Render distortion as HDR.");
 
-        arguments.getApplicationUsage()->addKeyboardMouseBinding("d", "Toggle Distortion.");
-
         // Read out Distortion CMDLine arguments
-        tex_width = 2048;
-    tex_height = 2048;
-    while (arguments.read("--width", tex_width)) {}
+        while (arguments.read("--width", tex_width)) {}
     while (arguments.read("--height", tex_height)) {}
 
-        renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT;
-
-    while (arguments.read("--fbo")) { renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT; }
+        while (arguments.read("--fbo")) { renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT; }
     while (arguments.read("--pbuffer")) { renderImplementation = osg::Camera::PIXEL_BUFFER; }
     while (arguments.read("--pbuffer-rtt")) { renderImplementation = osg::Camera::PIXEL_BUFFER_RTT; }
@@ -79 +73 @@
     while (arguments.read("--window")) { renderImplementation = osg::Camera::SEPERATE_WINDOW; }
 
-    useTextureRectangle = false;
     while (arguments.read("--texture-rectangle")) { useTextureRectangle = true; }
-        useShaderDistortion = false;
+
     while (arguments.read("--shaderDistortion")) { useShaderDistortion = true; }
-    useHDR = false; 
+
     while (arguments.read("--hdr")) { useHDR = true; }
 
-        distortMapFileName = "..\\resources\\distortion\\distort_distDisabled.bmp";
-    while (arguments.read("--distortionmap", distortMapFileName)) { }
-        blendMapFileName = "..\\resources\\distortion\\blend_distDisabled.bmp";
+        while (arguments.read("--distortionmap", distortMapFileName)) { }
     while (arguments.read("--blendmap", blendMapFileName)) { }
 
@@ -127 +118 @@
         OSG_NOTIFY (osg::ALWAYS ) << "visual_distortion initialize..." << std::endl;
 
+        // Initialize variables:
+        tex_width = 2048;
+    tex_height = 2048;
+        renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT;
+        useTextureRectangle = false;
+        useShaderDistortion = false;
+        useHDR = false; 
+        distortMapFileName = "..\\resources\\distortion\\distort_distDisabled.bmp";
+        blendMapFileName = "..\\resources\\distortion\\blend_distDisabled.bmp";
+
+
+
+
         // Process Commandline arguments:
         processCommandlineparameters();
@@ -134 +138 @@
 
         // add the keyboard handler for toggle distortion
+        arguments.getApplicationUsage()->addKeyboardMouseBinding("d", "Toggle Distortion.");
         kBEventHandler = new ToggleDistortionKBEventHandler( this );
         viewer->addEventHandler( kBEventHandler );
@@ -379 +384 @@
             osg::Shader* distortFragObj = new osg::Shader( osg::Shader::FRAGMENT );
 
-            if (loadShaderSource( distortVertObj, "shader.vert" ) &&
-                loadShaderSource( distortFragObj, "shader.frag" ) &&
+            if (loadShaderSource( distortVertObj, "../resources/distortion/shader.vert" ) &&
+                loadShaderSource( distortFragObj, "../resources/distortion/shader.frag" ) &&
                 distortMapTexture)
             {