From f6517d2f8b8f550d3f2a09bd391c2c83f09fc0b8 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 24 Sep 2010 14:53:10 +0000 Subject: [PATCH] From Alexander Wiebel, "I did some spell checking in my spare time. Here come 20 files." --- include/osg/AlphaFunc | 2 +- include/osg/AnimationPath | 2 +- include/osg/ArgumentParser | 2 +- include/osg/TexEnv | 2 +- include/osg/TexEnvFilter | 2 +- include/osg/TexGen | 2 +- include/osg/TexGenNode | 2 +- include/osg/TexMat | 2 +- include/osg/Texture | 6 +++--- include/osg/Texture1D | 2 +- include/osg/Texture2D | 2 +- include/osg/Texture2DArray | 2 +- include/osg/Texture3D | 2 +- include/osg/TextureCubeMap | 6 +++--- include/osg/Timer | 2 +- include/osg/TransferFunction | 10 +++++----- include/osg/Vec2f | 2 +- include/osg/Vec3s | 2 +- include/osg/VertexProgram | 2 +- include/osg/Viewport | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/osg/AlphaFunc b/include/osg/AlphaFunc index a21661517..c35dc3c91 100644 --- a/include/osg/AlphaFunc +++ b/include/osg/AlphaFunc @@ -58,7 +58,7 @@ class OSG_EXPORT AlphaFunc : 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(AlphaFunc,sa) // Compare each parameter in turn against the rhs. diff --git a/include/osg/AnimationPath b/include/osg/AnimationPath index 5c454377a..9062e3cd5 100644 --- a/include/osg/AnimationPath +++ b/include/osg/AnimationPath @@ -255,7 +255,7 @@ class OSG_EXPORT AnimationPathCallback : public NodeCallback _pause(false), _pauseTime(0.0) {} - /** Construct an AnimationPathCallback and automatical create an animation path to produce a rotation about a point.*/ + /** Construct an AnimationPathCallback and automatically create an animation path to produce a rotation about a point.*/ AnimationPathCallback(const osg::Vec3d& pivot,const osg::Vec3d& axis,float angularVelocity); diff --git a/include/osg/ArgumentParser b/include/osg/ArgumentParser index 0c7699b68..e20bdee32 100644 --- a/include/osg/ArgumentParser +++ b/include/osg/ArgumentParser @@ -191,7 +191,7 @@ class OSG_EXPORT ArgumentParser void writeErrorMessages(std::ostream& output,ErrorSeverity sevrity=BENIGN); - /** This convinience method handles help requests on the command line. + /** This convenience method handles help requests on the command line. * Return the type(s) of help requested. The return value of this * function is suitable for passing into getApplicationUsage()->write(). * If ApplicationUsage::NO_HELP is returned then no help commandline option diff --git a/include/osg/TexEnv b/include/osg/TexEnv index 322757fb3..47dd8c20d 100644 --- a/include/osg/TexEnv +++ b/include/osg/TexEnv @@ -58,7 +58,7 @@ class OSG_EXPORT TexEnv : 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(TexEnv,sa) // Compare each parameter in turn against the rhs. diff --git a/include/osg/TexEnvFilter b/include/osg/TexEnvFilter index 8bd9f3d24..0107bd9c4 100644 --- a/include/osg/TexEnvFilter +++ b/include/osg/TexEnvFilter @@ -44,7 +44,7 @@ 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_Paramter macro's below. + // used by the COMPARE_StateAttribute_Parameter macro's below. COMPARE_StateAttribute_Types(TexEnvFilter, sa) // compare each parameter in turn against the rhs. diff --git a/include/osg/TexGen b/include/osg/TexGen index 3e8a14256..1d77e7654 100644 --- a/include/osg/TexGen +++ b/include/osg/TexGen @@ -62,7 +62,7 @@ class OSG_EXPORT TexGen : 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(TexGen,sa) // Compare each parameter in turn against the rhs. diff --git a/include/osg/TexGenNode b/include/osg/TexGenNode index 546e738ad..1f5cd21be 100644 --- a/include/osg/TexGenNode +++ b/include/osg/TexGenNode @@ -43,7 +43,7 @@ class OSG_EXPORT TexGenNode : public Group * parent reference frame. */ void setReferenceFrame(ReferenceFrame rf); - /** Ge thte TexGenNode's ReferenceFrame.*/ + /** Get the TexGenNode's ReferenceFrame.*/ ReferenceFrame getReferenceFrame() const { return _referenceFrame; } /** Set the texture unit that this TexGenNode is associated with.*/ diff --git a/include/osg/TexMat b/include/osg/TexMat index d9eb7c57a..0413f3bf5 100644 --- a/include/osg/TexMat +++ b/include/osg/TexMat @@ -43,7 +43,7 @@ class OSG_EXPORT TexMat : 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(TexMat,sa) // Compare each parameter in turn against the rhs. diff --git a/include/osg/Texture b/include/osg/Texture index f1d9b6f77..c3cc7aad5 100644 --- a/include/osg/Texture +++ b/include/osg/Texture @@ -233,7 +233,7 @@ #define GL_TEXTURE_2D_MULTISAMPLE 0x9100 #endif -// Integer teture extension as in http://www.opengl.org/registry/specs/EXT/texture_integer.txt +// Integer texture extension as in http://www.opengl.org/registry/specs/EXT/texture_integer.txt #ifndef GL_EXT_texture_integer #define GL_RGBA32UI_EXT 0x8D70 #define GL_RGB32UI_EXT 0x8D71 @@ -294,7 +294,7 @@ namespace osg { -/** Texture pure virtual base class that encapsulates OpenGl texture +/** Texture pure virtual base class that encapsulates OpenGL texture * functionality common to the various types of OSG textures. */ class OSG_EXPORT Texture : public osg::StateAttribute @@ -506,7 +506,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute class TextureObject; - /** Returns a pointer to the TextureBbject for the current context. */ + /** Returns a pointer to the TextureObject for the current context. */ inline TextureObject* getTextureObject(unsigned int contextID) const { return _textureObjectBuffer[contextID].get(); diff --git a/include/osg/Texture1D b/include/osg/Texture1D index 1cbe9b668..1513c56f6 100644 --- a/include/osg/Texture1D +++ b/include/osg/Texture1D @@ -24,7 +24,7 @@ namespace osg { -/** Encapsulates OpenGl 1D texture functionality. Doesn't support cube maps, +/** Encapsulates OpenGL 1D texture functionality. Doesn't support cube maps, * so ignore \a face parameters. */ class OSG_EXPORT Texture1D : public Texture diff --git a/include/osg/Texture2D b/include/osg/Texture2D index d06baacc3..ba515a2cf 100644 --- a/include/osg/Texture2D +++ b/include/osg/Texture2D @@ -18,7 +18,7 @@ namespace osg { -/** Encapsulates OpenGl 2D texture functionality. Doesn't support cube maps, +/** Encapsulates OpenGL 2D texture functionality. Doesn't support cube maps, * so ignore \a face parameters. */ class OSG_EXPORT Texture2D : public Texture diff --git a/include/osg/Texture2DArray b/include/osg/Texture2DArray index 784d7965f..5dbcb0605 100644 --- a/include/osg/Texture2DArray +++ b/include/osg/Texture2DArray @@ -210,7 +210,7 @@ class OSG_EXPORT Texture2DArray : public Texture /** * Use std::vector to encapsulate referenced pointers to images of different layers. - * Vectors gives us a random access iterator. The overhead of non-used elements is negligeable */ + * Vectors gives us a random access iterator. The overhead of non-used elements is negligible */ std::vector > _images; // subloaded images can have different texture and image sizes. diff --git a/include/osg/Texture3D b/include/osg/Texture3D index 6da37a32f..5f7147225 100644 --- a/include/osg/Texture3D +++ b/include/osg/Texture3D @@ -22,7 +22,7 @@ namespace osg { -/** Encapsulates OpenGl 2D texture functionality. Doesn't support cube maps, +/** Encapsulates OpenGL 2D texture functionality. Doesn't support cube maps, * so ignore \a face parameters. */ class OSG_EXPORT Texture3D : public Texture diff --git a/include/osg/TextureCubeMap b/include/osg/TextureCubeMap index a271b2bcb..af51ae0da 100644 --- a/include/osg/TextureCubeMap +++ b/include/osg/TextureCubeMap @@ -77,7 +77,7 @@ class OSG_EXPORT TextureCubeMap : public Texture } /** Set the texture width and height. If width or height are zero then - * the repsective size value is calculated from the source image sizes. + * the respective size value is calculated from the source image sizes. */ inline void setTextureSize(int width, int height) const { @@ -131,7 +131,7 @@ class OSG_EXPORT TextureCubeMap : public Texture /** Extensions class which encapsulates the querying of extensions and - * associated function pointers, and provides convinience wrappers to + * associated function pointers, and provides convenience wrappers to * check for the extensions or use the associated functions. */ class OSG_EXPORT Extensions : public osg::Referenced @@ -157,7 +157,7 @@ class OSG_EXPORT TextureCubeMap : public Texture }; /** Function to call to get the extension of a specified context. - * If the Exentsion object for that context has not yet been created + * If the Extensions object for that context has not yet been created * and the 'createIfNotInitalized' flag been set to false then returns NULL. * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object will diff --git a/include/osg/Timer b/include/osg/Timer index 7b1a0278f..984e07829 100644 --- a/include/osg/Timer +++ b/include/osg/Timer @@ -49,7 +49,7 @@ class OSG_EXPORT Timer { /** Get elapsed time in milliseconds.*/ inline double time_m() const { return delta_m(_startTick, tick()); } - /** Get elapsed time in micoseconds.*/ + /** Get elapsed time in microseconds.*/ inline double time_u() const { return delta_u(_startTick, tick()); } /** Get elapsed time in nanoseconds.*/ diff --git a/include/osg/TransferFunction b/include/osg/TransferFunction index e887a93f0..e89c519f7 100644 --- a/include/osg/TransferFunction +++ b/include/osg/TransferFunction @@ -63,7 +63,7 @@ class OSG_EXPORT TransferFunction1D : public osg::TransferFunction META_Object(osg, TransferFunction1D) - /** Get the mnimum transfer function value.*/ + /** Get the minimum transfer function value.*/ float getMinimum() const { return _colorMap.empty() ? 0.0f : _colorMap.begin()->first; } /** Get the maximum transfer function value.*/ @@ -73,7 +73,7 @@ class OSG_EXPORT TransferFunction1D : public osg::TransferFunction * transfer function when download to GPU.*/ void allocate(unsigned int numImageCells); - /** Clear the whole range to just represet a single color.*/ + /** Clear the whole range to just represent a single color.*/ void clear(const osg::Vec4& color = osg::Vec4(1.0f,1.0f,1.0f,1.0f)); /** Get pixel value from the image. */ @@ -95,7 +95,7 @@ class OSG_EXPORT TransferFunction1D : public osg::TransferFunction /** Set the color for a specified transfer function value. * updateImage defaults to true, and tells the setColor function to update the associate osg::Image that * tracks the color map. Pass in false as the updateImage parameter if you are setting up many values - * at once to avoid recomputating og the image data, then once all setColor calls are made explictly call + * at once to avoid recomputation of the image data, then once all setColor calls are made explictly call * updateImage() to bring the osg::Image back into sync with the color map. */ void setColor(float v, const osg::Vec4& color, bool updateImage=true); @@ -104,10 +104,10 @@ class OSG_EXPORT TransferFunction1D : public osg::TransferFunction typedef std::map ColorMap; - /** Get the color map that stores the mapping between the the tranfser function value and the colour it maps to.*/ + /** Get the color map that stores the mapping between the the transfer function value and the colour it maps to.*/ ColorMap& getColorMap() { return _colorMap; } - /** Get the const color map that stores the mapping between the the tranfser function value and the colour it maps to.*/ + /** Get the const color map that stores the mapping between the the transfer function value and the colour it maps to.*/ const ColorMap& getColorMap() const { return _colorMap; } /** Assign a color map and automatically update the image to make sure they are in sync.*/ diff --git a/include/osg/Vec2f b/include/osg/Vec2f index 3ae2bd1c9..618a814d8 100644 --- a/include/osg/Vec2f +++ b/include/osg/Vec2f @@ -35,7 +35,7 @@ class Vec2f /** Number of vector components. */ enum { num_components = 2 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[2]; diff --git a/include/osg/Vec3s b/include/osg/Vec3s index ca6cf6a9e..a7bc03008 100644 --- a/include/osg/Vec3s +++ b/include/osg/Vec3s @@ -129,7 +129,7 @@ class Vec3s return *this; } - /** Binary vector substract. */ + /** Binary vector subtract. */ inline Vec3s operator - (const Vec3s& rhs) const { return Vec3s(_v[0]-rhs._v[0], _v[1]-rhs._v[1], _v[2]-rhs._v[2]); diff --git a/include/osg/VertexProgram b/include/osg/VertexProgram index 511ce46e7..0caccb415 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_Paramter macro's below. + // used by the COMPARE_StateAttribute_Parameter macro's 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 f8e7c7baa..57af11ac6 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_Paramter macro's below. + // used by the COMPARE_StateAttribute_Parameter macro's below. COMPARE_StateAttribute_Types(Viewport,sa) // compare each parameter in turn against the rhs.