From b4e0acc7b34b60d4a2d5e0ddb02f55d4ba29b4ee Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 11 Feb 2009 19:55:11 +0000 Subject: [PATCH] Updated wrappers to works with doxygen 1.5.8 output. --- src/osgWrappers/Doxyfile.template | 4 - src/osgWrappers/genwrapper.conf | 168 +++++++----------------------- 2 files changed, 37 insertions(+), 135 deletions(-) diff --git a/src/osgWrappers/Doxyfile.template b/src/osgWrappers/Doxyfile.template index 18a6abb09..0547b833b 100644 --- a/src/osgWrappers/Doxyfile.template +++ b/src/osgWrappers/Doxyfile.template @@ -8,7 +8,6 @@ PROJECT_NUMBER = OUTPUT_DIRECTORY = "$(OUTPUT_DIR)" CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = YES BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ @@ -30,7 +29,6 @@ STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO TAB_SIZE = 8 @@ -223,8 +221,6 @@ DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO diff --git a/src/osgWrappers/genwrapper.conf b/src/osgWrappers/genwrapper.conf index 1d45484a3..7d8dc1d85 100644 --- a/src/osgWrappers/genwrapper.conf +++ b/src/osgWrappers/genwrapper.conf @@ -179,6 +179,11 @@ suppress reflector "osg::MixinVector< GLuint >" suppress reflector "OpenThreads::Atomic" suppress reflector "OpenThreads::AtomicPtr" +suppress reflector "osg::BoundingBoxImpl< osg::Vec3f >" +suppress reflector "osg::BoundingBoxImpl< osg::Vec3d >" + +suppress reflector "osg::BoundingSphereImpl< osg::Vec3f >" +suppress reflector "osg::BoundingSphereImpl< osg::Vec3d >" ############################################################################# @@ -333,137 +338,24 @@ suppress reflector "osg::ref_ptr< const osgFX::Effect >" # Doxygen incorrectly parses function typedefs as methods -configure reflector "osg::VertexProgram::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::StencilTwoSided::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::Texture3D::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::GL2Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLuint__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::BufferObject::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::Drawable::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::BlendColor::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::BlendEquation::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::BlendFunc::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::FragmentProgram::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::Multisample::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::Point::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::ClampColor::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::Texture::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end - -configure reflector "osg::Texture2DArray::Extensions" - configure method "__typedef__void__APIENTRY_P1" - replace with "" - end - configure method "__typedef__GLboolean__APIENTRY_P1" - replace with "" - end -end +suppress reflector "osg::VertexProgram::Extensions" +suppress reflector "osg::StencilTwoSided::Extensions" +suppress reflector "osg::Texture3D::Extensions" +suppress reflector "osg::GL2Extensions" +suppress reflector "osg::Drawable::Extensions" +suppress reflector "osg::BufferObject::Extensions" +suppress reflector "osg::FBOExtensions" +suppress reflector "osg::Drawable::Extensions" +suppress reflector "osg::BlendColor::Extensions" +suppress reflector "osg::BlendEquation::Extensions" +suppress reflector "osg::BlendFunc::Extensions" +suppress reflector "osg::FragmentProgram::Extensions" +suppress reflector "osg::Multisample::Extensions" +suppress reflector "osg::Point::Extensions" +suppress reflector "osg::ClampColor::Extensions" +suppress reflector "osg::Texture::Extensions" +suppress reflector "osg::Texture2DArray::Extensions" +suppress reflector "osgSim::ShapeAttribute" configure reflector "osg::State" configure method "__typedef__void__APIENTRY_P1" @@ -471,6 +363,20 @@ configure reflector "osg::State" end end +configure reflector "osgWidget::Window::Getter" + replace with "" +end + +configure reflector "osgWidget::MouseHandler::MouseAction" + replace with "" +end + +configure reflector "osgWidget::MouseHandler::MouseEvent" + replace with "" +end + + + ############################################################################# # avoid functions that use protected types, since those are not handled