From Jannik Heller, typo fixes

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14832 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-04-13 10:43:56 +00:00
parent 166c49eedd
commit 0a1db3d6fc
60 changed files with 110 additions and 110 deletions

View File

@@ -32,7 +32,7 @@ namespace osg
//#define ENFORCE_THREADSAFE
//#define DEBUG_OBJECT_ALLOCATION_DESTRUCTION
// specialized smart pointer, used to get round auto_ptr<>'s lack of the destructor reseting itself to 0.
// specialized smart pointer, used to get round auto_ptr<>'s lack of the destructor resetting itself to 0.
template<typename T>
struct ResetPointer
{

View File

@@ -215,13 +215,13 @@ void Shader::discardDeletedGlShaders(unsigned int contextID)
Shader::Shader(Type type) :
_type(type),
_shaderDefinesMode(USE_SHADER_PRAGAMA)
_shaderDefinesMode(USE_SHADER_PRAGMA)
{
}
Shader::Shader(Type type, const std::string& source) :
_type(type),
_shaderDefinesMode(USE_SHADER_PRAGAMA)
_shaderDefinesMode(USE_SHADER_PRAGMA)
{
setShaderSource( source);
}
@@ -229,7 +229,7 @@ Shader::Shader(Type type, const std::string& source) :
Shader::Shader(Type type, ShaderBinary* shaderBinary) :
_type(type),
_shaderBinary(shaderBinary),
_shaderDefinesMode(USE_SHADER_PRAGAMA)
_shaderDefinesMode(USE_SHADER_PRAGMA)
{
}

View File

@@ -277,7 +277,7 @@ void State::reset()
_lastAppliedProgramObject = 0;
// what about uniforms??? need to clear them too...
// go through all active Unfirom's, setting to change to force update,
// go through all active Uniform's, setting to change to force update,
// the idea is to leave only the global defaults left.
for(UniformMap::iterator uitr=_uniformMap.begin();
uitr!=_uniformMap.end();
@@ -945,7 +945,7 @@ void State::setInterleavedArrays( GLenum format, GLsizei stride, const GLvoid* p
OSG_NOTICE<<"Warning: State::setInterleavedArrays(..) not implemented."<<std::endl;
#endif
// the crude way, assume that all arrays have been effected so dirty them and
// the crude way, assume that all arrays have been affected so dirty them and
// disable them...
dirtyAllVertexArrays();
}

View File

@@ -985,7 +985,7 @@ unsigned int Uniform::getNameID(const std::string& name)
return id;
}
// Use a proxy to force the initialization of the static variables in the Unifrom::getNameID() method during static initialization
// Use a proxy to force the initialization of the static variables in the Uniform::getNameID() method during static initialization
OSG_INIT_SINGLETON_PROXY(UniformNameIDStaticInitializationProxy, Uniform::getNameID(std::string()))