From eac3dc1963f501d86be47c5df8d726a486e3fe39 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 27 Jun 2007 20:36:16 +0000 Subject: [PATCH] From Paul Melis, "Here is a list of fixes to misspelled APIs. Unfortunately, more than one of these are public APIs and therefore will break linkage to existing shared libraries." Note from Robert Osfield, updated wrappers. --- include/osg/BlendColor | 2 +- include/osg/BlendEquation | 2 +- include/osg/BufferObject | 2 +- include/osg/ClampColor | 2 +- include/osg/CollectOccludersVisitor | 2 +- include/osg/Drawable | 2 +- include/osg/FragmentProgram | 2 +- include/osg/Multisample | 2 +- include/osg/Point | 2 +- include/osg/Referenced | 4 ++-- include/osg/StencilTwoSided | 2 +- include/osg/TextureCubeMap | 2 +- include/osg/VertexProgram | 2 +- include/osgDB/Input | 2 +- include/osgDB/Registry | 4 ++-- include/osgParticle/ModularEmitter | 10 +++++----- include/osgShadow/OccluderGeometry | 4 ++-- include/osgTerrain/GeometryTechnique | 4 ++-- include/osgText/Text | 2 +- src/osg/BlendColor.cpp | 4 ++-- src/osg/BlendEquation.cpp | 4 ++-- src/osg/BufferObject.cpp | 4 ++-- src/osg/ClampColor.cpp | 4 ++-- src/osg/Drawable.cpp | 4 ++-- src/osg/FragmentProgram.cpp | 4 ++-- src/osg/Multisample.cpp | 4 ++-- src/osg/Point.cpp | 4 ++-- src/osg/Referenced.cpp | 2 +- src/osg/StencilTwoSided.cpp | 4 ++-- src/osg/TextureCubeMap.cpp | 4 ++-- src/osg/VertexProgram.cpp | 4 ++-- src/osgDB/DatabasePager.cpp | 2 +- src/osgDB/Input.cpp | 2 +- src/osgDB/Registry.cpp | 6 +++--- src/osgParticle/FireEffect.cpp | 2 +- src/osgParticle/SmokeEffect.cpp | 2 +- src/osgPlugins/osg/Geometry.cpp | 2 +- src/osgShadow/OccluderGeometry.cpp | 8 ++++---- src/osgText/Text.cpp | 8 ++++---- src/osgWrappers/osg/BlendColor.cpp | 4 ++-- src/osgWrappers/osg/BlendEquation.cpp | 4 ++-- src/osgWrappers/osg/BufferObject.cpp | 4 ++-- src/osgWrappers/osg/ClampColor.cpp | 4 ++-- src/osgWrappers/osg/CollectOccludersVisitor.cpp | 13 +++++-------- src/osgWrappers/osg/Drawable.cpp | 4 ++-- src/osgWrappers/osg/FragmentProgram.cpp | 4 ++-- src/osgWrappers/osg/Multisample.cpp | 4 ++-- src/osgWrappers/osg/Point.cpp | 4 ++-- src/osgWrappers/osg/Referenced.cpp | 4 ++-- src/osgWrappers/osg/StencilTwoSided.cpp | 4 ++-- src/osgWrappers/osg/TextureCubeMap.cpp | 4 ++-- src/osgWrappers/osg/VertexProgram.cpp | 4 ++-- src/osgWrappers/osgDB/Input.cpp | 4 ++-- src/osgWrappers/osgDB/Registry.cpp | 6 +++--- src/osgWrappers/osgParticle/ModularEmitter.cpp | 14 +++++++------- src/osgWrappers/osgShadow/OccluderGeometry.cpp | 8 ++++---- src/osgWrappers/osgTerrain/GeometryTechnique.cpp | 15 +++++++++++---- src/osgWrappers/osgText/Text.cpp | 4 ++-- 58 files changed, 124 insertions(+), 120 deletions(-) diff --git a/include/osg/BlendColor b/include/osg/BlendColor index 0a1f868a3..660f23b0b 100644 --- a/include/osg/BlendColor +++ b/include/osg/BlendColor @@ -81,7 +81,7 @@ class OSG_EXPORT BlendColor : public StateAttribute void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); void setBlendColorSupported(bool flag) { _isBlendColorSupported=flag; } bool isBlendColorSupported() const { return _isBlendColorSupported; } diff --git a/include/osg/BlendEquation b/include/osg/BlendEquation index 5687040c0..f40478db9 100644 --- a/include/osg/BlendEquation +++ b/include/osg/BlendEquation @@ -103,7 +103,7 @@ class OSG_EXPORT BlendEquation : public StateAttribute void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); void setBlendEquationSupported(bool flag) { _isBlendEquationSupported=flag; } bool isBlendEquationSupported() const { return _isBlendEquationSupported; } diff --git a/include/osg/BufferObject b/include/osg/BufferObject index d28963173..d75476e6a 100644 --- a/include/osg/BufferObject +++ b/include/osg/BufferObject @@ -159,7 +159,7 @@ class OSG_EXPORT BufferObject : public Object void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); bool isBufferObjectSupported() const { return _glGenBuffers!=0; } bool isPBOSupported() const { return _isPBOSupported; } diff --git a/include/osg/ClampColor b/include/osg/ClampColor index 114461baa..90222767f 100644 --- a/include/osg/ClampColor +++ b/include/osg/ClampColor @@ -89,7 +89,7 @@ class OSG_EXPORT ClampColor : public StateAttribute void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); void setClampColorSupported(bool flag) { _isClampColorSupported=flag; } bool isClampColorSupported() const { return _isClampColorSupported; } diff --git a/include/osg/CollectOccludersVisitor b/include/osg/CollectOccludersVisitor index d22fb5551..223678d27 100644 --- a/include/osg/CollectOccludersVisitor +++ b/include/osg/CollectOccludersVisitor @@ -62,7 +62,7 @@ class OSG_EXPORT CollectOccludersVisitor : public osg::NodeVisitor, public osg:: void setCreateDrawablesOnOccludeNodes(bool flag) { _createDrawables=flag; } bool getCreateDrawablesOnOccludeNodes() const { return _createDrawables; } - void setCollectedOcculderSet(const ShadowVolumeOccluderSet& svol) { _occluderSet = svol; } + void setCollectedOccluderSet(const ShadowVolumeOccluderSet& svol) { _occluderSet = svol; } ShadowVolumeOccluderSet& getCollectedOccluderSet() { return _occluderSet; } const ShadowVolumeOccluderSet& getCollectedOccluderSet() const { return _occluderSet; } diff --git a/include/osg/Drawable b/include/osg/Drawable index ef23de6ce..34e49a9c7 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -575,7 +575,7 @@ class OSG_EXPORT Drawable : public Object void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); void setVertexProgramSupported(bool flag) { _isVertexProgramSupported=flag; } bool isVertexProgramSupported() const { return _isVertexProgramSupported; } diff --git a/include/osg/FragmentProgram b/include/osg/FragmentProgram index e0de6f1ca..252f1ea5c 100644 --- a/include/osg/FragmentProgram +++ b/include/osg/FragmentProgram @@ -240,7 +240,7 @@ class OSG_EXPORT FragmentProgram : public StateAttribute void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); void setFragmentProgramSupported(bool flag) { _isFragmentProgramSupported=flag; } bool isFragmentProgramSupported() const { return _isFragmentProgramSupported; } diff --git a/include/osg/Multisample b/include/osg/Multisample index 5c4f095d9..853feae78 100644 --- a/include/osg/Multisample +++ b/include/osg/Multisample @@ -105,7 +105,7 @@ class OSG_EXPORT Multisample : public StateAttribute void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); void setMultisampleSupported(bool flag) { _isMultisampleSupported=flag; } void setMultisampleFilterHintSupported(bool flag) { _isMultisampleFilterHintSupported=flag; } diff --git a/include/osg/Point b/include/osg/Point index b7e2d0d9b..557f891b1 100644 --- a/include/osg/Point +++ b/include/osg/Point @@ -89,7 +89,7 @@ class OSG_EXPORT Point : public StateAttribute void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); void setPointParametersSupported(bool flag) { _isPointParametersSupported=flag; } bool isPointParametersSupported() const { return _isPointParametersSupported; } diff --git a/include/osg/Referenced b/include/osg/Referenced index 2d72707cd..ae09f58bf 100644 --- a/include/osg/Referenced +++ b/include/osg/Referenced @@ -108,7 +108,7 @@ class OSG_EXPORT Referenced virtual ~Referenced(); - void deletUsingDeleteHandler() const; + void deleteUsingDeleteHandler() const; mutable OpenThreads::Mutex* _refMutex; @@ -148,7 +148,7 @@ inline void Referenced::unref() const if (needDelete) { - if (getDeleteHandler()) deletUsingDeleteHandler(); + if (getDeleteHandler()) deleteUsingDeleteHandler(); else delete this; } } diff --git a/include/osg/StencilTwoSided b/include/osg/StencilTwoSided index 61c73eb0f..8247a0ee1 100644 --- a/include/osg/StencilTwoSided +++ b/include/osg/StencilTwoSided @@ -148,7 +148,7 @@ class OSG_EXPORT StencilTwoSided : public StateAttribute void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); void setStencilTwoSidedSupported(bool flag) { _isStencilTwoSidedSupported=flag; } bool isStencilTwoSidedSupported() const { return _isStencilTwoSidedSupported; } diff --git a/include/osg/TextureCubeMap b/include/osg/TextureCubeMap index 6e0751796..ff6832681 100644 --- a/include/osg/TextureCubeMap +++ b/include/osg/TextureCubeMap @@ -143,7 +143,7 @@ class OSG_EXPORT TextureCubeMap : public Texture void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); void setCubeMapSupported(bool flag) { _isCubeMapSupported=flag; } bool isCubeMapSupported() const { return _isCubeMapSupported; } diff --git a/include/osg/VertexProgram b/include/osg/VertexProgram index 24a337786..2272f331f 100644 --- a/include/osg/VertexProgram +++ b/include/osg/VertexProgram @@ -243,7 +243,7 @@ class OSG_EXPORT VertexProgram : public StateAttribute void lowestCommonDenominator(const Extensions& rhs); - void setupGLExtenions(unsigned int contextID); + void setupGLExtensions(unsigned int contextID); void setVertexProgramSupported(bool flag) { _isVertexProgramSupported=flag; } bool isVertexProgramSupported() const { return _isVertexProgramSupported; } diff --git a/include/osgDB/Input b/include/osgDB/Input index eeeb20673..9d10f85b8 100644 --- a/include/osgDB/Input +++ b/include/osgDB/Input @@ -55,7 +55,7 @@ class OSGDB_EXPORT Input : public FieldReaderIterator virtual osg::Node* readNode(const std::string& fileName); virtual osg::Object* getObjectForUniqueID(const std::string& uniqueID); - virtual void regisiterUniqueIDForObject(const std::string& uniqueID,osg::Object* obj); + virtual void registerUniqueIDForObject(const std::string& uniqueID,osg::Object* obj); private: diff --git a/include/osgDB/Registry b/include/osgDB/Registry index 4319b9eb3..d3bf21346 100644 --- a/include/osgDB/Registry +++ b/include/osgDB/Registry @@ -330,12 +330,12 @@ class OSGDB_EXPORT Registry : public osg::Referenced * This would typically be called once per frame by applications which are doing database paging, * and need to prune objects that are no longer required. * Time value is time in sceonds.*/ - void updateTimeStampOfObjectsInCacheWithExtenalReferences(double currentTime); + void updateTimeStampOfObjectsInCacheWithExternalReferences(double currentTime); /** Removed object in the cache which have a time stamp at or before the specified expiry time. * This would typically be called once per frame by applications which are doing database paging, * and need to prune objects that are no longer required, and called after the a called - * after the call to updateTimeStampOfObjectsInCacheWithExtenalReferences(currentTime). + * after the call to updateTimeStampOfObjectsInCacheWithExternalReferences(currentTime). * Note, the currentTime is not the expiryTime, one would typically set the expiry time * to a fixed amount of time before currentTime, such as expiryTime = currentTime-10.0. * Time value is time in sceonds.*/ diff --git a/include/osgParticle/ModularEmitter b/include/osgParticle/ModularEmitter index afca35915..874b60419 100644 --- a/include/osgParticle/ModularEmitter +++ b/include/osgParticle/ModularEmitter @@ -57,11 +57,11 @@ namespace osgParticle /// Set the Counter object. inline void setCounter(Counter* c); - /// Get the ratio between number of particle to create in compenstation for movement of the emitter - inline float getNumParticlesToCreateMovementCompenstationRatio() const; + /// Get the ratio between number of particle to create in compensation for movement of the emitter + inline float getNumParticlesToCreateMovementCompensationRatio() const; /// Set the ratio between number of particle to create in compenstation for movement of the emitter - inline void setNumParticlesToCreateMovementCompenstationRatio(float r); + inline void setNumParticlesToCreateMovementCompensationRatio(float r); /// Get the Placer object. @@ -113,12 +113,12 @@ namespace osgParticle _counter = c; } - inline float ModularEmitter::getNumParticlesToCreateMovementCompenstationRatio() const + inline float ModularEmitter::getNumParticlesToCreateMovementCompensationRatio() const { return _numParticleToCreateMovementCompensationRatio; } - inline void ModularEmitter::setNumParticlesToCreateMovementCompenstationRatio(float r) + inline void ModularEmitter::setNumParticlesToCreateMovementCompensationRatio(float r) { _numParticleToCreateMovementCompensationRatio = r; } diff --git a/include/osgShadow/OccluderGeometry b/include/osgShadow/OccluderGeometry index 58130dc52..4d308a90a 100644 --- a/include/osgShadow/OccluderGeometry +++ b/include/osgShadow/OccluderGeometry @@ -188,8 +188,8 @@ class OSGSHADOW_EXPORT OccluderGeometry : public osg::Drawable void computeNormals(); void buildEdgeMaps(); - void computeLightDirectionSlihouetteEdges(const osg::Vec3& lightdirection, UIntList& silhouetteIndices) const; - void computeLightPositionSlihouetteEdges(const osg::Vec3& lightpos, UIntList& silhouetteIndices) const; + void computeLightDirectionSilhouetteEdges(const osg::Vec3& lightdirection, UIntList& silhouetteIndices) const; + void computeLightPositionSilhouetteEdges(const osg::Vec3& lightpos, UIntList& silhouetteIndices) const; osg::Polytope _boundingPolytope; diff --git a/include/osgTerrain/GeometryTechnique b/include/osgTerrain/GeometryTechnique index 343d10c96..82ef841df 100644 --- a/include/osgTerrain/GeometryTechnique +++ b/include/osgTerrain/GeometryTechnique @@ -54,8 +54,8 @@ class OSGTERRAIN_EXPORT TerrainGeometry : public osg::Drawable void addPrimitiveSet(osg::PrimitiveSet* primitiveSet) { _primitiveSets.push_back(primitiveSet); } - osg::PrimitiveSet* getPrimtitiveSet(unsigned int i) { return _primitiveSets[i].get(); } - const osg::PrimitiveSet* getPrimtitiveSet(unsigned int i) const { return _primitiveSets[i].get(); } + osg::PrimitiveSet* getPrimitiveSet(unsigned int i) { return _primitiveSets[i].get(); } + const osg::PrimitiveSet* getPrimitiveSet(unsigned int i) const { return _primitiveSets[i].get(); } unsigned int getNumPrimitiveSets() const { return _primitiveSets.size(); } diff --git a/include/osgText/Text b/include/osgText/Text index 4871e48b1..5f31c2db2 100644 --- a/include/osgText/Text +++ b/include/osgText/Text @@ -570,7 +570,7 @@ protected: mutable osg::BoundingBox _textBB; - bool computeAverageGlypthWidthAndHeight(float& avg_width, float& avg_height) const; + bool computeAverageGlyphWidthAndHeight(float& avg_width, float& avg_height) const; void computePositions(); void computePositions(unsigned int contextID) const; diff --git a/src/osg/BlendColor.cpp b/src/osg/BlendColor.cpp index 5df2658fb..202be5ffc 100644 --- a/src/osg/BlendColor.cpp +++ b/src/osg/BlendColor.cpp @@ -72,7 +72,7 @@ void BlendColor::setExtensions(unsigned int contextID,Extensions* extensions) BlendColor::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } BlendColor::Extensions::Extensions(const Extensions& rhs): @@ -87,7 +87,7 @@ void BlendColor::Extensions::lowestCommonDenominator(const Extensions& rhs) if (!rhs._glBlendColor) _glBlendColor = 0; } -void BlendColor::Extensions::setupGLExtenions(unsigned int contextID) +void BlendColor::Extensions::setupGLExtensions(unsigned int contextID) { _isBlendColorSupported = isGLExtensionSupported(contextID,"GL_EXT_blend_color") || strncmp((const char*)glGetString(GL_VERSION),"1.2",3)>=0; diff --git a/src/osg/BlendEquation.cpp b/src/osg/BlendEquation.cpp index bc4dcef7c..839ca830b 100644 --- a/src/osg/BlendEquation.cpp +++ b/src/osg/BlendEquation.cpp @@ -85,7 +85,7 @@ void BlendEquation::setExtensions(unsigned int contextID,Extensions* extensions) BlendEquation::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } BlendEquation::Extensions::Extensions(const Extensions& rhs): @@ -103,7 +103,7 @@ void BlendEquation::Extensions::lowestCommonDenominator(const Extensions& rhs) if (!rhs._glBlendEquation) _glBlendEquation = 0; } -void BlendEquation::Extensions::setupGLExtenions(unsigned int contextID) +void BlendEquation::Extensions::setupGLExtensions(unsigned int contextID) { _isBlendEquationSupported = isGLExtensionSupported(contextID,"GL_EXT_blend_equation") || strncmp((const char*)glGetString(GL_VERSION),"1.2",3)>=0; diff --git a/src/osg/BufferObject.cpp b/src/osg/BufferObject.cpp index 6400295ef..92015aa89 100644 --- a/src/osg/BufferObject.cpp +++ b/src/osg/BufferObject.cpp @@ -154,7 +154,7 @@ void BufferObject::setExtensions(unsigned int contextID,Extensions* extensions) BufferObject::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } BufferObject::Extensions::Extensions(const Extensions& rhs): @@ -189,7 +189,7 @@ void BufferObject::Extensions::lowestCommonDenominator(const Extensions& rhs) if (!rhs._glGetBufferParameteriv) _glGetBufferPointerv = rhs._glGetBufferPointerv; } -void BufferObject::Extensions::setupGLExtenions(unsigned int contextID) +void BufferObject::Extensions::setupGLExtensions(unsigned int contextID) { _glGenBuffers = ((GenBuffersProc)osg::getGLExtensionFuncPtr("glGenBuffers","glGenBuffersARB")); _glBindBuffer = ((BindBufferProc)osg::getGLExtensionFuncPtr("glBindBuffer","glBindBufferARB")); diff --git a/src/osg/ClampColor.cpp b/src/osg/ClampColor.cpp index 76ec4730c..266268af7 100644 --- a/src/osg/ClampColor.cpp +++ b/src/osg/ClampColor.cpp @@ -75,7 +75,7 @@ void ClampColor::setExtensions(unsigned int contextID,Extensions* extensions) ClampColor::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } ClampColor::Extensions::Extensions(const Extensions& rhs): @@ -91,7 +91,7 @@ void ClampColor::Extensions::lowestCommonDenominator(const Extensions& rhs) if (!rhs._glClampColor) _glClampColor = 0; } -void ClampColor::Extensions::setupGLExtenions(unsigned int contextID) +void ClampColor::Extensions::setupGLExtensions(unsigned int contextID) { _isClampColorSupported = isGLExtensionSupported(contextID,"GL_ARB_color_buffer_float") || strncmp((const char*)glGetString(GL_VERSION),"2.0",3)>=0; diff --git a/src/osg/Drawable.cpp b/src/osg/Drawable.cpp index adf326d04..1029e2205 100644 --- a/src/osg/Drawable.cpp +++ b/src/osg/Drawable.cpp @@ -819,7 +819,7 @@ void Drawable::setExtensions(unsigned int contextID,Extensions* extensions) Drawable::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } Drawable::Extensions::Extensions(const Extensions& rhs): @@ -928,7 +928,7 @@ void Drawable::Extensions::lowestCommonDenominator(const Extensions& rhs) if (!rhs._gl_get_query_objectui64v) _gl_get_query_objectui64v = 0; } -void Drawable::Extensions::setupGLExtenions(unsigned int contextID) +void Drawable::Extensions::setupGLExtensions(unsigned int contextID) { _isVertexProgramSupported = isGLExtensionSupported(contextID,"GL_ARB_vertex_program"); _isSecondaryColorSupported = isGLExtensionSupported(contextID,"GL_EXT_secondary_color"); diff --git a/src/osg/FragmentProgram.cpp b/src/osg/FragmentProgram.cpp index 8db673e09..45c680c10 100644 --- a/src/osg/FragmentProgram.cpp +++ b/src/osg/FragmentProgram.cpp @@ -219,7 +219,7 @@ void FragmentProgram::setExtensions(unsigned int contextID,Extensions* extension FragmentProgram::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } FragmentProgram::Extensions::Extensions(const Extensions& rhs): @@ -246,7 +246,7 @@ void FragmentProgram::Extensions::lowestCommonDenominator(const Extensions& rhs) } -void FragmentProgram::Extensions::setupGLExtenions(unsigned int contextID) +void FragmentProgram::Extensions::setupGLExtensions(unsigned int contextID) { _isFragmentProgramSupported = isGLExtensionSupported(contextID,"GL_ARB_fragment_program"); diff --git a/src/osg/Multisample.cpp b/src/osg/Multisample.cpp index 2553809ac..23e772cf6 100644 --- a/src/osg/Multisample.cpp +++ b/src/osg/Multisample.cpp @@ -69,7 +69,7 @@ void Multisample::setExtensions(unsigned int contextID,Extensions* extensions) Multisample::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } Multisample::Extensions::Extensions(const Extensions& rhs): @@ -86,7 +86,7 @@ void Multisample::Extensions::lowestCommonDenominator(const Extensions& rhs) if (!rhs._glSampleCoverage) _glSampleCoverage = 0; } -void Multisample::Extensions::setupGLExtenions(unsigned int contextID) +void Multisample::Extensions::setupGLExtensions(unsigned int contextID) { _isMultisampleSupported = isGLExtensionSupported(contextID,"GL_ARB_multisample"); _isMultisampleFilterHintSupported = isGLExtensionSupported(contextID,"GL_NV_multisample_filter_hint"); diff --git a/src/osg/Point.cpp b/src/osg/Point.cpp index 181f1c7cb..7b3471c91 100644 --- a/src/osg/Point.cpp +++ b/src/osg/Point.cpp @@ -104,7 +104,7 @@ void Point::setExtensions(unsigned int contextID,Extensions* extensions) Point::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } Point::Extensions::Extensions(const Extensions& rhs): @@ -121,7 +121,7 @@ void Point::Extensions::lowestCommonDenominator(const Extensions& rhs) if (!rhs._glPointParameterfv) _glPointParameterfv = 0; } -void Point::Extensions::setupGLExtenions(unsigned int contextID) +void Point::Extensions::setupGLExtensions(unsigned int contextID) { _isPointParametersSupported = strncmp((const char*)glGetString(GL_VERSION),"1.4",3)>=0 || isGLExtensionSupported(contextID,"GL_ARB_point_parameters") || diff --git a/src/osg/Referenced.cpp b/src/osg/Referenced.cpp index 12e688a5c..415721465 100644 --- a/src/osg/Referenced.cpp +++ b/src/osg/Referenced.cpp @@ -223,7 +223,7 @@ void Referenced::removeObserver(Observer* observer) } } -void Referenced::deletUsingDeleteHandler() const +void Referenced::deleteUsingDeleteHandler() const { getDeleteHandler()->requestDelete(this); } diff --git a/src/osg/StencilTwoSided.cpp b/src/osg/StencilTwoSided.cpp index e45b163a8..cb5f3e29c 100644 --- a/src/osg/StencilTwoSided.cpp +++ b/src/osg/StencilTwoSided.cpp @@ -119,7 +119,7 @@ void StencilTwoSided::setExtensions(unsigned int contextID,Extensions* extension StencilTwoSided::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } StencilTwoSided::Extensions::Extensions(const Extensions& rhs): @@ -138,7 +138,7 @@ void StencilTwoSided::Extensions::lowestCommonDenominator(const Extensions& rhs) } -void StencilTwoSided::Extensions::setupGLExtenions(unsigned int contextID) +void StencilTwoSided::Extensions::setupGLExtensions(unsigned int contextID) { _isStencilTwoSidedSupported = isGLExtensionSupported(contextID,"GL_EXT_stencil_two_side"); diff --git a/src/osg/TextureCubeMap.cpp b/src/osg/TextureCubeMap.cpp index 9fd49bb1d..456fb4a3b 100644 --- a/src/osg/TextureCubeMap.cpp +++ b/src/osg/TextureCubeMap.cpp @@ -379,7 +379,7 @@ void TextureCubeMap::setExtensions(unsigned int contextID,Extensions* extensions TextureCubeMap::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } TextureCubeMap::Extensions::Extensions(const Extensions& rhs): @@ -393,7 +393,7 @@ void TextureCubeMap::Extensions::lowestCommonDenominator(const Extensions& rhs) if (!rhs._isCubeMapSupported) _isCubeMapSupported = false; } -void TextureCubeMap::Extensions::setupGLExtenions(unsigned int contextID) +void TextureCubeMap::Extensions::setupGLExtensions(unsigned int contextID) { _isCubeMapSupported = isGLExtensionSupported(contextID,"GL_ARB_texture_cube_map") || isGLExtensionSupported(contextID,"GL_EXT_texture_cube_map") || diff --git a/src/osg/VertexProgram.cpp b/src/osg/VertexProgram.cpp index e4cb45f1b..3a8c05a4b 100644 --- a/src/osg/VertexProgram.cpp +++ b/src/osg/VertexProgram.cpp @@ -219,7 +219,7 @@ void VertexProgram::setExtensions(unsigned int contextID,Extensions* extensions) VertexProgram::Extensions::Extensions(unsigned int contextID) { - setupGLExtenions(contextID); + setupGLExtensions(contextID); } VertexProgram::Extensions::Extensions(const Extensions& rhs): @@ -246,7 +246,7 @@ void VertexProgram::Extensions::lowestCommonDenominator(const Extensions& rhs) } -void VertexProgram::Extensions::setupGLExtenions(unsigned int contextID) +void VertexProgram::Extensions::setupGLExtensions(unsigned int contextID) { _isVertexProgramSupported = isGLExtensionSupported(contextID,"GL_ARB_vertex_program"); diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp index a90af31e7..08f30d5f4 100644 --- a/src/osgDB/DatabasePager.cpp +++ b/src/osgDB/DatabasePager.cpp @@ -843,7 +843,7 @@ void DatabasePager::removeExpiredSubgraphs(double currentFrameTime) osgDB::Registry::instance()->getSharedStateManager()->prune(); // update the Registry object cache. - osgDB::Registry::instance()->updateTimeStampOfObjectsInCacheWithExtenalReferences(currentFrameTime); + osgDB::Registry::instance()->updateTimeStampOfObjectsInCacheWithExternalReferences(currentFrameTime); osgDB::Registry::instance()->removeExpiredObjectsInCache(expiryTime); diff --git a/src/osgDB/Input.cpp b/src/osgDB/Input.cpp index b81ba5100..696f97b7b 100644 --- a/src/osgDB/Input.cpp +++ b/src/osgDB/Input.cpp @@ -36,7 +36,7 @@ osg::Object* Input::getObjectForUniqueID(const std::string& uniqueID) } -void Input::regisiterUniqueIDForObject(const std::string& uniqueID,osg::Object* obj) +void Input::registerUniqueIDForObject(const std::string& uniqueID,osg::Object* obj) { _uniqueIDToObjectMap[uniqueID] = obj; } diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index ebe8ee57b..84012bd2b 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -783,7 +783,7 @@ osg::Object* Registry::readObjectOfType(const basic_type_wrapper &btw,Input& fr) bool iteratorAdvanced = false; if (fr[0].matchWord("UniqueID") && fr[1].isString()) { - fr.regisiterUniqueIDForObject(fr[1].getStr(),obj); + fr.registerUniqueIDForObject(fr[1].getStr(),obj); fr += 2; iteratorAdvanced = true; } @@ -905,7 +905,7 @@ osg::Object* Registry::readObject(DotOsgWrapperMap& dowMap,Input& fr) bool iteratorAdvanced = false; if (fr[0].matchWord("UniqueID") && fr[1].isString()) { - fr.regisiterUniqueIDForObject(fr[1].getStr(),obj); + fr.registerUniqueIDForObject(fr[1].getStr(),obj); fr += 2; iteratorAdvanced = true; } @@ -1790,7 +1790,7 @@ osg::Object* Registry::getFromObjectCache(const std::string& fileName) else return 0; } -void Registry::updateTimeStampOfObjectsInCacheWithExtenalReferences(double currentTime) +void Registry::updateTimeStampOfObjectsInCacheWithExternalReferences(double currentTime) { OpenThreads::ScopedLock lock(_objectCacheMutex); diff --git a/src/osgParticle/FireEffect.cpp b/src/osgParticle/FireEffect.cpp index 388024400..ac2d44104 100644 --- a/src/osgParticle/FireEffect.cpp +++ b/src/osgParticle/FireEffect.cpp @@ -115,7 +115,7 @@ void FireEffect::setUpEmitterAndProgram() if (!_emitter) { _emitter = new osgParticle::ModularEmitter; - _emitter->setNumParticlesToCreateMovementCompenstationRatio(1.5f); + _emitter->setNumParticlesToCreateMovementCompensationRatio(1.5f); _emitter->setCounter(new osgParticle::RandomRateCounter); _emitter->setPlacer(new osgParticle::SectorPlacer); _emitter->setShooter(new osgParticle::RadialShooter); diff --git a/src/osgParticle/SmokeEffect.cpp b/src/osgParticle/SmokeEffect.cpp index e41ef03a4..5fd78dc4d 100644 --- a/src/osgParticle/SmokeEffect.cpp +++ b/src/osgParticle/SmokeEffect.cpp @@ -111,7 +111,7 @@ void SmokeEffect::setUpEmitterAndProgram() if (!_emitter) { _emitter = new osgParticle::ModularEmitter; - _emitter->setNumParticlesToCreateMovementCompenstationRatio(1.5f); + _emitter->setNumParticlesToCreateMovementCompensationRatio(1.5f); _emitter->setCounter(new osgParticle::RandomRateCounter); _emitter->setPlacer(new osgParticle::SectorPlacer); _emitter->setShooter(new osgParticle::RadialShooter); diff --git a/src/osgPlugins/osg/Geometry.cpp b/src/osgPlugins/osg/Geometry.cpp index 6ba02fe56..58e952e11 100644 --- a/src/osgPlugins/osg/Geometry.cpp +++ b/src/osgPlugins/osg/Geometry.cpp @@ -718,7 +718,7 @@ Array* Array_readLocalData(Input& fr) if (return_array) { - if (!uniqueID.empty()) fr.regisiterUniqueIDForObject(uniqueID.c_str(),return_array); + if (!uniqueID.empty()) fr.registerUniqueIDForObject(uniqueID.c_str(),return_array); } return return_array; diff --git a/src/osgShadow/OccluderGeometry.cpp b/src/osgShadow/OccluderGeometry.cpp index 9ac313d7b..f71d4e76f 100644 --- a/src/osgShadow/OccluderGeometry.cpp +++ b/src/osgShadow/OccluderGeometry.cpp @@ -681,7 +681,7 @@ void OccluderGeometry::buildEdgeMaps() } -void OccluderGeometry::computeLightDirectionSlihouetteEdges(const osg::Vec3& lightdirection, UIntList& silhouetteIndices) const +void OccluderGeometry::computeLightDirectionSilhouetteEdges(const osg::Vec3& lightdirection, UIntList& silhouetteIndices) const { silhouetteIndices.clear(); @@ -709,7 +709,7 @@ void OccluderGeometry::computeLightDirectionSlihouetteEdges(const osg::Vec3& lig } } -void OccluderGeometry::computeLightPositionSlihouetteEdges(const osg::Vec3& lightpos, UIntList& silhouetteIndices) const +void OccluderGeometry::computeLightPositionSilhouetteEdges(const osg::Vec3& lightpos, UIntList& silhouetteIndices) const { silhouetteIndices.clear(); @@ -783,7 +783,7 @@ void OccluderGeometry::computeShadowVolumeGeometry(const osg::Vec4& lightpos, Sh // compute the silhouette edge UIntList silhouetteIndices; - computeLightDirectionSlihouetteEdges(lightdirection, silhouetteIndices); + computeLightDirectionSilhouetteEdges(lightdirection, silhouetteIndices); osg::Vec3 offset( lightdirection*5.0f ); @@ -825,7 +825,7 @@ void OccluderGeometry::computeShadowVolumeGeometry(const osg::Vec4& lightpos, Sh // osg::notify(osg::NOTICE)<<"Positional light"<