FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source 
These changes add the necessary superclass type qualification so that Doxygen now recognizes the references."
This commit is contained in:
Robert Osfield 2007-03-05 17:34:36 +00:00
parent 71ec26ba62
commit 579700bedf
26 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/AlphaFunc
View File

@ -64,7 +64,7 @@ class OSG_EXPORT AlphaFunc : public StateAttribute
return 0; // Passed all the above comparison macros, so must be equal. 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); usage.usesMode(GL_ALPHA_TEST);
return true; return true;

2
include/osg/BlendColor
View File

@ -52,7 +52,7 @@ class OSG_EXPORT BlendColor : public StateAttribute
return 0; // Passed all the above comparison macros, so must be equal. 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); usage.usesMode(GL_BLEND);
return true; return true;

2
include/osg/BlendEquation
View File

@ -76,7 +76,7 @@ class OSG_EXPORT BlendEquation : public StateAttribute
return 0; // Passed all the above comparison macros, so must be equal. 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); usage.usesMode(GL_BLEND);
return true; return true;

2
include/osg/BlendFunc
View File

@ -71,7 +71,7 @@ class OSG_EXPORT BlendFunc : public StateAttribute
return 0; // Passed all the above comparison macros, so must be equal. 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); usage.usesMode(GL_BLEND);
return true; return true;

2
include/osg/ClipPlane
View File

@ -63,7 +63,7 @@ class OSG_EXPORT ClipPlane : public StateAttribute
virtual unsigned int getMember() const { return _clipPlaneNum; } 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)); usage.usesMode((GLMode)(GL_CLIP_PLANE0+_clipPlaneNum));
return true; return true;

2
include/osg/CullFace
View File

@ -54,7 +54,7 @@ class OSG_EXPORT CullFace : public StateAttribute
return 0; // passed all the above comparison macro's, must be equal. 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); usage.usesMode(GL_CULL_FACE);
return true; return true;

2
include/osg/Depth
View File

@ -67,7 +67,7 @@ class OSG_EXPORT Depth : public StateAttribute
return 0; // passed all the above comparison macro's, must be equal. 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); usage.usesMode(GL_DEPTH_TEST);
return true; return true;

2
include/osg/Fog
View File

@ -64,7 +64,7 @@ class OSG_EXPORT Fog : public StateAttribute
return 0; // passed all the above comparison macro's, must be equal. 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); usage.usesMode(GL_FOG);
return true; return true;

2
include/osg/FragmentProgram
View File

@ -136,7 +136,7 @@ class OSG_EXPORT FragmentProgram : public StateAttribute
return 0; // passed all the above comparison macro's, must be equal. 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); usage.usesMode(GL_FRAGMENT_PROGRAM_ARB);
return true; return true;

16
include/osg/Geometry
View File

@ -338,17 +338,17 @@ class OSG_EXPORT Geometry : public Drawable
*/ */
virtual void drawImplementation(State& state) const; virtual void drawImplementation(State& state) const;
/** Return true, osg::Geometry does support accept(AttributeFunctor&). */ /** Return true, osg::Geometry does support accept(Drawable::AttributeFunctor&). */
virtual bool supports(const AttributeFunctor&) const { return true; } 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. */ /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */
virtual void accept(AttributeFunctor& af); virtual void accept(Drawable::AttributeFunctor& af);
/** Return true, osg::Geometry does support accept(ConstAttributeFunctor&). */ /** Return true, osg::Geometry does support accept(Drawable::ConstAttributeFunctor&). */
virtual bool supports(const ConstAttributeFunctor&) const { return true; } 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. */ /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */
virtual void accept(ConstAttributeFunctor& af) const; virtual void accept(Drawable::ConstAttributeFunctor& af) const;
/** Return true, osg::Geometry does support accept(PrimitiveFunctor&). */ /** Return true, osg::Geometry does support accept(PrimitiveFunctor&). */
virtual bool supports(const PrimitiveFunctor&) const { return true; } virtual bool supports(const PrimitiveFunctor&) const { return true; }

2
include/osg/Light
View File

@ -69,7 +69,7 @@ class OSG_EXPORT Light : public StateAttribute
virtual unsigned int getMember() const { return _lightnum; } 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); usage.usesMode(GL_LIGHT0+_lightnum);
return true; return true;

2
include/osg/LineStipple
View File

@ -46,7 +46,7 @@ class OSG_EXPORT LineStipple : public StateAttribute
return 0; // passed all the above comparison macros, must be equal. 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); usage.usesMode(GL_LINE_STIPPLE);
return true; return true;

2
include/osg/LogicOp
View File

@ -66,7 +66,7 @@ class OSG_EXPORT LogicOp : public StateAttribute
return 0; // Passed all the above comparison macros, so must be equal. 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); usage.usesMode(GL_COLOR_LOGIC_OP);
return true; return true;

2
include/osg/Material
View File

@ -77,7 +77,7 @@ class OSG_EXPORT Material : public StateAttribute
Material& operator = (const Material& rhs); 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 // 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. // we shouldn't declare usage of that mode, so commenting out the below usage.

2
include/osg/Point
View File

@ -54,7 +54,7 @@ class OSG_EXPORT Point : public StateAttribute
return 0; // passed all the above comparison macro's, must be equal. 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); usage.usesMode(GL_POINT_SMOOTH);
return true; return true;

2
include/osg/PointSprite
View File

@ -47,7 +47,7 @@ public:
/** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
virtual int compare(const StateAttribute& sa) const; 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); usage.usesMode(GL_POINT_SPRITE_ARB);
return true; return true;

2
include/osg/PolygonOffset
View File

@ -49,7 +49,7 @@ class OSG_EXPORT PolygonOffset : public StateAttribute
return 0; // passed all the above comparison macros, must be equal. 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_FILL);
usage.usesMode(GL_POLYGON_OFFSET_LINE); usage.usesMode(GL_POLYGON_OFFSET_LINE);

2
include/osg/PolygonStipple
View File

@ -34,7 +34,7 @@ class OSG_EXPORT PolygonStipple : public StateAttribute
/** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
virtual int compare(const StateAttribute& sa) const; 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); usage.usesMode(GL_POLYGON_STIPPLE);
return true; return true;

2
include/osg/Scissor
View File

@ -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); usage.usesMode(GL_SCISSOR_TEST);
return true; return true;

8
include/osg/ShapeDrawable
View File

@ -165,11 +165,11 @@ class OSG_EXPORT ShapeDrawable : public Drawable
/** Return false, osg::ShapeDrawable does not support accept(AttributeFunctor&).*/ /** Return false, osg::ShapeDrawable does not support accept(AttributeFunctor&).*/
virtual bool supports(const AttributeFunctor&) const { return false; } virtual bool supports(const AttributeFunctor&) const { return false; }
/** Return true, osg::ShapeDrawable does support accept(ConstAttributeFunctor&).*/ /** Return true, osg::ShapeDrawable does support accept(Drawable::ConstAttributeFunctor&).*/
virtual bool supports(const ConstAttributeFunctor&) const { return true; } 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.*/ /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.*/
virtual void accept(ConstAttributeFunctor& af) const; virtual void accept(Drawable::ConstAttributeFunctor& af) const;
/** Return true, osg::ShapeDrawable does support accept(PrimitiveFunctor&) .*/ /** Return true, osg::ShapeDrawable does support accept(PrimitiveFunctor&) .*/
virtual bool supports(const PrimitiveFunctor&) const { return true; } virtual bool supports(const PrimitiveFunctor&) const { return true; }

2
include/osg/Stencil
View File

@ -66,7 +66,7 @@ class OSG_EXPORT Stencil : public StateAttribute
return 0; // passed all the above comparison macro's, must be equal. 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); usage.usesMode(GL_STENCIL_TEST);
return true; return true;

2
include/osg/StencilTwoSided
View File

@ -39,7 +39,7 @@ class OSG_EXPORT StencilTwoSided : public StateAttribute
/** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/ /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
virtual int compare(const StateAttribute& sa) const; 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);
usage.usesMode(GL_STENCIL_TEST_TWO_SIDE); usage.usesMode(GL_STENCIL_TEST_TWO_SIDE);

2
include/osg/TexGen
View File

@ -65,7 +65,7 @@ class OSG_EXPORT TexGen : public StateAttribute
return 0; // Passed all the above comparison macros, so must be equal. 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_S);
usage.usesTextureMode(GL_TEXTURE_GEN_T); usage.usesTextureMode(GL_TEXTURE_GEN_T);

2
include/osg/Texture
View File

@ -214,7 +214,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute
virtual GLenum getTextureTarget() const = 0; virtual GLenum getTextureTarget() const = 0;
virtual bool getModeUsage(ModeUsage& usage) const virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const
{ {
usage.usesTextureMode(getTextureTarget()); usage.usesTextureMode(getTextureTarget());
return true; return true;

2
include/osg/VertexProgram
View File

@ -136,7 +136,7 @@ class OSG_EXPORT VertexProgram : public StateAttribute
return 0; // passed all the above comparison macros, must be equal. 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); usage.usesMode(GL_VERTEX_PROGRAM_ARB);
return true; return true;

16
include/osgSim/ImpostorSprite
View File

@ -128,17 +128,17 @@ class OSGSIM_EXPORT ImpostorSprite : public osg::Drawable
/** Draw ImpostorSprite directly. */ /** Draw ImpostorSprite directly. */
virtual void drawImplementation(osg::State& state) const; virtual void drawImplementation(osg::State& state) const;
/** Return true, osg::ImpostorSprite does support accept(AttributeFunctor&). */ /** Return true, osg::ImpostorSprite does support accept(Drawable::AttributeFunctor&). */
virtual bool supports(const AttributeFunctor&) const { return true; } 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. */ /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */
virtual void accept(AttributeFunctor& af); virtual void accept(Drawable::AttributeFunctor& af);
/** Return true, osg::ImpostorSprite does support accept(ConstAttributeFunctor&). */ /** Return true, osg::ImpostorSprite does support accept(Drawable::ConstAttributeFunctor&). */
virtual bool supports(const ConstAttributeFunctor&) const { return true; } 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. */ /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */
virtual void accept(ConstAttributeFunctor& af) const; virtual void accept(Drawable::ConstAttributeFunctor& af) const;
/** Return true, osg::ImpostorSprite does support accept(PrimitiveFunctor&). */ /** Return true, osg::ImpostorSprite does support accept(PrimitiveFunctor&). */
virtual bool supports(const osg::PrimitiveFunctor&) const { return true; } virtual bool supports(const osg::PrimitiveFunctor&) const { return true; }