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

From Jannik Heller, typo fixes

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14826 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-04-07 18:01:12 +00:00
parent ab2fc1be76
commit 70b5297575
62 changed files with 104 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenThreads/pthreads/PThread.cpp
View File

@@ -830,7 +830,7 @@ int Thread::setCancelModeAsynchronous() {
//-----------------------------------------------------------------------------
//
// Description: set the thread to cancel at the next convienent point.
// Description: set the thread to cancel at the next convenient point.
//
// Use: public
//

2
src/osg/Image.cpp
View File

@@ -638,7 +638,7 @@ unsigned int Image::computePixelSizeInBits(GLenum format,GLenum type)
// note, haven't yet added proper handling of the ARB GL_COMPRESSRED_* pathways
// yet, no clear size for these since its probably implementation dependent
// which raises the question of how to actually querry for these sizes...
// which raises the question of how to actually query for these sizes...
// will need to revisit this issue, for now just report an error.
// this is possible a bit of mute point though as since the ARB compressed formats
// arn't yet used for storing images to disk, so its likely that users wont have

2
src/osg/LightSource.cpp
View File

@@ -41,7 +41,7 @@ void LightSource::setLight(Light* light)
setLocalStateSetModes(_value);
}
// Set the GLModes on StateSet associated with the ClipPlanes.
// Set the GLModes on StateSet associated with the LightSource.
void LightSource::setStateSetModes(StateSet& stateset,StateAttribute::GLModeValue value) const
{
if (_light.valid())

2
src/osg/OcclusionQueryNode.cpp
View File

@@ -482,7 +482,7 @@ bool OcclusionQueryNode::getPassed( const Camera* camera, NodeVisitor& nv )
{
// Two situations where we want to simply do a regular traversal:
// 1) it's the first frame for this camers
// 1) it's the first frame for this camera
// 2) we haven't rendered for an abnormally long time (probably because we're an out-of-range LOD child)
// In these cases, assume we're visible to avoid blinking.
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( _frameCountMutex );

2
src/osg/Texture1D.cpp
View File

@@ -400,7 +400,7 @@ void Texture1D::copyTexImage1D(State& state, int x, int y, int width)
copyTexSubImage1D(state,0 ,x, y, width);
return;
}
// the relevent texture object is not of the right size so
// the relevant texture object is not of the right size so
// needs to been deleted
// remove previously bound textures.
dirtyTextureObject();

2
src/osg/Texture2D.cpp
View File

@@ -350,7 +350,7 @@ void Texture2D::copyTexImage2D(State& state, int x, int y, int width, int height
copyTexSubImage2D(state,0 ,0, x, y, width, height);
return;
}
// the relevent texture object is not of the right size so
// the relevant texture object is not of the right size so
// needs to been deleted
// remove previously bound textures.
dirtyTextureObject();

2
src/osg/Texture2DMultisample.cpp
View File

@@ -89,7 +89,7 @@ void Texture2DMultisample::apply(State& state) const
const GLExtensions* extensions = state.get<GLExtensions>();
if (!extensions->isTextureMultisampledSupported)
{
OSG_INFO<<"Texture2DMultisample not supoorted."<<std::endl;
OSG_INFO<<"Texture2DMultisample not supported."<<std::endl;
return;
}

2
src/osg/TextureRectangle.cpp
View File

@@ -477,7 +477,7 @@ void TextureRectangle::copyTexImage2D(State& state, int x, int y, int width, int
copyTexSubImage2D(state,0 ,0, x, y, width, height);
return;
}
// the relevent texture object is not of the right size so
// the relevant texture object is not of the right size so
// needs to been deleted
// remove previously bound textures.
dirtyTextureObject();

1
src/osgAnimation/Bone.cpp
View File

@@ -15,7 +15,6 @@
#include <osgAnimation/Bone>
#include <osgAnimation/Skeleton>
#include <osgAnimation/UpdateBone>
#include <osgAnimation/BoneMapVisitor>
using namespace osgAnimation;

4
src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
View File

@@ -37,8 +37,8 @@
* Peder Blekken
*
*
* Ported into the OSG as a plugin, Robert Osfield Decemeber 2000.
* Note, reference above to license of simage_rgb is not relevent to the OSG
* Ported into the OSG as a plugin, Robert Osfield December 2000.
* Note, reference above to license of simage_rgb is not relevant to the OSG
* as the OSG does not use it. Also for patches, bugs and new features
* please send them direct to the OSG dev team rather than address above.
*

4
src/osgPlugins/pic/ReaderWriterPIC.cpp
View File

@@ -29,8 +29,8 @@
* Peder Blekken
*
*
* Ported into the OSG as a plugin, Robert Osfield Decemeber 2000.
* Note, reference above to license of simage_rgb is not relevent to the OSG
* Ported into the OSG as a plugin, Robert Osfield December 2000.
* Note, reference above to license of simage_rgb is not relevant to the OSG
* as the OSG does not use it. Also for patches, bugs and new features
* please send them direct to the OSG dev team rather than address above.
*

4
src/osgPlugins/tga/ReaderWriterTGA.cpp
View File

@@ -35,8 +35,8 @@
* Peder Blekken
*
*
* Ported into the OSG as a plugin, Robert Osfield Decemeber 2000.
* Note, reference above to license of simage_rgb is not relevent to the OSG
* Ported into the OSG as a plugin, Robert Osfield December 2000.
* Note, reference above to license of simage_rgb is not relevant to the OSG
* as the OSG does not use it. Also for patches, bugs and new features
* please send them direct to the OSG dev team rather than address above.
*

2
src/osgPlugins/txp/trpage_geom.h
View File

@@ -2899,7 +2899,7 @@ protected:
/* The Support Styles are used to consolidate attributes related to labels.
For the most part, support styles are very simple, consisting of
very basic description of object to use for drawing suport.
very basic description of object to use for drawing support.
*/
TX_EXDECL class TX_CLDECL trpgSupportStyle : public trpgReadWriteable
{

2
src/osgText/String.cpp
View File

@@ -238,7 +238,7 @@ unsigned int getNextCharacter(look_ahead_iterator& charString,String::Encoding e
////////////////////////////////////////////////////////////////////////////
//
// String implemention.
// String implementation.
//
String::String(const String& str):

8
src/osgUtil/SceneView.cpp
View File

@@ -879,11 +879,11 @@ bool SceneView::cullStage(const osg::Matrixd& projection,const osg::Matrixd& mod
{
case(HEADLIGHT):
if (_light.valid()) renderStage->addPositionedAttribute(NULL,_light.get());
else OSG_WARN<<"Warning: no osg::Light attached to ogUtil::SceneView to provide head light.*/"<<std::endl;
else OSG_WARN<<"Warning: no osg::Light attached to osgUtil::SceneView to provide head light.*/"<<std::endl;
break;
case(SKY_LIGHT):
if (_light.valid()) renderStage->addPositionedAttribute(mv.get(),_light.get());
else OSG_WARN<<"Warning: no osg::Light attached to ogUtil::SceneView to provide sky light.*/"<<std::endl;
else OSG_WARN<<"Warning: no osg::Light attached to osgUtil::SceneView to provide sky light.*/"<<std::endl;
break;
default:
break;
@@ -1379,7 +1379,7 @@ void SceneView::draw()
_renderStage->draw(_renderInfo,previous);
}
// re apply the defalt OGL state.
// re apply the default OGL state.
state->popAllStateSets();
state->apply();
@@ -1459,7 +1459,7 @@ const osg::Matrix SceneView::computeMVPW() const
if (getViewport())
matrix.postMult(getViewport()->computeWindowMatrix());
else
OSG_WARN<<"osg::Matrix SceneView::computeMVPW() - error no viewport attached to SceneView, coords will be computed inccorectly."<<std::endl;
OSG_WARN<<"osg::Matrix SceneView::computeMVPW() - error no viewport attached to SceneView, coords will be computed incorrectly."<<std::endl;
return matrix;
}

2
src/osgViewer/View.cpp
View File

@@ -300,7 +300,7 @@ void View::setSceneData(osg::Node* node)
}
else
{
OSG_INFO<<"View::setSceneData() Reusing exisitng scene"<<_scene.get()<<std::endl;
OSG_INFO<<"View::setSceneData() Reusing existing scene"<<_scene.get()<<std::endl;
}
_scene->setSceneData(node);