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

From Albert Luaces, typo fixes.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14883 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-06-01 13:40:20 +00:00
parent d14a602a59
commit ba9dfb2ff6
103 changed files with 164 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/ImageUtils.cpp
View File

@@ -347,7 +347,7 @@ bool clearImageToColor(osg::Image* image, const osg::Vec4& colour)
return true;
}
/** Search through the list of Images and find the maximum number of components used amoung the images.*/
/** Search through the list of Images and find the maximum number of components used among the images.*/
unsigned int maximimNumOfComponents(const ImageList& imageList)
{
unsigned int max_components = 0;

2
src/osg/Sequence.cpp
View File

@@ -338,7 +338,7 @@ void Sequence::traverse(NodeVisitor& nv)
int loops = (int)(deltaT/adjTotalTime);
// adjust reps & quick check to see if done becuase reps used up
// adjust reps & quick check to see if done because reps used up
if (_nreps>0)
{

2
src/osg/ShadowVolumeOccluder.cpp
View File

@@ -210,7 +210,7 @@ bool ShadowVolumeOccluder::computeOccluder(const NodePath& nodePath,const Convex
// then push to coords to far plane by setting its coord to c[i].z = -1.
// then transform far plane polygon back into projection space, by p[i]*inv(P)
// compute orientation of front plane, if normal.z()<0 then facing away from eye pont, so reverse the polygons, or simply invert planes.
// compute volume (quality) betwen front polygon in projection space and back polygon in projection space.
// compute volume (quality) between front polygon in projection space and back polygon in projection space.
const VertexList& vertices_in = occluder.getOccluder().getVertexList();

2
src/osg/TexGen.cpp
View File

@@ -120,7 +120,7 @@ void TexGen::apply(State&) const
else // SPHERE_MAP
{
// Also don't set the mode of GL_R & GL_Q as these will generate
// GL_INVALID_ENUM (See OpenGL Refrence Guide, glTexGEn.)
// GL_INVALID_ENUM (See OpenGL Reference Guide, glTexGEn.)
glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, _mode );
glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, _mode );

2
src/osg/Texture1D.cpp
View File

@@ -174,7 +174,7 @@ void Texture1D::apply(State& state) const
{
applyTexImage1D(GL_TEXTURE_1D,_image.get(),state, _textureWidth, _numMipmapLevels);
// update the modified count to show that it is upto date.
// update the modified count to show that it is up to date.
getModifiedCount(contextID) = _image->getModifiedCount();
}

4
src/osg/Texture2D.cpp
View File

@@ -236,7 +236,7 @@ void Texture2D::apply(State& state) const
// perhaps it is the first glBind which is not required...
//glBindTexture( GL_TEXTURE_2D, handle );
// update the modified tag to show that it is upto date.
// update the modified tag to show that it is up to date.
if (_image.valid()) getModifiedCount(contextID) = _image->getModifiedCount();
}
else if (_image.valid() && _image->data())
@@ -272,7 +272,7 @@ void Texture2D::apply(State& state) const
textureObject->setAllocated(true);
}
// update the modified tag to show that it is upto date.
// update the modified tag to show that it is up to date.
getModifiedCount(contextID) = image->getModifiedCount();
// unref image data?

4
src/osg/Texture2DArray.cpp
View File

@@ -367,7 +367,7 @@ void Texture2DArray::apply(State& state) const
// For certain we have to manually allocate memory for mipmaps if images are compressed
// if not allocated OpenGL will produce errors on mipmap upload.
// I have not tested if this is neccessary for plain texture formats but
// I have not tested if this is necessary for plain texture formats but
// common sense suggests its required as well.
if( _min_filter != LINEAR && _min_filter != NEAREST && _images[0]->isMipmap() )
{
@@ -630,7 +630,7 @@ void Texture2DArray::copyTexSubImage2DArray(State& state, int xoffset, int yoffs
}
else
{
OSG_WARN<<"Warning: Texture2DArray::copyTexSubImage2DArray(..) failed, cannot not copy to a non existant texture."<<std::endl;
OSG_WARN<<"Warning: Texture2DArray::copyTexSubImage2DArray(..) failed, cannot not copy to a non existent texture."<<std::endl;
}
}

6
src/osg/Texture3D.cpp
View File

@@ -257,7 +257,7 @@ void Texture3D::apply(State& state) const
applyTexImage3D(GL_TEXTURE_3D,_image.get(),state, _textureWidth, _textureHeight, _textureDepth,_numMipmapLevels);
// update the modified count to show that it is upto date.
// update the modified count to show that it is up to date.
getModifiedCount(contextID) = _image->getModifiedCount();
}
@@ -302,7 +302,7 @@ void Texture3D::apply(State& state) const
textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,_textureDepth,0);
// update the modified count to show that it is upto date.
// update the modified count to show that it is up to date.
getModifiedCount(contextID) = _image->getModifiedCount();
// unref image data?
@@ -505,7 +505,7 @@ void Texture3D::copyTexSubImage3D(State& state, int xoffset, int yoffset, int zo
}
else
{
OSG_WARN<<"Warning: Texture3D::copyTexSubImage3D(..) failed, cannot not copy to a non existant texture."<<std::endl;
OSG_WARN<<"Warning: Texture3D::copyTexSubImage3D(..) failed, cannot not copy to a non existent texture."<<std::endl;
}
}

2
src/osg/TextureCubeMap.cpp
View File

@@ -388,7 +388,7 @@ void TextureCubeMap::copyTexSubImageCubeMap(State& state, int face, int xoffset,
if (!textureObject)
{
// failed to create texture object
OSG_NOTICE<<"Warning : failed to create TextureCubeMap texture obeject, copyTexSubImageCubeMap abondoned."<<std::endl;
OSG_NOTICE<<"Warning : failed to create TextureCubeMap texture obeject, copyTexSubImageCubeMap abandoned."<<std::endl;
return;
}

6
src/osg/TextureRectangle.cpp
View File

@@ -211,7 +211,7 @@ void TextureRectangle::apply(State& state) const
{
applyTexImage_subload(GL_TEXTURE_RECTANGLE, _image.get(), state, _textureWidth, _textureHeight, _internalFormat);
// update the modified count to show that it is upto date.
// update the modified count to show that it is up to date.
getModifiedCount(contextID) = _image->getModifiedCount();
}
}
@@ -310,7 +310,7 @@ void TextureRectangle::applyTexImage_load(GLenum target, Image* image, State& st
const unsigned int contextID = state.getContextID();
const GLExtensions* extensions = state.get<GLExtensions>();
// update the modified count to show that it is upto date.
// update the modified count to show that it is up to date.
getModifiedCount(contextID) = image->getModifiedCount();
// compute the internal texture format, sets _internalFormat.
@@ -393,7 +393,7 @@ void TextureRectangle::applyTexImage_subload(GLenum target, Image* image, State&
const GLExtensions* extensions = state.get<GLExtensions>();
// update the modified count to show that it is upto date.
// update the modified count to show that it is up to date.
getModifiedCount(contextID) = image->getModifiedCount();
// compute the internal texture format, sets _internalFormat.

2
src/osg/Uniform.cpp
View File

@@ -1298,7 +1298,7 @@ Uniform::Uniform( const char* name, bool b0, bool b1, bool b2, bool b3 ) :
///////////////////////////////////////////////////////////////////////////
// Value assignment for single-element (ie: non-array) uniforms.
// (For backwards compatability, if not already configured, set the
// (For backwards compatibility, if not already configured, set the
// Uniform's _numElements=1)
bool Uniform::set( float f )