Changeset 11355

Timestamp:

04/21/10 18:37:28 (3 years ago)

Author:

robert

Message:

From Mourad Boufarguine, "When compiling the example on VS9, the compiler complain about undefined GL_DEPTH_COMPONENT32F and GL_DEPTH_COMPONENT32F_NV. So I added them to include/osg/FrameBufferObject. The example builds fine and is working for me without crashs unless it is ran whithout argument. I added couple of lines to check for arguments number and print the example usage when needed."

Location:

OpenSceneGraph/trunk

Files:

• examples/osgfpdepth/osgfpdepth.cpp (modified) (2 diffs)
• include/osg/FrameBufferObject (modified) (1 diff)

OpenSceneGraph/trunk/examples/osgfpdepth/osgfpdepth.cpp

@@ -918 +918 @@
     // use an ArgumentParser object to manage the program arguments.
     ArgumentParser arguments(&argc,argv);
-    arguments.getApplicationUsage()
-        ->setDescription(arguments.getApplicationName()
+    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()
                          + " demonstrates using a floating point depth buffer.\nThe user can invert the depth buffer range and choose among available multi-sample configurations.");
-    arguments.getApplicationUsage()
-        ->addCommandLineOption("--far <number>", "Set far plane value");
+    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
+    arguments.getApplicationUsage()->addCommandLineOption("--far <number>", "Set far plane value");
     // if user request help write it out to cout.
     if (arguments.read("-h") || arguments.read("--help"))
@@ -949 +948 @@
     width = traits->width;
     height = traits->height;
+    if (arguments.argc()<=1)
+    {
+        arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
+        return 1;
+    }
     ref_ptr<Node> loadedModel = osgDB::readNodeFiles(arguments);
     if (!loadedModel) {

OpenSceneGraph/trunk/include/osg/FrameBufferObject

@@ -119 +119 @@
 #endif
 
+#ifndef GL_DEPTH_COMPONENT32F
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#endif
+
+#ifndef GL_DEPTH_COMPONENT32F_NV
+#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
+#endif
+
 #ifndef GL_EXT_packed_depth_stencil
 #define GL_EXT_packed_depth_stencil 1