Changeset 6960

Timestamp:

06/13/07 16:05:21

Author:

robert

Message:

Wired up new shaders

Files:

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

OpenSceneGraph/trunk/src/osgSim/OverlayNode.cpp

@@ -995 +995 @@
-
-        // get shaders from source
-overlay
+shaders/overlay_perspective_rtt
-        if (!vertexShaderFile.empty())
-        {
@@ -1024 +1024 @@
-
-        // get shaders from source
-mainsubgraph
+shaders/overlay_perspective_main
-        if (!vertexShaderFile.empty())
-        {
@@ -1030 +1030 @@
-        }
-
-mainsubgraph
+shaders/overlay_perspective_main
-        if (!fragmentShaderFile.empty())
-        {
@@ -1457 +1457 @@
-        if (usePerspectiveShaders)
-        {
-
+//
-            double original_width = max_side-min_side;
-
@@ -1463 +1463 @@
-            if (ratio<minRatio) ratio = minRatio;
-        
-
+//
-
-            double base_up = min_up - (max_up - min_up) * ratio / (1.0 - ratio);
@@ -1480 +1480 @@
-            
-            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; 
@@ -1507 +1508 @@
-            
-            double frustumDiagonal = osg::RadiansToDegrees(acos(edgeBottomLeft * edgeBottomRight));
+#if 0            
-            osg::notify(osg::NOTICE)<<"  frustum base angle  = "<<frustumDiagonal<<std::endl;
-
+#endif
-        
-            double y0 = -(1.0+ratio)/(1.0-ratio); // suspect