Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos in src/ sub-directory #1154

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/OpenThreads/win32/Win32Mutex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//
// Win32Mutex.c++ - C++ Mutex class .
// The idea for it is borrowed from SGI STL
// It looks like it's hard to use win32 CRITICALL_SECTIONS withour introducing race
// It looks like it's hard to use win32 CRITICALL_SECTIONS without introducing race
// conditions on InitializeCriticalSection() . So we use spin mutex here.
// ~~~~~~~~~~~~~~~~
//
Expand Down
2 changes: 1 addition & 1 deletion src/OpenThreads/win32/Win32Thread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ int Thread::cancel()
SetEvent(pd->cancelEvent.get());

// cancelMode == 1 (asynch)-> kill em
// cancelMode == 0 (deffered) -> wait a little then kill em
// cancelMode == 0 (deferred) -> wait a little then kill em

// if( (pd->cancelMode == 1) || (WaitForSingleObject(pd->tid,INFINITE)!=WAIT_OBJECT_0) )
if( pd->cancelMode == 1 )
Expand Down
2 changes: 1 addition & 1 deletion src/OpenThreads/win32/Win32ThreadPrivateData.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace OpenThreads {

Block threadStartedBlock;

int cancelMode; // 0 - deffered (default) 1-asynch 2-disabled
int cancelMode; // 0 - deferred (default) 1-asynch 2-disabled

bool detached;

Expand Down
4 changes: 2 additions & 2 deletions src/osg/BufferObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ void GLBufferObject::compileBuffer()

if (i<_bufferEntries.size())
{
// triming end of bufferEntries as the source data is has less entries than the originally held.
// trimming end of bufferEntries as the source data is has less entries than the originally held.
_bufferEntries.erase(_bufferEntries.begin()+i, _bufferEntries.end());
}

Expand Down Expand Up @@ -864,7 +864,7 @@ void GLBufferObjectSet::orphan(GLBufferObject* to)
// handled in the handlePendingOrphandedGLBufferObjects() where the TO's
// will be removed from the active list, and then placed in the orhpanGLBufferObject
// list. This double buffered approach to handling orphaned TO's is used
// to avoid having to mutex the process of appling active TO's.
// to avoid having to mutex the process of applying active TO's.
_pendingOrphanedGLBufferObjects.push_back(to);
}

Expand Down
2 changes: 1 addition & 1 deletion src/osg/CullingSet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void CullingSet::disableAndPushOccludersCurrentMask(NodePath& nodePath)
{
//std::cout<<" ++ disabling occluder "<<itr<<std::endl;
// we have trapped for the case an occlude potentially occluding itself,
// to prevent this we disable the results mask so that no subsequnt
// to prevent this we disable the results mask so that no subsequent
// when the next pushCurrentMask calls happens this occluder is switched off.
itr->disableResultMasks();
itr->pushCurrentMask();
Expand Down
2 changes: 1 addition & 1 deletion src/osg/DisplaySettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ static ApplicationUsageProxy DisplaySetting_e9(ApplicationUsage::ENVIRONMENTAL_V
"LEFT_EYE_TOP_VIEWPORT | LEFT_EYE_BOTTOM_VIEWPORT");
static ApplicationUsageProxy DisplaySetting_e10(ApplicationUsage::ENVIRONMENTAL_VARIABLE,
"OSG_SPLIT_STEREO_AUTO_ADJUST_ASPECT_RATIO <mode>",
"OFF | ON Default to OFF to compenstate for the compression of the aspect ratio when viewing in split screen stereo. Note, if you are setting fovx and fovy explicityly OFF should be used.");
"OFF | ON Default to OFF to compenstate for the compression of the aspect ratio when viewing in split screen stereo. Note, if you are setting fovx and fovy explicitly OFF should be used.");
static ApplicationUsageProxy DisplaySetting_e11(ApplicationUsage::ENVIRONMENTAL_VARIABLE,
"OSG_SPLIT_STEREO_VERTICAL_SEPARATION <float>",
"Number of pixels between viewports.");
Expand Down
2 changes: 1 addition & 1 deletion src/osg/Geometry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ void Geometry::fixDeprecatedData()
default: primLength=0; break; // compute later when =0.
}

// copy the vertex data across to the new arays
// copy the vertex data across to the new arrays
switch(primitiveset->getType())
{
case(PrimitiveSet::DrawArraysPrimitiveType):
Expand Down
2 changes: 1 addition & 1 deletion src/osg/Program.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ void Program::PerContextProgram::linkProgram(osg::State& state)
}

// set any explicit vertex attribute bindings that are set up via osg::State, such as the vertex arrays
// that have been aliase to vertex attrib arrays
// that have been aliased to vertex attrib arrays
if (state.getUseVertexAttributeAliasing())
{
const AttribBindingList& stateBindlist = state.getAttributeBindingList();
Expand Down
2 changes: 1 addition & 1 deletion src/osg/Texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ void TextureObjectSet::orphan(Texture::TextureObject* to)
// handled in the handlePendingOrphandedTextureObjects() where the TO's
// will be removed from the active list, and then placed in the orhpanTextureObject
// list. This double buffered approach to handling orphaned TO's is used
// to avoid having to mutex the process of appling active TO's.
// to avoid having to mutex the process of applying active TO's.
_pendingOrphanedTextureObjects.push_back(to);

#if 0
Expand Down
2 changes: 1 addition & 1 deletion src/osg/Texture1D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ void Texture1D::copyTexSubImage1D(State& state, int xoffset, int x, int y, int w
}
else
{
// no texture object already exsits for this context so need to
// no texture object already exists for this context so need to
// create it upfront - simply call copyTexImage1D.
copyTexImage1D(state,x,y,width);
}
Expand Down
2 changes: 1 addition & 1 deletion src/osg/Texture2D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ void Texture2D::copyTexSubImage2D(State& state, int xoffset, int yoffset, int x,
}
else
{
// no texture object already exsits for this context so need to
// no texture object already exists for this context so need to
// create it upfront - simply call copyTexImage2D.
copyTexImage2D(state,x,y,width,height);
}
Expand Down
2 changes: 1 addition & 1 deletion src/osg/TextureCubeMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,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 abandoned."<<std::endl;
OSG_NOTICE<<"Warning : failed to create TextureCubeMap texture object, copyTexSubImageCubeMap abandoned."<<std::endl;
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/osg/TextureRectangle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ void TextureRectangle::copyTexSubImage2D(State& state, int xoffset, int yoffset,
}
else
{
// no texture object already exsits for this context so need to
// no texture object already exists for this context so need to
// create it upfront - simply call copyTexImage2D.
copyTexImage2D(state,x,y,width,height);
}
Expand Down
2 changes: 1 addition & 1 deletion src/osg/glu/libtess/README
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ The interface
GLU_TESS_WINDING_NEGATIVE
GLU_TESS_WINDING_ABS_GEQ_TWO

The input contours parition the plane into regions. A winding
The input contours partition the plane into regions. A winding
rule determines which of these regions are inside the polygon.

For a single contour C, the winding number of a point x is simply
Expand Down
4 changes: 2 additions & 2 deletions src/osg/glu/libtess/sweep.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ static void CallCombine( GLUtesselator *tess, GLUvertex *isect,
static void SpliceMergeVertices( GLUtesselator *tess, GLUhalfEdge *e1,
GLUhalfEdge *e2 )
/*
* Two vertices with idential coordinates are combined into one.
* Two vertices with identical coordinates are combined into one.
* e1->Org is kept, while e2->Org is discarded.
*/
{
Expand Down Expand Up @@ -941,7 +941,7 @@ static void ConnectRightVertex( GLUtesselator *tess, ActiveRegion *regUp,
static void ConnectLeftDegenerate( GLUtesselator *tess,
ActiveRegion *regUp, GLUvertex *vEvent )
/*
* The event vertex lies exacty on an already-processed edge or vertex.
* The event vertex lies exactly on an already-processed edge or vertex.
* Adding the new vertex involves splicing it into the already-processed
* part of the mesh.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/osgManipulator/Dragger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ void Dragger::setHandleEvents(bool flag)

void Dragger::addConstraint(Constraint* constraint)
{
// check to make sure constaint hasn't already been attached.
// check to make sure constraint hasn't already been attached.
for(Constraints::iterator itr = _constraints.begin();
itr != _constraints.end();
++itr)
Expand Down
2 changes: 1 addition & 1 deletion src/osgParticle/ParticleSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void osgParticle::ParticleSystem::update(double dt, osg::NodeVisitor& nv)
// Update shader uniforms
// This slightly reduces the consumption of traversing the particle vector, because we
// don't compute tile and angle attributes that are useleff for shaders.
// At present, our lcoal shader implementation will ignore these particle props:
// At present, our local shader implementation will ignore these particle props:
// _cur_tile, _s_coord, _t_coord, _prev_pos, _prev_angle and _angle
osg::StateSet* stateset = getOrCreateStateSet();

Expand Down
18 changes: 9 additions & 9 deletions src/osgPlugins/3ds/WriterNodeVisitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@ WriterNodeVisitor::buildFaces(osg::Geode & geo,
bool texcoords)
{
unsigned int nbTrianglesRemaining = listTriangles.size();
unsigned int nbVerticesRemaining = calcVertices(geo); // May set _succeded to false
unsigned int nbVerticesRemaining = calcVertices(geo); // May set _succeeded to false
if (!succeeded()) return;

std::string name( getUniqueName(geo.getName().empty() ? geo.className() : geo.getName(), true, "geo") );
Expand Down Expand Up @@ -942,7 +942,7 @@ WriterNodeVisitor::buildFaces(osg::Geode & geo,
// Finnish mesh
lib3ds_mesh_resize_faces (mesh, numFace);
//lib3ds_mesh_resize_vertices() will be called in buildMesh()
buildMesh(geo, mat, index_vert, texcoords, mesh); // May set _succeded to false
buildMesh(geo, mat, index_vert, texcoords, mesh); // May set _succeeded to false
if (!succeeded())
{
lib3ds_mesh_free(mesh);
Expand Down Expand Up @@ -973,7 +973,7 @@ WriterNodeVisitor::buildFaces(osg::Geode & geo,
face.material = it->first.material;
}

buildMesh(geo, mat, index_vert, texcoords, mesh); // May set _succeded to false
buildMesh(geo, mat, index_vert, texcoords, mesh); // May set _succeeded to false
if (!succeeded())
{
lib3ds_mesh_free(mesh);
Expand Down Expand Up @@ -1027,7 +1027,7 @@ void WriterNodeVisitor::apply( osg::Geode &node )
if ( g != NULL )
{
pushStateSet(g->getStateSet());
createListTriangle(g, listTriangles, texcoords, i); // May set _succeded to false
createListTriangle(g, listTriangles, texcoords, i); // May set _succeeded to false
popStateSet(g->getStateSet());
if (!succeeded()) break;
}
Expand All @@ -1036,9 +1036,9 @@ void WriterNodeVisitor::apply( osg::Geode &node )
{
#if DISABLE_3DS_ANIMATION
osg::Matrix mat( osg::computeLocalToWorld(getNodePath()) );
buildFaces(node, mat, listTriangles, texcoords); // May set _succeded to false
buildFaces(node, mat, listTriangles, texcoords); // May set _succeeded to false
#else
buildFaces(node, osg::Matrix(), listTriangles, texcoords); // May set _succeded to false
buildFaces(node, osg::Matrix(), listTriangles, texcoords); // May set _succeeded to false
#endif
}
popStateSet(node.getStateSet());
Expand Down Expand Up @@ -1071,17 +1071,17 @@ void WriterNodeVisitor::apply( osg::Billboard &node )

pushStateSet(g->getStateSet());
createListTriangle(g, listTriangles, texcoords, i);
popStateSet(g->getStateSet()); // May set _succeded to false
popStateSet(g->getStateSet()); // May set _succeeded to false
if (!succeeded()) break;

osg::Matrix pointLocalMat(osg::Matrix::translate(node.getPosition(i))); // TODO handle rotation
#if DISABLE_3DS_ANIMATION
osg::Matrix currentBillboardWorldMat(pointLocalMat * m);
apply3DSMatrixNode(node, &pointLocalMat, "bil"); // Add a 3DS matrix node (with local matrix)
buildFaces(node, currentBillboardWorldMat, listTriangles, texcoords); // May set _succeded to false
buildFaces(node, currentBillboardWorldMat, listTriangles, texcoords); // May set _succeeded to false
#else
apply3DSMatrixNode(node, &pointLocalMat, "bil"); // Add a 3DS matrix node (with local matrix)
buildFaces(node, osg::Matrix(), listTriangles, texcoords); // May set _succeded to false
buildFaces(node, osg::Matrix(), listTriangles, texcoords); // May set _succeeded to false
#endif
if (!succeeded()) break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ endmacro()

############################################################
#
# NodeKit/Psudo loader plugins
# NodeKit/Pseudo loader plugins
#
ADD_PLUGIN_DIRECTORY(osga)
ADD_PLUGIN_DIRECTORY(rot)
Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/Inventor/ConvertFromInventor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1760,7 +1760,7 @@ ConvertFromInventor::getStateSet(SoCallbackAction* action)
case SoDrawStyle::FILLED:
{
#if 0
// OSG defaults to filled draw style, so no need to set redundent state.
// OSG defaults to filled draw style, so no need to set redundant state.
osg::PolygonMode *polygonMode = new osg::PolygonMode;
polygonMode->setMode(osg::PolygonMode::FRONT_AND_BACK,
osg::PolygonMode::FILL);
Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/Inventor/ConvertToInventor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ ConvertToInventor::InventorState* ConvertToInventor::createInventorState(const o

if (ccw)
// Warn if culling the lit faces while rendering unlit faces.
// Inventor does not support this setup and it lits the unculled faces only.
// Inventor does not support this setup and it lights the unculled faces only.
OSG_WARN << "IvWriter: Culling was set in a way that one-sided lighting will lit the culled sides of faces. "
"Using lighting on correct faces." << std::endl;

Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/Inventor/ReaderWriterIV.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ ReaderWriterIV::readNodeFromSoInput(SoInput &input,
// Create the inventor scenegraph by reading from SoInput
SoSeparator* rootIVNode = SoDB::readAll(&input);

// Remove recently appened search paths
// Remove recently appended search paths
if (options)
removeSearchPaths(searchPaths);

Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ osg::ref_ptr<osg::Geode> ReaderWritterOpenCASCADE::OCCTKReader::igesToOSGGeode(c
void ReaderWritterOpenCASCADE::OCCTKReader::_traverse(const TDF_Label &shapeTree, gp_Trsf& transformation)
{
TDF_Label referredShape;
/// find if current shape referes some shape. if it does then traverse that
/// find if current shape referred some shape. if it does then traverse that
/// else it is a simple shape and do visualize that simple shape
if(_assembly->GetReferredShape(shapeTree, referredShape))
{
Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/QTKit/ReaderWriterQTKit.mm
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ virtual ReadResult readImage(const std::string& file, const osgDB::ReaderWriter:
if (ext=="QTKit")
{
fileName = osgDB::findDataFile( osgDB::getNameLessExtension(file), options);
OSG_INFO<<"QTKit stipped filename = "<<fileName<<std::endl;
OSG_INFO<<"QTKit stripped filename = "<<fileName<<std::endl;
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions src/osgPlugins/cfg/Camera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -649,13 +649,13 @@ void Camera::run( void )

if (_done) break;

// printf(" Camera::run before sycn block\n");
// printf(" Camera::run before sync block\n");

_syncBarrier->block();

if (_done) break;

// printf(" Camera::run after sycn block\n");
// printf(" Camera::run after sync block\n");

advance();
}
Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/cfg/Camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class RenderSurface;

The Camera contains a Lens class and has a RenderSurface. Methods
are provided to give the programmer control over the OpenGL PROJECTION
matrix throught the Lens and over the initial MODELVIEW matrix through
matrix through the Lens and over the initial MODELVIEW matrix through
the camera's position and attitude.

The programmer must provide a class derived from Camera::SceneHandler
Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/directshow/DirectShowTexture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ struct ListDeviceAvailable
}
}

// covert to std::string
// convert to std::string
_bstr_t bstr_t(varName.bstrVal);
std::string deviceName(bstr_t);
std::string deviceGUID;
Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/dxf/DXFWriterNodeVisitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class AcadColor
// aci index format is
// last digit odd = 50% sat, even=100%
// last digit 0,1 = 100% value, 2,3=80%, 4,5=60% 6,7=50%, 8,9=30%
// first two sigits are hue angle /1.5 but count starts at 10, first 9 values are dummy named colours
// first two digits are hue angle /1.5 but count starts at 10, first 9 values are dummy named colours
int aci=10 + (int)(h/1.5);
aci -= (aci%10); // ensure last digit is zero

Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/fbx/WriterNodeVisitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ WriterNodeVisitor::Material::Material(WriterNodeVisitor& writerNodeVisitor,
_fbxMaterial = FbxSurfacePhong::Create(pSdkManager, relativePath.c_str());
}
// Connect texture to material's diffuse
// Note there should be no reason FbxSurfacePhong::Create() would return NULL, but as previous code made this secirity test, here we keep the same way.
// Note there should be no reason FbxSurfacePhong::Create() would return NULL, but as previous code made this security test, here we keep the same way.
if (_fbxMaterial)
{
_fbxMaterial->Diffuse.ConnectSrcObject(_fbxTexture);
Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/freetype/FreeTypeLibrary.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class FreeTypeLibrary : public osg::Referenced
{
public:

/** protected destrcutor to prevent inappropriate deletion.*/
/** protected destructor to prevent inappropriate deletion.*/
virtual ~FreeTypeLibrary();

/** get the singleton instance.*/
Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/gles/MostInfluencedGeometryByBone
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ protected:

struct sort_influences {
//We sort influences by number of influenced vertex first and then by normalized weight (number_of_vertex_influence / accumulated_weight)
//i.e we choose to keep geometries with many vertex insted of geometries with high normalized weight, it makes more sense for geometry
//i.e we choose to keep geometries with many vertex instead of geometries with high normalized weight, it makes more sense for geometry
//selection via bone influence box @see AABBonBoneVisitor class
bool operator()(const BoneInfluence &a, const BoneInfluence &b) {
return (a.second.getNumInfluencedVertex() > b.second.getNumInfluencedVertex()) ||
Expand Down
2 changes: 1 addition & 1 deletion src/osgPlugins/hdr/hdrwriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
developed by Greg Ward. It handles the conversions between rgbe and
pixels consisting of floats. The data is assumed to be an array of floats.
By default there are three floats per pixel in the order red, green, blue.
(RGBE_DATA_??? values control this.) Only the mimimal header reading and
(RGBE_DATA_??? values control this.) Only the minimal header reading and
writing is implemented. Each routine does error checking and will return
a status value as defined below. This code is intended as a skeleton so
feel free to modify it to suit your needs.
Expand Down
Loading