Changeset 3984 for OpenSceneGraph/trunk/examples/osgshaders/osgshaders.cpp

Timestamp:

04/07/05 22:20:09 (8 years ago)

Author:

robert

Message:

From Mike Weiblen, ported osgshaders example from osgGL2 to core osg based.

Files:

• OpenSceneGraph/trunk/examples/osgshaders/osgshaders.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/examples/osgshaders/osgshaders.cpp

@@ -1 +1 @@
 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield 
- * Copyright (C) 2003 3Dlabs Inc. Ltd.
+ * Copyright (C) 2003-2005 3Dlabs Inc. Ltd.
  *
  * This application is open source and may be redistributed and/or modified   
@@ -11 +11 @@
 */
 
-/* file:        examples/osgshaders/osgshaders.cpp
- * author:      Mike Weiblen 2003-09-18
+/* file:        examples/osgglsl/osgshaders.cpp
+ * author:      Mike Weiblen 2005-04-05
  *
- * A demo of the OpenGL Shading Language shaders using osgGL2.
+ * A demo of the OpenGL Shading Language shaders using core OSG.
  *
  * See http://www.3dlabs.com/opengl2/ for more information regarding
@@ -26 +26 @@
 #include <osgUtil/Optimizer>
 #include <osgProducer/Viewer>
-#include <osgGL2/Version>
 
 #include "GL2Scene.h"
@@ -72 +71 @@
     args.getApplicationUsage()->setApplicationName(args.getApplicationName());
     args.getApplicationUsage()->setDescription(args.getApplicationName() +
-            " demonstrates the OpenGL Shading Language using osgGL2");
+            " demonstrates the OpenGL Shading Language using core OSG");
     args.getApplicationUsage()->setCommandLineUsage(args.getApplicationName());
     args.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
@@ -99 +98 @@
 
     // create the scene
-    osg::notify(osg::NOTICE) << "osgGL2 version " << osgGL2GetVersion() << std::endl;
     GL2ScenePtr gl2Scene = new GL2Scene;