From 260cbab51888a8896b85c84176590d8abd7f562a Mon Sep 17 00:00:00 2001 From: Alberto Luaces Date: Mon, 30 May 2016 12:30:05 +0100 Subject: [PATCH] Typo fixes --- applications/present3D/present3D.cpp | 2 +- examples/osganimationtimeline/osganimationtimeline.cpp | 2 +- examples/osgcluster/osgcluster.cpp | 4 ++-- examples/osggpucull/osggpucull.cpp | 6 +++--- examples/osgimpostor/osgimpostor.cpp | 2 +- examples/osgphotoalbum/PhotoArchive.cpp | 2 +- examples/osgphotoalbum/osgphotoalbum.cpp | 2 +- examples/osgprecipitation/osgprecipitation.cpp | 4 ++-- examples/osgpresentation/osgpresentation.cpp | 2 +- examples/osgreflect/osgreflect.cpp | 2 +- examples/osgrobot/osgrobot.cpp | 2 +- examples/osgshadow/osgshadow.cpp | 2 +- examples/osgsimplifier/osgsimplifier.cpp | 2 +- examples/osgsimulation/osgsimulation.cpp | 2 +- examples/osgteapot/osgteapot.cpp | 2 +- examples/osgtexture2D/osgtexture2D.cpp | 4 ++-- examples/osgtexture3D/osgtexture3D.cpp | 2 +- examples/osgvertexprogram/osgvertexprogram.cpp | 2 +- examples/osgvirtualprogram/CreateAdvancedHierachy.cpp | 4 ++-- examples/osgwidgettable/osgwidgettable.cpp | 2 +- include/osg/Identifier | 2 +- include/osgUtil/SceneGraphBuilder | 2 +- src/osg/Texture1D.cpp | 2 +- src/osg/Uniform.cpp | 2 +- src/osg/glu/libtess/geom.cpp | 4 ++-- src/osgAnimation/RigGeometry.cpp | 6 +++--- src/osgAnimation/RigTransformHardware.cpp | 2 +- src/osgPlugins/cfg/ConfigParser.cpp | 2 +- src/osgPlugins/directshow/DirectShowTexture.cpp | 2 +- src/osgPlugins/dw/ReaderWriterDW.cpp | 2 +- src/osgPlugins/dxf/dxfEntity.cpp | 2 +- src/osgPlugins/gles/UnIndexMeshVisitor.cpp | 2 +- src/osgPlugins/obj/ReaderWriterOBJ.cpp | 2 +- src/osgPlugins/pov/POVWriterNodeVisitor.cpp | 2 +- src/osgPlugins/quicktime/ReaderWriterQT.cpp | 2 +- src/osgPlugins/stl/ReaderWriterSTL.cpp | 2 +- src/osgPlugins/trk/ReaderWriterTRK.cpp | 2 +- src/osgUtil/DelaunayTriangulator.cpp | 8 ++++---- src/osgUtil/Optimizer.cpp | 10 +++++----- .../deprecated-dotosg/osgAnimation/ReaderWriter.cpp | 2 +- 40 files changed, 56 insertions(+), 56 deletions(-) diff --git a/applications/present3D/present3D.cpp b/applications/present3D/present3D.cpp index cab9fbafc..a757f4786 100644 --- a/applications/present3D/present3D.cpp +++ b/applications/present3D/present3D.cpp @@ -851,7 +851,7 @@ int main( int argc, char **argv ) if (exportName.empty()) { - // objects for managing the broadcasting and recieving of camera packets. + // objects for managing the broadcasting and receiving of camera packets. CameraPacket cp; Broadcaster bc; Receiver rc; diff --git a/examples/osganimationtimeline/osganimationtimeline.cpp b/examples/osganimationtimeline/osganimationtimeline.cpp index 677d682c7..4885e7b06 100644 --- a/examples/osganimationtimeline/osganimationtimeline.cpp +++ b/examples/osganimationtimeline/osganimationtimeline.cpp @@ -129,7 +129,7 @@ struct ExampleTimelineUsage : public osgGA::GUIEventHandler if (_releaseKey) // we hit a key and release it execute an action { osgAnimation::Timeline* tml = _manager->getTimeline(); - // dont play if already playing + // don't play if already playing if (!tml->isActive(_scratchNose.get())) { // add this animation on top of two other diff --git a/examples/osgcluster/osgcluster.cpp b/examples/osgcluster/osgcluster.cpp index d895c6c93..de5f3eaa5 100644 --- a/examples/osgcluster/osgcluster.cpp +++ b/examples/osgcluster/osgcluster.cpp @@ -491,7 +491,7 @@ int main( int argc, char **argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program aguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); @@ -541,7 +541,7 @@ int main( int argc, char **argv ) CameraPacket *cp = new CameraPacket; - // objects for managing the broadcasting and recieving of camera packets. + // objects for managing the broadcasting and receiving of camera packets. Broadcaster bc; Receiver rc; diff --git a/examples/osggpucull/osggpucull.cpp b/examples/osggpucull/osggpucull.cpp index 10ef25ed2..b199578fc 100644 --- a/examples/osggpucull/osggpucull.cpp +++ b/examples/osggpucull/osggpucull.cpp @@ -46,7 +46,7 @@ #endif // each instance type may have max 8 LODs ( if you change -// this value, dont forget to change it in vertex shaders accordingly ) +// this value, don't forget to change it in vertex shaders accordingly ) const unsigned int OSGGPUCULL_MAXIMUM_LOD_NUMBER = 8; // during culling each instance may be sent to max 4 indirect targets const unsigned int OSGGPUCULL_MAXIMUM_INDIRECT_TARGET_NUMBER = 4; @@ -673,7 +673,7 @@ osg::Node* createInstanceTree(const std::vector& instances, const osg::Boundi } // Texture buffers holding information about the number of instances to render ( named "indirect command -// texture buffers", or simply - indirect commands ) must reset instance number to 0 in the beggining of each frame. +// texture buffers", or simply - indirect commands ) must reset instance number to 0 in the beginning of each frame. // It is done by simple texture reload from osg::Image. // Moreover - texture buffers that use texture images ( i mean "images" as defined in ARB_shader_image_load_store extension ) // should call glBindImageTexture() before every shader that uses imageLoad(), imageStore() and imageAtomic*() GLSL functions. @@ -1231,7 +1231,7 @@ struct AnimateObjectsCallback : public osg::DrawableUpdateCallback } void setRotationUsingRotSpeed( unsigned int index, unsigned int boneIndex, const osg::Matrix& zeroMatrix, double currentTime, double rotSpeed ) { - // setRotationUsingRotSpeed() is a very unoptimally writen ( because it uses osg::Matrix::inverse() ), + // setRotationUsingRotSpeed() is a very unoptimally written ( because it uses osg::Matrix::inverse() ), // and that is done on purpose : in real life scenario functions making updates may take long time // to calculate new object positions due to sophisticated physics models, geometry intersections etc. osg::Matrix mRot = osg::Matrix::rotate( fmod( 2.0 * osg::PI * rotSpeed * currentTime,2.0*osg::PI) , osg::Vec3(0.0,0.0,1.0) ); diff --git a/examples/osgimpostor/osgimpostor.cpp b/examples/osgimpostor/osgimpostor.cpp index ce3fe9ece..816c9f9a8 100644 --- a/examples/osgimpostor/osgimpostor.cpp +++ b/examples/osgimpostor/osgimpostor.cpp @@ -264,7 +264,7 @@ int main( int argc, char **argv ) impostor->setRange(0,0.0f,1e7f); impostor->setCenter(bs.center()); - // impostor specfic settings. + // impostor specific settings. impostor->setImpostorThresholdToBound(5.0f); model = impostor; diff --git a/examples/osgphotoalbum/PhotoArchive.cpp b/examples/osgphotoalbum/PhotoArchive.cpp index b1319277e..4a0fb1878 100644 --- a/examples/osgphotoalbum/PhotoArchive.cpp +++ b/examples/osgphotoalbum/PhotoArchive.cpp @@ -174,7 +174,7 @@ void PhotoArchive::buildArchive(const std::string& filename, const FileNameList& // open up the archive for writing to osgDB::ofstream out(filename.c_str(), std::ios::out | std::ios::binary); - // write out file indentifier. + // write out file identifier. out.write(FILE_IDENTIFER.c_str(),FILE_IDENTIFER.size()); unsigned int numPhotos = photoIndex.size(); diff --git a/examples/osgphotoalbum/osgphotoalbum.cpp b/examples/osgphotoalbum/osgphotoalbum.cpp index ac6e491e2..300de7d4e 100644 --- a/examples/osgphotoalbum/osgphotoalbum.cpp +++ b/examples/osgphotoalbum/osgphotoalbum.cpp @@ -193,7 +193,7 @@ Page::Page(Album* album, unsigned int pageNo, const std::string& frontFileName, osgDB::ReaderWriter* readerWriter = osgDB::Registry::instance()->getReaderWriterForExtension("gdal"); if (!readerWriter) { - std::cout<<"Error: GDAL plugin not available, cannot preceed with database creation"<addCommandLineOption("--particleColour ",""); arguments.getApplicationUsage()->addCommandLineOption("--wind ","Set the wind speed in model coordinates"); arguments.getApplicationUsage()->addCommandLineOption("--particleSpeed ","Set the particle speed"); - arguments.getApplicationUsage()->addCommandLineOption("--nearTransition ","Set the near transistion distance"); - arguments.getApplicationUsage()->addCommandLineOption("--farTransition ","Set the far transistion distance"); + arguments.getApplicationUsage()->addCommandLineOption("--nearTransition ","Set the near transition distance"); + arguments.getApplicationUsage()->addCommandLineOption("--farTransition ","Set the far transition distance"); arguments.getApplicationUsage()->addCommandLineOption("--particleDensity ","Set the particle density"); arguments.getApplicationUsage()->addCommandLineOption("--cellSize ","Set the cell size in model coordinates"); arguments.getApplicationUsage()->addCommandLineOption("--fogDensity ","Set the fog density"); diff --git a/examples/osgpresentation/osgpresentation.cpp b/examples/osgpresentation/osgpresentation.cpp index 4a4228e1d..24e5f601e 100644 --- a/examples/osgpresentation/osgpresentation.cpp +++ b/examples/osgpresentation/osgpresentation.cpp @@ -299,7 +299,7 @@ int main(int argc, char** argv) // if (pi.setProperty(presentation.get(), "Matrix", osg::Matrixd::scale(1.0,2.0,2.0))) if (pi.setProperty(presentation.get(), "Matrix", osg::Matrixd::scale(2.0,2.0,2.0))) { - OSG_NOTICE<<"setProperty(..,Matrix) succedded."<setColor(osg::Vec4(1.0f, 0.3f, 0.3f, 1.0f)); - shape->setName("red cyclinder"); + shape->setName("red cylinder"); geode_2->addDrawable(shape.get()); shape = new osg::ShapeDrawable(new osg::Box(osg::Vec3(0.0f, 0.0f, 3.0f), 2.0f, 2.0f, 0.1f), hints.get()); diff --git a/examples/osgsimplifier/osgsimplifier.cpp b/examples/osgsimplifier/osgsimplifier.cpp index d8a375081..0eee1db43 100644 --- a/examples/osgsimplifier/osgsimplifier.cpp +++ b/examples/osgsimplifier/osgsimplifier.cpp @@ -157,7 +157,7 @@ int main( int argc, char **argv ) osgUtil::Simplifier simplifier(ratio, maxError); - std::cout<<"Runing osgUtil::Simplifier with SampleRatio="< root = (osg::Node*)loadedModel->clone(osg::CopyOp::DEEP_COPY_ALL); diff --git a/examples/osgsimulation/osgsimulation.cpp b/examples/osgsimulation/osgsimulation.cpp index b163b1e94..6aa58fd36 100644 --- a/examples/osgsimulation/osgsimulation.cpp +++ b/examples/osgsimulation/osgsimulation.cpp @@ -395,7 +395,7 @@ int main(int argc, char **argv) csn->removeChildren(0, csn->getNumChildren()); csn->addChild(overlayNode.get()); - // tell the overlay node to continously update its overlay texture + // tell the overlay node to continuously update its overlay texture // as we know we'll be tracking a moving target. overlayNode->setContinuousUpdate(true); } diff --git a/examples/osgteapot/osgteapot.cpp b/examples/osgteapot/osgteapot.cpp index b2310bcb7..0d6575460 100644 --- a/examples/osgteapot/osgteapot.cpp +++ b/examples/osgteapot/osgteapot.cpp @@ -250,7 +250,7 @@ class Teapot : public osg::Drawable { osg::BoundingBox bbox; - // follow is some truely horrible code required to calculate the + // follow is some truly horrible code required to calculate the // bounding box of the teapot. Have used the original code above to do // help compute it. float p[4][4][3], q[4][4][3], r[4][4][3], s[4][4][3]; diff --git a/examples/osgtexture2D/osgtexture2D.cpp b/examples/osgtexture2D/osgtexture2D.cpp index a4df73a15..0d9cb58d5 100644 --- a/examples/osgtexture2D/osgtexture2D.cpp +++ b/examples/osgtexture2D/osgtexture2D.cpp @@ -231,7 +231,7 @@ public: _textList.push_back("Anisotropic filtering\nsetMaxAnisotropy(8.0f)"); _maxAnisotropyList.push_back(16.0f); - _textList.push_back("Higest quality anisotropic filtering\nsetMaxAnisotropy(16.0f)"); + _textList.push_back("Highest quality anisotropic filtering\nsetMaxAnisotropy(16.0f)"); setValues(); } @@ -544,7 +544,7 @@ public: subImage->setImage(originalImage->s()/2, originalImage->t()/2, originalImage->r(), // half the width and height originalImage->getInternalTextureFormat(), // same internal texture format originalImage->getPixelFormat(),originalImage->getDataType(), // same pixel foramt and data type - originalImage->data(originalImage->s()/4,originalImage->t()/4), // offset teh start point to 1/4 into the image + originalImage->data(originalImage->s()/4,originalImage->t()/4), // offset the start point to 1/4 into the image osg::Image::NO_DELETE, // don't attempt to delete the image data, leave this to the originalImage originalImage->getPacking(), // use the same packing originalImage->s()); // use the width of the original image as the row width diff --git a/examples/osgtexture3D/osgtexture3D.cpp b/examples/osgtexture3D/osgtexture3D.cpp index b5a766b44..beba4dd3a 100644 --- a/examples/osgtexture3D/osgtexture3D.cpp +++ b/examples/osgtexture3D/osgtexture3D.cpp @@ -81,7 +81,7 @@ osg::StateSet* createState() // set up the 3d texture itself, // note, well set the filtering up so that mip mapping is disabled, // gluBuild3DMipsmaps doesn't do a very good job of handled the - // inbalanced dimensions of the 256x256x4 texture. + // imbalanced dimensions of the 256x256x4 texture. osg::Texture3D* texture3D = new osg::Texture3D; texture3D->setFilter(osg::Texture3D::MIN_FILTER,osg::Texture3D::LINEAR); texture3D->setFilter(osg::Texture3D::MAG_FILTER,osg::Texture3D::LINEAR); diff --git a/examples/osgvertexprogram/osgvertexprogram.cpp b/examples/osgvertexprogram/osgvertexprogram.cpp index 5d11e1042..8637b4cd0 100644 --- a/examples/osgvertexprogram/osgvertexprogram.cpp +++ b/examples/osgvertexprogram/osgvertexprogram.cpp @@ -45,7 +45,7 @@ #include -float refract = 1.02; // ratio of indicies of refraction +float refract = 1.02; // ratio of indices of refraction float fresnel = 0.2; // Fresnel multiplier diff --git a/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp b/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp index 883efd871..3efe3cdc1 100644 --- a/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp +++ b/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp @@ -266,7 +266,7 @@ osg::Node * CreateAdvancedHierarchy( osg::Node * model ) PerFragmentDirectionalLightingFragmentShaderSource ); } - // Additionaly set bottom left model texture to procedural blue to + // Additionally set bottom left model texture to procedural blue to // better observe smooth speculars done through per pixel lighting if( 1 ) { @@ -279,7 +279,7 @@ osg::Node * CreateAdvancedHierarchy( osg::Node * model ) ProceduralBlueTextureFragmentShaderSource ); } - // Additionaly change texture mapping to SphereMAp in bottom right model + // Additionally change texture mapping to SphereMAp in bottom right model if( 1 ) { AddLabel( transformRightBottom, "EnvMap Sphere VP", offset ); diff --git a/examples/osgwidgettable/osgwidgettable.cpp b/examples/osgwidgettable/osgwidgettable.cpp index 6d96c8e7e..3a152abf1 100644 --- a/examples/osgwidgettable/osgwidgettable.cpp +++ b/examples/osgwidgettable/osgwidgettable.cpp @@ -8,7 +8,7 @@ const unsigned int MASK_2D = 0xF0000000; // This examples demonstrates the use of an osgWidget::Table, which differs from a Box in -// many ways. First and foremost, a Table's size is intially known, whereas a Box can be +// many ways. First and foremost, a Table's size is initially known, whereas a Box can be // dynamically added to. Secondly, a table is matrix Layout, with both vertical and // horizontal placement cells. A Box, on the other hand, can only be vertical or horizontal. diff --git a/include/osg/Identifier b/include/osg/Identifier index b61cc7e5d..24d616060 100644 --- a/include/osg/Identifier +++ b/include/osg/Identifier @@ -39,7 +39,7 @@ inline bool iequals(const std::string& lhs, const std::string& rhs) } -/** Unique Indentifier class to help with efficiently comparing +/** Unique Identifier class to help with efficiently comparing * road classification or region via pointers.*/ class OSG_EXPORT Identifier : public osg::Referenced, public osg::Observer { diff --git a/include/osgUtil/SceneGraphBuilder b/include/osgUtil/SceneGraphBuilder index 532868892..d36edf53d 100644 --- a/include/osgUtil/SceneGraphBuilder +++ b/include/osgUtil/SceneGraphBuilder @@ -23,7 +23,7 @@ namespace osgUtil { -/** A class for assisting the building a scene graph that is equivilant to OpenGL 1.0 style calls. +/** A class for assisting the building a scene graph that is equivalent to OpenGL 1.0 style calls. */ class OSGUTIL_EXPORT SceneGraphBuilder { diff --git a/src/osg/Texture1D.cpp b/src/osg/Texture1D.cpp index a18b23b02..0f3f1ae3b 100644 --- a/src/osg/Texture1D.cpp +++ b/src/osg/Texture1D.cpp @@ -210,7 +210,7 @@ void Texture1D::apply(State& state) const textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,1,1,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(); _textureObjectBuffer[contextID] = textureObject; diff --git a/src/osg/Uniform.cpp b/src/osg/Uniform.cpp index 2fa4e6353..2c0b103d7 100644 --- a/src/osg/Uniform.cpp +++ b/src/osg/Uniform.cpp @@ -1301,7 +1301,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 ) diff --git a/src/osg/glu/libtess/geom.cpp b/src/osg/glu/libtess/geom.cpp index a4a97f579..eafe0b503 100644 --- a/src/osg/glu/libtess/geom.cpp +++ b/src/osg/glu/libtess/geom.cpp @@ -49,7 +49,7 @@ GLdouble __gl_edgeEval( GLUvertex *u, GLUvertex *v, GLUvertex *w ) /* Given three vertices u,v,w such that VertLeq(u,v) && VertLeq(v,w), * evaluates the t-coord of the edge uw at the s-coord of the vertex v. * Returns v->t - (uw)(v->s), ie. the signed distance from uw to v. - * If uw is vertical (and thus passes thru v), the result is zero. + * If uw is vertical (and thus passes through v), the result is zero. * * The calculation is extremely accurate and stable, even when v * is very close to u or w. In particular if we set v->t = 0 and @@ -104,7 +104,7 @@ GLdouble __gl_transEval( GLUvertex *u, GLUvertex *v, GLUvertex *w ) /* Given three vertices u,v,w such that TransLeq(u,v) && TransLeq(v,w), * evaluates the t-coord of the edge uw at the s-coord of the vertex v. * Returns v->s - (uw)(v->t), ie. the signed distance from uw to v. - * If uw is vertical (and thus passes thru v), the result is zero. + * If uw is vertical (and thus passes through v), the result is zero. * * The calculation is extremely accurate and stable, even when v * is very close to u or w. In particular if we set v->s = 0 and diff --git a/src/osgAnimation/RigGeometry.cpp b/src/osgAnimation/RigGeometry.cpp index c773c2f5e..8fc283017 100644 --- a/src/osgAnimation/RigGeometry.cpp +++ b/src/osgAnimation/RigGeometry.cpp @@ -32,7 +32,7 @@ osg::BoundingBox RigComputeBoundingBoxCallback::computeBound(const osg::Drawable return _boundingBox; // if the computing of bb is invalid (like no geometry inside) - // then dont tag the bounding box as computed + // then don't tag the bounding box as computed osg::BoundingBox bb = rig.computeBoundingBox(); if (!bb.valid()) return bb; @@ -70,8 +70,8 @@ RigGeometry::RigGeometry(const RigGeometry& b, const osg::CopyOp& copyop) : _vertexInfluenceMap(b._vertexInfluenceMap), _needToComputeMatrix(b._needToComputeMatrix) { - // we dont copy the RigImplementation yet. because the RigImplementation need to be initialized in a valid graph, with a skeleton ... - // dont know yet what to do with a clone of a RigGeometry + // we don't copy the RigImplementation yet. because the RigImplementation need to be initialized in a valid graph, with a skeleton ... + // don't know yet what to do with a clone of a RigGeometry } diff --git a/src/osgAnimation/RigTransformHardware.cpp b/src/osgAnimation/RigTransformHardware.cpp index 8fe7a351f..6cbd5f270 100644 --- a/src/osgAnimation/RigTransformHardware.cpp +++ b/src/osgAnimation/RigTransformHardware.cpp @@ -90,7 +90,7 @@ bool RigTransformHardware::createPalette(int nbVertexes, BoneMap boneMap, const bonesForThisVertex++; // count max number of bones per vertexes vertexIndexWeight[vertexIndex].push_back(IndexWeightEntry(bname2palette[bw.getBoneName()],bw.getWeight())); } - else if (fabs(bw.getWeight()) > 1e-2) // dont use bone with weight too small + else if (fabs(bw.getWeight()) > 1e-2) // don't use bone with weight too small { if (boneMap.find(bw.getBoneName()) == boneMap.end()) { diff --git a/src/osgPlugins/cfg/ConfigParser.cpp b/src/osgPlugins/cfg/ConfigParser.cpp index deecb78b5..0e51f35b9 100644 --- a/src/osgPlugins/cfg/ConfigParser.cpp +++ b/src/osgPlugins/cfg/ConfigParser.cpp @@ -1187,7 +1187,7 @@ yyparse () `yyvs': related to semantic values, `yyls': related to locations. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ diff --git a/src/osgPlugins/directshow/DirectShowTexture.cpp b/src/osgPlugins/directshow/DirectShowTexture.cpp index ca5ad014d..4f5618171 100644 --- a/src/osgPlugins/directshow/DirectShowTexture.cpp +++ b/src/osgPlugins/directshow/DirectShowTexture.cpp @@ -809,7 +809,7 @@ bool CTextureRenderer::initBuildGraph() hr = _graphBuilder->QueryInterface( IID_IBasicAudio, (void **)&_basicAudio); - checkError(prefixForMessage, hr); //May be no sound so dont effect return result + checkError(prefixForMessage, hr); //May be no sound so don't effect return result return true; } diff --git a/src/osgPlugins/dw/ReaderWriterDW.cpp b/src/osgPlugins/dw/ReaderWriterDW.cpp index f60fd9964..cce6e6f96 100644 --- a/src/osgPlugins/dw/ReaderWriterDW.cpp +++ b/src/osgPlugins/dw/ReaderWriterDW.cpp @@ -757,7 +757,7 @@ void _dwobj::buildDrawable(Group *grp, const osgDB::ReaderWriter::Options *optio gluTessCallback(ts, GLU_TESS_ERROR, (GLU_TESS_CALLBACK) error); gluTessCallback(ts, GLU_TESS_COMBINE_DATA, (GLU_TESS_CALLBACK) combineCallback); // for (int nvf=0; nvf<6; nvf++) { // for each length of face - // for Geometry we dont need to collect prim types individually + // for Geometry we don't need to collect prim types individually // prd.setmode(nvf , nfnvf); // filter out only this type of tessellated face prd=new prims; prd->settmat(tmat.get()); diff --git a/src/osgPlugins/dxf/dxfEntity.cpp b/src/osgPlugins/dxf/dxfEntity.cpp index 77e432aa5..edb27034e 100644 --- a/src/osgPlugins/dxf/dxfEntity.cpp +++ b/src/osgPlugins/dxf/dxfEntity.cpp @@ -490,7 +490,7 @@ dxfPolyline::drawScene(scene* sc) unsigned int ncount; unsigned int mcount; if (_surfacetype == 6) { - // I dont have examples of type 5 and 8, but they may be the same as 6 + // I don't have examples of type 5 and 8, but they may be the same as 6 mcount = _mdensity; ncount = _ndensity; } else { diff --git a/src/osgPlugins/gles/UnIndexMeshVisitor.cpp b/src/osgPlugins/gles/UnIndexMeshVisitor.cpp index 64df5b9dc..08ed09cdc 100644 --- a/src/osgPlugins/gles/UnIndexMeshVisitor.cpp +++ b/src/osgPlugins/gles/UnIndexMeshVisitor.cpp @@ -46,7 +46,7 @@ void UnIndexMeshVisitor::apply(osg::Geometry& geom) return; } - // we dont manage lines + // we don't manage lines GeometryArrayList arraySrc(geom); GeometryArrayList arrayList = arraySrc.cloneType(); diff --git a/src/osgPlugins/obj/ReaderWriterOBJ.cpp b/src/osgPlugins/obj/ReaderWriterOBJ.cpp index 39d7a1ece..cb2e43d31 100644 --- a/src/osgPlugins/obj/ReaderWriterOBJ.cpp +++ b/src/osgPlugins/obj/ReaderWriterOBJ.cpp @@ -275,7 +275,7 @@ void ReaderWriterOBJ::buildMaterialToStateSetMap(obj::Model& model, MaterialToSt { if (localOptions.fixBlackMaterials) { - // hack to fix Maya exported models that contian all black materials. + // hack to fix Maya exported models that contain all black materials. int numBlack = 0; int numNotBlack = 0; obj::Model::MaterialMap::iterator itr; diff --git a/src/osgPlugins/pov/POVWriterNodeVisitor.cpp b/src/osgPlugins/pov/POVWriterNodeVisitor.cpp index d7e44dcaa..642da6028 100644 --- a/src/osgPlugins/pov/POVWriterNodeVisitor.cpp +++ b/src/osgPlugins/pov/POVWriterNodeVisitor.cpp @@ -393,7 +393,7 @@ protected: virtual bool processTriangle() { - // dont produce trinagle until we have got three vertices + // don't produce triangle until we have got three vertices if( numIndices < 3 ) return false; diff --git a/src/osgPlugins/quicktime/ReaderWriterQT.cpp b/src/osgPlugins/quicktime/ReaderWriterQT.cpp index 8b6cf4b18..1c033dc02 100644 --- a/src/osgPlugins/quicktime/ReaderWriterQT.cpp +++ b/src/osgPlugins/quicktime/ReaderWriterQT.cpp @@ -189,7 +189,7 @@ public: virtual bool acceptsExtension(const std::string& extension) const { // this should be the only image importer required on the Mac - // dont know what else it supports, but these will do + // don't know what else it supports, but these will do return #ifdef QT_HANDLE_IMAGES_ALSO diff --git a/src/osgPlugins/stl/ReaderWriterSTL.cpp b/src/osgPlugins/stl/ReaderWriterSTL.cpp index b951609b6..2665c971a 100644 --- a/src/osgPlugins/stl/ReaderWriterSTL.cpp +++ b/src/osgPlugins/stl/ReaderWriterSTL.cpp @@ -437,7 +437,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterSTL::readNode(const std::string& fil if (sizeof(unsigned int) != 4) { - OSG_NOTICE<<"Waring: STL reading not supported as unsigned int is not 4 bytes on this system."<index(i)],points_.get()); if (i>0 || prset->getMode()==osg::PrimitiveSet::LINE_LOOP) { - // dont check edge from end to start + // don't check edge from end to start // for strips // 2 points on the constraint bool edgused=false;// first check for exact edge indices are used. diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp index 2f7cfba25..813872986 100644 --- a/src/osgUtil/Optimizer.cpp +++ b/src/osgUtil/Optimizer.cpp @@ -3683,13 +3683,13 @@ Optimizer::TextureAtlasBuilder::Atlas::FitsIn Optimizer::TextureAtlasBuilder::At if (_texture->getFilter(osg::Texture2D::MIN_FILTER) != sourceTexture->getFilter(osg::Texture2D::MIN_FILTER)) { - // inconsitent min filters + // inconsistent min filters return DOES_NOT_FIT_IN_ANY_ROW; } if (_texture->getFilter(osg::Texture2D::MAG_FILTER) != sourceTexture->getFilter(osg::Texture2D::MAG_FILTER)) { - // inconsitent mag filters + // inconsistent mag filters return DOES_NOT_FIT_IN_ANY_ROW; } @@ -3707,19 +3707,19 @@ Optimizer::TextureAtlasBuilder::Atlas::FitsIn Optimizer::TextureAtlasBuilder::At if (_texture->getShadowCompareFunc() != sourceTexture->getShadowCompareFunc()) { - // shadow functions inconsitent + // shadow functions inconsistent return DOES_NOT_FIT_IN_ANY_ROW; } if (_texture->getShadowTextureMode() != sourceTexture->getShadowTextureMode()) { - // shadow texture mode inconsitent + // shadow texture mode inconsistent return DOES_NOT_FIT_IN_ANY_ROW; } if (_texture->getShadowAmbient() != sourceTexture->getShadowAmbient()) { - // shadow ambient inconsitent + // shadow ambient inconsistent return DOES_NOT_FIT_IN_ANY_ROW; } } diff --git a/src/osgWrappers/deprecated-dotosg/osgAnimation/ReaderWriter.cpp b/src/osgWrappers/deprecated-dotosg/osgAnimation/ReaderWriter.cpp index cb3343857..faf551c7d 100644 --- a/src/osgWrappers/deprecated-dotosg/osgAnimation/ReaderWriter.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgAnimation/ReaderWriter.cpp @@ -168,7 +168,7 @@ bool Animation_readChannel(osgAnimation::Channel* pChannel, Input& fr) } pChannel->setTargetName(target); -// we dont need this info +// we don't need this info float weight = 1.0; if (fr.matchSequence("weight %f")) {