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

From Magnus Kessler, "After a closer look at this particular issue, I used some grep and sed magic

Browse Source 
to fix all occurrences of "macro's" and "paramter".
"
This commit is contained in:
Robert Osfield
2010-09-30 16:57:02 +00:00
parent 17aaa4db94
commit e5bc43f04c
37 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/BlendColor
View File

@@ -43,7 +43,7 @@ class OSG_EXPORT BlendColor : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(BlendColor,sa)
// Compare each parameter in turn against the rhs.

2
include/osg/BlendEquation
View File

@@ -70,7 +70,7 @@ class OSG_EXPORT BlendEquation : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(BlendEquation,sa)
// Compare each parameter in turn against the rhs.

2
include/osg/BlendFunc
View File

@@ -86,7 +86,7 @@ class OSG_EXPORT BlendFunc : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(BlendFunc,sa)
// Compare each parameter in turn against the rhs.

2
include/osg/ClampColor
View File

@@ -60,7 +60,7 @@ class OSG_EXPORT ClampColor : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(ClampColor,sa)
// Compare each parameter in turn against the rhs.

2
include/osg/ClipPlane
View File

@@ -63,7 +63,7 @@ class OSG_EXPORT ClipPlane : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(ClipPlane,sa)
// Compare each parameter in turn against the rhs.

2
include/osg/ColorMask
View File

@@ -49,7 +49,7 @@ class OSG_EXPORT ColorMask : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(ColorMask,sa)
// Compare each parameter in turn against the rhs.

2
include/osg/ColorMatrix
View File

@@ -37,7 +37,7 @@ class OSG_EXPORT ColorMatrix : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(ColorMatrix,sa)
// Compare each parameter in turn against the rhs.

4
include/osg/CullFace
View File

@@ -45,13 +45,13 @@ class OSG_EXPORT CullFace : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(CullFace,sa)
// compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_mode)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const

4
include/osg/Depth
View File

@@ -55,7 +55,7 @@ class OSG_EXPORT Depth : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Depth,sa)
// compare each parameter in turn against the rhs.
@@ -64,7 +64,7 @@ class OSG_EXPORT Depth : public StateAttribute
COMPARE_StateAttribute_Parameter(_zNear)
COMPARE_StateAttribute_Parameter(_zFar)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const

4
include/osg/Fog
View File

@@ -72,7 +72,7 @@ class OSG_EXPORT Fog : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Fog,sa)
// compare each parameter in turn against the rhs.
@@ -84,7 +84,7 @@ class OSG_EXPORT Fog : public StateAttribute
COMPARE_StateAttribute_Parameter(_fogCoordinateSource)
COMPARE_StateAttribute_Parameter(_useRadialFog)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const

4
include/osg/FragmentProgram
View File

@@ -127,13 +127,13 @@ class OSG_EXPORT FragmentProgram : public StateAttribute
virtual int compare(const osg::StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(FragmentProgram,sa)
// compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_fragmentProgram)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const

4
include/osg/FrontFace
View File

@@ -43,13 +43,13 @@ class OSG_EXPORT FrontFace : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(FrontFace,sa)
// compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_mode)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
inline void setMode(Mode mode) { _mode = mode; }

2
include/osg/Hint
View File

@@ -47,7 +47,7 @@ public:
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Hint,sa)
// compare each parameter in turn against the rhs.

4
include/osg/Light
View File

@@ -70,7 +70,7 @@ class OSG_EXPORT Light : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Light,sa)
// compare each parameter in turn against the rhs.
@@ -86,7 +86,7 @@ class OSG_EXPORT Light : public StateAttribute
COMPARE_StateAttribute_Parameter(_spot_exponent)
COMPARE_StateAttribute_Parameter(_spot_cutoff)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
virtual unsigned int getMember() const { return _lightnum; }

2
include/osg/LightModel
View File

@@ -40,7 +40,7 @@ class OSG_EXPORT LightModel : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(LightModel,sa)
// compare each parameter in turn against the rhs.

2
include/osg/LogicOp
View File

@@ -76,7 +76,7 @@ class OSG_EXPORT LogicOp : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(LogicOp,sa)
// Compare each parameter in turn against the rhs.

2
include/osg/Multisample
View File

@@ -65,7 +65,7 @@ class OSG_EXPORT Multisample : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Multisample,sa)
// compare each parameter in turn against the rhs.

2
include/osg/Point
View File

@@ -61,7 +61,7 @@ class OSG_EXPORT Point : public StateAttribute
COMPARE_StateAttribute_Parameter(_minSize)
COMPARE_StateAttribute_Parameter(_maxSize)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const

6
include/osg/Scissor
View File

@@ -45,16 +45,16 @@ class OSG_EXPORT Scissor : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Scissor,sa)
// compare each paramter in turn against the rhs.
// compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_x)
COMPARE_StateAttribute_Parameter(_y)
COMPARE_StateAttribute_Parameter(_width)
COMPARE_StateAttribute_Parameter(_height)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}

4
include/osg/Stencil
View File

@@ -63,7 +63,7 @@ class OSG_EXPORT Stencil : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Stencil,sa)
// compare each parameter in turn against the rhs.
@@ -75,7 +75,7 @@ class OSG_EXPORT Stencil : public StateAttribute
COMPARE_StateAttribute_Parameter(_zpass)
COMPARE_StateAttribute_Parameter(_writeMask)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const

4
include/osg/TexEnvFilter
View File

@@ -44,13 +44,13 @@ class OSG_EXPORT TexEnvFilter : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(TexEnvFilter, sa)
// compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_lodBias)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
void setLodBias( float lodBias ) { _lodBias = lodBias; }

2
include/osg/VertexProgram
View File

@@ -127,7 +127,7 @@ class OSG_EXPORT VertexProgram : public StateAttribute
virtual int compare(const osg::StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(VertexProgram,sa)
// compare each parameter in turn against the rhs.

4
include/osg/Viewport
View File

@@ -52,7 +52,7 @@ class OSG_EXPORT Viewport : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Viewport,sa)
// compare each parameter in turn against the rhs.
@@ -61,7 +61,7 @@ class OSG_EXPORT Viewport : public StateAttribute
COMPARE_StateAttribute_Parameter(_width)
COMPARE_StateAttribute_Parameter(_height)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
inline void setViewport(value_type x,value_type y,value_type width,value_type height)

2
include/osgFX/Validator
View File

@@ -61,7 +61,7 @@ namespace osgFX
inline int Validator::compare(const osg::StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
//used by the COMPARE_StateAttribute_Paramter macro's below.
//used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Validator,sa)
// compare parameters