Changeset 8829

Timestamp:

09/04/08 00:55:49 (10 months ago)

Author:

jeremymoles

Message:

Merging osgWidget-dev branch with OSG trunk.

Location:

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev

Files:

• AUTHORS.txt (modified) (15 diffs)
• CMakeLists.txt (modified) (7 diffs)
• ChangeLog (modified) (1 diff)
• NEWS.txt (modified) (3 diffs)
• README.txt (modified) (3 diffs)
• applications/osgversion/osgversion.cpp (modified) (9 diffs)
• doc/Doxyfiles/auto_Doxyfile (modified) (1 diff)
• doc/Doxyfiles/core_Doxyfile (modified) (1 diff)
• doc/Doxyfiles/doxyfile.cmake (modified) (41 diffs)
• examples/osgimagesequence/osgimagesequence.cpp (modified) (4 diffs)
• examples/osgmovie/osgmovie.cpp (modified) (3 diffs)
• examples/osgviewerGTK/osgviewerGTK.cpp (modified) (2 diffs)
• examples/osgvolume/osgvolume.cpp (modified) (30 diffs)
• examples/osgwidgetcanvas/osgwidgetcanvas.cpp (modified) (1 diff)
• genwrapper.conf (deleted)
• include/osg/AnimationPath (modified) (1 diff)
• include/osg/AutoTransform (modified) (6 diffs)
• include/osg/Camera (modified) (1 diff)
• include/osg/FrameBufferObject (modified) (1 diff)
• include/osg/GLExtensions (modified) (2 diffs)
• include/osg/ImageSequence (modified) (4 diffs)
• include/osg/ImageStream (modified) (1 diff)
• include/osg/PagedLOD (modified) (3 diffs)
• include/osg/ShapeDrawable (modified) (1 diff)
• include/osg/Texture3D (modified) (1 diff)
• include/osg/Version (modified) (1 diff)
• include/osgDB/DatabasePager (modified) (5 diffs)
• include/osgDB/ImagePager (modified) (2 diffs)
• include/osgFX/Export (modified) (1 diff)
• include/osgIntrospection/Export (modified) (1 diff)
• include/osgManipulator/Export (modified) (1 diff)
• include/osgParticle/Export (modified) (1 diff)
• include/osgShadow/Export (modified) (1 diff)
• include/osgShadow/ParallelSplitShadowMap (modified) (9 diffs)
• include/osgSim/Export (modified) (1 diff)
• include/osgSim/ShapeAttribute (modified) (3 diffs)
• include/osgTerrain/Export (modified) (1 diff)
• include/osgTerrain/Layer (modified) (5 diffs)
• include/osgText/Export (modified) (1 diff)
• include/osgUtil/CullVisitor (modified) (1 diff)
• include/osgUtil/IntersectionVisitor (modified) (3 diffs)
• include/osgUtil/Optimizer (modified) (1 diff)
• include/osgViewer/GraphicsWindow (modified) (2 diffs)
• include/osgViewer/api/Win32/GraphicsWindowWin32 (modified) (2 diffs)
• include/osgViewer/api/X11/GraphicsWindowX11 (modified) (1 diff)
• include/osgWidget/EventInterface (modified) (1 diff)
• include/osgWidget/Export (modified) (1 diff)
• include/osgWidget/StyleInterface (modified) (1 diff)
• include/osgWidget/StyleManager (modified) (4 diffs)
• include/osgWidget/Window (modified) (4 diffs)
• packaging/pkgconfig/openscenegraph.pc (modified) (1 diff)
• src/OpenThreads/win32/Win32ConditionPrivateData.h (modified) (1 diff)
• src/OpenThreads/win32/Win32Thread.cpp (modified) (1 diff)
• src/osg/AutoTransform.cpp (modified) (9 diffs)
• src/osg/ClipNode.cpp (modified) (3 diffs)
• src/osg/ImageSequence.cpp (modified) (11 diffs)
• src/osg/KdTree.cpp (modified) (3 diffs)
• src/osg/LightSource.cpp (modified) (2 diffs)
• src/osg/Notify.cpp (modified) (1 diff)
• src/osg/OcclusionQueryNode.cpp (modified) (1 diff)
• src/osg/PagedLOD.cpp (modified) (7 diffs)
• src/osg/TexGenNode.cpp (modified) (3 diffs)
• src/osg/Texture3D.cpp (modified) (2 diffs)
• src/osgDB/DatabasePager.cpp (modified) (8 diffs)
• src/osgDB/ImagePager.cpp (modified) (1 diff)
• src/osgDB/Registry.cpp (modified) (2 diffs)
• src/osgGA/TerrainManipulator.cpp (modified) (1 diff)
• src/osgParticle/PrecipitationEffect.cpp (modified) (1 diff)
• src/osgPlugins/CMakeLists.txt (modified) (1 diff)
• src/osgPlugins/OpenFlight/FltExportVisitor.cpp (modified) (1 diff)
• src/osgPlugins/dicom (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/dicom)
• src/osgPlugins/dicom/CMakeLists.txt (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/dicom/CMakeLists.txt)
• src/osgPlugins/dicom/ReaderWriterDICOM.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/dicom/ReaderWriterDICOM.cpp)
• src/osgPlugins/ive/AnisotropicLighting.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/AnisotropicLighting.cpp)
• src/osgPlugins/ive/AnisotropicLighting.h (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/AnisotropicLighting.h)
• src/osgPlugins/ive/AutoTransform.cpp (modified) (2 diffs)
• src/osgPlugins/ive/BlendEquation.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/BlendEquation.cpp)
• src/osgPlugins/ive/BlendEquation.h (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/BlendEquation.h)
• src/osgPlugins/ive/BumpMapping.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/BumpMapping.cpp)
• src/osgPlugins/ive/BumpMapping.h (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/BumpMapping.h)
• src/osgPlugins/ive/CMakeLists.txt (modified) (8 diffs)
• src/osgPlugins/ive/Cartoon.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/Cartoon.cpp)
• src/osgPlugins/ive/Cartoon.h (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/Cartoon.h)
• src/osgPlugins/ive/CompositeLayer.cpp (modified) (1 diff)
• src/osgPlugins/ive/DataInputStream.cpp (modified) (65 diffs)
• src/osgPlugins/ive/DataInputStream.h (modified) (1 diff)
• src/osgPlugins/ive/DataOutputStream.cpp (modified) (63 diffs)
• src/osgPlugins/ive/DataOutputStream.h (modified) (1 diff)
• src/osgPlugins/ive/Effect.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/Effect.cpp)
• src/osgPlugins/ive/Effect.h (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/Effect.h)
• src/osgPlugins/ive/ImageSequence.cpp (modified) (2 diffs)
• src/osgPlugins/ive/IveVersion.h (modified) (1 diff)
• src/osgPlugins/ive/Layer.cpp (modified) (3 diffs)
• src/osgPlugins/ive/Object.cpp (modified) (2 diffs)
• src/osgPlugins/ive/Program.cpp (modified) (2 diffs)
• src/osgPlugins/ive/ReadWrite.h (modified) (3 diffs)
• src/osgPlugins/ive/Scribe.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/Scribe.cpp)
• src/osgPlugins/ive/Scribe.h (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/Scribe.h)
• src/osgPlugins/ive/ShapeAttributeList.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/ShapeAttributeList.cpp)
• src/osgPlugins/ive/ShapeAttributeList.h (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/ShapeAttributeList.h)
• src/osgPlugins/ive/SpecularHighlights.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/SpecularHighlights.cpp)
• src/osgPlugins/ive/SpecularHighlights.h (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/SpecularHighlights.h)
• src/osgPlugins/ive/SwitchLayer.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/SwitchLayer.cpp)
• src/osgPlugins/ive/SwitchLayer.h (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/ive/SwitchLayer.h)
• src/osgPlugins/osg/AutoTransform.cpp (modified) (2 diffs)
• src/osgPlugins/osg/BlendEquation.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/osg/BlendEquation.cpp)
• src/osgPlugins/osg/CMakeLists.txt (modified) (2 diffs)
• src/osgPlugins/osg/ImageSequence.cpp (modified) (2 diffs)
• src/osgPlugins/osg/Program.cpp (modified) (3 diffs)
• src/osgPlugins/osg/StateAttribute.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/osg/StateAttribute.cpp)
• src/osgPlugins/osg/StateSet.cpp (modified) (2 diffs)
• src/osgPlugins/osg/Uniform.cpp (modified) (2 diffs)
• src/osgPlugins/osgTerrain/CMakeLists.txt (modified) (1 diff)
• src/osgPlugins/osgTerrain/CompositeLayer.cpp (modified) (3 diffs)
• src/osgPlugins/osgTerrain/HeightFieldLayer.cpp (modified) (2 diffs)
• src/osgPlugins/osgTerrain/ImageLayer.cpp (modified) (2 diffs)
• src/osgPlugins/osgTerrain/SwitchLayer.cpp (copied) (copied from OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/SwitchLayer.cpp)
• src/osgPlugins/quicktime/MovieData.cpp (modified) (2 diffs)
• src/osgPlugins/quicktime/MovieData.h (modified) (1 diff)
• src/osgPlugins/quicktime/QTImportExport.cpp (modified) (8 diffs)
• src/osgPlugins/quicktime/QTUtils.cpp (modified) (3 diffs)
• src/osgPlugins/quicktime/QTUtils.h (modified) (1 diff)
• src/osgPlugins/xine/ReaderWriterXine.cpp (modified) (2 diffs)
• src/osgShadow/ParallelSplitShadowMap.cpp (modified) (32 diffs)
• src/osgSim/OverlayNode.cpp (modified) (1 diff)
• src/osgTerrain/Layer.cpp (modified) (3 diffs)
• src/osgText/TextBase.cpp (modified) (3 diffs)
• src/osgUtil/IntersectionVisitor.cpp (modified) (4 diffs)
• src/osgUtil/LineSegmentIntersector.cpp (modified) (5 diffs)
• src/osgUtil/Optimizer.cpp (modified) (1 diff)
• src/osgUtil/RenderStage.cpp (modified) (1 diff)
• src/osgUtil/SceneView.cpp (modified) (8 diffs)
• src/osgViewer/CMakeLists.txt (modified) (3 diffs)
• src/osgViewer/CompositeViewer.cpp (modified) (2 diffs)
• src/osgViewer/GraphicsWindowWin32.cpp (modified) (7 diffs)
• src/osgViewer/GraphicsWindowX11.cpp (modified) (2 diffs)
• src/osgViewer/Viewer.cpp (modified) (2 diffs)
• src/osgViewer/ViewerEventHandlers.cpp (modified) (1 diff)
• src/osgWidget/Box.cpp (modified) (1 diff)
• src/osgWidget/Canvas.cpp (modified) (1 diff)
• src/osgWidget/Frame.cpp (modified) (1 diff)
• src/osgWidget/Input.cpp (modified) (2 diffs)
• src/osgWidget/Label.cpp (modified) (3 diffs)
• src/osgWidget/Lua.cpp (modified) (1 diff)
• src/osgWidget/Python.cpp (modified) (1 diff)
• src/osgWidget/StyleManager.cpp (modified) (3 diffs)
• src/osgWidget/Table.cpp (modified) (1 diff)
• src/osgWidget/Util.cpp (modified) (3 diffs)
• src/osgWidget/Version.cpp (modified) (1 diff)
• src/osgWidget/ViewerEventHandlers.cpp (modified) (4 diffs)
• src/osgWidget/Widget.cpp (modified) (3 diffs)
• src/osgWidget/Window.cpp (modified) (9 diffs)
• src/osgWidget/WindowManager.cpp (modified) (6 diffs)
• src/osgWrappers/Doxyfile.template (copied) (copied from OpenSceneGraph/trunk/src/osgWrappers/Doxyfile.template)
• src/osgWrappers/genwrapper.conf (copied) (copied from OpenSceneGraph/trunk/src/osgWrappers/genwrapper.conf)
• src/osgWrappers/osg/AutoTransform.cpp (modified) (5 diffs)
• src/osgWrappers/osg/ImageSequence.cpp (modified) (4 diffs)
• src/osgWrappers/osg/ImageStream.cpp (modified) (1 diff)
• src/osgWrappers/osg/PagedLOD.cpp (modified) (4 diffs)
• src/osgWrappers/osgDB/DatabasePager.cpp (modified) (4 diffs)
• src/osgWrappers/osgDB/ImagePager.cpp (modified) (1 diff)
• src/osgWrappers/osgSim/ShapeAttribute.cpp (modified) (4 diffs)
• src/osgWrappers/osgTerrain/Layer.cpp (modified) (8 diffs)
• src/osgWrappers/osgUtil/IntersectionVisitor.cpp (modified) (5 diffs)
• src/osgWrappers/osgViewer/GraphicsWindow.cpp (modified) (2 diffs)
• src/osgWrappers/osgWidget/StyleManager.cpp (modified) (2 diffs)
• src/osgWrappers/osgWidget/Window.cpp (modified) (1 diff)

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/AUTHORS.txt

@@ -1 @@
-OpenSceneGraph Library 2.6.0
+OpenSceneGraph Library 2.7.1
 
-323 Contributors:
+330 Contributors:
 
 Firstname Surname
@@ -49 +49 @@
 Chris Hanson
 Adrian Egli
+Sherman Wilcox
 Per Fahlberg
+Jason Beverage
 J.P. Delport
 David Spilling
-Sherman Wilcox
+Philip Lowman
 Melchior Franz
+Joakim Simonsson
 Joran Jessurun
-Joakim Simonsson
-Jason Beverage
-Philip Lowman
 Jason Daly
 Frederic Marmond
@@ -64 +64 @@
 Yefei He
 Terry Welsh
+Stephane Lamoliatte
 Sondra Iverson
 Serge Lages
@@ -73 +74 @@
 Ben Discoe
 Andreas Ekstrand
-Stephane Lamoliatte
 Sasa Bistrovic
 Martin Naylor
@@ -110 +110 @@
 Roland Smeenk
 Paul de Repentigny
+Liang Aibin
 Leandro Motta Barros
 John Kelso
@@ -136 +137 @@
 Garrett Potts
 Gabor Dorka
+Doug McCorkle
 Donn Mielcarek
 Donald Cipperly
@@ -175 +177 @@
 Igor Kravtchenko
 Gustavo Wagner
+Guillaume Chouvenc
 Gerrick Bivins
 George Tarantilis
 Fabio Mierlo
 Edgar Ellis
-Doug McCorkle
 David Ergo
 Daniel Trstenjak
@@ -212 +214 @@
 Shuxing Xiao
 Shane Arnott
+Sergey Leontyev
 Sebastien Kuntz
 Ruth Lang
@@ -224 +227 @@
 Philipp Siemoleit
 Philipp Mächler
+Paul Palumbo
 Paul Obermeier
 Paul Fredrikson
@@ -241 +245 @@
 Michael Morrison
 Michael Logan
+Michael Guerrero
 Max Rhiener
 Mauricio Hofmam
@@ -253 +258 @@
 Marin Lavery
 Marco Lehmann
+Maceij Krol
 Louis Hamilton
 Lilin Xiong
@@ -260 +266 @@
 Karsten Weiss
 Karl Heijdenberg
+Jutta Sauer
 Josh Portway
 John Vidar Larring
@@ -267 +274 @@
 John Davis
 Joan Abadie
+Jeoen den Dekker
 Jean-Christophe Lombardo
 Jay Zuckerman
@@ -282 +290 @@
 Galen Faidley
 Frederic Bouvier
-Frashid Lashkari
 Frank Warmerdam
 Frank Lindeman
@@ -288 +295 @@
 Ferdinand Cornelissen
 Fabien Dachicourt
+Erik den Dekker
 Emmanuel Roche
 Edmond Gheury

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/CMakeLists.txt

@@ -25 +25 @@
 
 SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
-SET(OPENSCENEGRAPH_MINOR_VERSION 6)
-SET(OPENSCENEGRAPH_PATCH_VERSION 0)
-SET(OPENSCENEGRAPH_SOVERSION 43)
+SET(OPENSCENEGRAPH_MINOR_VERSION 7)
+SET(OPENSCENEGRAPH_PATCH_VERSION 2)
+SET(OPENSCENEGRAPH_SOVERSION 46)
+
+# set to 0 when not a release candidate, non zero means that any generated 
+# svn tags will be treated as release candidates of given number
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
@@ -81 +85 @@
     SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")
 ENDIF(CMAKE_SYSTEM MATCHES IRIX)
+
+OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making svn branches, tags, updating ChangeLog." OFF)
+IF (OSG_MAINTAINER)
+
+    SET(OPENSCENEGRAPH_SVN "trunk")
+    #SET(OPENSCENEGRAPH_SVN "branches")
+    SET(OPENSCENEGRAPH_BRANCH OpenSceneGraph-${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION})
+
+    #
+    # Provide target for tagging a release
+    #
+    SET(SVNCOMMAND svn)
+    SET(SVNTRUNKDIR     http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk)
+    SET(SVNTAGDIR       http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags)
+    SET(SVNBRANCHDIR    http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branch)
+
+    IF   (OPENSCENEGRAPH_SVN STREQUAL "trunk")
+        SET(SVNSOURCEDIR ${SVNTRUNKDIR})
+    ELSE (OPENSCENEGRAPH_SVN STREQUAL "trunk")
+        SET(SVNSOURCEDIR ${SVNBRANCH_DIR}/${OPENSCENEGRAPH_BRANCH})
+    ENDIF(OPENSCENEGRAPH_SVN STREQUAL "trunk")
+
+
+    IF   (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
+        SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION})
+    ELSE (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
+        SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION}-rc${OPENSCENEGRAPH_RELEASE_CANDIDATE})
+    ENDIF(OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
+
+
+    ADD_CUSTOM_TARGET(tag-test
+        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
+    )
+
+    ADD_CUSTOM_TARGET(tag-run
+        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
+    )
+
+    ADD_CUSTOM_TARGET(branch-test
+        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
+    )
+
+    ADD_CUSTOM_TARGET(branch-run
+        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
+    )
+
+    #
+    # Provide target for generating ChangeLog
+    #
+    SET(SVN2LOG ~/bin/svn2log.py)
+    SET(GENERATELOGS svn log -v --xml | python ${SVN2LOG} -L -H)
+
+    ADD_CUSTOM_TARGET(ChangeLog
+        COMMAND ${GENERATELOGS}
+    )
+    
+ENDIF(OSG_MAINTAINER)
+
 
 # Find OpenGL
@@ -226 +288 @@
 FIND_PACKAGE(GDAL)
 FIND_PACKAGE(CURL)
+FIND_PACKAGE(ITK)
 
 SET(wxWidgets_USE_LIBS base core gl net)
@@ -269 +332 @@
 
 ENDIF(PKG_CONFIG_FOUND)
+
+
+#
+# Enable workaround for OpenGL driver crash with occlusion query
+#
+OPTION(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL "Set to ON to build OcclussionQueryNode with a workaround for multi-threaded OpenGL driver occlussion query crash. " OFF)
+IF(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
+    ADD_DEFINITIONS(-DFORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
+ENDIF(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
+
+
 
 #
@@ -303 +377 @@
 ENDIF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
 
-OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build build with variable parameter (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT})
+OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build with variable parameter (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT})
 IF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
     ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT)
@@ -530 +604 @@
         # It does look like CMake handles the CMAKE_OSX_SYSROOT automatically.
         IF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
-            SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
+            # 64-bit compiles are not supported with Carbon. We should enable 
+            # 64-bit compilation by default once osgviewer has been 
+            # rewritten with Cocoa.
+            #SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
+            SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
         ELSE(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
@@ -547 +625 @@
 
 ENDIF(APPLE)
+
+
+#
+# Provide target for generating wrappers
+#
+SET(GENWRAPPER genwrapper)
+
+ADD_CUSTOM_TARGET(wrappers
+    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -t ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/Doxyfile.template -d ${OpenSceneGraph_SOURCE_DIR} | doxygen -
+    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -l ${OpenSceneGraph_SOURCE_DIR}
+)
+
 
 OPTION(BUILD_REF_DOCS "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF)

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/ChangeLog

@@ +1 @@
+2008-09-01 15:29 +0000 [r8821-8822]  robert:
+
+        * Replaced uint with unsigned int
+
+        * Introduced a OSG_MAINTAINER section of cmake build to help
+          support making tags and branches
+
+2008-09-01 14:05 +0000 [r8818-8819]  robert:
+
+        * Updated wrappers
+
+        * Changed curr and min to current and minimum respectively, to
+          avoid compile problems under Windows
+
+2008-09-01 12:40 +0000 [r8816-8817]  robert:
+
+        * Implemented support for ShapeAttributeList, used John Vidar
+          Larring's initial submission as a base, but implementing the user
+          data functionality in a different way to facilitate more flexible
+          user data support
+
+        * From John Vidar Larring, initial cut of .ive support for
+          ShapeAttributeList user data
+
+2008-09-01 11:09 +0000 [r8815]  robert:
+
+        * Updated version for 2.7.2 dev release
+
+2008-09-01 10:49 +0000 [r8812-8814]  robert:
+
+        * Updated wrappers
+
+        * Added call to free in setValue methods to prevent potential
+          memory leak
+
+        * From Mathias Froehilch,"Current include/osgSim/ShapeAttribute
+          also misses string.h include because of strdup. Attached is the
+          changed file."
+
+2008-09-01 10:22 +0000 [r8811]  robert:
+
+        * From He Sicong, "I found a bug here in VERTICAL_SPLIT stereo
+          type: The vertical separation not actually displayed as it is
+          set. So some display the up and down stereo images style will not
+          be correct. Someone may forget to change the "Horizontal" to
+          "Vertical" after copying and pasting the code from above
+          HORIZONTAL_SPLIT code segment. I've attached the file. By
+          replacing the incorrect "Horizontal" to "Vertical", the bug is
+          gone. "
+
+2008-09-01 10:19 +0000 [r8810]  robert:
+
+        * Removed std:: from in front of strcmp and added a string.h
+
+2008-09-01 10:06 +0000 [r8809]  robert:
+
+        * From Wojciech Lewandowski, "Most recent changes to
+          CameraPathEventHandler change path writing method. Now control
+          points are written on the fly. But default stream precision is
+          not adjusted as it used to and remains set to 6 digits (at least
+          with VS 2008) so larger coordinates like positions on Earth
+          Ellipsoid loose lots of fidelity. This patch fixes this issue. "
+
+2008-09-01 09:57 +0000 [r8808]  robert:
+
+        * Build fixes for Windows
+
+2008-08-29 09:28 +0000 [r8806-8807]  robert:
+
+        * Added CompositeLayer::addLayer(setname,filename) convinience
+          function
+
+        * From Michael Guerrero, "I've attached the files with the new
+          addition of the "registered = true" flag set."
+
+2008-08-28 16:15 +0000 [r8805]  robert:
+
+        * Introduce the concept of layer set name, using the
+          osg::Object::s/getName() to store the setname, and using a
+          compound string (set:setname:filename) in place of standard
+          filename when reading and writing files.
+
+2008-08-28 09:43 +0000 [r8804]  robert:
+
+        * Converted AutoTransform to use doubles.
+
+2008-08-27 10:13 +0000 [r8803]  robert:
+
+        * Introduced SwitchLayer which will form the basis of provided
+          support for varients
+
+2008-08-26 17:40 +0000 [r8802]  robert:
+
+        * Improved the GLSL implementation.
+
+2008-08-26 12:55 +0000 [r8800]  robert:
+
+        * Added ChangeLog target for updating the ChangeLog, and updated
+          the ChangeLog and AUTHORS files
+
+2008-08-26 12:05 +0000 [r8799]  robert:
+
+        * Added wrapper build target for generating the osgWrappers
+
+2008-08-26 09:39 +0000 [r8798]  robert:
+
+        * Added provisional block in computePositions()
+
+2008-08-26 08:41 +0000 [r8797]  robert:
+
+        * From Ulrich Hertlein, attached is a small fix for a mismatched
+          function signature
+
+2008-08-25 16:44 +0000 [r8795-8796]  robert:
+
+        * Updated version number for 2.7.1 release, and added
+          OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL Cmake option
+          that enables the occlusion query workaround for an OpenGL driver
+          crash
+
+        * From Doug McCorkle, via Paul Martz who writes : "Summary: Some
+          platforms/configurations cause application crashes if the
+          occlusion query result is not ready for retrieval when the app
+          tries to retrieve it. This fix adds an application-level wait
+          loop to ensure the result is ready for retrieval. This code is
+          not compiled by default; add "-D
+          FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL" to get this code.
+          Full, gory details, to the best of my recollection: The
+          conditions under which we encountered this issue are as follows:
+          64-bit processor, Mac/Linux OS, multiple NVIDIA GPUs, multiple
+          concurrent draw threads, VRJuggler/SceneView-based viewer, and a
+          scene graph containing OcclusionQueryNodes. Todd wrote a small
+          test program that produces an almost instant crash in this
+          environment. We verified the crash does not occur in a similar
+          environment with a 32-bit processor, but we have not yet tested
+          on Windows and have not yet tested with osgViewer. The OpenGL
+          spec states clearly that, if an occlusion query result is not yet
+          ready, an app can go ahead and attempt to retrieve it, and OpenGL
+          will simply block until the result is ready. Indeed, this is how
+          OcclusionQueryNode is written, and this has worked fine on
+          several platforms and configurations until Todd's test program.
+          By trial and error and dumb luck, we were able to workaround the
+          crash by inserting a wait loop that forces the app to only
+          retrieve the query after OpenGL says it is available. As this
+          should not be required (OpenGL should do this implicitly, and
+          more efficiently), the wait loop code is not compiled by default.
+          Developers requiring this work around must explicitly add "-D
+          FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL" to the compile
+          options to include the wait loop."
+
+2008-08-25 15:57 +0000 [r8794]  robert:
+
+        * From Liang Aibin, added support for : osgFX::Effect
+          osgFX::AnisotropicLighting osgFX::BumpMapping osgFX::Cartoon
+          osgFX::Scribe osgFX::SpecularHighlights.
+
+2008-08-25 15:37 +0000 [r8793]  robert:
+
+        * From Liang Aibin, removed redundent spaces
+
+2008-08-25 15:20 +0000 [r8792]  robert:
+
+        * From Michael Guerrero, Fixed crash that occurred when openning an
+          new movie file after all previous movie ImageStream had been
+          closed. Also add a missing close of the movie file.
+
+2008-08-25 15:03 +0000 [r8791]  robert:
+
+        * From Paul Martz, "This change fixes a problem with PAT nodes
+          during FLT export." Note, Paul Martz has merged this patch into
+          OpenSceneGraph-2.6.
+
+2008-08-25 14:59 +0000 [r8790]  robert:
+
+        * From Guillaume Chouvenc, "I have added the file
+          StateAttribute.cpp in src/osgPlugins/osg to support the reading
+          and writing of StateAttribute Callback in osg files. "
+
+2008-08-25 14:54 +0000 [r8789]  robert:
+
+        * From Guillaume Chouvenc, "I have modified Uniform.cpp and
+          StateSet.cpp in src/osgPlugins/osg to support the reading and
+          writing of Uniform Callback and StateSet Callback in osg files."
+
+2008-08-25 11:37 +0000 [r8788]  robert:
+
+        * Added testing of max texture size using a realize operation
+
+2008-08-25 10:38 +0000 [r8786-8787]  robert:
+
+        * Added support for event handler for non shader path, enable alpha
+          func
+
+        * Removed debug info
+
+2008-08-25 10:20 +0000 [r8785]  robert:
+
+        * Moved _stateset = new StateSet instances to setStateSet(new
+          StateSet) to make sure the wiring up of the StateSet parents is
+          done consistently
+
+2008-08-25 09:53 +0000 [r8784]  robert:
+
+        * Added command line arguments to Viewer constructor, and added
+          meaningful error message when no 3d image is provided
+
+2008-08-22 16:39 +0000 [r8780-8782]  robert:
+
+        * Introduced initial cut of a dicom loader, which uses ITK to do
+          the loading.
+
+        * Added warning message
+
+        * Added support for reading the image transform from UserData in
+          the form of a Matrix.
+
+2008-08-19 17:41 +0000 [r8779]  robert:
+
+        * Added checked against an empty _kdNodes list before commensing
+          with intersection
+
+2008-08-18 15:08 +0000 [r8776-8777]  robert:
+
+        * Added --mip command line option which enables Maximum Intensity
+          Projection filtering
+
+        * Added .ive support for BlendEquation
+
+2008-08-18 14:49 +0000 [r8775]  robert:
+
+        * Added BlendEquation .osg support
+
+2008-08-18 12:39 +0000 [r8773]  robert:
+
+        * Updated AUTHORS file for 2.7.0 release
+
+2008-08-18 11:55 +0000 [r8772]  robert:
+
+        * Updated ChangeLog for 2.7.0 release
+
+2008-08-18 11:48 +0000 [r8771]  robert:
+
+        * Updated wrappers
+
+2008-08-18 11:21 +0000 [r8770]  robert:
+
+        * From Sergey Leontyev, "1. In StyleManager when applying styles to
+          a Label element the code below runs in a infinite loop. The
+          reason for this is that nothing increments the Reader "r" in the
+          case when applying a style to label, so I advance the reader when
+          no match was found. ( To replicate the error apply style to any
+          label) replaced this: while(!r.eof())
+          if(_styles[style]->applyStyle(t, r)) inc = true; with this:
+          while(!r.eof()) { if(_styles[style]->applyStyle(t, r)) inc =
+          true; else r.advanceOverCurrentFieldOrBlock(); } I tested it and
+          it works well for me, I did not find any problems with it. 2.
+          Added style support for Canvas element, event though there is no
+          styles to apply yet. It is usefull for someone who inherits from
+          Canvas class to develop another element. If applyStyle(Canvas)
+          does not exist there is no way to apply style to the element that
+          inherited from Canvas element. Added virtual bool
+          applyStyle(Canvas). and in added call to apply style if the
+          Object is of type Canvas:
+          StyleManager::_applyStyleToObject(osg::Object* obj, const
+          std::string& style) { ... else
+          if(!std::string("Canvas").compare(c)) return
+          _coerceAndApply<Canvas>(obj,style,c); "
+
+2008-08-18 11:17 +0000 [r8769]  robert:
+
+        * Ran fixtabs to enforce four space tabs
+
+2008-08-18 11:00 +0000 [r8768]  robert:
+
+        * From Erik van Dekker, "I made several modifications: * The cause
+          of my errors was that my OSG source directory path contains
+          spaces. To fix this issue I wrapped all paths with quotes, as
+          stated in doxygen documentation. * I also received some warning
+          messages about deprecated doxygen settings, which I fixed by
+          updating the doxygen file, i.e. running \u2018doxygen \u2013u
+          doxygen.cmake\u2018. By running this command deprecated doxygen
+          options are removed, some option comments have changed and quite
+          some options have been added (I kept their default settings
+          unless mentioned). * I was surprised to find that the doxygen
+          OUTPUT_DIRECTORY was set to
+          \u201c${OpenSceneGraph_SOURCE_DIR}/doc\u201d, which does not seem
+          appropriate for out of source builds; I changed this to
+          \u201c${OpenSceneGraph_BINARY_DIR}/doc\u201d. (On the other hand,
+          maybe a cmake selectable option should be given to the user?) *
+          Fixed two warnings I received about unexpected
+          end-of-list-markers in \u2018osg\AnimationPath and
+          \u2018osgUtil\CullVisitor due to excess trailing points in
+          comments. * Fixed a warning in osgWidget\StyleInterface due to an
+          #include directive (strangely) placed inside a namespace. * Fixed
+          a warning in osg\Camera due to the META_Object macro that
+          confused doxygen. Adding a semi-colon fixed this. * Removed
+          auto_Mainpage from the INCLUDE option, because I am positive that
+          this file does not belong there; It never generated useful
+          documentation anyway. * I added the OSG version number
+          environment variable to the PROJECT_NUMBER option so that the
+          version number is now shown on the main page of generated
+          documentation (e.g. index.html). * Changed option FULL_PATH_NAMES
+          to YES, but made sure STRIP_FROM_PATH stripped the absolute path
+          until the include dir. This fixed an issue that created mangled
+          names for identical filenames in different directories. E.g.
+          osg/Export and osgDB/Export are now correctly named. * Changed
+          option SHOW_DIRECTORIES to yes, which is a case of preference I
+          guess. "
+
+2008-08-18 10:47 +0000 [r8767]  robert:
+
+        * Removed todo entry
+
+2008-08-17 16:52 +0000 [r8766]  robert:
+
+        * From Maceij Krol, "I have implement frame based expiration of
+          PagedLOD children. New attribute DatabasePager::_expiryFrames
+          sets number of frames a PagedLOD child is kept in memory. The
+          attribute is set with DatabasePager::setExpiryFrames method or
+          OSG_EXPIRY_FRAMES environmental variable. New attribute
+          PagedLOD::PerRangeData::_ frameNumber contains frame number of
+          last cull traversal. Children of PagedLOD are expired when time
+          _AND_ number of frames since last cull traversal exceed
+          OSG_EXPIRY_DELAY _AND_ OSG_EXPIRY_FRAMES respectively. By default
+          OSG_EXPIRY_FRAMES = 1 which means that nodes from last
+          cull/rendering traversal will not be expired even if last cull
+          time exceeds OSG_EXPIRY_DELAY. Setting OSG_EXPIRY_FRAMES = 0
+          revokes previous behaviour of PagedLOD. Setting OSG_EXPIRY_FRAMES
+          > 0 fixes problems of children reloading in lazy rendering
+          applications. Required behaviour is achieved by manipulating
+          OSG_EXPIRY_DELAY and OSG_EXPIRY_FRAMES together. Two interface
+          changes are made: DatabasePager::updateSceneGraph(double
+          currentFrameTime) is replaced by
+          DatabasePager::updateSceneGraph(const osg::FrameStamp
+          &frameStamp). The previous method is in #if 0 clause in the
+          header file. Robert, decide if You want to include it.
+          PagedLOD::removeExpiredChildren(double expiryTime, NodeList
+          &removedChildren) is deprecated (warning is printed), when
+          subclassing use PagedLOD::removeExpiredChildren(double
+          expiryTime, int expiryFrame, NodeList &removedChildren) instead.
+          "
+
+2008-08-17 16:45 +0000 [r8765]  robert:
+
+        * From Jason Beverage, "I've got a few machines that OSG
+          incorrectly believes support FRAME_BUFFER_OBJECTS so I am
+          manually trying to set the renderTargetImplementation to
+          PIXEL_BUFFER or PIXEL_BUFFER_RTT. I noticed that this call wasn't
+          setting the camera's overlay data properly because the
+          setRenderTargetImplementation simply calls init() which only does
+          anything for OBJECT_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY. Any
+          subsequent calls to getOverlayData will simply return the cached
+          OverlayData instead of setting it up. My fix updates the camera's
+          render target implementation for all OverlayData objects in the
+          OverlayDataMap."
+
+2008-08-15 17:35 +0000 [r8763-8764]  robert:
+
+        * From Paul Palumbo, "Fixes a typo in coverage antialiasing code...
+          Without this fix, get incorrect antialiasing results. "
+
+        * From Jutta Sauer, "We added a raise window method to
+          GraphicsWindow. And added two implementations for Win32 and X11.
+          "
+
+2008-08-15 17:26 +0000 [r8761-8762]  robert:
+
+        * Updated version numbers in prep for next dev release
+
+        * From Frashid Larshkari, "I modified the vertical/horizontal
+          interlace stereo modes so that they use the osg::State::applyMode
+          for enabling/disabling certain while rendering the stencil mask.
+          Previously some of these calls were overriding the scene graph
+          states because the global state was not aware of this change. "
+
+2008-08-15 17:18 +0000 [r8760]  robert:
+
+        * Added support for geometry shader attributes
+
+2008-08-15 16:43 +0000 [r8759]  robert:
+
+        * From Stephane Lamoliatte, "I added the osg::Program parameters
+          support for the osg plug'in. Now we could correctly configure
+          geometry shaders in osg files." Notes from Robert Osfield,
+          renamed the names of the parameters to be less GL centric and
+          more human readable.
+
+2008-08-15 16:21 +0000 [r8758]  robert:
+
+        * Changed osg::ImageSequence::set/getDuration to set/getLength() to
+          be in keeping with the osg::ImageStream's getLength().
+
+2008-08-15 13:07 +0000 [r8756-8757]  robert:
+
+        * Fixed the name of _playToggle
+
+        * Updated wrappers
+
+2008-08-15 12:45 +0000 [r8755]  robert:
+
+        * Further work on osg::ImageSequence, improving pause
+          functionality, and introducing new seek(double time) method
+
+2008-08-14 16:29 +0000 [r8753-8754]  robert:
+
+        * Added initial looping and pause play support
+
+        * Added event handler to toggling looping and play/pause
+
+2008-08-14 14:22 +0000 [r8752]  robert:
+
+        * Implemented a reference eye point and associated methods in
+          support of intersecting billboards
+
+2008-08-05 20:05 +0000 [r8747-8748]  robert:
+
+        * From Eric Sokolowski, added OSX release notes to READEME
+
+        * Added osgWidget to doc building
+
+2008-08-05 19:17 +0000 [r8744]  robert:
+
+        * Improved the doxygen docs over the various namespaces
+
+2008-08-05 16:05 +0000 [r8742]  robert:
+
+        * From Eric Sokolowki, disabled default build of 64bit under OSX to
+          prevent build problems
+
+2008-08-05 15:27 +0000 [r8739]  robert:
+
+        * Merged from OpenSceneGraph-2.6 branch
+
+2008-08-05 15:11 +0000 [r8738]  robert:
+
+        * Added NullStream class that automatically creates and delete the
+          NullStreamBuffer, thus fixing a memory leak
+
+2008-08-05 15:06 +0000 [r8737]  robert:
+
+        * From Eric Sokolowski, "Fixed the build of the osgViewer library
+          to get GL/glx.h from the right place, when building on OSX with
+          X11"
+
+2008-08-05 11:17 +0000 [r8734]  robert:
+
+        * Merged changes to OpenSceneGraph-2.6 into trunk using : svn merge
+          -r 8729:8734
+          http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.6
+          .
+
+2008-08-04 20:48 +0000 [r8728]  robert:
+
+        * Added -losgWidget to the list of libs
+
+2008-08-04 17:08 +0000 [r8726]  robert:
+
+        * From Sherman Wilcox, "Minor change to bool
+          setGLExtensionFuncPtr(T& t, const char* str1) and
+          setGLExtensionFuncPtr(T& t, const char* str1, const char* str2) -
+          functions returned false even on success."
+
+2008-08-04 15:09 +0000 [r8720-8722]  robert:
+
+        * Updated AUTHORS file
+
+        * Updated ChangeLog
+
+        * Updated news for 2.6.0 release rc2
+
+2008-08-04 14:01 +0000 [r8718]  robert:
+
+        * From Philip Lowman, workaround of Centos 5's missing definition
+          of GL_MAX_SAMPLES_EXT.
+
+2008-08-04 12:47 +0000 [r8716]  robert:
+
+        * Moved initial drawable setup to within the mutex locked section
+          to avoid multi-threaded crash on startup.
+
+2008-08-04 12:27 +0000 [r8714]  robert:
+
+        * Removed debug info
+
+2008-08-04 09:05 +0000 [r8712]  robert:
+
+        * From Ulrich Hertlien, "attached is a patch to
+          src/osgPlugins/quicktime/QTImportExport.cpp that fixes loading
+          images using the quicktime loader. Also fixes some minor bugs
+          like uninitialized variables and incorrect deletes. I'm a bit
+          puzzled why this didn't pop up for more people as it's quite
+          severe: basically the filename was never set!""
+
+2008-08-04 08:45 +0000 [r8711]  robert:
+
+        * Added a small epsilon expansion of the bounding box being
+          clipped/intersected against, to avoid numberic errors causing
+          problems.
+
+2008-08-03 20:35 +0000 [r8710]  robert:
+
+        * Improved the terrain intersection code so that it produces more
+          stable terrain movements.
+
+2008-08-03 16:57 +0000 [r8708]  robert:
+
+        * merged 2.6 branch changes back into trunk using : svn merge -r
+          8699:8706
+          http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.6
+          .
+
+2008-08-03 16:48 +0000 [r8707]  robert:
+
+        * Moved bb expansion out of loop.
+
+2008-07-25 21:09 +0000 [r8697]  robert:
+
+        * Updated ChangeLog and AUTHORS.txt file for relese candidate
+
+2008-07-25 21:01 +0000 [r8695-8696]  robert:
+
+        * Updated version numbers to 2.6.0
+
+        * Updated REAME and NEWS for 2.6 branch
+
 2008-07-25 20:50 +0000 [r8692-8694]  robert:
 

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/NEWS.txt

@@ -4 +4 @@
 = !OpenSceneGraph 2.6 release adds osgWidget library, KdTree intersections, Anti-aliased FBOsand much more. =
 
-PERTHSHIRE, Scotland - 25th July 2008 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.6, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.6 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.6 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
+PERTHSHIRE, Scotland - 5th August 2008 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.6, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.6 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.6 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
 
 === Open-source development delivers industry-leading features and performance ===
@@ -11 +11 @@
 === Updates include: ===
 
- * New osgWidget library (still in beta status)
- * New KdTree support, with automatic building of KdTrees and intersections with them for high performance intersection testing
- * New Anti-aliased FrameBufferObject support
- * Improved precision of intersections and camera manipulation
- * Improved Alias Wavefront .obj support
- * A wide range of build and bug fixes
-  
+    * New osgWidget library for scene graph based graphics user interface elements (beta release).
+    * KdTree support, with automatic KdTree generation on load and use of KdTree during line intersections which massively improves intersection speeds.
+    * Precision improvements to line intersections, provide accurate whole earth intersection.
+    * OpenGL Multi-sample FrameBufferObject support.
+    * New osg::ImageSequence class for doing texture animation of a series of image files.
+    * New database optimizer that is able to remove static transforms by duplicating shared geometries.
+    * Use glGenerateMipmap to speed up mipmap generation in non power-of-two textures.
+    * New osgViewer::ScreenCaptureHandler for adding screen shot support to osgViewer applications.
+    * New osgscreencapture example that demonstrates use of double buffer PixelBufferObject's for streaming of imagery from the screen.
+    * New utility application osgfilecache which can be used to populate the local cache for given lat/lon ranges and levels.
+    * Rewritten DatabasePager that now supports multiple database reading threads. This includes handling of HTTP requests via a separate reading thread, vastly improving the speed of updates when handling HTTP hosted databases that have already partially been downloaded to local file cache.
+    * Support for a file cache for locally caching paged databases hosted over HTTP.
+    * Support for http authentication in osgDB and the libcurl plugin
+    * New osgconv --format <fmt>, --formats and --plugins command line options for listing available plugins and the file formats/options they support.
+    * Performance improvements in handling TerraPage.
+    * Animated GIF support.
+    * New SVG image loader.
+    * Improvements to the .obj loader to support a wider range of .obj files and material properties.
+    * Support for thread safe Atomic reference counting.
+    * Support for COLLADA DOM 2.x
+    * Support for Philips WOWvx 3D auto-stereoscopic displays
+    * New include/osg/Config and include/OpenThreads/Config configuration files, that are automatically generated by CMake, which make more straight forward to build end users applications against OpenSceneGraph versions built with non default build options.
+    * Support for CMake 2.6
+    * A wide range of build and bug fixes 
+
+ 
 === Downloads and Licensing ===
 !OpenSceneGraph is open-source so full source code is provided, and can be copied, modified and used free of charge for commercial and non-commercial use. Access to the source allows end users greater flexibility in how they develop, debug and deploy their applications.  They gain productivity and freedom by being able to leverage the tool chain in accordance with their own release cycles. Downloads of binaries and source can be found in the [http://www.openscenegraph.org/projects/osg/wiki/Downloads Downloads] section of the openscenegraph.org website.
@@ -38 +57 @@
 The diverse and growing community of over 1900 developers is centred around the public osg-users mailing list, where members discuss how best to use !OpenSceneGraph, provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists. 
 
-The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointFour 306 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base. 
+The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointSix 324 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base. 
 
 ----

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/README.txt

@@ -16 +16 @@
 Robert Osfield.
 Project Lead.
-25th July 2008.
+26th August 2008.
 
 --
@@ -67 +67 @@
 Under OSX you can either use the CMake build system above, or use the 
 Xcode projects that you will find in the OpenSceneGraph/Xcode 
-directory.
+directory. See release notes on OSX CMake build below.
 
 For further details on compilation, installation and platform-specific 
@@ -73 +73 @@
 
     http://www.openscenegraph.org/projects/osg/wiki/Support/GettingStarted
+   
+   
+-- Release notes on OSX build, by Eric Sokolowsky, August 5, 2008
+
+There are several ways to compile OpenSceneGraph under OSX.  The
+recommended way is to use CMake 2.6 to generate Xcode projects, then use
+Xcode to build the library. The default project will be able to build
+Debug or Release libraries, examples, and sample applications. Here are
+some key settings to consider when using CMake:
+
+BUILD_OSG_EXAMPLES - By default this is turned off. Turn this setting on
+to compile many great example programs.
+
+CMAKE_OSX_ARCHITECTURES - Xcode can create applications, executables,
+libraries, and frameworks that can be run on more than one architecture.
+Use this setting to indicate the architectures on which to build OSG.
+Possibilities include ppc, ppc64, i386, and x86_64. Building OSG using
+either of the 64-bit options (ppc64 and x86_64) has its own caveats
+below.
+
+OSG_BUILD_APPLICATION_BUNDLES - Normally only executable binaries are
+created for the examples and sample applications. Turn this option on if
+you want to create real OSX .app bundles. There are caveats to creating
+.app bundles, see below.
+
+OSG_WINDOWING_SYSTEM - You have the choice to use Carbon or X11 when
+building applications on OSX. Under Leopard and later, X11 applications,
+when started, will automatically launch X11 when needed. However,
+full-screen X11 applications will still show the menu bar at the top of
+the screen. Since many parts of the Carbon user interface are not
+64-bit, X11 is the only supported option for OSX applications compiled
+for ppc64 or x86_64.
+
+There is an Xcode directory in the base of the OSG software
+distribution, but its future is limited, and will be discontinued once
+the CMake project generator completely implements its functionality.
+
+
+APPLICATION BUNDLES (.app bundles)
+
+The example programs when built as application bundles only contain the
+executable file. They do not contain the dependent libraries as would a
+normal bundle, so they are not generally portable to other machines.
+They also do not know where to find plugins. An environmental variable
+OSG_LIBRARY_PATH may be set to point to the location where the plugin
+.so files are located. OSG_FILE_PATH may be set to point to the location
+where data files are located. Setting OSG_FILE_PATH to the
+OpenSceneGraph-Data directory is very useful when testing OSG by running
+the example programs.
+
+Many of the example programs use command-line arguments. When
+double-clicking on an application (or using the equivalent "open"
+command on the command line) only those examples and applications that
+do not require command-line arguments will successfully run. The
+executable file within the .app bundle can be run from the command-line
+if command-line arguments are needed.
+
+
+64-BIT APPLICATION SUPPORT
+
+OpenSceneGraph will not compile successfully when OSG_WINDOWING_SYSTEM is
+Carbon and either x86_64 or ppc64 is selected under CMAKE_OSX_ARCHITECTURES,
+as Carbon is a 32bit only API. A version of the osgviewer library written in
+Cocoa is needed. However, OSG may be compiled under 64-bits if the X11
+windowing system is selected. However, Two parts of the OSG default
+distribution will not work with 64-bit X11: the osgviewerWX example
+program and the osgdb_qt (Quicktime) plugin. These must be removed from
+the Xcode project after Cmake generates it in order to compile with
+64-bit architectures. The lack of the latter means that images such as
+jpeg, tiff, png, and gif will not work, nor will animations dependent on
+Quicktime. A new ImageIO-based plugin is being developed to handle the
+still images, and a QTKit plugin will need to be developed to handle
+animations.

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/applications/osgversion/osgversion.cpp

@@ +1 @@
+#include <osg/Notify>
 #include <osg/Version>
 #include <osg/ArgumentParser>
@@ -35 +36 @@
 {
     if (first=="de") return true;
+    if (first=="den") return true;
+    if (first=="van") return true;
 
 
@@ -220 +223 @@
     if (first=="GeometryTechnique") return false;
     if (first=="GeoemtryTechnique") return false;
+    if (first=="KdTree") return false;
+    if (first=="LineSegment") return false;
+    if (first=="Canvas") return false;
+    if (first=="OpenSceneGraph-2") return false;
     return true;
 }
@@ -231 +238 @@
     if (name=="") return "";
 #endif
-    if (name=="Weidemann") return "Wiedemann";
-    if (name=="Martsz") return "Martz";
-    if (name=="Matz")  return "Martz";
-    if (name=="Froenlich") return "Fröhlich";
-    if (name=="Froechlich") return "Fröhlich";
-    if (name=="Froelich") return "Fröhlich";    
-    if (name=="Fruciel") return "Frauciel";
-    if (name=="Hebelin") return "Herbelin";
-    if (name=="Jea-Sebastien") return "Jean-Sebastien";
-    if (name=="Jean-Sebastian") return "Jean-Sebastien";
-    if (name=="Robet") return "Robert";
-    if (name=="Morné") return "Morné";
+    if (name=="Aderian")  return "Adrian";
     if (name=="Adndre") return "Andre";
-    if (name=="Mellis") return "Melis";
-    if (name=="Rajce") return "Trajce";
-    if (name=="Trastenjak") return "Trstenjak";
+    if (name=="Adrain") return "Adrian";
+    if (name=="Andew") return "Andrew";
+    if (name=="André") return "André";
+    if (name=="Antione") return "Antoine";
+    if (name=="Antonoine") return "Antoine";
+    if (name=="Atr")  return "Art";
     if (name=="Baverage") return "Beverage";
     if (name=="Bistroviae") return "Bistrovic";
+    if (name=="Callue")  return "Callu";
     if (name=="Christaiansen") return "Christiansen";
     if (name=="Cobin") return "Corbin";
+    if (name=="Comporesi") return "Camporesi";
     if (name=="Connel") return "Connell";
+    if (name=="Cullu") return "Callu";
+    if (name=="Daneil") return "Daniel";
     if (name=="Daust") return "Daoust";
-    if (name=="Lugi") return "Luigi";
     if (name=="Daved") return "David";
+    if (name=="Drederic") return "Frederic";
+    if (name=="Eileman") return "Eilemann";
+    if (name=="Elgi") return "Egli";
     if (name=="Fred") return "Frederic";
-    if (name=="Drederic") return "Frederic";
     if (name=="Fredrick") return "Frederic";
     if (name=="Fredric") return "Frederic";
+    if (name=="Froechlich") return "Fröhlich";
+    if (name=="Froehlich") return "Fröhlich";
+    if (name=="Froelich") return "Fröhlich";    
+    if (name=="Froenlich") return "Fröhlich";
+    if (name=="Fröhlich") return "Fröhlich";
+    if (name=="Fruciel") return "Frauciel";
+    if (name=="García") return "Garcea";
     if (name=="Garrat") return "Garrett";
+    if (name=="Garret") return "Garrett";
     if (name=="Geof") return "Geoff";
+    if (name=="Giatan") return "Gaitan";
     if (name=="Gronenger") return "Gronager";
     if (name=="Gronger") return "Gronager";
+    if (name=="Hebelin") return "Herbelin";
     if (name=="Heirtlein") return "Hertlein";
     if (name=="Heirtlein") return "Hertlein";
     if (name=="Heirtlein") return "Hertlein";
     if (name=="Hertlien") return "Hertlein";
-    if (name=="Narache") return "Marache";
     if (name=="Hi") return "He";
     if (name=="Hooper") return "Hopper";
     if (name=="Inverson") return "Iverson";
     if (name=="Iversion") return "Iverson";
-    if (name=="Jeoen") return "Joran";
+    if (name=="Jean-Sebastian") return "Jean-Sebastien";
+    if (name=="Jea-Sebastien") return "Jean-Sebastien";
     if (name=="Johhansen") return "Johansen";
     if (name=="Johnansen") return "Johansen";
@@ -278 +292 @@
     if (name=="Jolly") return "Jolley";
     if (name=="Jose") return "José";
+    if (name=="José") return "José";
     if (name=="Joson") return "Jason";
     if (name=="J") return "José";
     if (name=="Keuhne") return "Kuehne";
     if (name=="Kheune") return "Kuehne";
+    if (name=="Larshkari") return "Lashkari";
     if (name=="Lashakari") return "Lashkari";
     if (name=="Lashari") return "Lashkari";
     if (name=="Lasharki") return "Lashkari";
     if (name=="Laskari") return "Lashkari";
+    if (name=="Leandowski" || name=="Lawandowski")  return "Lewandowski";
+    if (name=="Lugi") return "Luigi";
+    if (name=="Machler") return "Mächler";
     if (name=="Macro") return "Marco";
+    if (name=="Maechler") return "Mächler";
+    if (name=="Mahai")  return "Mihai";
     if (name=="Mammond") return "Marmond";
     if (name=="March") return "Marco";
+    if (name=="Martsz") return "Martz";
     if (name=="Marz") return "Martz";
+    if (name=="Matz")  return "Martz";
+    if (name=="Melchoir") return "Melchior";
+    if (name=="Mellis") return "Melis";
+    if (name=="Messerschimdt") return "Messerschmidt";
     if (name=="Micheal") return "Michael";
+    if (name=="Mihair")  return "Mihai";
     if (name=="Molishtan") return "Moloshtan";
     if (name=="Molishtan") return "Moloshtan";
     if (name=="Moloshton") return "Moloshtan";
+    if (name=="Morné") return "Morné";
     if (name=="Moule") return "Moiule";
+    if (name=="Narache") return "Marache";
     if (name=="Nicklov") return "Nikolov";
     if (name=="Nickolov") return "Nikolov";
@@ -302 +331 @@
     if (name=="Osfied") return "Osfield";
     if (name=="Pail") return "Paul";
+    if (name=="Rajce") return "Trajce";
     if (name=="Randal") return "Randall";
+    if (name=="Robet") return "Robert";
     if (name=="Rodger") return "Roger";
     if (name=="Sewel") return "Sewell";
+    if (name=="Simmonson") return "Simonsson";
+    if (name=="Simmonsson") return "Simonsson";
     if (name=="Sjolie") return "Sjölie";
+    if (name=="Sjölie") return "Sjölie";
+    if (name=="Skinnder") return "Skinner";
     if (name=="Sokolosky") return "Sokolowsky";
+    if (name=="Sokolowki") return "Sokolowsky";
     if (name=="Sokolowski") return "Sokolowsky";
     if (name=="Sokolsky") return "Sokolowsky";
+    if (name=="Sokolwsky") return "Sokolowsky";
     if (name=="Sonda") return "Sondra";
     if (name=="Stansilav") return "Stanislav";
     if (name=="Stefan") return "Stephan";
     if (name=="Stell") return "Steel";
+    if (name=="Sylvan") return "Sylvain";
     if (name=="Takeahei") return "Takahei";
     if (name=="Takehei") return "Takahei";
     if (name=="Tarantilils") return "Tarantilis";
+    if (name=="Trastenjak") return "Trstenjak";
     if (name=="Vines") return "Vine";
+    if (name=="Waldrom")  return "Waldron";
+    if (name=="Weidemann") return "Wiedemann";
     if (name=="Wieblen") return "Weiblen";
+    if (name=="Wojiech" || name=="Wojchiech")  return "Wojciech";
     if (name=="Xennon") return "Hanson";
     if (name=="Yefrei") return "Yefei";
     if (name=="Yfei") return "Yefei";
-    if (name=="Antonoine") return "Antoine";
-    if (name=="Antione") return "Antoine";
-    if (name=="Andew") return "Andrew";
-    if (name=="Daneil") return "Daniel";
-    if (name=="André") return "André";
-    if (name=="García") return "Garcea";
-    if (name=="Sjölie") return "Sjölie";
-    if (name=="José") return "José";
-    if (name=="Fröhlich") return "Fröhlich";
-    if (name=="Froehlich") return "Fröhlich";
-    if (name=="Eileman") return "Eilemann";
-    if (name=="Skinnder") return "Skinner";
-    if (name=="Mihair")  return "Mihai";
-    if (name=="Mahai")  return "Mihai";
-    if (name=="Wojiech" || name=="Wojchiech")  return "Wojciech";
-    if (name=="Leandowski" || name=="Lawandowski")  return "Lewandowski";
-    if (name=="Aderian")  return "Adrian";
-    if (name=="Callue")  return "Callu";
-    if (name=="Waldrom")  return "Waldron";
-    if (name=="Atr")  return "Art";
-    if (name=="Sylvan") return "Sylvain";
-    if (name=="Giatan") return "Gaitan";
-    if (name=="Melchoir") return "Melchior";
-    if (name=="Simmonsson") return "Simonsson";
-    if (name=="Simmonson") return "Simonsson";
-    if (name=="Sokolwsky") return "Sokolowsky";
-    if (name=="Cullu") return "Callu";
-    if (name=="Comporesi") return "Camporesi";
-    if (name=="Machler") return "Mächler";
-    if (name=="Maechler") return "Mächler";
-    if (name=="Messerschimdt") return "Messerschmidt";
-    if (name=="Garret") return "Garrett";
-    if (name=="Adrain") return "Adrian";
-    if (name=="Elgi") return "Egli";
+    if (name=="Frashid") return "Farshid";
+    
     return name;
 }
@@ -360 +370 @@
 void nameCorrection(NamePair& name)
 {
+    if (name.first=="Erik" && name.second=="van")
+    {
+        name.first = "Erik";
+        name.second = "den Dekker";
+    }
+    
+    if (name.first=="Jeoen" && name.second=="den")
+    {
+        name.first = "Jeoen";
+        name.second = "den Dekker";
+    }
+    
     if (name.first=="John" && name.second=="Vidar")
     {
@@ -397 +419 @@
         name.second = "Cipperly";
     }
-    if (name.first=="Gino" && name.second=="")
+    if (name.first=="Gino" && name.second=="van")
     {
         name.first = "Gino";
@@ -540 +562 @@
 {
     if (first.empty()) return EmptyNamePair;
+    
+    // osg::notify(osg::NOTICE)<<"first = "<<first<<" second = "<<second<<std::endl;
     
     unsigned int last = first.size();

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/doc/Doxyfiles/auto_Doxyfile

@@ -324 +324 @@
                          $(OSGHOME)/include/osgParticle \
                          $(OSGHOME)/include/osgViewer \
+                         $(OSGHOME)/include/osgWidget \
                          $(OSGHOME)/include/osgShadow \
                          $(OSGHOME)/include/osgManipulator \

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/doc/Doxyfiles/core_Doxyfile

@@ -399 +399 @@
                          $(OSGHOME)/include/osgParticle \
                          $(OSGHOME)/include/osgViewer \
+                         $(OSGHOME)/include/osgWidget \
                          $(OSGHOME)/include/osgManipulator \
                          $(OSGHOME)/include/osgShadow \

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/doc/Doxyfiles/doxyfile.cmake

@@ -1 @@
-# Doxyfile 1.3.6
+# Doxyfile 1.5.6
 
 # This file describes the settings to be used by the documentation system
@@ -15 +15 @@
 #---------------------------------------------------------------------------
 
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
@@ -24 +32 @@
 # if some version control system is used.
 
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         = ${OPENSCENEGRAPH_VERSION}
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
@@ -31 +39 @@
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ${OpenSceneGraph_SOURCE_DIR}/doc/
+OUTPUT_DIRECTORY       = "${PROJECT_BINARY_DIR}/doc/"
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
@@ -37 +54 @@
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
-# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, 
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, 
+# and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
@@ -71 +90 @@
 # that is used to form the text in various listings. Each string 
 # in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is used 
-# as the annotated text. Otherwise, the brief description is used as-is. If left 
-# blank, the following values are used ("$name" is automatically replaced with the 
-# name of the entity): "The $name class" "The $name widget" "The $name file" 
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
 
 ABBREVIATE_BRIEF       = 
@@ -85 +105 @@
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
-# the base classes will not be shown.
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
@@ -96 +116 @@
 # to NO the shortest path that makes the file name unique will be used.
 
-FULL_PATH_NAMES        = NO
+FULL_PATH_NAMES        = YES
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
 # can be used to strip a user-defined part of the path. Stripping is 
 # only done if one of the specified strings matches the left-hand part of 
-# the path. It is allowed to use relative paths in the argument list. 
+# the path. The tag can be used to show relative paths in the file list. 
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        = "${OpenSceneGraph_SOURCE_DIR}/include/"
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
@@ -116 +145 @@
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
@@ -142 +179 @@
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
@@ -163 +199 @@
 ALIASES                = 
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
 # For instance, some of the names that are used will be different. The list 
 # of all members will be omitted, etc.
@@ -170 +206 @@
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
 
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
@@ -185 +269 @@
 SUBGROUPING            = YES
 
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
 #---------------------------------------------------------------------------
 # Build related configuration options
@@ -211 +305 @@
 
 EXTRACT_LOCAL_CLASSES  = NO
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
 
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
@@ -252 +361 @@
 # allowed. This is useful if you have classes or files whose names only differ 
 # in case and if your file system supports case sensitive file names. Windows 
-# users are advised to set this option to NO.
+# and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
@@ -286 +395 @@
 
 SORT_BRIEF_DOCS        = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
 
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
@@ -342 +457 @@
 SHOW_USED_FILES        = YES
 
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
@@ -370 +513 @@
 WARN_IF_DOC_ERROR      = YES
 
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that 
 # doxygen can produce. The string should contain the $file, $line, and $text 
 # tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text.
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
@@ -392 +545 @@
 # with spaces.
 
-INPUT                  = ${OpenSceneGraph_SOURCE_DIR}/include/osg \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgDB \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgFX \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgGA \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgIntrospection \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgParticle \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgViewer \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgManipulator \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgShadow \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgSim \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgTerrain \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgText \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgUtil \
-                         ${OpenSceneGraph_SOURCE_DIR}/doc/Doxyfiles/auto_Mainpage
+INPUT                  = "${OpenSceneGraph_SOURCE_DIR}/include/osg" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgDB" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgFX" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgGA" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgIntrospection" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgManipulator" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgParticle" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgShadow" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgSim" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgTerrain" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgText" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgUtil" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgViewer" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgWidget"
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the 
@@ -411 +572 @@
 # and *.h) to filter out the source-files in the directories. If left 
 # blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
 FILE_PATTERNS          = *include* \
@@ -429 +590 @@
 EXCLUDE                = 
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
 
 EXCLUDE_SYMLINKS       = NO
@@ -436 +598 @@
 # If the value of the INPUT tag contains directories, you can use the 
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = */.svn/*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or 
@@ -471 +643 @@
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
 # input file. Doxygen will then use the output that the filter program writes 
-# to standard output.
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
 
 INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
@@ -503 +685 @@
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# If the REFERENCED_BY_RELATION tag is set to YES 
 # then for each documented function all documented 
 # functions referencing it will be listed.
@@ -509 +691 @@
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default) 
+# If the REFERENCES_RELATION tag is set to YES 
 # then for each documented function all documented entities 
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
 
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
@@ -575 +772 @@
 # standard footer.
 
-HTML_FOOTER            = ${OpenSceneGraph_SOURCE_DIR}/doc/Doxyfiles/custom_Footer.html
+HTML_FOOTER            = "${OpenSceneGraph_SOURCE_DIR}/doc/Doxyfiles/custom_Footer.html"
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
@@ -594 +791 @@
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
@@ -619 +849 @@
 GENERATE_CHI           = NO
 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     = 
+
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
 # controls whether a binary table of contents is generated (YES) or a 
@@ -641 +877 @@
 ENUM_VALUES_PER_LINE   = 4
 
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to FRAME, a side panel will be generated
+# containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
 # JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
 # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
+# and Class Hiererachy pages using a tree view instead of an ordered list;
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
+# disables this behavior completely. For backwards compatibility with previous
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
+# respectively.
 
 GENERATE_TREEVIEW      = NO
@@ -655 +899 @@
 
 TREEVIEW_WIDTH         = 250
+
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
 
 #---------------------------------------------------------------------------
@@ -901 +1153 @@
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
@@ -927 +1179 @@
 # gcc). The argument of the tag is a list of macros of the form: name 
 # or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
 
 PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS
@@ -941 +1195 @@
 # doxygen's preprocessor will remove all function-like macros that are alone 
 # on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse the 
-# parser if not removed.
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
@@ -994 +1248 @@
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is 
-# recommended to install and use dot, since it yields more powerful graphs.
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
 
 CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH            = 
 
 # If set to YES, the inheritance and collaboration graphs will hide 
@@ -1014 +1278 @@
 HAVE_DOT               = YES
 
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = 
+
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
@@ -1028 +1310 @@
 COLLABORATION_GRAPH    = NO
 
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
 # collaboration diagrams in a style similar to the OMG's Unified Modeling 
@@ -1053 +1340 @@
 INCLUDED_BY_GRAPH      = NO
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
 
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
@@ -1065 +1360 @@
 
 GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
@@ -1073 +1375 @@
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path.
+# found. If left blank, it is assumed the dot tool can be found in the path.
 
 DOT_PATH               = 
@@ -1083 +1385 @@
 DOTFILE_DIRS           = 
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
 # graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes that 
-# lay further from the root node will be omitted. Note that setting this option to 
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
-# note that a graph may be further truncated if the graph's image dimensions are 
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is enabled by default, which results in a transparent 
+# background. Warning: Depending on the platform used, enabling this option 
+# may lead to badly anti-aliased labels on the edges of a graph (i.e. they 
+# become hard to read).
+
+DOT_TRANSPARENT        = YES
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
@@ -1130 +1440 @@
 
 SEARCHENGINE           = ${SEARCHENGINE}
-

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/examples/osgimagesequence/osgimagesequence.cpp

@@ -35 +35 @@
 #include <iostream>
 
+
+
+
 //
 // A simple demo demonstrating how to set on an animated texture using an osg::ImageSequence
@@ -43 +46 @@
     osg::ref_ptr<osg::ImageSequence> imageSequence = new osg::ImageSequence;
 
-    imageSequence->setDuration(2.0);
+    imageSequence->setLength(4.0);
     imageSequence->addImage(osgDB::readImageFile("Cubemap_axis/posx.png"));
     imageSequence->addImage(osgDB::readImageFile("Cubemap_axis/negx.png"));
@@ -95 +98 @@
 
 
+osg::ImageStream* s_imageStream = 0;
+class MovieEventHandler : public osgGA::GUIEventHandler
+{
+public:
+
+    MovieEventHandler():_trackMouse(false),_playToggle(true) {}
+    
+    void setMouseTracking(bool track) { _trackMouse = track; }
+    bool getMouseTracking() const { return _trackMouse; }
+    
+    void set(osg::Node* node);
+
+    virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object*, osg::NodeVisitor* nv);
+    
+    virtual void getUsage(osg::ApplicationUsage& usage) const;
+
+    typedef std::vector< osg::observer_ptr<osg::ImageStream> > ImageStreamList;
+
+protected:
+
+    virtual ~MovieEventHandler() {}
+
+    class FindImageStreamsVisitor : public osg::NodeVisitor
+    {
+    public:
+        FindImageStreamsVisitor(ImageStreamList& imageStreamList):
+            _imageStreamList(imageStreamList) {}
+            
+        virtual void apply(osg::Geode& geode)
+        {
+            apply(geode.getStateSet());
+
+            for(unsigned int i=0;i<geode.getNumDrawables();++i)
+            {
+                apply(geode.getDrawable(i)->getStateSet());
+            }
+        
+            traverse(geode);
+        }
+
+        virtual void apply(osg::Node& node)
+        {
+            apply(node.getStateSet());
+            traverse(node);
+        }
+        
+        inline void apply(osg::StateSet* stateset)
+        {
+            if (!stateset) return;
+            
+            osg::StateAttribute* attr = stateset->getTextureAttribute(0,osg::StateAttribute::TEXTURE);
+            if (attr)
+            {
+                osg::Texture2D* texture2D = dynamic_cast<osg::Texture2D*>(attr);
+                if (texture2D) apply(dynamic_cast<osg::ImageStream*>(texture2D->getImage()));
+
+                osg::TextureRectangle* textureRec = dynamic_cast<osg::TextureRectangle*>(attr);
+                if (textureRec) apply(dynamic_cast<osg::ImageStream*>(textureRec->getImage()));
+            }
+        }
+        
+        inline void apply(osg::ImageStream* imagestream)
+        {
+            if (imagestream)
+            {
+                _imageStreamList.push_back(imagestream); 
+                s_imageStream = imagestream;
+            }
+        }
+        
+        ImageStreamList& _imageStreamList;
+    };
+
+
+    bool            _playToggle;
+    bool            _trackMouse;
+    ImageStreamList _imageStreamList;
+    
+};
+
+
+
+void MovieEventHandler::set(osg::Node* node)
+{
+    _imageStreamList.clear();
+    if (node)
+    {
+        FindImageStreamsVisitor fisv(_imageStreamList);
+        node->accept(fisv);
+    }
+}
+
+
+bool MovieEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object*, osg::NodeVisitor* nv)
+{
+    switch(ea.getEventType())
+    {
+        case(osgGA::GUIEventAdapter::KEYDOWN):
+        {
+            if (ea.getKey()=='p')
+            {
+                for(ImageStreamList::iterator itr=_imageStreamList.begin();
+                    itr!=_imageStreamList.end();
+                    ++itr)
+                {
+                    if ((*itr)->getStatus()==osg::ImageStream::PLAYING)
+                    {
+                        // playing, so pause
+                        std::cout<<"Pause"<<std::endl;
+                        (*itr)->pause();
+                    }
+                    else
+                    {
+                        // playing, so pause
+                        std::cout<<"Play"<<std::endl;
+                        (*itr)->play();
+                    }
+                }
+                return true;
+            }
+            else if (ea.getKey()=='r')
+            {
+                for(ImageStreamList::iterator itr=_imageStreamList.begin();
+                    itr!=_imageStreamList.end();
+                    ++itr)
+                {
+                    std::cout<<"Restart"<<std::endl;
+                    (*itr)->rewind();
+                }
+                return true;
+            }
+            else if (ea.getKey()=='L')
+            {
+                for(ImageStreamList::iterator itr=_imageStreamList.begin();
+                    itr!=_imageStreamList.end();
+                    ++itr)
+                {
+                    if ( (*itr)->getLoopingMode() == osg::ImageStream::LOOPING)
+                    {
+                        std::cout<<"Toggle Looping Off"<<std::endl;
+                        (*itr)->setLoopingMode( osg::ImageStream::NO_LOOPING );
+                    }
+                    else
+                    {
+                        std::cout<<"Toggle Looping On"<<std::endl;
+                        (*itr)->setLoopingMode( osg::ImageStream::LOOPING );
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+
+        default:
+            return false;
+    }
+    return false;
+}
+
+void MovieEventHandler::getUsage(osg::ApplicationUsage& usage) const
+{
+    usage.addKeyboardMouseBinding("p","Play/Pause movie");
+    usage.addKeyboardMouseBinding("r","Restart movie");
+    usage.addKeyboardMouseBinding("l","Toggle looping of movie");
+}
+
+
+
+
 int main(int argc, char **argv)
 {
@@ -105 +277 @@
     viewer.setSceneData(createModel());
 
+    // pass the model to the MovieEventHandler so it can pick out ImageStream's to manipulate.
+    MovieEventHandler* meh = new MovieEventHandler();
+    meh->set( viewer.getSceneData() );
+    viewer.addEventHandler( meh );
+
+
     std::string filename;
     if (arguments.read("-o",filename))

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/examples/osgmovie/osgmovie.cpp

@@ -45 +45 @@
 public:
 
-    MovieEventHandler():_trackMouse(false),playToggle_(true) {}
+    MovieEventHandler():_trackMouse(false),_playToggle(true) {}
     
     void setMouseTracking(bool track) { _trackMouse = track; }
@@ -114 +114 @@
 
 
-    bool            playToggle_;
+    bool            _playToggle;
     bool            _trackMouse;
     ImageStreamList _imageStreamList;
@@ -209 +209 @@
                     ++itr)
                 {
-                    playToggle_ = !playToggle_;
-                    if ( playToggle_ )
+                    _playToggle = !_playToggle;
+                    if ( _playToggle )
                     {
                         // playing, so pause

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/examples/osgviewerGTK/osgviewerGTK.cpp

@@ +1 @@
+#include <string.h>
+
 #include <iostream>
 #include <string>
@@ -51 +53 @@
         );
 
-        if(not std::strncmp(text, "Close", 5)) gtk_main_quit();
+        if(not strncmp(text, "Close", 5)) gtk_main_quit();
     
-        else if(not std::strncmp(text, "Open File", 9)) {
+        else if(not strncmp(text, "Open File", 9)) {
             GtkWidget* of = gtk_file_chooser_dialog_new(
                 "Please select an OSG file...",

OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev/examples/osgvolume/osgvolume.cpp

@@ -33 +33 @@
 #include <osg/PrimitiveSet>
 #include <osg/Endian>
+#include <osg/BlendFunc>
+#include <osg/BlendEquation>
 
 #include <osgDB/Registry>
@@ -45 +47 @@
 
 #include <osgViewer/Viewer>
+#include <osgViewer/ViewerEventHandlers>
+
+#include <osg/io_utils>
 
 #include <iostream>
@@ -630 +635 @@
     float halfSize = size*0.5f;
     float y = halfSize;
-    float dy =-size*1.4/(float)(numSlices-1)*sliceEnd;
+    float dy =-size/(float)(numSlices-1)*sliceEnd;
 
     //y = -halfSize;
@@ -669 +674 @@
     public:
     
-        FollowMouseCallback()
+        FollowMouseCallback(bool shader = false):
+            _shader(shader)
         {
             _updateTransparency = false;
@@ -709 +715 @@
                 case(osgGA::GUIEventAdapter::DRAG):
                 {
-                    float v = ea.getY()*0.5f+0.5f;
-                    osg::Uniform* uniform = 0;
-                    if (_updateTransparency && (uniform = stateset->getUniform("transparency"))) uniform->set(v);
-                    if (_updateAlphaCutOff && (uniform = stateset->getUniform("alphaCutOff"))) uniform->set(v);
-                    if (_updateSampleDensity && (uniform = stateset->getUniform("sampleDensity"))) uniform->set(powf(v,5));
+                    float v = (ea.getY()-ea.getYmin())/(ea.getYmax()-ea.getYmin());
+                    if (_shader)
+                    {
+                        osg::Uniform* uniform = 0;
+                        if (_updateTransparency && (uniform = stateset->getUniform("transparency"))) uniform->set(v);
+                        if (_updateAlphaCutOff && (uniform = stateset->getUniform("alphaCutOff"))) uniform->set(v);
+                        if (_updateSampleDensity && (uniform = stateset->getUniform("sampleDensity"))) uniform->set(powf(v,5));
+                    }
+                    else
+                    {                    
+                        if (_updateAlphaCutOff)
+                        {
+                            osg::AlphaFunc* alphaFunc = dynamic_cast<osg::AlphaFunc*>(stateset->getAttribute(osg::StateAttribute::ALPHAFUNC));
+                            if (alphaFunc) 
+                            {
+                                alphaFunc->setReferenceValue(v);
+                            }
+                        }
+                        
+                        if (_updateTransparency)
+                        {
+                            osg::Material* material = dynamic_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
+                            if (material)
+                            {
+                                material->setAlpha(osg::Material::FRONT_AND_BACK,v);
+                            }
+                        }
+                    }
+
                     break;
                 }
@@ -736 +766 @@
         }
         
+        bool _shader;
         bool _updateTransparency;
         bool _updateAlphaCutOff;
@@ -744 +775 @@
 osg::Node* createShaderModel(osg::ref_ptr<osg::Image>& image_3d, osg::ref_ptr<osg::Image>& /*normalmap_3d*/,
                        osg::Texture::InternalFormatMode internalFormatMode,
-                       float /*xSize*/, float /*ySize*/, float /*zSize*/,
+                       float xSize, float ySize, float zSize,
                        float /*xMultiplier*/, float /*yMultiplier*/, float /*zMultiplier*/,
-                       unsigned int /*numSlices*/=500, float /*sliceEnd*/=1.0f, float alphaFuncValue=0.02f)
-{
+                       unsigned int /*numSlices*/=500, float /*sliceEnd*/=1.0f, float alphaFuncValue=0.02f, bool maximumIntensityProjection = false)
+{
+
+    osg::Group* root = new osg::Group;
+    
     osg::Geode* geode = new osg::Geode;
+    root->addChild(geode);
+    
     osg::StateSet* stateset = geode->getOrCreateStateSet();
     
-    stateset->setEventCallback(new FollowMouseCallback);
+    stateset->setEventCallback(new FollowMouseCallback(true));
     
     stateset->setMode(GL_ALPHA_TEST,osg::StateAttribute::ON);
@@ -760 +796 @@
     // imbalanced dimensions of the 256x256x4 texture.
     osg::Texture3D* texture3D = new osg::Texture3D;
+    texture3D->setResizeNonPowerOfTwoHint(false);
     texture3D->setFilter(osg::Texture3D::MIN_FILTER,osg::Texture3D::LINEAR);
     texture3D->setFilter(osg::Texture3D::MAG_FILTER,osg::Texture3D::LINEAR);
@@ -792 +829 @@
     {
         char vertexShaderSource[] = 
-            "varying vec3 texcoord;\n"
-            "varying vec3 cameraPos;\n"
+            "varying vec4 cameraPos;\n"
+            "varying vec4 vertexPos;\n"
+            "varying mat4 texgen;\n"
             "\n"
             "void main(void)\n"
             "{\n"
-            "        texcoord = gl_MultiTexCoord0.xyz;\n"
-            "        gl_Position     = ftransform();\n"
-            "        cameraPos=vec4(gl_ModelViewMatrixInverse*vec4(0,0,0,1)).xyz;\n"
+            "        gl_Position = ftransform();\n"
+            "\n"
+            "        cameraPos = gl_ModelViewMatrixInverse*vec4(0,0,0,1);\n"
+            "        vertexPos = gl_Vertex;\n"
+            "\n"
+            "        texgen = mat4(gl_ObjectPlaneS[0], \n"
+            "                      gl_ObjectPlaneT[0],\n"
+            "                      gl_ObjectPlaneR[0],\n"
+            "                      gl_ObjectPlaneQ[0]);\n"
             "}\n";
 
@@ -823 +867 @@
             "uniform float alphaCutOff;\n"
             "\n"