Changeset 1868

Timestamp:

04/13/03 15:26:41 (10 years ago)

Author:

robert

Message:

Added Geoff Michel's osgpick and osgUtil::PickVisitor? code.

Location:

OpenSceneGraph/trunk

Files:

• Make/makedefs (modified) (2 diffs)
• Make/makedirdefs (modified) (1 diff)
• VisualStudio/VisualStudio.dsw (modified) (1 diff)
• VisualStudio/examples/osgpick (added)
• VisualStudio/examples/osgpick/osgpick.dsp (added)
• doc/data.html (modified) (3 diffs)
• doc/install.html (modified) (1 diff)
• doc/introduction.html (modified) (11 diffs)
• doc/plan.html (modified) (3 diffs)
• examples/osgcameragroup/osgcameragroup.cpp (modified) (3 diffs)
• examples/osgpick (added)
• examples/osgpick/GNUmakefile (added)
• examples/osgpick/GNUmakefile.inst (added)
• examples/osgpick/osgpick.cpp (added)
• include/osgUtil/PickVisitor (added)
• src/osgUtil/GNUmakefile (modified) (1 diff)
• src/osgUtil/PickVisitor.cpp (added)

OpenSceneGraph/trunk/Make/makedefs

@@ -329 +329 @@
 ifeq ($(OS),Darwin)
   C++               = c++
-  INC               += 
+  INC               += -I/usr/X11R6/include
+  LDFLAGS           += -L/usr/X11R6/lib
   DEF               += -Wall -D__DARWIN_OSX__
   OPTF              = -O2
@@ -344 +345 @@
   CARBON_LIB        = -framework Carbon
   GL_LIBS           = -framework OpenGL $(CARBON_LIB)
-  X_LIBS            = 
+  X_LIBS            = -lX11 
   SOCKET_LIBS       = 
   OTHER_LIBS        = -lm -lstdc++ -lobjc

OpenSceneGraph/trunk/Make/makedirdefs

@@ -120 +120 @@
         osgoccluder\
         osgparticle\
+        osgpick\
         osgprerender\
         osgreflect\

OpenSceneGraph/trunk/VisualStudio/VisualStudio.dsw

@@ -1144 +1144 @@
 ###############################################################################
 
+Project: "Example osgpick"=.\examples\osgpick\osgpick.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Core osg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Core osgDB
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Core osgGA
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Core osgProducer
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Core osgUtil
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "Example osgwindows"=.\examples\osgwindows\osgwindows.dsp - Package Owner=<4>
 

OpenSceneGraph/trunk/doc/data.html

@@ -31 +31 @@
 
 <li>Open scene graph .osg demo data set can downloaded here:</li>
-<i><a href="http://www.openscenegraph.org/download/data/OpenSceneGraph-Data-0.9.1.tar.gz">http://www.openscenegraph.org/download/data/OpenSceneGraph-Data-0.9.1.tar.gz</a></i>
+<i><a href="http://www.openscenegraph.org/download/data/OpenSceneGraph-Data-0.9.4.tar.gz">http://www.openscenegraph.org/download/data/OpenSceneGraph-Data-0.9.4.tar.gz</a></i>
 
 <br>
@@ -41 +41 @@
 <br>
 <li>Terrain models in OpenFlight .flt format at Grime:</li>
-<a href="http://www.grime.net">http://www.grime.net</a>
+<a href="http://www.grime.net/Downloads/simulations.htm">http://www.grime.net</a>
 
 <br>
@@ -59 +59 @@
 
 
-<br>
-<br>
-<li>Vehicle models in OpenFlight .flt format at Full Sail (spinnercar & veritech):</li>
-<a href="http://www.fullsail.com/loader/models.html">http://www.fullsail.com/loader/models.html</a>
-
 </ul>
 

OpenSceneGraph/trunk/doc/install.html

@@ -37 +37 @@
 <u>Compiling and installing the OpenSceneGraph</u></h2>
 The scene graph depends upon Standard C++, STL and OpenGL so you need a
-C++ compiler up to the task and OpenGL or Mesa installed. The viewer depends
-upon Producer which you'll need to download and install from the Producer website.
-The OSG has it own native ascii file format, and .rgb image reader inbuilt
+C++ compiler up to the task and OpenGL or Mesa installed. The example applications depend
+upon Open Producer which you'll need to download and install from the Producer website.
+The OSG has it own native ascii file format, and .rgb image reader
 which allows you read the example data with any dependencies other than
 C++, STL and OpenGL.
-<p>The osgText library adds the dependency of the freetype library for
-support of true type fonts, however it is not essential to the core library,
-so you can comment it out from compilation by modifying the src/Makefile,
-and examples/Makefile. I you wish to use fonts then you can download freetype
-from www.freetype.org. The osgText library also requires an up to date
-GLU implementation which supports GLU1.2 tessellation routines. If you
-your current GLU is out of date you'll need to download the latest, for
-instance the sgi's sample implementation for GLU from the www.opengl.org
-website.
 <p>The OSG also has a set of plug-ins which support non-native 3d database
 and image formats, several have no dependencies on external libraries (flt,3ds,obj,

OpenSceneGraph/trunk/doc/introduction.html

@@ -72 +72 @@
 <u>Why use a Scene Graph - Performance, Productivity, Portability and Scalability</u>.</h3>
 
-<ol><i>Performance</i> - scene graphs provide an excellent framework for
+<ol><b><i>Performance</i></b> - scene graphs provide an excellent framework for
 maximizing graphics performance. A good scene graph employs two key techniques
 - culling of the objects that won't be seen on screen, and state sorting
@@ -84 +84 @@
 througput. As GPU's get faster and faster, the cost of stalling the graphics
 is also going up, so scene graphs are becoming ever more important.
-<p><i>Productivity</i> - scene graphs take away much of the hard work required
+<p><b><i>Productivity</i></b> - scene graphs take away much of the hard work required
 to develop high performance graphics applications. The scene graph manages
 all the graphics for you, reducing what would be thousands of lines of
@@ -97 +97 @@
 very little coding. A dozen lines of code can be enough to load your data
 and create an interactive viewer!
-<p><i>Portability</i> - scene graphs encapsulate much of the lower level
+<p><b><i>Portability</i></b> - scene graphs encapsulate much of the lower level
 tasks of rendering graphics and reading and writing data, reducing or even
 eradicating the platform specific coding that you require in your own application.
 If the underlying scene graph is portable then moving from platform to
 platform can be as simple as recompiling your source code.
-<p><i>Scalability</i> - along with being able to dynamic manage the complexity
+<p><b><i>Scalability</i></b> - along with being able to dynamic manage the complexity
 of scenes automatically to account for differences in graphics performance
 across a range of machines, scene graphs also make it much easier to manage
@@ -124 +124 @@
 the four key benefits of scene graph technology outlined above using the
 following features:
-<ol><i>Performance</i> - supports view frustum culling, occlusion culling, small feature culling,
+<ol><b><i>Performance</i></b> - supports view frustum culling, occlusion culling, small feature culling,
 Level Of Detail (LOD) nodes, state sorting, vertex arrays and display
 lists as part of the core scene graph. These together make the OpenSceneGraph
@@ -135 +135 @@
 be found at Vterrain.org and TerrainEngine.com, both of which integrate
 with the OpenSceneGraph.
-<p><i>Productivity</i> - by combining lessons learned from established
+<p><b><i>Productivity</i></b> - by combining lessons learned from established
 scene graphs like Performer and Open Inventor, with modern software engineering
 boosts like Design Patterns, along with a great deal of feedback early on
@@ -144 +144 @@
 graph and viewers and a wide range of loaders it is possible to create
 an application and bring in user data with a very small amount of code.
-<p><i>Portability</i> - The core scene graph has also been designed to
+<p><b><i>Portability</i></b> - The core scene graph has also been designed to
 have minimal dependency on any specific platform, requiring little more than
 Standard C++ and OpenGL. This has allowed the scene graph to be rapidly
@@ -155 +155 @@
 written on top of Qt, MFC, WxWindows and SDL. Users have also integrated it
 with Motif, and X.
-<p><i>Scalability</i> - the scene graph will not only run on portables all
+<p><b><i>Scalability</i></b> - the scene graph will not only run on portables all
 the way up to Onyx Infinite Reality Monsters, it supports the multiple
 graphics subsystems found on machines like a mulitpipe Onyx. This is
@@ -163 +163 @@
 scene graph almost entirely as a read-only operation. This allows multiple
 cull-draw pairs to run on multiple CPU's which are bound to multiple graphics
-subsystems. This has been demonstrated using the OpenSceneGraph in conjunction
-with SGI's OpenGL multipipe SDK. We also have osgMP in development, which
-will be cross platform and will transparently support multiple multipipe systems
-like the Onyx and graphics clusters</ol>
+subsystems. Support for multiple graphic context and multi-threading is all
+available out of the box via osgProducer - all the examples in the distribution
+can run multi-pipe just by use a simple configuation file.</ol>
+
 All the source to the OSG is published under the GNU Lesser General Public License
 (LGPL) which allows both open source and closed source projects to use,
@@ -181 +181 @@
 to appreciate.
 <p>The project is currently in beta, which means the main core features are now in
-place, with a 1.0 release in fall 2002. Despite the beta development status,
+place, with a 1.0 release in second half of 2003. Despite the beta development status,
 the project has already earned the reputation the leading open source scene
 graph, and is establishing itself as a viable alternative to the commercial
@@ -212 +212 @@
 OpenSceneGraph depend upon, such as Producer. Check the <a href="dependencies.html">dependencies</a>
 list for further details.
-<p>For full instructions of how to run the demos read the <a href="examples.html">demos</a>
+<p>For full instructions of how to run the examples read the <a href="examples.html">examples</a>
 page.
 <br>
@@ -219 +219 @@
 <u>Learning how to use the OpenSceneGraph</u></h3>
 The OpenSceneGraph distribution comes with a reference guide for each of
-the component libraries - osg, osgDB, osgUtil, osgText, osgParticle and osgProducer, a set
-of demos - the source of which can be found in examples. For questions
+the component libraries - osg, osgDB, osgUtil, osgText, osgSim, osgParticle and osgProducer, a set
+of examples - the source of which can be found in examples. For questions
 or help which can't be easily be answered by the reference guide and demo
 source, one should join the mailing list (details below). There are also

OpenSceneGraph/trunk/doc/plan.html

@@ -38 +38 @@
 Now we have reached the beta phase (0.9.x) of OpenScenegGraph project,
 and are now working towards the full 1.0 release, with a likely 
-release date in fall 2002.
+release date in second half of 2003.
 
 <h3>
@@ -46 +46 @@
 
 <li>
-Multi-pass fallback for when multi-texturing is not supported.</li>
+StateSet composite structure for managing multi-pass effects and alternate rendering implemations.  
+This will allow one to manage the use of extensions and provide effecient fallback rendering paths.</li>
 
 <li>
@@ -53 +54 @@
 
 <li>
-Open Producer - cross platform library for transparently managing mulitpipe and
-cluster graphics systems. Similar in concept to OpenGL multipipe SDK, except
-cross platform and with support of graphics clusters.</li>
+Support for clustering in Open Producer and osgProducer.</li>
 
 <li>
-osgSim - cross platform library for the visual simulation market with support for light points,
-small target anti-aliasing, geometry correction and clip mapping.</li>
+Enhance osgDB and plugins to allow them to be used with alternate input streams.  Add support for native binary 
+file format for rapid loading and saving of scene graphs.
+</li>
 
 <li>
-Replace osgProducer with Open Producer for the demos.  Open Producer is a much cleaner and more scalable
-windowing API. Move osgProducer out of the distribution and into the bazaar.</li>
+Development of virtual texture support for rendering in real-time massive images, such as whole earth textures.</li>
 
 <li>
-Introduce a new library osgEnv/osgShapes, which adds support for creating
-shapes and environmental effects such as stars, planets, cloud layers and
+Introduce a new library osgEnvironment, which adds support for creating
+shapes and environmental effects such as stars, planets, cloud layers, oceans and
 ground planes.</li>
 

OpenSceneGraph/trunk/examples/osgcameragroup/osgcameragroup.cpp

@@ -148 +148 @@
 
     Producer::Trackball tb;
-    tb.setOrientation( Producer::Trackball::Y_UP );
+    tb.setOrientation( Producer::Trackball::Z_UP );
 
     // create the windows and run the threads.
@@ -157 +157 @@
     while( !kbmcb.done() )
     {
-        // syncronize to screen refresh.
+        // syncronize to the when cull and draw threads have completed.
         cg.sync();
 
@@ -172 +172 @@
         cg.frame();
     }
+
+    // syncronize to the when cull and draw threads have completed.
+    cg.sync();
+
     return 0;
 }

OpenSceneGraph/trunk/src/osgUtil/GNUmakefile

@@ -10 +10 @@
         InsertImpostorsVisitor.cpp\
         IntersectVisitor.cpp\
+        PickVisitor.cpp\
         Optimizer.cpp\
         RenderBin.cpp\