diff --git a/doc/Doxyfiles/all_Doxyfile b/doc/Doxyfiles/all_Doxyfile index 711f083f9..32d812f13 100644 --- a/doc/Doxyfiles/all_Doxyfile +++ b/doc/Doxyfiles/all_Doxyfile @@ -17,7 +17,7 @@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = "Open Scene Graph" +PROJECT_NAME = "OpenSceneGraph" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/doc/Doxyfiles/auto_Doxyfile b/doc/Doxyfiles/auto_Doxyfile index 75b09d559..2a4a0a7e1 100644 --- a/doc/Doxyfiles/auto_Doxyfile +++ b/doc/Doxyfiles/auto_Doxyfile @@ -17,7 +17,7 @@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = "Open Scene Graph" +PROJECT_NAME = "OpenSceneGraph" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or @@ -324,6 +324,7 @@ INPUT = $(OSGHOME)/include/osg \ $(OSGHOME)/include/osgParticle \ $(OSGHOME)/include/osgViewer \ $(OSGHOME)/include/osgWidget \ + $(OSGHOME)/include/osgVolume \ $(OSGHOME)/include/osgShadow \ $(OSGHOME)/include/osgManipulator \ $(OSGHOME)/include/osgSim \ diff --git a/doc/Doxyfiles/core_Doxyfile b/doc/Doxyfiles/core_Doxyfile index d573ed45e..254b4eb86 100644 --- a/doc/Doxyfiles/core_Doxyfile +++ b/doc/Doxyfiles/core_Doxyfile @@ -399,6 +399,7 @@ INPUT = $(OSGHOME)/include/osg \ $(OSGHOME)/include/osgParticle \ $(OSGHOME)/include/osgViewer \ $(OSGHOME)/include/osgWidget \ + $(OSGHOME)/include/osgVolume \ $(OSGHOME)/include/osgManipulator \ $(OSGHOME)/include/osgShadow \ $(OSGHOME)/include/osgSim \ diff --git a/doc/Doxyfiles/custom_Footer.html b/doc/Doxyfiles/custom_Footer.html index c62f24520..8b1e3adb1 100644 --- a/doc/Doxyfiles/custom_Footer.html +++ b/doc/Doxyfiles/custom_Footer.html @@ -1,6 +1,6 @@
Generated at $datetime for the OpenSceneGraph by doxygen $doxygenversion.
- + diff --git a/doc/Doxyfiles/doxyfile.cmake b/doc/Doxyfiles/doxyfile.cmake index 99438f4a8..60007b7a6 100644 --- a/doc/Doxyfiles/doxyfile.cmake +++ b/doc/Doxyfiles/doxyfile.cmake @@ -557,6 +557,7 @@ INPUT = "${OpenSceneGraph_SOURCE_DIR}/include/osg" \ "${OpenSceneGraph_SOURCE_DIR}/include/osgText" \ "${OpenSceneGraph_SOURCE_DIR}/include/osgUtil" \ "${OpenSceneGraph_SOURCE_DIR}/include/osgViewer" \ + "${OpenSceneGraph_SOURCE_DIR}/include/osgVolume" \ "${OpenSceneGraph_SOURCE_DIR}/include/osgWidget" # This tag can be used to specify the character encoding of the source files diff --git a/src/osgWrappers/CMakeLists.txt b/src/osgWrappers/CMakeLists.txt index e7fbbe05d..d50b4cfd0 100644 --- a/src/osgWrappers/CMakeLists.txt +++ b/src/osgWrappers/CMakeLists.txt @@ -123,16 +123,18 @@ SET(OSGWRAPPER_LIB_LIST OpenThreads osg osgDB - osgUtil - osgGA - osgText - osgParticle osgFX - osgSim + osgGA osgManipulator + osgParticle osgShadow + osgSim osgTerrain + osgText + osgUtil osgViewer + osgVolume + osgWidget ) diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index f38ed8540..e9aabee50 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -635,6 +635,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry) __void__copyToAndOptimize__Geometry_R1, "", ""); + I_Method0(bool, containsSharedArrays, + Properties::NON_VIRTUAL, + __bool__containsSharedArrays, + "", + ""); + I_Method0(void, duplicateSharedArrays, + Properties::NON_VIRTUAL, + __void__duplicateSharedArrays, + "", + ""); I_Method0(void, computeInternalOptimizedGeometry, Properties::NON_VIRTUAL, __void__computeInternalOptimizedGeometry, diff --git a/src/osgWrappers/osgTerrain/Layer.cpp b/src/osgWrappers/osgTerrain/Layer.cpp index e8a18d5dd..c2b73dfb9 100644 --- a/src/osgWrappers/osgTerrain/Layer.cpp +++ b/src/osgWrappers/osgTerrain/Layer.cpp @@ -980,11 +980,6 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::SwitchLayer) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method0(void, clear, - Properties::NON_VIRTUAL, - __void__clear, - "", - ""); I_Method1(void, setActiveLayer, IN, int, i, Properties::NON_VIRTUAL, __void__setActiveLayer__int, diff --git a/src/osgWrappers/osgVolume/Export.cpp b/src/osgWrappers/osgVolume/Export.cpp new file mode 100644 index 000000000..8d6e72af6 --- /dev/null +++ b/src/osgWrappers/osgVolume/Export.cpp @@ -0,0 +1,22 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#include + +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif +