From 579700bedf2e70bbe9f0338a2a45d7be9e3891bb Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 5 Mar 2007 17:34:36 +0000 Subject: [PATCH] From Mike Wittman, " noticed that some type references of osg::Drawable::AttributeFunctor, osg::Drawable::ConstAttributeFunctor, and osg::StateAttribute::ModeUsage in osg and osgSim were not being properly reflected in osgIntrospection. This appears to be due to Doxygen not handling nested types from superclasses if they're not qualified when referenced in subclasses. These changes add the necessary superclass type qualification so that Doxygen now recognizes the references." --- include/osg/AlphaFunc | 2 +- include/osg/BlendColor | 2 +- include/osg/BlendEquation | 2 +- include/osg/BlendFunc | 2 +- include/osg/ClipPlane | 2 +- include/osg/CullFace | 2 +- include/osg/Depth | 2 +- include/osg/Fog | 2 +- include/osg/FragmentProgram | 2 +- include/osg/Geometry | 16 ++++++++-------- include/osg/Light | 2 +- include/osg/LineStipple | 2 +- include/osg/LogicOp | 2 +- include/osg/Material | 2 +- include/osg/Point | 2 +- include/osg/PointSprite | 2 +- include/osg/PolygonOffset | 2 +- include/osg/PolygonStipple | 2 +- include/osg/Scissor | 2 +- include/osg/ShapeDrawable | 8 ++++---- include/osg/Stencil | 2 +- include/osg/StencilTwoSided | 2 +- include/osg/TexGen | 2 +- include/osg/Texture | 2 +- include/osg/VertexProgram | 2 +- include/osgSim/ImpostorSprite | 16 ++++++++-------- 26 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/osg/AlphaFunc b/include/osg/AlphaFunc index b70208aec..703d8e052 100644 --- a/include/osg/AlphaFunc +++ b/include/osg/AlphaFunc @@ -64,7 +64,7 @@ class OSG_EXPORT AlphaFunc : public StateAttribute return 0; // Passed all the above comparison macros, so must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_ALPHA_TEST); return true; diff --git a/include/osg/BlendColor b/include/osg/BlendColor index ccaabc937..0a1f868a3 100644 --- a/include/osg/BlendColor +++ b/include/osg/BlendColor @@ -52,7 +52,7 @@ class OSG_EXPORT BlendColor : public StateAttribute return 0; // Passed all the above comparison macros, so must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_BLEND); return true; diff --git a/include/osg/BlendEquation b/include/osg/BlendEquation index 9e064063a..5687040c0 100644 --- a/include/osg/BlendEquation +++ b/include/osg/BlendEquation @@ -76,7 +76,7 @@ class OSG_EXPORT BlendEquation : public StateAttribute return 0; // Passed all the above comparison macros, so must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_BLEND); return true; diff --git a/include/osg/BlendFunc b/include/osg/BlendFunc index 5fdb37a4e..4995ced3f 100644 --- a/include/osg/BlendFunc +++ b/include/osg/BlendFunc @@ -71,7 +71,7 @@ class OSG_EXPORT BlendFunc : public StateAttribute return 0; // Passed all the above comparison macros, so must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_BLEND); return true; diff --git a/include/osg/ClipPlane b/include/osg/ClipPlane index 91c91bdfc..a08f5005f 100644 --- a/include/osg/ClipPlane +++ b/include/osg/ClipPlane @@ -63,7 +63,7 @@ class OSG_EXPORT ClipPlane : public StateAttribute virtual unsigned int getMember() const { return _clipPlaneNum; } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode((GLMode)(GL_CLIP_PLANE0+_clipPlaneNum)); return true; diff --git a/include/osg/CullFace b/include/osg/CullFace index f1e306f72..4b782ae78 100644 --- a/include/osg/CullFace +++ b/include/osg/CullFace @@ -54,7 +54,7 @@ class OSG_EXPORT CullFace : public StateAttribute return 0; // passed all the above comparison macro's, must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_CULL_FACE); return true; diff --git a/include/osg/Depth b/include/osg/Depth index 36417f9fe..3ff8878a8 100644 --- a/include/osg/Depth +++ b/include/osg/Depth @@ -67,7 +67,7 @@ class OSG_EXPORT Depth : public StateAttribute return 0; // passed all the above comparison macro's, must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_DEPTH_TEST); return true; diff --git a/include/osg/Fog b/include/osg/Fog index a5a209fd8..8fee64afd 100644 --- a/include/osg/Fog +++ b/include/osg/Fog @@ -64,7 +64,7 @@ class OSG_EXPORT Fog : public StateAttribute return 0; // passed all the above comparison macro's, must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_FOG); return true; diff --git a/include/osg/FragmentProgram b/include/osg/FragmentProgram index cd59b64da..e0de6f1ca 100644 --- a/include/osg/FragmentProgram +++ b/include/osg/FragmentProgram @@ -136,7 +136,7 @@ class OSG_EXPORT FragmentProgram : public StateAttribute return 0; // passed all the above comparison macro's, must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_FRAGMENT_PROGRAM_ARB); return true; diff --git a/include/osg/Geometry b/include/osg/Geometry index bfcad0cb4..499d918ab 100644 --- a/include/osg/Geometry +++ b/include/osg/Geometry @@ -338,17 +338,17 @@ class OSG_EXPORT Geometry : public Drawable */ virtual void drawImplementation(State& state) const; - /** Return true, osg::Geometry does support accept(AttributeFunctor&). */ - virtual bool supports(const AttributeFunctor&) const { return true; } + /** Return true, osg::Geometry does support accept(Drawable::AttributeFunctor&). */ + virtual bool supports(const Drawable::AttributeFunctor&) const { return true; } - /** Accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ - virtual void accept(AttributeFunctor& af); + /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ + virtual void accept(Drawable::AttributeFunctor& af); - /** Return true, osg::Geometry does support accept(ConstAttributeFunctor&). */ - virtual bool supports(const ConstAttributeFunctor&) const { return true; } + /** Return true, osg::Geometry does support accept(Drawable::ConstAttributeFunctor&). */ + virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } - /** Accept a ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ - virtual void accept(ConstAttributeFunctor& af) const; + /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ + virtual void accept(Drawable::ConstAttributeFunctor& af) const; /** Return true, osg::Geometry does support accept(PrimitiveFunctor&). */ virtual bool supports(const PrimitiveFunctor&) const { return true; } diff --git a/include/osg/Light b/include/osg/Light index b8c76d488..51e594a35 100644 --- a/include/osg/Light +++ b/include/osg/Light @@ -69,7 +69,7 @@ class OSG_EXPORT Light : public StateAttribute virtual unsigned int getMember() const { return _lightnum; } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_LIGHT0+_lightnum); return true; diff --git a/include/osg/LineStipple b/include/osg/LineStipple index cdf12929c..a01d1816e 100644 --- a/include/osg/LineStipple +++ b/include/osg/LineStipple @@ -46,7 +46,7 @@ class OSG_EXPORT LineStipple : public StateAttribute return 0; // passed all the above comparison macros, must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_LINE_STIPPLE); return true; diff --git a/include/osg/LogicOp b/include/osg/LogicOp index ffa36cc5f..8b0d53aa2 100644 --- a/include/osg/LogicOp +++ b/include/osg/LogicOp @@ -66,7 +66,7 @@ class OSG_EXPORT LogicOp : public StateAttribute return 0; // Passed all the above comparison macros, so must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_COLOR_LOGIC_OP); return true; diff --git a/include/osg/Material b/include/osg/Material index 89912c512..f8128abe0 100644 --- a/include/osg/Material +++ b/include/osg/Material @@ -77,7 +77,7 @@ class OSG_EXPORT Material : public StateAttribute Material& operator = (const Material& rhs); - virtual bool getModeUsage(ModeUsage& /*usage*/) const + virtual bool getModeUsage(StateAttribute::ModeUsage& /*usage*/) const { // note, since Material does it's own glEnable/glDisable of GL_COLOR_MATERIAL // we shouldn't declare usage of that mode, so commenting out the below usage. diff --git a/include/osg/Point b/include/osg/Point index a0b8a21af..b7e2d0d9b 100644 --- a/include/osg/Point +++ b/include/osg/Point @@ -54,7 +54,7 @@ class OSG_EXPORT Point : public StateAttribute return 0; // passed all the above comparison macro's, must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_POINT_SMOOTH); return true; diff --git a/include/osg/PointSprite b/include/osg/PointSprite index 4cc63ca1d..349fa816b 100644 --- a/include/osg/PointSprite +++ b/include/osg/PointSprite @@ -47,7 +47,7 @@ public: /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const; - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_POINT_SPRITE_ARB); return true; diff --git a/include/osg/PolygonOffset b/include/osg/PolygonOffset index 648955732..4d1afb9bc 100644 --- a/include/osg/PolygonOffset +++ b/include/osg/PolygonOffset @@ -49,7 +49,7 @@ class OSG_EXPORT PolygonOffset : public StateAttribute return 0; // passed all the above comparison macros, must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_POLYGON_OFFSET_FILL); usage.usesMode(GL_POLYGON_OFFSET_LINE); diff --git a/include/osg/PolygonStipple b/include/osg/PolygonStipple index 4138aedfe..b097cbaf0 100644 --- a/include/osg/PolygonStipple +++ b/include/osg/PolygonStipple @@ -34,7 +34,7 @@ class OSG_EXPORT PolygonStipple : public StateAttribute /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const; - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_POLYGON_STIPPLE); return true; diff --git a/include/osg/Scissor b/include/osg/Scissor index 03be982ab..ade2c25bd 100644 --- a/include/osg/Scissor +++ b/include/osg/Scissor @@ -58,7 +58,7 @@ class OSG_EXPORT Scissor : public StateAttribute } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_SCISSOR_TEST); return true; diff --git a/include/osg/ShapeDrawable b/include/osg/ShapeDrawable index 3eed9ea81..24266b207 100644 --- a/include/osg/ShapeDrawable +++ b/include/osg/ShapeDrawable @@ -165,11 +165,11 @@ class OSG_EXPORT ShapeDrawable : public Drawable /** Return false, osg::ShapeDrawable does not support accept(AttributeFunctor&).*/ virtual bool supports(const AttributeFunctor&) const { return false; } - /** Return true, osg::ShapeDrawable does support accept(ConstAttributeFunctor&).*/ - virtual bool supports(const ConstAttributeFunctor&) const { return true; } + /** Return true, osg::ShapeDrawable does support accept(Drawable::ConstAttributeFunctor&).*/ + virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } - /** Accept a ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.*/ - virtual void accept(ConstAttributeFunctor& af) const; + /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.*/ + virtual void accept(Drawable::ConstAttributeFunctor& af) const; /** Return true, osg::ShapeDrawable does support accept(PrimitiveFunctor&) .*/ virtual bool supports(const PrimitiveFunctor&) const { return true; } diff --git a/include/osg/Stencil b/include/osg/Stencil index 28dd60e4a..95445e4df 100644 --- a/include/osg/Stencil +++ b/include/osg/Stencil @@ -66,7 +66,7 @@ class OSG_EXPORT Stencil : public StateAttribute return 0; // passed all the above comparison macro's, must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_STENCIL_TEST); return true; diff --git a/include/osg/StencilTwoSided b/include/osg/StencilTwoSided index 3027f27fa..61c73eb0f 100644 --- a/include/osg/StencilTwoSided +++ b/include/osg/StencilTwoSided @@ -39,7 +39,7 @@ class OSG_EXPORT StencilTwoSided : public StateAttribute /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ virtual int compare(const StateAttribute& sa) const; - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_STENCIL_TEST); usage.usesMode(GL_STENCIL_TEST_TWO_SIDE); diff --git a/include/osg/TexGen b/include/osg/TexGen index 655bea6f5..4183074a8 100644 --- a/include/osg/TexGen +++ b/include/osg/TexGen @@ -65,7 +65,7 @@ class OSG_EXPORT TexGen : public StateAttribute return 0; // Passed all the above comparison macros, so must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesTextureMode(GL_TEXTURE_GEN_S); usage.usesTextureMode(GL_TEXTURE_GEN_T); diff --git a/include/osg/Texture b/include/osg/Texture index 6c83e369b..2afa5cbfc 100644 --- a/include/osg/Texture +++ b/include/osg/Texture @@ -214,7 +214,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute virtual GLenum getTextureTarget() const = 0; - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesTextureMode(getTextureTarget()); return true; diff --git a/include/osg/VertexProgram b/include/osg/VertexProgram index ee6ebd846..24a337786 100644 --- a/include/osg/VertexProgram +++ b/include/osg/VertexProgram @@ -136,7 +136,7 @@ class OSG_EXPORT VertexProgram : public StateAttribute return 0; // passed all the above comparison macros, must be equal. } - virtual bool getModeUsage(ModeUsage& usage) const + virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const { usage.usesMode(GL_VERTEX_PROGRAM_ARB); return true; diff --git a/include/osgSim/ImpostorSprite b/include/osgSim/ImpostorSprite index 885596d04..5e41bd582 100644 --- a/include/osgSim/ImpostorSprite +++ b/include/osgSim/ImpostorSprite @@ -128,17 +128,17 @@ class OSGSIM_EXPORT ImpostorSprite : public osg::Drawable /** Draw ImpostorSprite directly. */ virtual void drawImplementation(osg::State& state) const; - /** Return true, osg::ImpostorSprite does support accept(AttributeFunctor&). */ - virtual bool supports(const AttributeFunctor&) const { return true; } + /** Return true, osg::ImpostorSprite does support accept(Drawable::AttributeFunctor&). */ + virtual bool supports(const Drawable::AttributeFunctor&) const { return true; } - /** Accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ - virtual void accept(AttributeFunctor& af); + /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ + virtual void accept(Drawable::AttributeFunctor& af); - /** Return true, osg::ImpostorSprite does support accept(ConstAttributeFunctor&). */ - virtual bool supports(const ConstAttributeFunctor&) const { return true; } + /** Return true, osg::ImpostorSprite does support accept(Drawable::ConstAttributeFunctor&). */ + virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } - /** Accept a ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ - virtual void accept(ConstAttributeFunctor& af) const; + /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ + virtual void accept(Drawable::ConstAttributeFunctor& af) const; /** Return true, osg::ImpostorSprite does support accept(PrimitiveFunctor&). */ virtual bool supports(const osg::PrimitiveFunctor&) const { return true; }