Changeset 6981

Timestamp:

06/14/07 22:58:43

Author:

robert

Message:

Included shaders directly into source, added support for toggle lighting on/off

Files:

• OpenSceneGraph/trunk/src/osgSim/OverlayNode.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/src/osgSim/OverlayNode.cpp

@@ -975 +975 @@
-    }
-
-
-
-
-
-
-
-
-
-
+
+
-
-    if (!overlayData._overlayStateSet) 
-    {
-        overlayData._overlayStateSet = new osg::StateSet;
-exponent_scale
-exponent_offset
+y0
+lightingEnabled
-
-        osg::Program* program = new osg::Program;
@@ -1000 +993 @@
-            program->addShader(osg::Shader::readShaderFile(osg::Shader::VERTEX, vertexShaderFile));
-        }
-#if 0
-        else
-        {
-            char vertexShaderSource[] = 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            osg::Shader* vertex_shader = new osg::Shader(osg::Shader::VERTEX, vertexShaderSource);
-            program->addShader(vertex_shader);
-        }
-#endif        
-        
-    }
@@ -1035 +1090 @@
-            overlayData._mainSubgraphProgram->addShader(osg::Shader::readShaderFile(osg::Shader::FRAGMENT, fragmentShaderFile));
-        }
+        else
+        {
+            char fragmentShaderSource[] = 
+                "uniform sampler2D texture_0; \n"
+                "uniform sampler2D texture_1; \n"
+                " \n"
+                "uniform float y0; \n"
+                " \n"
+                "vec2 warp(in vec2 source) \n"
+                "{ \n"
+                "    float inv_divisor = 1.0 / (source.y + y0); \n"
+                "    return vec2(source.x * (1.0 + y0 ) * inv_divisor , (source.y * y0 + 1.0 ) * inv_divisor); \n"
+                "} \n"
+                " \n"
+                "void main() \n"
+                "{ \n"
+                "    vec2 coord = gl_TexCoord[1].xy; \n"
+                "    coord.x = coord.x*2.0 - 1.0; \n"
+                "    coord.y = coord.y*2.0 - 1.0; \n"
+                " \n"
+                "    vec2 warped = warp(coord); \n"
+                "    warped.x = (warped.x + 1.0)*0.5; \n"
+                "    warped.y = (warped.y + 1.0)*0.5; \n"
+                " \n"
+                "    vec4 base_color = texture2D(texture_0, gl_TexCoord[0].xy); \n"
+                "    vec4 overlay_color = texture2D(texture_1, warped ); \n"
+                "    vec3 mixed_color = mix(base_color.rgb, overlay_color.rgb, overlay_color.a); \n"
+                "    gl_FragColor = vec4(mixed_color, base_color.a); \n"
+                "} \n";
+
+            osg::Shader* fragment_shader = new osg::Shader(osg::Shader::FRAGMENT, fragmentShaderSource);
+            overlayData._mainSubgraphProgram->addShader(fragment_shader);
+        }
-    }
-
@@ -1041 +1129 @@
-        overlayData._mainSubgraphStateSet = new osg::StateSet;
-
-
-
+
-        overlayData._mainSubgraphStateSet->addUniform(new osg::Uniform("texture_0",0));
-        overlayData._mainSubgraphStateSet->addUniform(new osg::Uniform("texture_1",1));
@@ -1451 +1538 @@
-        double mid_side = (min_side + max_side) * 0.5;
-        double ratio = min_distanceEye / max_distanceEye;
-
-
-
+
-
-        if (usePerspectiveShaders)
@@ -1460 +1545 @@
-            double original_width = max_side-min_side;
-
-
+02
-            if (ratio<minRatio) ratio = minRatio;
-        
-            osg::notify(osg::NOTICE)<<" new ratio = "<<ratio<<std::endl;
-
-            double base_up = min_up - (max_up - min_up) * ratio / (1.0 - ratio);
@@ -1474 +1557 @@
-                if (side_over_up > max_side_over_up) max_side_over_up = side_over_up;
-            }
-            
-            double max_half_width = max_side_over_up*(max_up - base_up);
-            min_side = mid_side - max_half_width;
-            max_side = mid_side + max_half_width;
-            
-            double new_width = max_side-min_side;
-#if 0            
-            osg::notify(osg::NOTICE)<<"  width ratio  = "<<new_width/original_width<<std::endl;
-            osg::notify(osg::NOTICE)<<"  near ratio  = "<<ratio * new_width/original_width<<std::endl;
-            osg::notify(osg::NOTICE)<<"  angle  = "<<2.0*osg::RadiansToDegrees(atan(max_side_over_up))<<std::endl;
-#endif        
-            osg::Vec3d v000 = osg::Vec3d(-1.0, -1.0, -1.0) * inverseMVP; 
-            osg::Vec3d v010 = osg::Vec3d(-1.0, 1.0, -1.0) * inverseMVP; 
@@ -1505 +1577 @@
-            edgeTopRight.normalize();
-            
+           
+            double frustumDiagonal = osg::RadiansToDegrees(acos(edgeBottomLeft * edgeBottomRight));
-            
-            
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-
-
+
+
+
+
+
-            
-
-
-
+
+
-        
-            overlayData._mainSubgraphStateSet->setAttribute(overlayData._mainSubgraphProgram.get());
@@ -1579 +1686 @@
-        unsigned int contextID = cv->getState()!=0 ? cv->getState()->getContextID() : 0;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        // if we need to redraw then do cull traversal on camera.