diff --git a/examples/osgvirtualprogram/VirtualProgram.h b/examples/osgvirtualprogram/VirtualProgram.h index d9c621ea6..5c33b56c4 100644 --- a/examples/osgvirtualprogram/VirtualProgram.h +++ b/examples/osgvirtualprogram/VirtualProgram.h @@ -25,13 +25,13 @@ public: 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(VirtualProgram,sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_mask) COMPARE_StateAttribute_Parameter(_shaderMap) - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } /** If enabled, activate our program in the GL pipeline, diff --git a/include/osg/BlendColor b/include/osg/BlendColor index 858291560..3670a6065 100644 --- a/include/osg/BlendColor +++ b/include/osg/BlendColor @@ -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. diff --git a/include/osg/BlendEquation b/include/osg/BlendEquation index fad66849a..de4ab4fe9 100644 --- a/include/osg/BlendEquation +++ b/include/osg/BlendEquation @@ -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. diff --git a/include/osg/BlendFunc b/include/osg/BlendFunc index 79ffc8cd5..4b75e310c 100644 --- a/include/osg/BlendFunc +++ b/include/osg/BlendFunc @@ -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. diff --git a/include/osg/ClampColor b/include/osg/ClampColor index 4ea5d627b..b817f4fbc 100644 --- a/include/osg/ClampColor +++ b/include/osg/ClampColor @@ -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. diff --git a/include/osg/ClipPlane b/include/osg/ClipPlane index 207d13f17..0913039b7 100644 --- a/include/osg/ClipPlane +++ b/include/osg/ClipPlane @@ -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. diff --git a/include/osg/ColorMask b/include/osg/ColorMask index 843d6a01d..48ac2eb53 100644 --- a/include/osg/ColorMask +++ b/include/osg/ColorMask @@ -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. diff --git a/include/osg/ColorMatrix b/include/osg/ColorMatrix index 7cf9bd1d4..169419c01 100644 --- a/include/osg/ColorMatrix +++ b/include/osg/ColorMatrix @@ -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. diff --git a/include/osg/CullFace b/include/osg/CullFace index 4b782ae78..647ce2056 100644 --- a/include/osg/CullFace +++ b/include/osg/CullFace @@ -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 diff --git a/include/osg/Depth b/include/osg/Depth index 27962f89d..7080f3a0a 100644 --- a/include/osg/Depth +++ b/include/osg/Depth @@ -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 diff --git a/include/osg/Fog b/include/osg/Fog index 62a2aeedc..56bf41113 100644 --- a/include/osg/Fog +++ b/include/osg/Fog @@ -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 diff --git a/include/osg/FragmentProgram b/include/osg/FragmentProgram index 307948428..9d86311e8 100644 --- a/include/osg/FragmentProgram +++ b/include/osg/FragmentProgram @@ -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 diff --git a/include/osg/FrontFace b/include/osg/FrontFace index 3cd6b4515..43eeb8eb8 100644 --- a/include/osg/FrontFace +++ b/include/osg/FrontFace @@ -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; } diff --git a/include/osg/Hint b/include/osg/Hint index a156a0798..63b1d5f1f 100644 --- a/include/osg/Hint +++ b/include/osg/Hint @@ -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. diff --git a/include/osg/Light b/include/osg/Light index 7cf15c9d2..58e4bcf2e 100644 --- a/include/osg/Light +++ b/include/osg/Light @@ -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; } diff --git a/include/osg/LightModel b/include/osg/LightModel index a12c28cce..310ef7301 100644 --- a/include/osg/LightModel +++ b/include/osg/LightModel @@ -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. diff --git a/include/osg/LogicOp b/include/osg/LogicOp index cd3d5699a..37677db9e 100644 --- a/include/osg/LogicOp +++ b/include/osg/LogicOp @@ -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. diff --git a/include/osg/Multisample b/include/osg/Multisample index cbbcfb5e1..322085a02 100644 --- a/include/osg/Multisample +++ b/include/osg/Multisample @@ -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. diff --git a/include/osg/Point b/include/osg/Point index fd3b1324c..e364612bb 100644 --- a/include/osg/Point +++ b/include/osg/Point @@ -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 diff --git a/include/osg/Scissor b/include/osg/Scissor index ade2c25bd..41c8bcb56 100644 --- a/include/osg/Scissor +++ b/include/osg/Scissor @@ -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. } diff --git a/include/osg/Stencil b/include/osg/Stencil index 046807d43..912586c2b 100644 --- a/include/osg/Stencil +++ b/include/osg/Stencil @@ -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 diff --git a/include/osg/TexEnvFilter b/include/osg/TexEnvFilter index 0107bd9c4..cffce29bc 100644 --- a/include/osg/TexEnvFilter +++ b/include/osg/TexEnvFilter @@ -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; } diff --git a/include/osg/VertexProgram b/include/osg/VertexProgram index 0caccb415..8a3cf5c3a 100644 --- a/include/osg/VertexProgram +++ b/include/osg/VertexProgram @@ -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. diff --git a/include/osg/Viewport b/include/osg/Viewport index 57af11ac6..cfa2c1c3f 100644 --- a/include/osg/Viewport +++ b/include/osg/Viewport @@ -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) diff --git a/include/osgFX/Validator b/include/osgFX/Validator index 5fc1825e2..1b38e0ee3 100644 --- a/include/osgFX/Validator +++ b/include/osgFX/Validator @@ -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 diff --git a/src/osg/PointSprite.cpp b/src/osg/PointSprite.cpp index 29e22ff8c..68d71c282 100644 --- a/src/osg/PointSprite.cpp +++ b/src/osg/PointSprite.cpp @@ -36,7 +36,7 @@ int PointSprite::compare(const StateAttribute& sa) const COMPARE_StateAttribute_Parameter(_coordOriginMode) - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } diff --git a/src/osg/PolygonStipple.cpp b/src/osg/PolygonStipple.cpp index 5a075b52b..8442cba34 100644 --- a/src/osg/PolygonStipple.cpp +++ b/src/osg/PolygonStipple.cpp @@ -61,7 +61,7 @@ PolygonStipple::~PolygonStipple() int PolygonStipple::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(PolygonStipple,sa) // compare each parameter in turn against the rhs. @@ -71,7 +71,7 @@ int PolygonStipple::compare(const StateAttribute& sa) const else if (_mask[i]>rhs._mask[i]) return 1; } - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } void PolygonStipple::setMask(const GLubyte* givenMask) diff --git a/src/osg/Program.cpp b/src/osg/Program.cpp index 40b97b90b..c50bc58a7 100644 --- a/src/osg/Program.cpp +++ b/src/osg/Program.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2008 Zebra Imaging * * This application is open source and may be redistributed and/or modified - * freely and without restriction, both in commericial and non commericial + * freely and without restriction, both in commercial and non commercial * applications, as long as this copyright notice is maintained. * * This application is distributed in the hope that it will be useful, @@ -141,7 +141,7 @@ Program::~Program() int Program::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(Program,sa) if( _shaderList.size() < rhs._shaderList.size() ) return -1; @@ -169,7 +169,7 @@ int Program::compare(const osg::StateAttribute& sa) const if (result!=0) return result; } - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } diff --git a/src/osg/StencilTwoSided.cpp b/src/osg/StencilTwoSided.cpp index e658f4452..a8c9f7801 100644 --- a/src/osg/StencilTwoSided.cpp +++ b/src/osg/StencilTwoSided.cpp @@ -61,7 +61,7 @@ StencilTwoSided::~StencilTwoSided() int StencilTwoSided::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(StencilTwoSided,sa) // compare each parameter in turn against the rhs. @@ -81,7 +81,7 @@ int StencilTwoSided::compare(const StateAttribute& sa) const COMPARE_StateAttribute_Parameter(_zpass[BACK]) COMPARE_StateAttribute_Parameter(_writeMask[BACK]) - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } void StencilTwoSided::apply(State& state) const diff --git a/src/osg/Texture1D.cpp b/src/osg/Texture1D.cpp index 7fa929315..e46b70a3f 100644 --- a/src/osg/Texture1D.cpp +++ b/src/osg/Texture1D.cpp @@ -48,7 +48,7 @@ Texture1D::~Texture1D() int Texture1D::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(Texture1D,sa) if (_image!=rhs._image) // smart pointer comparison. @@ -89,7 +89,7 @@ int Texture1D::compare(const StateAttribute& sa) const COMPARE_StateAttribute_Parameter(_textureWidth) COMPARE_StateAttribute_Parameter(_subloadCallback) - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } void Texture1D::setImage(Image* image) diff --git a/src/osg/Texture2D.cpp b/src/osg/Texture2D.cpp index 4ce89f06a..33ba9088b 100644 --- a/src/osg/Texture2D.cpp +++ b/src/osg/Texture2D.cpp @@ -52,7 +52,7 @@ Texture2D::~Texture2D() int Texture2D::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(Texture2D,sa) if (_image!=rhs._image) // smart pointer comparison. @@ -102,7 +102,7 @@ int Texture2D::compare(const StateAttribute& sa) const #endif COMPARE_StateAttribute_Parameter(_subloadCallback) - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } void Texture2D::setImage(Image* image) diff --git a/src/osg/Texture2DArray.cpp b/src/osg/Texture2DArray.cpp index b4169c81b..1c87b50a6 100644 --- a/src/osg/Texture2DArray.cpp +++ b/src/osg/Texture2DArray.cpp @@ -51,7 +51,7 @@ Texture2DArray::~Texture2DArray() int Texture2DArray::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(Texture2DArray,sa) bool noImages = true; @@ -97,7 +97,7 @@ int Texture2DArray::compare(const StateAttribute& sa) const COMPARE_StateAttribute_Parameter(_textureDepth) COMPARE_StateAttribute_Parameter(_subloadCallback) - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } void Texture2DArray::setImage(unsigned int layer, Image* image) diff --git a/src/osg/Texture2DMultisample.cpp b/src/osg/Texture2DMultisample.cpp index 45ccb25dd..2dbdd1ccf 100644 --- a/src/osg/Texture2DMultisample.cpp +++ b/src/osg/Texture2DMultisample.cpp @@ -53,7 +53,7 @@ Texture2DMultisample::~Texture2DMultisample() int Texture2DMultisample::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(Texture2DMultisample,sa) @@ -79,7 +79,7 @@ int Texture2DMultisample::compare(const StateAttribute& sa) const } - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } void Texture2DMultisample::apply(State& state) const diff --git a/src/osg/Texture3D.cpp b/src/osg/Texture3D.cpp index 476c13129..0cb55fed6 100644 --- a/src/osg/Texture3D.cpp +++ b/src/osg/Texture3D.cpp @@ -58,7 +58,7 @@ Texture3D::~Texture3D() int Texture3D::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(Texture3D,sa) if (_image!=rhs._image) // smart pointer comparison. @@ -101,7 +101,7 @@ int Texture3D::compare(const StateAttribute& sa) const COMPARE_StateAttribute_Parameter(_textureDepth) COMPARE_StateAttribute_Parameter(_subloadCallback) - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } void Texture3D::setImage(Image* image) diff --git a/src/osg/TextureCubeMap.cpp b/src/osg/TextureCubeMap.cpp index c97234b6d..cea3f4ab3 100644 --- a/src/osg/TextureCubeMap.cpp +++ b/src/osg/TextureCubeMap.cpp @@ -73,7 +73,7 @@ TextureCubeMap::~TextureCubeMap() int TextureCubeMap::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(TextureCubeMap,sa) bool noImages = true; @@ -117,12 +117,12 @@ int TextureCubeMap::compare(const StateAttribute& sa) const int result = compareTexture(rhs); if (result!=0) return result; - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_textureWidth) COMPARE_StateAttribute_Parameter(_textureHeight) COMPARE_StateAttribute_Parameter(_subloadCallback) - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } diff --git a/src/osg/TextureRectangle.cpp b/src/osg/TextureRectangle.cpp index cca317488..5c7ed1065 100644 --- a/src/osg/TextureRectangle.cpp +++ b/src/osg/TextureRectangle.cpp @@ -76,7 +76,7 @@ TextureRectangle::~TextureRectangle() int TextureRectangle::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(TextureRectangle,sa) if (_image!=rhs._image) // smart pointer comparison. @@ -118,7 +118,7 @@ int TextureRectangle::compare(const StateAttribute& sa) const COMPARE_StateAttribute_Parameter(_textureHeight) COMPARE_StateAttribute_Parameter(_subloadCallback) - return 0; // passed all the above comparison macro's, must be equal. + return 0; // passed all the above comparison macros, must be equal. } void TextureRectangle::setImage(Image* image) diff --git a/src/osgPlugins/cfg/VisualChooser.cpp b/src/osgPlugins/cfg/VisualChooser.cpp index 6de38a1e3..e87e3feca 100644 --- a/src/osgPlugins/cfg/VisualChooser.cpp +++ b/src/osgPlugins/cfg/VisualChooser.cpp @@ -593,7 +593,7 @@ VisualInfo *VisualChooser::choose( Display *dpy, int screen, bool strict_adheren { if (*k == WGL_SWAP_METHOD_ARB) { - // attribute come in sequential attribute,paramter pairs + // attribute come in sequential attribute,parameter pairs // as WGL specifications so we need to delete two entries attribs.erase(k,k+2); break;