Changeset 6311

Show
Ignore:
Timestamp:
03/05/07 18:34:36
Author:
robert
Message:

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."

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/include/osg/AlphaFunc

    r5328 r6311  
    6565        } 
    6666 
    67         virtual bool getModeUsage(ModeUsage& usage) const 
     67        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    6868        { 
    6969            usage.usesMode(GL_ALPHA_TEST); 

  • OpenSceneGraph/trunk/include/osg/BlendColor

    r5573 r6311  
    5353        } 
    5454 
    55         virtual bool getModeUsage(ModeUsage& usage) const 
     55        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    5656        { 
    5757            usage.usesMode(GL_BLEND); 

  • OpenSceneGraph/trunk/include/osg/BlendEquation

    r5328 r6311  
    7777        } 
    7878 
    79         virtual bool getModeUsage(ModeUsage& usage) const 
     79        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    8080        { 
    8181            usage.usesMode(GL_BLEND); 

  • OpenSceneGraph/trunk/include/osg/BlendFunc

    r5328 r6311  
    7272        } 
    7373 
    74         virtual bool getModeUsage(ModeUsage& usage) const 
     74        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    7575        { 
    7676            usage.usesMode(GL_BLEND); 

  • OpenSceneGraph/trunk/include/osg/ClipPlane

    r5328 r6311  
    6464        virtual unsigned int getMember() const { return _clipPlaneNum; } 
    6565 
    66         virtual bool getModeUsage(ModeUsage& usage) const 
     66        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    6767        { 
    6868            usage.usesMode((GLMode)(GL_CLIP_PLANE0+_clipPlaneNum)); 

  • OpenSceneGraph/trunk/include/osg/CullFace

    r5328 r6311  
    5555        } 
    5656 
    57         virtual bool getModeUsage(ModeUsage& usage) const 
     57        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    5858        { 
    5959            usage.usesMode(GL_CULL_FACE); 

  • OpenSceneGraph/trunk/include/osg/Depth

    r5328 r6311  
    6868        } 
    6969 
    70         virtual bool getModeUsage(ModeUsage& usage) const 
     70        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    7171        { 
    7272            usage.usesMode(GL_DEPTH_TEST); 

  • OpenSceneGraph/trunk/include/osg/Fog

    r5328 r6311  
    6565        } 
    6666 
    67         virtual bool getModeUsage(ModeUsage& usage) const 
     67        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    6868        { 
    6969            usage.usesMode(GL_FOG); 

  • OpenSceneGraph/trunk/include/osg/FragmentProgram

    r5882 r6311  
    137137        } 
    138138 
    139         virtual bool getModeUsage(ModeUsage& usage) const 
     139        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    140140        { 
    141141            usage.usesMode(GL_FRAGMENT_PROGRAM_ARB); 

  • OpenSceneGraph/trunk/include/osg/Geometry

    r5328 r6311  
    339339        virtual void drawImplementation(State& state) const; 
    340340 
    341         /** Return true, osg::Geometry does support accept(AttributeFunctor&). */ 
    342         virtual bool supports(const AttributeFunctor&) const { return true; } 
    343  
    344         /** Accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
    345         virtual void accept(AttributeFunctor& af); 
    346  
    347         /** Return true, osg::Geometry does support accept(ConstAttributeFunctor&). */ 
    348         virtual bool supports(const ConstAttributeFunctor&) const { return true; } 
    349  
    350         /** Accept a ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
    351         virtual void accept(ConstAttributeFunctor& af) const; 
     341        /** Return true, osg::Geometry does support accept(Drawable::AttributeFunctor&). */ 
     342        virtual bool supports(const Drawable::AttributeFunctor&) const { return true; } 
     343 
     344        /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
     345        virtual void accept(Drawable::AttributeFunctor& af); 
     346 
     347        /** Return true, osg::Geometry does support accept(Drawable::ConstAttributeFunctor&). */ 
     348        virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } 
     349 
     350        /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
     351        virtual void accept(Drawable::ConstAttributeFunctor& af) const; 
    352352 
    353353        /** Return true, osg::Geometry does support accept(PrimitiveFunctor&). */ 

  • OpenSceneGraph/trunk/include/osg/Light

    r5328 r6311  
    7070        virtual unsigned int getMember() const { return _lightnum; } 
    7171 
    72         virtual bool getModeUsage(ModeUsage& usage) const 
     72        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    7373        { 
    7474            usage.usesMode(GL_LIGHT0+_lightnum); 

  • OpenSceneGraph/trunk/include/osg/LineStipple

    r4803 r6311  
    4747        } 
    4848         
    49         virtual bool getModeUsage(ModeUsage& usage) const 
     49        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    5050        { 
    5151            usage.usesMode(GL_LINE_STIPPLE); 

  • OpenSceneGraph/trunk/include/osg/LogicOp

    r5328 r6311  
    6767        } 
    6868 
    69         virtual bool getModeUsage(ModeUsage& usage) const 
     69        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    7070        { 
    7171            usage.usesMode(GL_COLOR_LOGIC_OP); 

  • OpenSceneGraph/trunk/include/osg/Material

    r5708 r6311  
    7878        Material& operator = (const Material& rhs); 
    7979 
    80         virtual bool getModeUsage(ModeUsage& /*usage*/) const 
     80        virtual bool getModeUsage(StateAttribute::ModeUsage& /*usage*/) const 
    8181        { 
    8282            // note, since Material does it's own glEnable/glDisable of GL_COLOR_MATERIAL 

  • OpenSceneGraph/trunk/include/osg/Point

    r5706 r6311  
    5555        } 
    5656 
    57         virtual bool getModeUsage(ModeUsage& usage) const 
     57        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    5858        { 
    5959            usage.usesMode(GL_POINT_SMOOTH); 

  • OpenSceneGraph/trunk/include/osg/PointSprite

    r5729 r6311  
    4848        virtual int compare(const StateAttribute& sa) const; 
    4949 
    50         virtual bool getModeUsage(ModeUsage& usage) const 
     50        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    5151        { 
    5252            usage.usesMode(GL_POINT_SPRITE_ARB); 

  • OpenSceneGraph/trunk/include/osg/PolygonOffset

    r5328 r6311  
    5050        } 
    5151 
    52         virtual bool getModeUsage(ModeUsage& usage) const 
     52        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    5353        { 
    5454            usage.usesMode(GL_POLYGON_OFFSET_FILL); 

  • OpenSceneGraph/trunk/include/osg/PolygonStipple

    r5328 r6311  
    3535        virtual int compare(const StateAttribute& sa) const; 
    3636 
    37         virtual bool getModeUsage(ModeUsage& usage) const 
     37        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    3838        { 
    3939            usage.usesMode(GL_POLYGON_STIPPLE); 

  • OpenSceneGraph/trunk/include/osg/Scissor

    r5328 r6311  
    5959 
    6060 
    61         virtual bool getModeUsage(ModeUsage& usage) const 
     61        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    6262        { 
    6363            usage.usesMode(GL_SCISSOR_TEST); 

  • OpenSceneGraph/trunk/include/osg/ShapeDrawable

    r5940 r6311  
    166166        virtual bool supports(const AttributeFunctor&) const { return false; } 
    167167 
    168         /** Return true, osg::ShapeDrawable does support accept(ConstAttributeFunctor&).*/ 
    169         virtual bool supports(const ConstAttributeFunctor&) const { return true; } 
     168        /** Return true, osg::ShapeDrawable does support accept(Drawable::ConstAttributeFunctor&).*/ 
     169        virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } 
    170170 
    171         /** Accept a ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.*/ 
    172         virtual void accept(ConstAttributeFunctor& af) const; 
     171        /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.*/ 
     172        virtual void accept(Drawable::ConstAttributeFunctor& af) const; 
    173173 
    174174        /** Return true, osg::ShapeDrawable does support accept(PrimitiveFunctor&) .*/ 

  • OpenSceneGraph/trunk/include/osg/Stencil

    r6009 r6311  
    6767        } 
    6868 
    69         virtual bool getModeUsage(ModeUsage& usage) const 
     69        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    7070        { 
    7171            usage.usesMode(GL_STENCIL_TEST); 

  • OpenSceneGraph/trunk/include/osg/StencilTwoSided

    r6010 r6311  
    4040        virtual int compare(const StateAttribute& sa) const; 
    4141 
    42         virtual bool getModeUsage(ModeUsage& usage) const 
     42        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    4343        { 
    4444            usage.usesMode(GL_STENCIL_TEST); 

  • OpenSceneGraph/trunk/include/osg/TexGen

    r5328 r6311  
    6666        } 
    6767 
    68         virtual bool getModeUsage(ModeUsage& usage) const 
     68        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    6969        { 
    7070            usage.usesTextureMode(GL_TEXTURE_GEN_S); 

  • OpenSceneGraph/trunk/include/osg/Texture

    r5882 r6311  
    215215        virtual GLenum getTextureTarget() const = 0; 
    216216 
    217         virtual bool getModeUsage(ModeUsage& usage) const 
     217        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    218218        { 
    219219            usage.usesTextureMode(getTextureTarget()); 

  • OpenSceneGraph/trunk/include/osg/VertexProgram

    r5882 r6311  
    137137        } 
    138138 
    139         virtual bool getModeUsage(ModeUsage& usage) const 
     139        virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const 
    140140        { 
    141141            usage.usesMode(GL_VERTEX_PROGRAM_ARB); 

  • OpenSceneGraph/trunk/include/osgSim/ImpostorSprite

    r5757 r6311  
    129129        virtual void drawImplementation(osg::State& state) const; 
    130130 
    131         /** Return true, osg::ImpostorSprite does support accept(AttributeFunctor&). */ 
    132         virtual bool supports(const AttributeFunctor&) const { return true; } 
    133  
    134         /** Accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
    135         virtual void accept(AttributeFunctor& af); 
    136  
    137         /** Return true, osg::ImpostorSprite does support accept(ConstAttributeFunctor&). */ 
    138         virtual bool supports(const ConstAttributeFunctor&) const { return true; } 
    139  
    140         /** Accept a ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
    141         virtual void accept(ConstAttributeFunctor& af) const; 
     131        /** Return true, osg::ImpostorSprite does support accept(Drawable::AttributeFunctor&). */ 
     132        virtual bool supports(const Drawable::AttributeFunctor&) const { return true; } 
     133 
     134        /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
     135        virtual void accept(Drawable::AttributeFunctor& af); 
     136 
     137        /** Return true, osg::ImpostorSprite does support accept(Drawable::ConstAttributeFunctor&). */ 
     138        virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } 
     139 
     140        /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
     141        virtual void accept(Drawable::ConstAttributeFunctor& af) const; 
    142142 
    143143        /** Return true, osg::ImpostorSprite does support accept(PrimitiveFunctor&). */