diff --git a/examples/osgAndroidExampleGLES1/AndroidManifest.xml b/examples/osgAndroidExampleGLES1/AndroidManifest.xml index eac0d374a..ccb99b39b 100644 --- a/examples/osgAndroidExampleGLES1/AndroidManifest.xml +++ b/examples/osgAndroidExampleGLES1/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionCode="1" android:versionName="1.0"> - + diff --git a/examples/osgAndroidExampleGLES2/AndroidManifest.xml b/examples/osgAndroidExampleGLES2/AndroidManifest.xml index 7c6c68209..d7b9b3f29 100644 --- a/examples/osgAndroidExampleGLES2/AndroidManifest.xml +++ b/examples/osgAndroidExampleGLES2/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionCode="1" android:versionName="1.0"> - + diff --git a/examples/osganimationhardware/osganimationhardware.cpp b/examples/osganimationhardware/osganimationhardware.cpp index 1cb05473f..36a63d9db 100644 --- a/examples/osganimationhardware/osganimationhardware.cpp +++ b/examples/osganimationhardware/osganimationhardware.cpp @@ -84,7 +84,7 @@ struct MyRigTransformHardware : public osgAnimation::RigTransformHardware CommonProgram = new osg::Program; CommonProgram->setName("HardwareSkinning"); - //set default source if _shader is not user setted + //set default source if _shader is not user set if (!vertexshader.valid()) { vertexshader = osgDB::readRefShaderFile(osg::Shader::VERTEX,"skinning.vert"); diff --git a/examples/osgautocapture/osgautocapture.cpp b/examples/osgautocapture/osgautocapture.cpp index be19ef22a..4012c980b 100644 --- a/examples/osgautocapture/osgautocapture.cpp +++ b/examples/osgautocapture/osgautocapture.cpp @@ -245,7 +245,7 @@ int main( int argc, char **argv ) traits->depth = src_traits->depth; traits->pbuffer = true; } else { - //viewer would use fullscreen size (unknown here) pbuffer will use 4096 x4096 (or best avaiable) + //viewer would use fullscreen size (unknown here) pbuffer will use 4096 x4096 (or best available) traits->width = 1 << 12; traits->height = 1 << 12; traits->pbuffer = true; diff --git a/examples/osgcluster/osgcluster.cpp b/examples/osgcluster/osgcluster.cpp index c61380203..832e09290 100644 --- a/examples/osgcluster/osgcluster.cpp +++ b/examples/osgcluster/osgcluster.cpp @@ -509,7 +509,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 occurred when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgdepthpeeling/DePee.h b/examples/osgdepthpeeling/DePee.h index 1933ff94a..2d9ab1621 100644 --- a/examples/osgdepthpeeling/DePee.h +++ b/examples/osgdepthpeeling/DePee.h @@ -91,7 +91,7 @@ private: bool createMap(MapMode mapMode, bool first=false); /*! - Creates a two dimensional noise map and initalizes _noiseMap with it + Creates a two dimensional noise map and initializes _noiseMap with it */ bool createNoiseMap(); diff --git a/examples/osgdepthpeeling/DePeePass.h b/examples/osgdepthpeeling/DePeePass.h index d80c3c168..8a47522ca 100644 --- a/examples/osgdepthpeeling/DePeePass.h +++ b/examples/osgdepthpeeling/DePeePass.h @@ -34,7 +34,7 @@ class DePeePass DePeePass(); /*! - Desctructor cleans the whole depth peeling pass + Destructor cleans the whole depth peeling pass */ ~DePeePass(); diff --git a/examples/osgfpdepth/osgfpdepth.cpp b/examples/osgfpdepth/osgfpdepth.cpp index 49e6d349d..1399a1ec9 100644 --- a/examples/osgfpdepth/osgfpdepth.cpp +++ b/examples/osgfpdepth/osgfpdepth.cpp @@ -381,7 +381,7 @@ AppState::AppState(osgViewer::Viewer* viewer_) textProjection = new Projection; textProjection->setMatrix(Matrix::ortho2D(0,1280,0,1024)); textProjection->addChild(textGeode); - // "texture not available" text displayed when the user trys to + // "texture not available" text displayed when the user tries to // display the depth texture while multisampling. osgText::Text* noCanDo = new osgText::Text; noCanDo->setFont(fontName); diff --git a/examples/osgframerenderer/osgframerenderer.cpp b/examples/osgframerenderer/osgframerenderer.cpp index 7c0eddaf9..a27803ee1 100644 --- a/examples/osgframerenderer/osgframerenderer.cpp +++ b/examples/osgframerenderer/osgframerenderer.cpp @@ -74,7 +74,7 @@ int main( int argc, char **argv ) arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options]"); arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information"); arguments.getApplicationUsage()->addCommandLineOption("-i ","Input scene (or presentation) filename."); - arguments.getApplicationUsage()->addCommandLineOption("-o ","Base ouput filename of the images, recommended to use something like Images/image.png"); + arguments.getApplicationUsage()->addCommandLineOption("-o ","Base output filename of the images, recommended to use something like Images/image.png"); arguments.getApplicationUsage()->addCommandLineOption("--cs ","Load pre-generated configuration file for run."); arguments.getApplicationUsage()->addCommandLineOption("--ouput-cs ","Output configuration file with settings provided on commandline."); arguments.getApplicationUsage()->addCommandLineOption("-p ","Use specificied camera path file to control camera position."); diff --git a/examples/osggameoflife/osggameoflife.cpp b/examples/osggameoflife/osggameoflife.cpp index a75ee2cfd..130a71103 100644 --- a/examples/osggameoflife/osggameoflife.cpp +++ b/examples/osggameoflife/osggameoflife.cpp @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) osg::ArgumentParser arguments(&argc,argv); // set up the usage document, in case we need to print out how to use this program. - arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates ping pong rendering with FBOs and mutliple rendering branches. It uses Conway's Game of Life to illustrate the concept."); + arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates ping pong rendering with FBOs and multiple rendering branches. It uses Conway's Game of Life to illustrate the concept."); arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] --startim start_image"); arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information"); arguments.getApplicationUsage()->addCommandLineOption("--startim","The initial image to seed the game of life with."); diff --git a/examples/osggpucull/osggpucull.cpp b/examples/osggpucull/osggpucull.cpp index 9001c8616..8461b4bf0 100644 --- a/examples/osggpucull/osggpucull.cpp +++ b/examples/osggpucull/osggpucull.cpp @@ -124,7 +124,7 @@ but if Robert will accept its current implementations ( I mean - primitive sets that have osg::TextureBuffer in constructor ), I may add it to osg/include/PrimitiveSet header. - - I used BufferTemplate class writen and published by Aurelien in submission forum + - I used BufferTemplate class written and published by Aurelien in submission forum some time ago. For some reason this class never got into osg/include, but is really needed during creation of UBOs, TBOs, and possibly SSBOs in the future. I added std::vector specialization to that template class. @@ -1145,7 +1145,7 @@ osg::Group* createAirplane( float detailRatio, const osg::Vec4& hullColor, const return root.release(); } -// createStaticRendering() shows how to use any OSG graph ( wheter it is single osg::Geode, or sophisticated osg::PagedLOD tree covering whole earth ) +// createStaticRendering() shows how to use any OSG graph ( whether it is single osg::Geode, or sophisticated osg::PagedLOD tree covering whole earth ) // as a source of instance data. This way, the OSG graph of arbitrary size is at first culled using typical OSG mechanisms, then remaining osg::Geometries // are sent to cull shader ( cullProgram ). Cull shader does not draw anything to screen ( thanks to GL_RASTERIZER_DISCARD mode ), but calculates if particular // instances - sourced from above mentioned osg::Geometries - are visible and what LODs for these instances should be rendered. diff --git a/examples/osghangglide/osghangglide.cpp b/examples/osghangglide/osghangglide.cpp index b6caee4d7..578293d29 100644 --- a/examples/osghangglide/osghangglide.cpp +++ b/examples/osghangglide/osghangglide.cpp @@ -125,7 +125,7 @@ int main( int argc, char **argv ) osg::ArgumentParser arguments(&argc,argv); // set up the usage document, in case we need to print out how to use this program. - arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates how to create a scene programatically, in this case a hang gliding flying site."); + arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates how to create a scene programmatically, in this case a hang gliding flying site."); arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ..."); arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information"); diff --git a/examples/osglight/osglight.cpp b/examples/osglight/osglight.cpp index 394285e45..42cc86f92 100644 --- a/examples/osglight/osglight.cpp +++ b/examples/osglight/osglight.cpp @@ -39,7 +39,7 @@ #include "stdio.h" -// callback to make the loaded model oscilate up and down. +// callback to make the loaded model oscillate up and down. class ModelTransformCallback : public osg::NodeCallback { public: diff --git a/examples/osgmemorytest/osgmemorytest.cpp b/examples/osgmemorytest/osgmemorytest.cpp index 9ccca09ba..21fbc2a48 100644 --- a/examples/osgmemorytest/osgmemorytest.cpp +++ b/examples/osgmemorytest/osgmemorytest.cpp @@ -326,7 +326,7 @@ int main( int argc, char **argv ) arguments.getApplicationUsage()->addCommandLineOption("--texture ","Allocate a 3D texture of specified dimensions."); arguments.getApplicationUsage()->addCommandLineOption("--texture ","Allocate a 2D texture of specified dimensions."); arguments.getApplicationUsage()->addCommandLineOption("--texture ","Allocate a 1D texture of specified dimensions."); - arguments.getApplicationUsage()->addCommandLineOption("--geometry ","Allocate a osg::Geometry representing a grid of specified size, using OpenGL Dislay Lists."); + arguments.getApplicationUsage()->addCommandLineOption("--geometry ","Allocate a osg::Geometry representing a grid of specified size, using OpenGL Display Lists."); arguments.getApplicationUsage()->addCommandLineOption("--geometry-va ","Allocate a osg::Geometry representing a grid of specified size, using Vertex Arrays."); arguments.getApplicationUsage()->addCommandLineOption("--geometry-vbo ","Allocate a osg::Geometry representing a grid of specified size, using Vertex Buffer Objects."); arguments.getApplicationUsage()->addCommandLineOption("--fbo ","Allocate a FrameBufferObject of specified dimensions."); diff --git a/examples/osgoccluder/osgoccluder.cpp b/examples/osgoccluder/osgoccluder.cpp index 12f917b49..d959d8527 100644 --- a/examples/osgoccluder/osgoccluder.cpp +++ b/examples/osgoccluder/osgoccluder.cpp @@ -290,7 +290,7 @@ int main( int argc, char **argv ) arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates use of convex planer occluders."); arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ..."); arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information"); - arguments.getApplicationUsage()->addCommandLineOption("-m","Mannually create occluders"); + arguments.getApplicationUsage()->addCommandLineOption("-m","Manually create occluders"); // initialize the viewer. osgViewer::Viewer viewer; diff --git a/examples/osgparticle/osgparticle.cpp b/examples/osgparticle/osgparticle.cpp index c0d9c4a06..6f71167ce 100644 --- a/examples/osgparticle/osgparticle.cpp +++ b/examples/osgparticle/osgparticle.cpp @@ -444,7 +444,7 @@ void build_world(osg::Group *root) // the second one will be a little bit more complex, showing how to // create custom operators. // To avoid inserting too much code in a single function, we have - // splitted the work into two functions which accept a Group node as + // split the work into two functions which accept a Group node as // parameter, and return a pointer to the particle system they created. osgParticle::ParticleSystem *ps1 = create_simple_particle_system(root); diff --git a/examples/osgparticleeffects/osgparticleeffects.cpp b/examples/osgparticleeffects/osgparticleeffects.cpp index 289914328..0684259fd 100644 --- a/examples/osgparticleeffects/osgparticleeffects.cpp +++ b/examples/osgparticleeffects/osgparticleeffects.cpp @@ -317,7 +317,7 @@ public: // insert particle effects alongside the hit node, therefore able to track that nodes movement, // however, this does require us to insert the ParticleSystem itself into the root of the scene graph // separately from the main particle effects group which contains the emitters and programs. - // the follow code block implements this, note the path for handling particle effects which arn't attached to + // the follow code block implements this, note the path for handling particle effects which aren't attached to // moving models is easy - just a single line of code! // tell the effects not to attach to the particle system locally for rendering, as we'll handle add it into the diff --git a/examples/osgparticleshader/osgparticleshader.cpp b/examples/osgparticleshader/osgparticleshader.cpp index d701c7c3b..00e84a1cc 100644 --- a/examples/osgparticleshader/osgparticleshader.cpp +++ b/examples/osgparticleshader/osgparticleshader.cpp @@ -155,7 +155,7 @@ int main( int argc, char** argv ) root->addChild( parent.get() ); root->addChild( updater.get() ); - // FIXME 2010.9.19: the updater can't be a drawable; otehrwise the ParticleEffect will not work properly. why? + // FIXME 2010.9.19: the updater can't be a drawable; otherwise the ParticleEffect will not work properly. why? updater->addParticleSystem( ps.get() ); osg::ref_ptr geode = new osg::Geode; diff --git a/examples/osgphotoalbum/osgphotoalbum.cpp b/examples/osgphotoalbum/osgphotoalbum.cpp index 300de7d4e..b4bfe5800 100644 --- a/examples/osgphotoalbum/osgphotoalbum.cpp +++ b/examples/osgphotoalbum/osgphotoalbum.cpp @@ -747,7 +747,7 @@ int main( int argc, char **argv ) osg::ref_ptr album = new Album(arguments,width,height); - // creat the scene from the file list. + // create the scene from the file list. osg::ref_ptr rootNode = album->getScene(); if (!rootNode) return 0; diff --git a/examples/osgpresentation/osgpresentation.cpp b/examples/osgpresentation/osgpresentation.cpp index 24e5f601e..93e9b5819 100644 --- a/examples/osgpresentation/osgpresentation.cpp +++ b/examples/osgpresentation/osgpresentation.cpp @@ -50,7 +50,7 @@ int main(int argc, char** argv) if (script.valid()) scripts.push_back(script.get()); } - // assgin script engine to scene graphs + // assign script engine to scene graphs model->getOrCreateUserDataContainer()->addUserObject(osgDB::readFile("ScriptEngine.lua")); model->getOrCreateUserDataContainer()->addUserObject(osgDB::readFile("ScriptEngine.python")); model->getOrCreateUserDataContainer()->addUserObject(osgDB::readFile("ScriptEngine.js")); diff --git a/examples/osgsampler/osgSampler.cpp b/examples/osgsampler/osgSampler.cpp index 4c09d13c1..d1a984ae2 100644 --- a/examples/osgsampler/osgSampler.cpp +++ b/examples/osgsampler/osgSampler.cpp @@ -120,7 +120,7 @@ int main(int argc, char* argv[]) sampler2=(osg::Sampler*)(*it)->getTextureAttribute(0, osg::StateAttribute::SAMPLER); } if(sampler1.valid()&&sampler2.valid()){ - OSG_WARN<<"2samplers manipulator setted"<dirty(); tex2->setImage(im); } - ///Overrided Filtering setup + ///Overridden Filtering setup tex1->setFilter(osg::Texture::MAG_FILTER,osg::Texture::NEAREST); tex1->setFilter(osg::Texture::MIN_FILTER,osg::Texture::NEAREST); diff --git a/examples/osgslice/osgslice.cpp b/examples/osgslice/osgslice.cpp index e2905e350..e6c393df3 100644 --- a/examples/osgslice/osgslice.cpp +++ b/examples/osgslice/osgslice.cpp @@ -187,7 +187,7 @@ int main( int argc, char **argv ) // pass frame stamp to the SceneView so that the update, cull and draw traversals all use the same FrameStamp sceneView->setFrameStamp(frameStamp.get()); - // update the viewport dimensions, incase the window has been resized. + // update the viewport dimensions, in case the window has been resized. sceneView->setViewport(0,0,traits->width,traits->height); diff --git a/examples/osgstereoimage/osgstereoimage.cpp b/examples/osgstereoimage/osgstereoimage.cpp index f23fedef5..9d666a68c 100644 --- a/examples/osgstereoimage/osgstereoimage.cpp +++ b/examples/osgstereoimage/osgstereoimage.cpp @@ -610,7 +610,7 @@ int main( int argc, char **argv ) osg::TexMat* texmatLeft = new osg::TexMat; osg::TexMat* texmatRight = new osg::TexMat; - // creat the scene from the file list. + // create the scene from the file list. osg::ref_ptr rootNode; if (!onDisk) rootNode = createScene(fileList,texmatLeft,texmatRight,radius,height,length); else rootNode=new osg::Switch(); diff --git a/examples/osgteapot/osgteapot.cpp b/examples/osgteapot/osgteapot.cpp index 0d6575460..88cce2a59 100644 --- a/examples/osgteapot/osgteapot.cpp +++ b/examples/osgteapot/osgteapot.cpp @@ -235,7 +235,7 @@ class Teapot : public osg::Drawable // of OpenGL primitives. virtual void drawImplementation(osg::RenderInfo&) const { - // teapot(..) doens't use vertex arrays at all so we don't need to toggle their state + // teapot(..) doesn't use vertex arrays at all so we don't need to toggle their state // if we did we'd need to something like following call // state.disableAllVertexArrays(), see src/osg/Geometry.cpp for the low down. diff --git a/examples/osgtext3D/TextNode.h b/examples/osgtext3D/TextNode.h index 710cc9a18..bdc0a7955 100644 --- a/examples/osgtext3D/TextNode.h +++ b/examples/osgtext3D/TextNode.h @@ -61,7 +61,7 @@ class /*OSGTEXT_EXPORT*/ TextTechnique : public osg::Object /// default TextTechnique implementation used if no other is specified on TextNode static osg::ref_ptr& getDefaultTextTechinque(); - /// start building a new charater layout + /// start building a new character layout virtual void start(); /// called by Layout engine to place individual characters @@ -70,7 +70,7 @@ class /*OSGTEXT_EXPORT*/ TextTechnique : public osg::Object /// called by Layout engine to place individual characters virtual void addCharacter(const osg::Vec3& position, const osg::Vec3& size, Glyph3D* glyph, Style* style); - /// finish building new charater layout + /// finish building new character layout virtual void finish(); /// provide traversal control diff --git a/examples/osgviewerGTK/osggtkdrawingarea.h b/examples/osgviewerGTK/osggtkdrawingarea.h index 9f916a299..53748e948 100644 --- a/examples/osgviewerGTK/osggtkdrawingarea.h +++ b/examples/osgviewerGTK/osggtkdrawingarea.h @@ -4,7 +4,7 @@ #include // This is an implementation of SimpleViewer that is designed to be subclassed -// and used as a GtkDrawingArea in a GTK application. Because of the implemention +// and used as a GtkDrawingArea in a GTK application. Because of the implementation // of GTK, I was unable to derive from GtkWidget and instead had to "wrap" it. // Conceptually, however, you can think of an OSGGTKDrawingArea as both an OSG // Viewer AND GtkDrawingArea. diff --git a/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp b/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp index 3efe3cdc1..1c9f8a964 100644 --- a/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp +++ b/examples/osgvirtualprogram/CreateAdvancedHierachy.cpp @@ -211,7 +211,7 @@ osg::Node * CreateAdvancedHierarchy( osg::Node * model ) // Set default VirtualProgram in root StateSet // With main vertex and main fragment shaders calling - // lighting and texture functions defined in aditional shaders + // lighting and texture functions defined in additional shaders // Lighting is done per vertex using simple directional light // Texture uses stage 0 TexCoords and TexMap diff --git a/include/OpenThreads/Affinity b/include/OpenThreads/Affinity index 27fc2a546..0f9626195 100644 --- a/include/OpenThreads/Affinity +++ b/include/OpenThreads/Affinity @@ -45,10 +45,10 @@ public: Affinity& operator = (const Affinity& rhs) { if (&rhs!=this) { activeCPUs = rhs.activeCPUs; } return *this; } - /** add a specfied cpu core from the list to have affinity to. */ + /** add a specified cpu core from the list to have affinity to. */ void add(unsigned int cpuNmber) { activeCPUs.insert(cpuNmber); } - /** remove a specfied cpu core from the list to have affinity to. */ + /** remove a specified cpu core from the list to have affinity to. */ void remove(unsigned int cpuNmber) { activeCPUs.erase(cpuNmber); } /** return true if affinity has been provided for specific CPU cores.*/ diff --git a/include/OpenThreads/Thread b/include/OpenThreads/Thread index 90a424dad..4d0d71562 100644 --- a/include/OpenThreads/Thread +++ b/include/OpenThreads/Thread @@ -190,7 +190,7 @@ public: /** * Set the thread's schedule priority. This is a complex method. * Beware of thread priorities when using a many-to-many kernel - * entity implemenation (such as IRIX pthreads). If one is not careful + * entity implementation (such as IRIX pthreads). If one is not careful * to manage the thread priorities, a priority inversion deadlock can * easily occur (Although the OpenThreads::Mutex & OpenThreads::Barrier * constructs have been designed with this scenario in mind). Unless diff --git a/include/osg/BufferObject b/include/osg/BufferObject index 3e627cf95..3ec365544 100644 --- a/include/osg/BufferObject +++ b/include/osg/BufferObject @@ -437,10 +437,10 @@ class OSG_EXPORT BufferObject : public Object const BufferObjectProfile& getProfile() const { return _profile; } - /** Set whether the BufferObject should use a GLBufferObject just for copying the BufferData and release it immmediately so that it may be reused.*/ + /** Set whether the BufferObject should use a GLBufferObject just for copying the BufferData and release it immediately so that it may be reused.*/ void setCopyDataAndReleaseGLBufferObject(bool copyAndRelease) { _copyDataAndReleaseGLBufferObject = copyAndRelease; } - /** Get whether the BufferObject should use a GLBufferObject just for copying the BufferData and release it immmediately.*/ + /** Get whether the BufferObject should use a GLBufferObject just for copying the BufferData and release it immediately.*/ bool getCopyDataAndReleaseGLBufferObject() const { return _copyDataAndReleaseGLBufferObject; } diff --git a/include/osg/Callback b/include/osg/Callback index 1387fce4b..35480a39c 100644 --- a/include/osg/Callback +++ b/include/osg/Callback @@ -158,7 +158,7 @@ public: }; -/** Convenience function for getting the CallbackObject associated with specificed name from an Object's UserDataContainer.*/ +/** Convenience function for getting the CallbackObject associated with specified name from an Object's UserDataContainer.*/ inline CallbackObject* getCallbackObject(osg::Object* object, const std::string& name) { osg::UserDataContainer* udc = object->getUserDataContainer(); @@ -171,7 +171,7 @@ inline CallbackObject* getCallbackObject(osg::Object* object, const std::string& } -/** Convenience function for getting the CallbackObject associated with specificed name from an Object's UserDataContainer.*/ +/** Convenience function for getting the CallbackObject associated with specified name from an Object's UserDataContainer.*/ inline const CallbackObject* getCallbackObject(const osg::Object* object, const std::string& name) { const osg::UserDataContainer* udc = object->getUserDataContainer(); diff --git a/include/osg/Image b/include/osg/Image index 4bf7df74b..28c28429d 100644 --- a/include/osg/Image +++ b/include/osg/Image @@ -433,7 +433,7 @@ class OSG_EXPORT Image : public BufferData /** Ensure image dimensions are a power of two. * Mipmapped textures require the image dimensions to be - * power of two and are within the maxiumum texture size for + * power of two and are within the maximum texture size for * the host machine. */ void ensureValidSizeForTexturing(GLint maxTextureSize); diff --git a/include/osg/Node b/include/osg/Node index 32ff5c3d2..68642bd68 100644 --- a/include/osg/Node +++ b/include/osg/Node @@ -194,11 +194,11 @@ class OSG_EXPORT Node : public Object /** Get the list of node paths parent paths. - * The optional Node* haltTraversalAtNode allows the user to prevent traversal beyond a specifed node. */ + * The optional Node* haltTraversalAtNode allows the user to prevent traversal beyond a specified node. */ NodePathList getParentalNodePaths(osg::Node* haltTraversalAtNode=0) const; /** Get the list of matrices that transform this node from local coordinates to world coordinates. - * The optional Node* haltTraversalAtNode allows the user to prevent traversal beyond a specifed node. */ + * The optional Node* haltTraversalAtNode allows the user to prevent traversal beyond a specified node. */ MatrixList getWorldMatrices(const osg::Node* haltTraversalAtNode=0) const; diff --git a/include/osg/PagedLOD b/include/osg/PagedLOD index c24666e5a..06b88282a 100644 --- a/include/osg/PagedLOD +++ b/include/osg/PagedLOD @@ -154,7 +154,7 @@ class OSG_EXPORT PagedLOD : public LOD /** Get the number of children that the PagedLOD must keep around, even if they are older than their expiry time.*/ unsigned int getNumChildrenThatCannotBeExpired() const { return _numChildrenThatCannotBeExpired; } - /** Set wether you want to disable the paging in of external nodes.*/ + /** Set whether you want to disable the paging in of external nodes.*/ void setDisableExternalChildrenPaging(bool flag) { _disableExternalChildrenPaging = flag; } bool getDisableExternalChildrenPaging() const { return _disableExternalChildrenPaging; } diff --git a/include/osg/Referenced b/include/osg/Referenced index 0a683232f..924b06390 100644 --- a/include/osg/Referenced +++ b/include/osg/Referenced @@ -47,7 +47,7 @@ class OSG_EXPORT Referenced Referenced(); - /** Deprecated, Referenced is now always uses thread safe ref/unref, use default Refernced() constructor instead */ + /** Deprecated, Referenced is now always uses thread safe ref/unref, use default Referenced() constructor instead */ explicit Referenced(bool threadSafeRefUnref); Referenced(const Referenced&); diff --git a/include/osg/Shape b/include/osg/Shape index 69cd9e90e..7d856bee2 100644 --- a/include/osg/Shape +++ b/include/osg/Shape @@ -747,7 +747,7 @@ class TessellationHints : public Object // forward declare; class Geometry; -/** Convenience class for populating an Geomtry with vertex, normals, texture coords and primitives that can render a Shape. */ +/** Convenience class for populating an Geometry with vertex, normals, texture coords and primitives that can render a Shape. */ class OSG_EXPORT BuildShapeGeometryVisitor : public ConstShapeVisitor { public: diff --git a/include/osg/UserDataContainer b/include/osg/UserDataContainer index ab63aaf20..65b0100a3 100644 --- a/include/osg/UserDataContainer +++ b/include/osg/UserDataContainer @@ -203,14 +203,14 @@ protected: }; -/** Convenience function for getting the User Object associated with specificed name from an Object's UserDataContainer.*/ +/** Convenience function for getting the User Object associated with specified name from an Object's UserDataContainer.*/ inline Object* getUserObject(osg::Object* object, const std::string& name) { osg::UserDataContainer* udc = object->getUserDataContainer(); return udc ? udc->getUserObject(name) : 0; } -/** Convenience function for getting the User Object associated with specificed name from an Object's UserDataContainer.*/ +/** Convenience function for getting the User Object associated with specified name from an Object's UserDataContainer.*/ inline const Object* getUserObject(const osg::Object* object, const std::string& name) { const osg::UserDataContainer* udc = object->getUserDataContainer(); diff --git a/include/osg/Vec2i b/include/osg/Vec2i index 6ec16054c..bc26d6985 100644 --- a/include/osg/Vec2i +++ b/include/osg/Vec2i @@ -28,7 +28,7 @@ class Vec2i /** Number of vector components. */ enum { num_components = 2 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[2]; Vec2i() { _v[0]=0; _v[1]=0; } diff --git a/include/osg/Vec2ui b/include/osg/Vec2ui index 7e5e31bc5..641bc4e9e 100644 --- a/include/osg/Vec2ui +++ b/include/osg/Vec2ui @@ -28,7 +28,7 @@ class Vec2ui /** Number of vector components. */ enum { num_components = 2 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[2]; Vec2ui() { _v[0]=0; _v[1]=0; } diff --git a/include/osg/Vec3i b/include/osg/Vec3i index fe0a0c761..884460088 100644 --- a/include/osg/Vec3i +++ b/include/osg/Vec3i @@ -28,7 +28,7 @@ class Vec3i /** Number of vector components. */ enum { num_components = 3 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[3]; Vec3i() { _v[0]=0; _v[1]=0; _v[2]=0; } diff --git a/include/osg/Vec3ui b/include/osg/Vec3ui index 410f80cfa..126a97599 100644 --- a/include/osg/Vec3ui +++ b/include/osg/Vec3ui @@ -28,7 +28,7 @@ class Vec3ui /** Number of vector components. */ enum { num_components = 3 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[3]; Vec3ui() { _v[0]=0; _v[1]=0; _v[2]=0; } diff --git a/include/osg/Vec4i b/include/osg/Vec4i index d53ac8f3e..e29675e34 100644 --- a/include/osg/Vec4i +++ b/include/osg/Vec4i @@ -28,7 +28,7 @@ class Vec4i /** Number of vector components. */ enum { num_components = 4 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[4]; Vec4i() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; } diff --git a/include/osg/Vec4ui b/include/osg/Vec4ui index 7be56811e..059617ea8 100644 --- a/include/osg/Vec4ui +++ b/include/osg/Vec4ui @@ -28,7 +28,7 @@ class Vec4ui /** Number of vector components. */ enum { num_components = 4 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[4]; Vec4ui() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; } diff --git a/include/osg/ref_ptr b/include/osg/ref_ptr index f9166ac15..693e98e2c 100644 --- a/include/osg/ref_ptr +++ b/include/osg/ref_ptr @@ -81,7 +81,7 @@ class ref_ptr bool operator < (const ref_ptr& rp) const { return (_ptr inline void compute(const osg::Matrix& transform, const osg::Matrix& invTransform, const V* src, V* dst) { - // the result of matrix mult should be cached to be used for vertexes transform and normal transform and maybe other computation + // the result of matrix mult should be cached to be used for vertices transform and normal transform and maybe other computation for(VertexGroupList::iterator itvg=_uniqVertexGroupList.begin(); itvg!=_uniqVertexGroupList.end(); ++itvg) { VertexGroup& uniq = *itvg; uniq.computeMatrixForVertexSet(); osg::Matrix matrix = transform * uniq.getMatrix() * invTransform; - const IndexList& vertexes = uniq.getVertices(); - for(IndexList::const_iterator vertIDit=vertexes.begin(); vertIDit!=vertexes.end(); ++vertIDit) + const IndexList& vertices = uniq.getVertices(); + for(IndexList::const_iterator vertIDit=vertices.begin(); vertIDit!=vertices.end(); ++vertIDit) { dst[*vertIDit] = src[*vertIDit] * matrix; } @@ -160,8 +160,8 @@ namespace osgAnimation uniq.computeMatrixForVertexSet(); osg::Matrix matrix = transform * uniq.getMatrix() * invTransform; - const IndexList& vertexes = uniq.getVertices(); - for(IndexList::const_iterator vertIDit=vertexes.begin(); vertIDit!=vertexes.end(); ++vertIDit) + const IndexList& vertices = uniq.getVertices(); + for(IndexList::const_iterator vertIDit=vertices.begin(); vertIDit!=vertices.end(); ++vertIDit) { dst[*vertIDit] = osg::Matrix::transform3x3(src[*vertIDit],matrix); } diff --git a/include/osgAnimation/VertexInfluence b/include/osgAnimation/VertexInfluence index 1bf1e6e01..1aa3e83da 100644 --- a/include/osgAnimation/VertexInfluence +++ b/include/osgAnimation/VertexInfluence @@ -61,7 +61,7 @@ namespace osgAnimation ///normalize per vertex weights given numvert of the attached mesh void normalize(unsigned int numvert); - ///remove weakest influences in order to fit targetted numbonepervertex + ///remove weakest influences in order to fit targeted numbonepervertex void cullInfluenceCountPerVertex(unsigned int maxnumbonepervertex, float minweight=0, bool renormalize=true); //compute PerVertexInfluenceList diff --git a/include/osgDB/ClassInterface b/include/osgDB/ClassInterface index 5c66ac9c7..703f3c472 100644 --- a/include/osgDB/ClassInterface +++ b/include/osgDB/ClassInterface @@ -110,12 +110,12 @@ DECLARE_TYPE(osg::BoundingBoxd, BOUNDINGBOXD) DECLARE_TYPE(osg::BoundingSpheref, BOUNDINGSPHEREF) DECLARE_TYPE(osg::BoundingSphered, BOUNDINGSPHERED) -// forward decalare +// forward declare class PropertyOutputIterator; class PropertyInputIterator; -/** ClassInterface provides a general means of checking for supported properties of classes, and getting/setting thoses properties. +/** ClassInterface provides a general means of checking for supported properties of classes, and getting/setting those properties. Uses the osgDB serializers to do the actual object query/get/set. */ class OSGDB_EXPORT ClassInterface @@ -166,10 +166,10 @@ public: /// run method of object bool run(osg::Object* object, const std::string& methodName, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const; - /// checked for support of specificed method + /// checked for support of specified method bool hasMethod(const std::string& compoundClassName, const std::string& methodName) const; - /// checked for support of specificed method + /// checked for support of specified method bool hasMethod(const osg::Object* object, const std::string& methodName) const; diff --git a/include/osgDB/DatabasePager b/include/osgDB/DatabasePager index f90e79075..e7cc062f8 100644 --- a/include/osgDB/DatabasePager +++ b/include/osgDB/DatabasePager @@ -434,7 +434,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl void compileCompleted(DatabaseRequest* databaseRequest); /** Iterate through the active PagedLOD nodes children removing - * children which havn't been visited since specified expiryTime. + * children which haven't been visited since specified expiryTime. * note, should be only be called from the update thread. */ virtual void removeExpiredSubgraphs(const osg::FrameStamp &frameStamp); diff --git a/include/osgDB/FileNameUtils b/include/osgDB/FileNameUtils index 42be97a9a..c7a2560d5 100644 --- a/include/osgDB/FileNameUtils +++ b/include/osgDB/FileNameUtils @@ -39,7 +39,7 @@ extern OSGDB_EXPORT std::string getNameLessAllExtensions(const std::string& file extern OSGDB_EXPORT std::string getStrippedName(const std::string& fileName); /** If 'to' is in a subdirectory of 'from' then this function returns the subpath, otherwise it just returns the file name. * The function does \b not automagically resolve paths as the system does, so be careful to give canonical paths. - * However, the function interprets slashes ('/') ans backslashes ('\') as they were equal. + * However, the function interprets slashes ('/') and backslashes ('\') as they were equal. */ extern OSGDB_EXPORT std::string getPathRelative(const std::string& from, const std::string& to); /** Gets root part of a path ("/" or "C:"), or an empty string if none found. */ diff --git a/include/osgDB/InputStream b/include/osgDB/InputStream index f6afc027b..8fc999a6e 100644 --- a/include/osgDB/InputStream +++ b/include/osgDB/InputStream @@ -181,10 +181,10 @@ public: else return 0; } - /// set an input iterator, used directly when not using InputStream with a traditional file releated stream. + /// set an input iterator, used directly when not using InputStream with a traditional file related stream. void setInputIterator( InputIterator* ii ) { _in = ii; } - /// start reading from InputStream treating it as a traditional file releated stream, handles headers and versioning + /// start reading from InputStream treating it as a traditional file related stream, handles headers and versioning ReadType start( InputIterator* ); void decompress(); diff --git a/include/osgDB/OutputStream b/include/osgDB/OutputStream index 5a4a93a15..7a2b9e64c 100644 --- a/include/osgDB/OutputStream +++ b/include/osgDB/OutputStream @@ -173,10 +173,10 @@ public: void writeObjectFields( const osg::Object* obj ); void writeObjectFields( const osg::Object* obj, const std::string& compoundName ); - /// set an output iterator, used directly when not using OutputStream with a traditional file releated stream. + /// set an output iterator, used directly when not using OutputStream with a traditional file related stream. void setOutputIterator( OutputIterator* oi ) { _out = oi; } - /// start writing to OutputStream treating it as a traditional file releated stream, handles headers and versioning + /// start writing to OutputStream treating it as a traditional file related stream, handles headers and versioning void start( OutputIterator* outIterator, WriteType type ); void compress( std::ostream* ostream ); diff --git a/include/osgFX/Cartoon b/include/osgFX/Cartoon index 361a22ec0..57603e77f 100644 --- a/include/osgFX/Cartoon +++ b/include/osgFX/Cartoon @@ -37,7 +37,7 @@ namespace osgFX Cartoon(); Cartoon(const Cartoon& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); - // effect class informations + // effect class information META_Effect( osgFX, Cartoon, diff --git a/include/osgFX/Scribe b/include/osgFX/Scribe index 3b28285bc..28a6ccdca 100644 --- a/include/osgFX/Scribe +++ b/include/osgFX/Scribe @@ -36,7 +36,7 @@ namespace osgFX Scribe(); Scribe(const Scribe& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); - // effect class informations + // effect class information META_Effect( osgFX, Scribe, diff --git a/include/osgGA/EventVisitor b/include/osgGA/EventVisitor index ff3deece5..a4c9baa5e 100644 --- a/include/osgGA/EventVisitor +++ b/include/osgGA/EventVisitor @@ -107,7 +107,7 @@ class OSGGA_EXPORT EventVisitor : public osg::NodeVisitor } // The following overrides are technically redundant as the default implementation would eventually trickle down to - // apply(osg::Node&); - however defining these explicitely should save a couple of virtual function calls + // apply(osg::Node&); - however defining these explicitly should save a couple of virtual function calls virtual void apply(osg::Geode& node) { handle_callbacks_and_traverse(node); } virtual void apply(osg::Billboard& node) { handle_callbacks_and_traverse(node); } virtual void apply(osg::LightSource& node) { handle_callbacks_and_traverse(node); } diff --git a/include/osgGA/Export b/include/osgGA/Export index 0743d6795..d997a70b4 100644 --- a/include/osgGA/Export +++ b/include/osgGA/Export @@ -66,7 +66,7 @@ as appropriate for the viewer. Events from the windowing environment are adpated, and then fed into the GUIEventHandlers. The GUIEventHandlers analyse and take action, and make requests of the windowing -environemnt via the GUIActionAdapter. The viewer writer should then honour these +environment via the GUIActionAdapter. The viewer writer should then honour these requests, translating them into calls to the windowing API. */ diff --git a/include/osgGA/KeySwitchMatrixManipulator b/include/osgGA/KeySwitchMatrixManipulator index f67a5e04a..d1dec04a4 100644 --- a/include/osgGA/KeySwitchMatrixManipulator +++ b/include/osgGA/KeySwitchMatrixManipulator @@ -44,7 +44,7 @@ class OSGGA_EXPORT KeySwitchMatrixManipulator : public CameraManipulator void addMatrixManipulator(int key, std::string name, CameraManipulator *cm); /** - Add a camera manipulator with an autogenerated keybinding which is '1' + previous number of camera's registerd. + Add a camera manipulator with an autogenerated keybinding which is '1' + previous number of camera's registered. */ void addNumberedMatrixManipulator(CameraManipulator *cm); diff --git a/include/osgShadow/MinimalShadowMap b/include/osgShadow/MinimalShadowMap index bec349f41..d1de78194 100644 --- a/include/osgShadow/MinimalShadowMap +++ b/include/osgShadow/MinimalShadowMap @@ -90,7 +90,7 @@ class OSGSHADOW_EXPORT MinimalShadowMap : public StandardShadowMap // when scene objects are put on earth ellipsoid surface. // Other scenarios are also possible for example when models are - // built in XZY space which would require identity matrix with swapped colums + // built in XZY space which would require identity matrix with swapped columns osg::Matrix _modellingSpaceToWorld; float _maxFarPlane; diff --git a/include/osgShadow/StandardShadowMap b/include/osgShadow/StandardShadowMap index b0ec7f554..d6a3da6d5 100644 --- a/include/osgShadow/StandardShadowMap +++ b/include/osgShadow/StandardShadowMap @@ -61,7 +61,7 @@ class OSGSHADOW_EXPORT StandardShadowMap : public DebugShadowMap // Example: Imagine we want to swap base(0) and shadow(1) indices: // We have to do an extra step to make sure both do not end up as 1 // - // // initialy change base to something else than 1 + // // initially change base to something else than 1 // setBaseTextureCoordIndex( 100 ); // // now search and replace all gl_TexCord[1] to gl_TexCord[0] // setShadowTextureCoordIndex( 0 ); diff --git a/include/osgSim/SphereSegment b/include/osgSim/SphereSegment index ec451af81..c9fae8c34 100644 --- a/include/osgSim/SphereSegment +++ b/include/osgSim/SphereSegment @@ -53,7 +53,7 @@ Caveats: - It's possible to render the whole sphere by specifying elevation and azimuth ranges round the full 360 degrees. When doing so you may consider switching the planes, spokes, and edge lines - off, to avoid rendering artefacts, e.g. the upper and lower + off, to avoid rendering artifacts, e.g. the upper and lower planes will be coincident. */ @@ -214,27 +214,27 @@ public: /** A list of vertex arrays representing a list of lines.*/ typedef std::vector< osg::ref_ptr > LineList; - /** Compute the interesection lines between subgraph and this sphere segment. - * The matrix is the transform that takes the subgraph into the same coordiante frame as the sphere segment. + /** Compute the intersection lines between subgraph and this sphere segment. + * The matrix is the transform that takes the subgraph into the same coordinate frame as the sphere segment. * The resulting intersections are in the coordinate frame of the sphere segment. */ LineList computeIntersection(const osg::Matrixd& matrix, osg::Node* subgraph); - /** Compute the interesection lines between specified drawable and this sphere segment. - * The matrix is the transform that takes the subgraph into the same coordiante frame as the sphere segment. + /** Compute the intersection lines between specified drawable and this sphere segment. + * The matrix is the transform that takes the subgraph into the same coordinate frame as the sphere segment. * The resulting intersections are in the coordinate frame of the sphere segment. */ LineList computeIntersection(const osg::Matrixd& matrix, osg::Drawable* drawable); - /** Compute the interesection lines between subgraph and this sphere segment. - * The matrix is the transform that takes the subgraph into the same coordiante frame as the sphere segment. + /** Compute the intersection lines between subgraph and this sphere segment. + * The matrix is the transform that takes the subgraph into the same coordinate frame as the sphere segment. * The resulting intersections are in the coordinate frame of the sphere segment. */ osg::Node* computeIntersectionSubgraph(const osg::Matrixd& matrix, osg::Node* subgraph); - /** Compute the interesection lines between specified drawable and this sphere segment. - * The matrix is the transform that takes the subgraph into the same coordiante frame as the sphere segment. + /** Compute the intersection lines between specified drawable and this sphere segment. + * The matrix is the transform that takes the subgraph into the same coordinate frame as the sphere segment. * The resulting intersections are in the coordinate frame of the sphere segment. */ osg::Node* computeIntersectionSubgraph(const osg::Matrixd& matrix, osg::Drawable* drawable); - /** recompute the vertex positions of the rendering meshes/lines thtat represent the sphere segment.*/ + /** recompute the vertex positions of the rendering meshes/lines that represent the sphere segment.*/ void updatePositions(); /** recompute the primitives rendering meshes/lines thtat represent the sphere segment.*/ diff --git a/include/osgText/Text b/include/osgText/Text index 5e13bbefc..6181b060a 100644 --- a/include/osgText/Text +++ b/include/osgText/Text @@ -73,7 +73,7 @@ public: * placing text against noisy backgrounds. * The color of the background shadow text is specified by setBackdropColor(). * DROP_SHADOW_BOTTOM_RIGHT will draw backdrop text to the right and down of - * the normal text. Other DROW_SHADOW_* modes do the same for their repective directions. + * the normal text. Other DROW_SHADOW_* modes do the same for their respective directions. * OUTLINE will draw backdrop text so that it appears the text has an outline * or border around the normal text. This mode is particularly useful against * really noisy backgrounds that may put text on top of things that have diff --git a/include/osgUtil/CullVisitor b/include/osgUtil/CullVisitor index 2e36bc2e2..802e1275b 100644 --- a/include/osgUtil/CullVisitor +++ b/include/osgUtil/CullVisitor @@ -466,7 +466,7 @@ inline RenderLeaf* CullVisitor::createOrReuseRenderLeaf(osg::Drawable* drawable, while (_currentReuseRenderLeafIndex<_reuseRenderLeafList.size() && _reuseRenderLeafList[_currentReuseRenderLeafIndex]->referenceCount()>1) { - osg::notify(osg::NOTICE)<<"Warning:createOrReuseRenderLeaf() skipping multiply refrenced entry."<< std::endl; + osg::notify(osg::NOTICE)<<"Warning:createOrReuseRenderLeaf() skipping multiply referenced entry."<< std::endl; ++_currentReuseRenderLeafIndex; } diff --git a/include/osgUtil/DelaunayTriangulator b/include/osgUtil/DelaunayTriangulator index 4c01d0268..128f45faa 100644 --- a/include/osgUtil/DelaunayTriangulator +++ b/include/osgUtil/DelaunayTriangulator @@ -91,7 +91,7 @@ public: virtual bool outside(const osg::Vec3 &testpoint) const; /** Tessellate the constraint loops so that the crossing points are interpolated - * and added to the contraints for the triangulation. */ + * and added to the constraints for the triangulation. */ void handleOverlaps(void); protected: diff --git a/include/osgUtil/IncrementalCompileOperation b/include/osgUtil/IncrementalCompileOperation index 56a5a950a..25f141976 100644 --- a/include/osgUtil/IncrementalCompileOperation +++ b/include/osgUtil/IncrementalCompileOperation @@ -107,7 +107,7 @@ class OSGUTIL_EXPORT IncrementalCompileOperation : public osg::GraphicsOperation /** ConservativeTimeRatio governs how much of the measured spare time in each frame is used for flushing deleted and compile new OpenGL objects. * Default value is 0.5, valid range is 0.1 to 1.0. * A ratio near 1.0 will lead to paged databases being compiled and merged quicker but increase the chances of frame drop. - * A ratio near 0.1 will lead to paged databases being compiled and merged closer but reduse the chances of frame drop.*/ + * A ratio near 0.1 will lead to paged databases being compiled and merged closer but reduce the chances of frame drop.*/ void setConservativeTimeRatio(double ratio) { _conservativeTimeRatio = ratio; } double getConservativeTimeRatio() const { return _conservativeTimeRatio; } diff --git a/include/osgUtil/SceneView b/include/osgUtil/SceneView index cd74d6c8d..22f5f42a5 100644 --- a/include/osgUtil/SceneView +++ b/include/osgUtil/SceneView @@ -323,7 +323,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings /** search through any pre and post RenderStages that reference a Camera, and take a reference to each of these cameras to prevent them being deleted while they are still be used by the drawing thread.*/ void collateReferencesToDependentCameras(); - /** clear the refence to any any dependent cameras.*/ + /** clear the reference to any any dependent cameras.*/ void clearReferencesToDependentCameras(); diff --git a/include/osgUtil/Tessellator b/include/osgUtil/Tessellator index 2b004269d..6271efabd 100644 --- a/include/osgUtil/Tessellator +++ b/include/osgUtil/Tessellator @@ -23,7 +23,7 @@ #include #ifndef CALLBACK - /* Win32 calling conventions. (or a least thats what the GLUT example tess.c uses.)*/ + /* Win32 calling conventions. (or a least that's what the GLUT example tess.c uses.)*/ #define CALLBACK #endif diff --git a/include/osgUtil/UpdateVisitor b/include/osgUtil/UpdateVisitor index 1e16a2b1f..2d051034c 100644 --- a/include/osgUtil/UpdateVisitor +++ b/include/osgUtil/UpdateVisitor @@ -74,7 +74,7 @@ class OSGUTIL_EXPORT UpdateVisitor : public osg::NodeVisitor } // The following overrides are technically redundant as the default implementation would eventually trickle down to - // apply(osg::Node&); - however defining these explicitely should save a couple of virtual function calls + // apply(osg::Node&); - however defining these explicitly should save a couple of virtual function calls virtual void apply(osg::Geode& node) { handle_callbacks_and_traverse(node); } virtual void apply(osg::Billboard& node) { handle_callbacks_and_traverse(node); } virtual void apply(osg::LightSource& node) { handle_callbacks_and_traverse(node); } diff --git a/include/osgViewer/View b/include/osgViewer/View index 1f8c7e8de..b16123a6c 100644 --- a/include/osgViewer/View +++ b/include/osgViewer/View @@ -47,7 +47,7 @@ class OSGVIEWER_EXPORT ViewConfig : public osg::Object /** configure method that is overridden by Config subclasses.*/ virtual void configure(osgViewer::View& /*view*/) const {} - /** convenience method for getting the relavent display settings to use.*/ + /** convenience method for getting the relevant display settings to use.*/ virtual osg::DisplaySettings* getActiveDisplaySetting(osgViewer::View& view) const; }; diff --git a/include/osgWidget/Lua b/include/osgWidget/Lua index 2abf0deff..8203fdde6 100644 --- a/include/osgWidget/Lua +++ b/include/osgWidget/Lua @@ -23,7 +23,7 @@ namespace osgWidget { // Externally defined; does this work in Windows? struct LuaEngineData; -// The actual Engine itself. Every attempt is made to export the implemenation into the +// The actual Engine itself. Every attempt is made to export the implementation into the // source file, rather than having it here. class OSGWIDGET_EXPORT LuaEngine: public ScriptEngine { diff --git a/include/osgWidget/Window b/include/osgWidget/Window index da5ff6004..de0833cd4 100644 --- a/include/osgWidget/Window +++ b/include/osgWidget/Window @@ -638,7 +638,7 @@ class OSGWIDGET_EXPORT Window: // This method is passed the additional values by which width and height should be // modified as calculed by the parent method, Window::resize. Keep in mind that these // values can be negative (indicating a potential "shrink" request) or positive (which - // would indicate a "grow" reqeust). + // would indicate a "grow" request). virtual void _resizeImplementation(point_type, point_type) = 0; // These are made into implementation functions since getting the width or height diff --git a/src/OpenThreads/pthreads/PThread.cpp b/src/OpenThreads/pthreads/PThread.cpp index 3b6b6e838..4b1bf4a0b 100644 --- a/src/OpenThreads/pthreads/PThread.cpp +++ b/src/OpenThreads/pthreads/PThread.cpp @@ -401,7 +401,7 @@ int Thread::GetConcurrency() //---------------------------------------------------------------------------- // -// Decription: Constructor +// Description: Constructor // // Use: public. // @@ -418,7 +418,7 @@ Thread::Thread() //---------------------------------------------------------------------------- // -// Decription: Destructor +// Description: Destructor // // Use: public. // diff --git a/src/OpenThreads/pthreads/PThreadBarrier.cpp b/src/OpenThreads/pthreads/PThreadBarrier.cpp index 7f486500c..02a450d82 100644 --- a/src/OpenThreads/pthreads/PThreadBarrier.cpp +++ b/src/OpenThreads/pthreads/PThreadBarrier.cpp @@ -97,7 +97,7 @@ Barrier::Barrier(int numThreads) { } -#endif // ] Priority sheduling +#endif // ] Priority scheduling #endif // ] ALLOW_PRIORITY_SCHEDULING diff --git a/src/OpenThreads/pthreads/PThreadCondition.cpp b/src/OpenThreads/pthreads/PThreadCondition.cpp index 33a2aae3e..f1a511f45 100644 --- a/src/OpenThreads/pthreads/PThreadCondition.cpp +++ b/src/OpenThreads/pthreads/PThreadCondition.cpp @@ -76,7 +76,7 @@ void condition_cleanup_handler(void *arg) { //---------------------------------------------------------------------------- // -// Decription: Constructor +// Description: Constructor // // Use: public. // @@ -97,7 +97,7 @@ Condition::Condition() { //---------------------------------------------------------------------------- // -// Decription: Destructor +// Description: Destructor // // Use: public. // @@ -118,7 +118,7 @@ Condition::~Condition() { //---------------------------------------------------------------------------- // -// Decription: wait on a condition +// Description: wait on a condition // // Use: public. // @@ -145,7 +145,7 @@ int Condition::wait(Mutex *mutex) { //---------------------------------------------------------------------------- // -// Decription: wait on a condition, for a specified period of time +// Description: wait on a condition, for a specified period of time // // Use: public. // @@ -191,7 +191,7 @@ int Condition::wait(Mutex *mutex, unsigned long int ms) { //---------------------------------------------------------------------------- // -// Decription: signal a thread to wake up. +// Description: signal a thread to wake up. // // Use: public. // @@ -205,7 +205,7 @@ int Condition::signal() { //---------------------------------------------------------------------------- // -// Decription: signal many threads to wake up. +// Description: signal many threads to wake up. // // Use: public. // diff --git a/src/OpenThreads/pthreads/PThreadMutex.cpp b/src/OpenThreads/pthreads/PThreadMutex.cpp index a4d3be0f6..3a3d1c338 100644 --- a/src/OpenThreads/pthreads/PThreadMutex.cpp +++ b/src/OpenThreads/pthreads/PThreadMutex.cpp @@ -26,7 +26,7 @@ using namespace OpenThreads; //---------------------------------------------------------------------------- // -// Decription: Constructor +// Description: Constructor // // Use: public. // @@ -101,7 +101,7 @@ Mutex::Mutex(MutexType type): //---------------------------------------------------------------------------- // -// Decription: Destructor +// Description: Destructor // // Use: public. // @@ -118,7 +118,7 @@ Mutex::~Mutex() { //---------------------------------------------------------------------------- // -// Decription: lock the mutex +// Description: lock the mutex // // Use: public. // @@ -133,7 +133,7 @@ int Mutex::lock() { //---------------------------------------------------------------------------- // -// Decription: unlock the mutex +// Description: unlock the mutex // // Use: public. // @@ -148,7 +148,7 @@ int Mutex::unlock() { //---------------------------------------------------------------------------- // -// Decription: test if the mutex may be locked +// Description: test if the mutex may be locked // // Use: public. // diff --git a/src/osg/ArgumentParser.cpp b/src/osg/ArgumentParser.cpp index 58d010b37..c1fb6fca7 100644 --- a/src/osg/ArgumentParser.cpp +++ b/src/osg/ArgumentParser.cpp @@ -622,7 +622,7 @@ void ArgumentParser::reportRemainingOptionsAsUnrecognized(ErrorSeverity severity for(int pos=1;pos GLBufferObjectSet::takeFromOrphans(BufferObject* bu osg::ref_ptr GLBufferObjectSet::takeOrGenerate(BufferObject* bufferObject) { - // see if we can recyle GLBufferObject from the orphan list + // see if we can recycle GLBufferObject from the orphan list { OpenThreads::ScopedLock lock(_mutex); if (!_pendingOrphanedGLBufferObjects.empty()) diff --git a/src/osg/CollectOccludersVisitor.cpp b/src/osg/CollectOccludersVisitor.cpp index 4645d8975..a64dff60a 100644 --- a/src/osg/CollectOccludersVisitor.cpp +++ b/src/osg/CollectOccludersVisitor.cpp @@ -156,7 +156,7 @@ void CollectOccludersVisitor::apply(osg::OccluderNode& node) if (node.getOccluder()) { // computeOccluder will check if the occluder is the view frustum, - // if it ins't then the it will return false, when in it will + // if it isn't then the it will return false, when in it will // clip the occluder's polygons in clip space, then create occluder // planes, all with their normals facing inward towards the volume, // and then transform them back into projection space. diff --git a/src/osg/DrawPixels.cpp b/src/osg/DrawPixels.cpp index 0919647c6..e84848ca7 100644 --- a/src/osg/DrawPixels.cpp +++ b/src/osg/DrawPixels.cpp @@ -16,7 +16,7 @@ using namespace osg; DrawPixels::DrawPixels() { - // turn off display lists right now, just incase we want to modify the projection matrix along the way. + // turn off display lists right now, just in case we want to modify the projection matrix along the way. setSupportsDisplayList(false); _position.set(0.0f,0.0f,0.0f); diff --git a/src/osg/Drawable.cpp b/src/osg/Drawable.cpp index f37b094e3..d6c84e2ee 100644 --- a/src/osg/Drawable.cpp +++ b/src/osg/Drawable.cpp @@ -127,7 +127,7 @@ public: virtual void deleteAllGLObjects() { - OSG_INFO<<"DisplayListManager::deleteAllGLObjects() Not currently implementated"<()-> glDrawElementsIndirect(mode, GL_UNSIGNED_INT, - (const GLvoid *)(dibo->getOffset(_indirectCommandArray->getBufferIndex()) //command array adress + (const GLvoid *)(dibo->getOffset(_indirectCommandArray->getBufferIndex()) //command array address +_firstCommand* _indirectCommandArray->getElementSize())// runtime offset computaion can be sizeof(*_indirectCommandArray->begin()) ); } diff --git a/src/osg/ShadowVolumeOccluder.cpp b/src/osg/ShadowVolumeOccluder.cpp index 373dcfc36..1dfc572a1 100644 --- a/src/osg/ShadowVolumeOccluder.cpp +++ b/src/osg/ShadowVolumeOccluder.cpp @@ -209,7 +209,7 @@ bool ShadowVolumeOccluder::computeOccluder(const NodePath& nodePath,const Convex // first transform occluder polygon into clipspace by multiple it by c[i] = v[i]*(MV*P) // 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 orientation of front plane, if normal.z()<0 then facing away from eye point, so reverse the polygons, or simply invert planes. // compute volume (quality) between front polygon in projection space and back polygon in projection space. diff --git a/src/osg/State.cpp b/src/osg/State.cpp index 2c2b7fabf..c2b72b066 100644 --- a/src/osg/State.cpp +++ b/src/osg/State.cpp @@ -373,7 +373,7 @@ void State::reset() as.changed = true; } - // we can do a straight clear, we arn't interested in GL_DEPTH_TEST defaults in texture modes. + // we can do a straight clear, we aren't interested in GL_DEPTH_TEST defaults in texture modes. for(TextureModeMapList::iterator tmmItr=_textureModeMapList.begin(); tmmItr!=_textureModeMapList.end(); ++tmmItr) @@ -1316,7 +1316,7 @@ bool State::convertVertexShaderSourceToOsgBuiltIns(std::string& source) const std::string attributeQualifier("attribute "); // find the first legal insertion point for replacement declarations. GLSL requires that nothing - // precede a "#verson" compiler directive, so we must insert new declarations after it. + // precede a "#version" compiler directive, so we must insert new declarations after it. std::string::size_type declPos = source.rfind( "#version " ); if ( declPos != std::string::npos ) { diff --git a/src/osg/StateSet.cpp b/src/osg/StateSet.cpp index 5741ba73c..d5ef599bc 100644 --- a/src/osg/StateSet.cpp +++ b/src/osg/StateSet.cpp @@ -1186,7 +1186,7 @@ void StateSet::addUniform(Uniform* uniform, StateAttribute::OverrideValue value) { if (itr->second.first==uniform) { - // chaning just override + // changing just override itr->second.second = value&(StateAttribute::OVERRIDE|StateAttribute::PROTECTED); } else diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index 73e7a78c1..78f9c032b 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -1301,7 +1301,7 @@ int Texture::compareTexture(const Texture& rhs) const COMPARE_StateAttribute_Parameter(_useHardwareMipMapGeneration) COMPARE_StateAttribute_Parameter(_internalFormatMode) - // only compare _internalFomat is it has alrady been set in both lhs, and rhs + // only compare _internalFomat is it has already been set in both lhs, and rhs if (_internalFormat!=0 && rhs._internalFormat!=0) { COMPARE_StateAttribute_Parameter(_internalFormat) diff --git a/src/osg/Texture1D.cpp b/src/osg/Texture1D.cpp index eb07a081a..dd0a28ad6 100644 --- a/src/osg/Texture1D.cpp +++ b/src/osg/Texture1D.cpp @@ -211,7 +211,7 @@ void Texture1D::apply(State& state) const applyTexParameters(GL_TEXTURE_1D,state); - // 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(); applyTexImage1D(GL_TEXTURE_1D,_image.get(),state, _textureWidth, _numMipmapLevels); diff --git a/src/osg/VertexArrayState.cpp b/src/osg/VertexArrayState.cpp index 092414f45..a644a2e2c 100644 --- a/src/osg/VertexArrayState.cpp +++ b/src/osg/VertexArrayState.cpp @@ -83,7 +83,7 @@ public: virtual void deleteAllGLObjects() { - OSG_INFO<<"VertexArrayStateManager::deleteAllGLObjects() Not currently implementated"<setDataVariance(osg::Object::STATIC); - ///check if source is setted correctly + ///check if source is set correctly if (!vertexSource|| vertexSource->size() != pos->size()) { vertexSource =(static_cast( pos->clone(osg::CopyOp::DEEP_COPY_ARRAYS))); @@ -116,7 +116,7 @@ bool MorphTransformHardware::init(MorphGeometry& morphGeometry) osg::ref_ptr program ; osg::ref_ptr vertexshader; osg::ref_ptr stateset = morphGeometry.getOrCreateStateSet(); - //grab geom source program and vertex shader if _shader is not setted + //grab geom source program and vertex shader if _shader is not set if(!_shader.valid() && (program = (osg::Program*)stateset->getAttribute(osg::StateAttribute::PROGRAM))) { for(unsigned int i=0;igetNumShaders();++i) @@ -135,7 +135,7 @@ bool MorphTransformHardware::init(MorphGeometry& morphGeometry) } program->setName("HardwareMorphing"); - //set default source if _shader is not user setted + //set default source if _shader is not user set if (!vertexshader.valid()) { if (!_shader.valid()) vertexshader = osgDB::readRefShaderFile(osg::Shader::VERTEX,"morphing.vert"); diff --git a/src/osgAnimation/RigTransformHardware.cpp b/src/osgAnimation/RigTransformHardware.cpp index 32d5540aa..d94c340a1 100644 --- a/src/osgAnimation/RigTransformHardware.cpp +++ b/src/osgAnimation/RigTransformHardware.cpp @@ -211,7 +211,7 @@ bool RigTransformHardware::buildPalette(const BoneMap& boneMap, const RigGeometr if (bonename.empty()) { - OSG_WARN << "RigTransformHardware::VertexInfluenceMap contains unamed bone IndexWeightList" << std::endl; + OSG_WARN << "RigTransformHardware::VertexInfluenceMap contains unnamed bone IndexWeightList" << std::endl; } BoneMap::const_iterator bmit = boneMap.find(bonename); if (bmit == boneMap.end() ) @@ -297,7 +297,7 @@ bool RigTransformHardware::init(RigGeometry& rig) osg::ref_ptr vertexshader; osg::ref_ptr stateset = rig.getOrCreateStateSet(); - //grab geom source program and vertex shader if _shader is not setted + //grab geom source program and vertex shader if _shader is not set if(!_shader.valid() && (program = (osg::Program*)stateset->getAttribute(osg::StateAttribute::PROGRAM))) { for(unsigned int i = 0; igetNumShaders(); ++i) @@ -312,7 +312,7 @@ bool RigTransformHardware::init(RigGeometry& rig) program = new osg::Program; program->setName("HardwareSkinning"); } - //set default source if _shader is not user setted + //set default source if _shader is not user set if (!vertexshader.valid()) { if (!_shader.valid()) vertexshader = osgDB::readRefShaderFile(osg::Shader::VERTEX,"skinning.vert"); diff --git a/src/osgAnimation/RigTransformSoftware.cpp b/src/osgAnimation/RigTransformSoftware.cpp index 56f6c6477..e659e53bd 100644 --- a/src/osgAnimation/RigTransformSoftware.cpp +++ b/src/osgAnimation/RigTransformSoftware.cpp @@ -55,7 +55,7 @@ void RigTransformSoftware::buildMinimumUpdateSet( const RigGeometry&rig ) if (bonename.empty()) { - OSG_WARN << "RigTransformSoftware::VertexInfluenceMap contains unamed bone IndexWeightList" << std::endl; + OSG_WARN << "RigTransformSoftware::VertexInfluenceMap contains unnamed bone IndexWeightList" << std::endl; } for(IndexWeightList::const_iterator infit = inflist.begin(); infit!=inflist.end(); ++infit) { @@ -165,7 +165,7 @@ bool RigTransformSoftware::init(RigGeometry&rig) if (bonename.empty()) { - OSG_WARN << "RigTransformSoftware::VertexInfluenceMap contains unamed bone IndexWeightList" << std::endl; + OSG_WARN << "RigTransformSoftware::VertexInfluenceMap contains unnamed bone IndexWeightList" << std::endl; } BoneMap::const_iterator bmit = boneMap.find(bonename); if (bmit == boneMap.end() ) diff --git a/src/osgAnimation/VertexInfluence.cpp b/src/osgAnimation/VertexInfluence.cpp index 75a7b22a6..bb1b43995 100644 --- a/src/osgAnimation/VertexInfluence.cpp +++ b/src/osgAnimation/VertexInfluence.cpp @@ -71,7 +71,7 @@ void VertexInfluenceMap::normalize(unsigned int numvert) } } -///remove weakest influences in order to fit targetted numbonepervertex +///remove weakest influences in order to fit targeted numbonepervertex void VertexInfluenceMap::cullInfluenceCountPerVertex(unsigned int numbonepervertex,float minweight, bool renormalize) { @@ -139,7 +139,7 @@ void VertexInfluenceMap::computePerVertexInfluenceList(std::vectorsecond; if (it->first.empty()) { - OSG_WARN << "VertexInfluenceMap::computePerVertexInfluenceList contains unamed bone IndexWeightList" << std::endl; + OSG_WARN << "VertexInfluenceMap::computePerVertexInfluenceList contains unnamed bone IndexWeightList" << std::endl; } for(IndexWeightList::const_iterator infit = inflist.begin(); infit != inflist.end(); ++infit) diff --git a/src/osgDB/ClassInterface.cpp b/src/osgDB/ClassInterface.cpp index e347483b0..df0ca4af2 100644 --- a/src/osgDB/ClassInterface.cpp +++ b/src/osgDB/ClassInterface.cpp @@ -308,7 +308,7 @@ osg::Object* ClassInterface::createObject(const std::string& compoundClassName) } else { - OSG_NOTICE<<"ClassInterface::createObject("<createInstance() : 0; diff --git a/src/osgDB/DynamicLibrary.cpp b/src/osgDB/DynamicLibrary.cpp index e17dd20d8..0fe9256c6 100644 --- a/src/osgDB/DynamicLibrary.cpp +++ b/src/osgDB/DynamicLibrary.cpp @@ -79,7 +79,7 @@ DynamicLibrary* DynamicLibrary::loadLibrary(const std::string& libraryName) std::string fullLibraryName = osgDB::findLibraryFile(libraryName); if (!fullLibraryName.empty()) handle = getLibraryHandle( fullLibraryName ); // try the lib we have found - else handle = getLibraryHandle( libraryName ); // havn't found a lib ourselves, see if the OS can find it simply from the library name. + else handle = getLibraryHandle( libraryName ); // haven't found a lib ourselves, see if the OS can find it simply from the library name. if (handle) return new DynamicLibrary(libraryName,handle); diff --git a/src/osgDB/FileNameUtils.cpp b/src/osgDB/FileNameUtils.cpp index 34b740a86..ceb09ebe9 100644 --- a/src/osgDB/FileNameUtils.cpp +++ b/src/osgDB/FileNameUtils.cpp @@ -155,7 +155,7 @@ std::string osgDB::getNameLessExtension(const std::string& fileName) // strip all extensions from the filename. std::string osgDB::getNameLessAllExtensions(const std::string& fileName) { - // Finds start serach position: from last slash, or the beginning of the string if none found + // Finds start search position: from last slash, or the beginning of the string if none found std::string::size_type startPos = fileName.find_last_of(PATH_SEPARATORS); // Finds forward slash *or* back slash if (startPos == std::string::npos) startPos = 0; std::string::size_type dot = fileName.find_first_of('.', startPos); // Finds *FIRST* dot from start pos @@ -449,7 +449,7 @@ std::string osgDB::getPathRelative(const std::string& from, const std::string& t // Definition: an "element" is a part between slashes. Ex: "/a/b" has two elements ("a" and "b"). // Algorithm: - // 1. If paths are neither both absolute nor both relative, then we cannot do anything (we need to make them absolute, but need additionnal info on how to make it). Return. + // 1. If paths are neither both absolute nor both relative, then we cannot do anything (we need to make them absolute, but need additional info on how to make it). Return. // 2. If both paths are absolute and root isn't the same (for Windows only, as roots are of the type "C:", "D:"), then the operation is impossible. Return. // 3. Iterate over two paths elements until elements are equal // 4. For each remaining element in "from", add ".." to result diff --git a/src/osgGA/StandardManipulator.cpp b/src/osgGA/StandardManipulator.cpp index 559405e67..467bf2b03 100644 --- a/src/osgGA/StandardManipulator.cpp +++ b/src/osgGA/StandardManipulator.cpp @@ -831,8 +831,8 @@ bool StandardManipulator::setCenterByMousePointerIntersection( const GUIEventAda } -/** Makes mouse pointer intersection test with the geometry bellow the pointer - and starts animation to center camera to look at the closest hit bellow the mouse pointer. +/** Makes mouse pointer intersection test with the geometry below the pointer + and starts animation to center camera to look at the closest hit below the mouse pointer. If there is a hit, animation is started and true is returned. Otherwise, the method returns false.*/ diff --git a/src/osgParticle/ConnectedParticleSystem.cpp b/src/osgParticle/ConnectedParticleSystem.cpp index 02eea9e33..c006e38ea 100644 --- a/src/osgParticle/ConnectedParticleSystem.cpp +++ b/src/osgParticle/ConnectedParticleSystem.cpp @@ -49,7 +49,7 @@ Particle* ConnectedParticleSystem::createParticle(const Particle* ptemplate) if (_startParticle == Particle::INVALID_INDEX) { - // we are the fisrt particle create, so start the connect particle list + // we are the first particle create, so start the connect particle list _startParticle = particleIndex; } diff --git a/src/osgParticle/ParticleProcessor.cpp b/src/osgParticle/ParticleProcessor.cpp index df926a0c5..f794980eb 100644 --- a/src/osgParticle/ParticleProcessor.cpp +++ b/src/osgParticle/ParticleProcessor.cpp @@ -73,7 +73,7 @@ void osgParticle::ParticleProcessor::traverse(osg::NodeVisitor& nv) ParticleSystem::ScopedWriteLock lock(*(_ps->getReadWriteMutex())); //added- 1/17/06- bgandere@nps.edu - //a check to make sure we havent updated yet this frame + //a check to make sure we haven't updated yet this frame if(_frameNumber < nv.getFrameStamp()->getFrameNumber()) { diff --git a/src/osgParticle/ParticleSystem.cpp b/src/osgParticle/ParticleSystem.cpp index fc9fec13f..d10fd42d3 100644 --- a/src/osgParticle/ParticleSystem.cpp +++ b/src/osgParticle/ParticleSystem.cpp @@ -232,7 +232,7 @@ void osgParticle::ParticleSystem::drawImplementation(osg::RenderInfo& renderInfo if (_useVertexArray) { - // note from Robert Osfield, September 2016, this block implementated for backwards compatibility but is pretty way vertex array/shaders were hacked into osgParticle + // note from Robert Osfield, September 2016, this block implemented for backwards compatibility but is pretty way vertex array/shaders were hacked into osgParticle // set up arrays and primitives ready to fill in if (!ad.vertices.valid()) diff --git a/src/osgPlugins/3ds/ReaderWriter3DS.cpp b/src/osgPlugins/3ds/ReaderWriter3DS.cpp index dfa601b61..e13f3022e 100644 --- a/src/osgPlugins/3ds/ReaderWriter3DS.cpp +++ b/src/osgPlugins/3ds/ReaderWriter3DS.cpp @@ -204,7 +204,7 @@ protected: typedef std::vector FaceList; typedef std::map GeoStateMap; - osg::Texture2D* createTexture(Lib3dsTextureMap *texture,const char* label,bool& transparancy); + osg::Texture2D* createTexture(Lib3dsTextureMap *texture,const char* label,bool& transparency); StateSetInfo createStateSet(Lib3dsMaterial *materials); osg::Drawable* createDrawable(Lib3dsMesh *meshes,FaceList& faceList, const osg::Matrix * matrix, StateSetInfo & ssi, bool smoothVertexNormals); @@ -1205,7 +1205,7 @@ osg::Texture2D* ReaderWriter3DS::ReaderObject::createTexture(Lib3dsTextureMap * osg::Texture2D* osg_texture = new osg::Texture2D; osg_texture->setImage(osg_image.get()); osg_texture->setName(texture->name); - // does the texture support transparancy? + // does the texture support transparency? transparency = ((texture->flags)&LIB3DS_TEXTURE_ALPHA_SOURCE)!=0; // what is the wrap mode of the texture. diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt index c16d48c1c..df20085cd 100644 --- a/src/osgPlugins/CMakeLists.txt +++ b/src/osgPlugins/CMakeLists.txt @@ -32,7 +32,7 @@ SET(TARGET_COMMON_LIBRARIES osgUtil ) -OPTION(BUILD_OSG_PLUGINS_BY_DEFAULT "If set, all available plugins are built by default and each plugin can be disabled from the build by setting BUILD_OSG_PLUGIN_ to 0. If not set, no plugins are built by default and each desired plugin must be explicitely enabled by setting BUILD_OSG_PLUGIN_ to 1." ON) +OPTION(BUILD_OSG_PLUGINS_BY_DEFAULT "If set, all available plugins are built by default and each plugin can be disabled from the build by setting BUILD_OSG_PLUGIN_ to 0. If not set, no plugins are built by default and each desired plugin must be explicitly enabled by setting BUILD_OSG_PLUGIN_ to 1." ON) # Macro used for adding plugins below. By default, all plugins are built # but can be disabled by setting the CMake Variable BUILD_OSG_PLUGIN_ to 0. diff --git a/src/osgPlugins/Inventor/ConvertFromInventor.cpp b/src/osgPlugins/Inventor/ConvertFromInventor.cpp index 400523ed3..5dffafc04 100644 --- a/src/osgPlugins/Inventor/ConvertFromInventor.cpp +++ b/src/osgPlugins/Inventor/ConvertFromInventor.cpp @@ -125,7 +125,7 @@ ConvertFromInventor::restructure(void* data, SoCallbackAction* action, if (!child->isOfType(SoSeparator::getClassTypeId()) && child->affectsState()) { - // Put the node bellow separator + // Put the node below separator SoSeparator *s = new SoSeparator; s->addChild(group->getChild(i)); group->replaceChild(i, s); @@ -1492,7 +1492,7 @@ ConvertFromInventor::preLight(void* data, SoCallbackAction* action, // Set object names const char* name = ivLight->getName().getString(); osgLight->setName(name); - //ls->setName(name); -> this will be handled bellow in ivPushState + //ls->setName(name); -> this will be handled below in ivPushState #if 1 // Let's place the light to its place in scene graph instead of // old approach of global light group. @@ -1837,7 +1837,7 @@ ConvertFromInventor::getStateSet(SoCallbackAction* action) const SbColor &c = ivState.currentAmbientLight; lightModel->setAmbientIntensity(osg::Vec4(c[0], c[1], c[2], 1.0)); #if 0 -// disable as two sided lighting causes problem under NVidia, and the above osg::Material settings are single sided anway.. +// disable as two sided lighting causes problems under NVidia, and the above osg::Material settings are single sided anyway.. update: The mentioned bug is probably just for very old NVidia drivers (commit time of the comment is 2005-03-18). The proper solution should be to set two sided lighting based on SoShapeHints node. Need to be developed. PCJohn-2010-01-20 // Set two sided lighting diff --git a/src/osgPlugins/Inventor/ConvertFromInventor.h b/src/osgPlugins/Inventor/ConvertFromInventor.h index 2dcc66a13..0dd3da593 100644 --- a/src/osgPlugins/Inventor/ConvertFromInventor.h +++ b/src/osgPlugins/Inventor/ConvertFromInventor.h @@ -28,7 +28,7 @@ class ConvertFromInventor osg::Node* convert(SoNode* rootIVNode); /** - * Preprocessing restructure the scene for the convertor + * Preprocessing restructure the scene for the converter * to be able to convert some peculiar scene constructions. * Resulting scene is geometrically equivalent to the source * scene. The preprocessing is related to grouping nodes only diff --git a/src/osgPlugins/Inventor/DeprecatedGeometry.h b/src/osgPlugins/Inventor/DeprecatedGeometry.h index 752b2da5d..17e58c0ce 100644 --- a/src/osgPlugins/Inventor/DeprecatedGeometry.h +++ b/src/osgPlugins/Inventor/DeprecatedGeometry.h @@ -40,7 +40,7 @@ namespace deprecated_osg { #define GET_BINDING(array) (array!=0 ? static_cast(array->getBinding()) : BIND_OFF) -/** Geometry class contaning deprecated features. +/** Geometry class containing deprecated features. * Users should only use deprecated_osg::Geometry when absolutely necessary for keeping things compiling, * it is recommended that you should migrate your code to work just with osg::Geometry as existing * deprecated_osg::Geometry will be removed in future release. diff --git a/src/osgPlugins/Inventor/ReaderWriterIV.cpp b/src/osgPlugins/Inventor/ReaderWriterIV.cpp index ab1ee5898..acc39c2c9 100644 --- a/src/osgPlugins/Inventor/ReaderWriterIV.cpp +++ b/src/osgPlugins/Inventor/ReaderWriterIV.cpp @@ -66,7 +66,7 @@ void ReaderWriterIV::initInventor() const // Disable delayed loading of VRML textures SoVRMLImageTexture::setDelayFetchURL(FALSE); - // initialize convertor + // initialize converter ConvertFromInventor::init(); #endif } @@ -226,7 +226,7 @@ ReaderWriterIV::readNode(std::istream& fin, // about it and think how to stream textures instead. // Get the data to the buffer - size_t bufSize = 126*1024; // let's make it something bellow 128KB + size_t bufSize = 126*1024; // let's make it something below 128KB char *buf = (char*)malloc(bufSize); size_t dataSize = 0; while (!fin.eof() && fin.good()) { diff --git a/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp b/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp index 60de6cb23..383ef31bd 100644 --- a/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp +++ b/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp @@ -321,7 +321,7 @@ osg::ref_ptr ReaderWritterOpenCASCADE::OCCTKReader::igesToOSGGeode(c _colorTool = XCAFDoc_DocumentTool::ColorTool(doc->Main()); // free shape sequence - // get sequence of free shape lables + // get sequence of free shape labels TDF_LabelSequence freeShapes; _assembly->GetFreeShapes(freeShapes); diff --git a/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp b/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp index 4291ce112..d76ce8354 100644 --- a/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp +++ b/src/osgPlugins/OpenFlight/expPrimaryRecords.cpp @@ -709,7 +709,7 @@ FltExportVisitor::writeLightPoint( const osgSim::LightPointNode* lpn ) _records->writeID( id ); _records->writeInt16( 0 ); // Surface material code _records->writeInt16( 0 ); // Feature ID - _records->writeUInt32( ~0u ); // OpenFlight erronously say -1, so will assume ~0u is OK. Back color for bidirectional + _records->writeUInt32( ~0u ); // OpenFlight erroneously say -1, so will assume ~0u is OK. Back color for bidirectional _records->writeInt32( EITHER ); // Display mode _records->writeFloat32( lp0._intensity ); // Intensity _records->writeFloat32( 0.f ); // Back intensity TBD diff --git a/src/osgPlugins/ZeroConfDevice/mdns_win/dns_sd.h b/src/osgPlugins/ZeroConfDevice/mdns_win/dns_sd.h index 54c412638..6375abd50 100644 --- a/src/osgPlugins/ZeroConfDevice/mdns_win/dns_sd.h +++ b/src/osgPlugins/ZeroConfDevice/mdns_win/dns_sd.h @@ -990,7 +990,7 @@ DNSServiceErrorType DNSSD_API DNSServiceRegister * * sdRef: A DNSServiceRef initialized by DNSServiceRegister(). * - * RecordRef: A pointer to an uninitialized DNSRecordRef. Upon succesfull completion of this + * RecordRef: A pointer to an uninitialized DNSRecordRef. Upon successful completion of this * call, this ref may be passed to DNSServiceUpdateRecord() or DNSServiceRemoveRecord(). * If the above DNSServiceRef is passed to DNSServiceRefDeallocate(), RecordRef is also * invalidated and may not be used further. @@ -1624,7 +1624,7 @@ DNSServiceErrorType DNSSD_API DNSServiceCreateConnection(DNSServiceRef *sdRef); * * sdRef: A DNSServiceRef initialized by DNSServiceCreateConnection(). * - * RecordRef: A pointer to an uninitialized DNSRecordRef. Upon succesfull completion of this + * RecordRef: A pointer to an uninitialized DNSRecordRef. Upon successful completion of this * call, this ref may be passed to DNSServiceUpdateRecord() or DNSServiceRemoveRecord(). * (To deregister ALL records registered on a single connected DNSServiceRef * and deallocate each of their corresponding DNSServiceRecordRefs, call diff --git a/src/osgPlugins/ac/ac3d.cpp b/src/osgPlugins/ac/ac3d.cpp index 3f38a6a5a..612e90cbd 100644 --- a/src/osgPlugins/ac/ac3d.cpp +++ b/src/osgPlugins/ac/ac3d.cpp @@ -731,7 +731,7 @@ class LineBin : public PrimitiveBin virtual bool beginPrimitive(unsigned nRefs) { - // Check if we have enough for a line or someting broken ... + // Check if we have enough for a line or something broken ... if (nRefs < 2) { OSG_WARN << "osgDB ac3d reader: detected line with less than 2 vertices!" << std::endl; return false; @@ -823,7 +823,7 @@ class SurfaceBin : public PrimitiveBin { _refs.reserve(nRefs); _refs.clear(); - // Check if we have enough for a line or someting broken ... + // Check if we have enough for a line or something broken ... if (nRefs < 3) { OSG_WARN << "osgDB ac3d reader: detected surface with less than 3 vertices!" << std::endl; return false; diff --git a/src/osgPlugins/bsp/VBSPEntity.cpp b/src/osgPlugins/bsp/VBSPEntity.cpp index 81e8b0e73..e41b11553 100644 --- a/src/osgPlugins/bsp/VBSPEntity.cpp +++ b/src/osgPlugins/bsp/VBSPEntity.cpp @@ -358,7 +358,7 @@ void VBSPEntity::parseParameters(std::string & entityText) // This is an "item". Like a prop, these are external models // placed in the scene, but the specific model is determined // directly by the entity's class. In HL2, these entities are - // useable by the player (ammunition and health packs are examples) + // usable by the player (ammunition and health packs are examples) entity_class = ENTITY_ITEM; processItem(); } diff --git a/src/osgPlugins/cfg/RenderSurface.h b/src/osgPlugins/cfg/RenderSurface.h index a9ef6e890..a6df65d7a 100644 --- a/src/osgPlugins/cfg/RenderSurface.h +++ b/src/osgPlugins/cfg/RenderSurface.h @@ -184,14 +184,14 @@ class RenderSurface : public osg::Referenced unsigned int getWindowHeight() const; #if 0 - /** Explicitely set the Display variable before realization. (X11 only). */ + /** Explicitly set the Display variable before realization. (X11 only). */ void setDisplay( Display *dpy ); /** Get the Display. (X11 only). */ Display* getDisplay( void ); /** Get the const Display. (X11 only). */ const Display* getDisplay( void ) const; - /** Explicitely set the Windowing system window before realization. */ + /** Explicitly set the Windowing system window before realization. */ void setWindow( const Window win ); /** Returns the Windowing system handle to the window */ Window getWindow( void ) const; diff --git a/src/osgPlugins/cfg/VisualChooser.cpp b/src/osgPlugins/cfg/VisualChooser.cpp index e8c38689f..ad5548865 100644 --- a/src/osgPlugins/cfg/VisualChooser.cpp +++ b/src/osgPlugins/cfg/VisualChooser.cpp @@ -527,7 +527,7 @@ void VisualChooser::applyAttribute(const VisualAttribute &va, std::vector & } // please note that *all* WGL attributes must have a parameter! - // to keep compatibility we'll explicitely set a boolean + // to keep compatibility we'll explicitly set a boolean // parameter value where needed. std::pair attr = std::make_pair(static_cast(va.attribute()), va.parameter()); diff --git a/src/osgPlugins/cfg/VisualChooser.h b/src/osgPlugins/cfg/VisualChooser.h index 4fe629e27..b3a42ce2f 100644 --- a/src/osgPlugins/cfg/VisualChooser.h +++ b/src/osgPlugins/cfg/VisualChooser.h @@ -49,7 +49,7 @@ class VisualChooser : public osg::Referenced }; #if 0 //------------------------------------------------------------------------- - // Explicitely set the visual info pointer. This will override the use of + // Explicitly set the visual info pointer. This will override the use of // glXChooseVisual(). Useful for functions requiring a VisualChooser // argument, but not a XVisualInfo. void setVisual( VisualInfo *vinfo ); @@ -87,7 +87,7 @@ class VisualChooser : public osg::Referenced bool isDoubleBuffer() const; //------------------------------------------------------------------------- - // The following methods set attributes explicitely + // The following methods set attributes explicitly // void setBufferSize( unsigned int size ); diff --git a/src/osgPlugins/dae/daeRTransforms.cpp b/src/osgPlugins/dae/daeRTransforms.cpp index 9100b8d0b..be182f854 100644 --- a/src/osgPlugins/dae/daeRTransforms.cpp +++ b/src/osgPlugins/dae/daeRTransforms.cpp @@ -33,7 +33,7 @@ using namespace osgDAE; // Note , , , , and may appear in any order // These transformations can be combined in any number and ordering to produce the desired -// coordinate system for the parent element. The COLLADA specificatin requires that the +// coordinate system for the parent element. The COLLADA specification requires that the // transformation elements are processed in order and accumulate the result as if they were // converted to column-order matrices and concatenated using matrix post-multiplication. osg::Transform* daeReader::processOsgMatrixTransform(domNode *node, bool isBone) diff --git a/src/osgPlugins/directshow/DirectShowTexture.cpp b/src/osgPlugins/directshow/DirectShowTexture.cpp index 4f5618171..dfb087b7a 100644 --- a/src/osgPlugins/directshow/DirectShowTexture.cpp +++ b/src/osgPlugins/directshow/DirectShowTexture.cpp @@ -1309,7 +1309,7 @@ bool CTextureRenderer::openSoundCaptureDevice(const std::string& capture, int nb } else { - OSG_WARN << prefixForMessage << " can t retrieve informations pins" << std::endl; + OSG_WARN << prefixForMessage << " can t retrieve information pins" << std::endl; } } if (pISC) pISC->Release(); pISC = 0; @@ -1639,7 +1639,7 @@ HRESULT CTextureRenderer::CheckMediaType(const CMediaType *pmt) //----------------------------------------------------------------------------- HRESULT CTextureRenderer::SetMediaType(const CMediaType *pmt) { - // Retrive the size of this media type + // Retrieve the size of this media type VIDEOINFO *pviBmp; // Bitmap info header pviBmp = (VIDEOINFO *)pmt->Format(); @@ -1673,7 +1673,7 @@ void CTextureRenderer::syncStreams(bool state) _dropFrame = S_OK; } HRESULT CTextureRenderer::ShouldDrawSampleNow(IMediaSample *sample, REFERENCE_TIME *start, REFERENCE_TIME *stop) { - return _dropFrame; // disable droping of frames + return _dropFrame; // disable dropping of frames } bool CTextureRenderer::StopFilters() diff --git a/src/osgPlugins/exr/ReaderWriterEXR.cpp b/src/osgPlugins/exr/ReaderWriterEXR.cpp index afb471b2d..7132e97f8 100644 --- a/src/osgPlugins/exr/ReaderWriterEXR.cpp +++ b/src/osgPlugins/exr/ReaderWriterEXR.cpp @@ -25,7 +25,7 @@ using namespace Imath; * * Follows is code written by FOI (www.foi.se) * it is a wrapper of openEXR(www.openexr.com) - * to add suport of exr images into osg + * to add support of exr images into osg * * Ported to a OSG-plugin, Ragnar Hammarqvist. * For patches, bugs and new features @@ -404,6 +404,6 @@ protected: } }; -// now register with Registry to instantiate the exr suport +// now register with Registry to instantiate the exr support // reader/writer. REGISTER_OSGPLUGIN(exr, ReaderWriterEXR) diff --git a/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp b/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp index e285aa3c7..0bfd78905 100644 --- a/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp +++ b/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp @@ -50,7 +50,7 @@ FFmpegImageStream::~FFmpegImageStream() OSG_INFO<<"Have done quit"< -// Here the idea is to compute AABB by bone for a skelton +// Here the idea is to compute AABB by bone for a skeleton // You just need to call this visitor on a skeleton and after call computeBoundingBoxOnBones // If you have more than one skeleton you should crete a visitor by skeleton class ComputeAABBOnBoneVisitor : public osg::NodeVisitor { diff --git a/src/osgPlugins/gles/AnimationCleanerVisitor.cpp b/src/osgPlugins/gles/AnimationCleanerVisitor.cpp index cb692675d..ffa8e8d77 100644 --- a/src/osgPlugins/gles/AnimationCleanerVisitor.cpp +++ b/src/osgPlugins/gles/AnimationCleanerVisitor.cpp @@ -395,7 +395,7 @@ bool AnimationCleanerVisitor::isValidAnimation(const osgAnimation::Animation& an bool AnimationCleanerVisitor::isValidChannel(const osgAnimation::Channel& channel) const { // a valid channel has valid target i.e. // 1. there exists some UpdateMatrixTransform with channel's target name - // 2. the channel does not simply mimick the UpdateMatrixTransform content + // 2. the channel does not simply mimic the UpdateMatrixTransform content std::string target = channel.getTargetName(); for(AnimationUpdateCallBackMap::const_iterator update = _updates.begin() ; update != _updates.end() ; ++ update) { osgAnimation::UpdateMorph *updateMorph = dynamic_cast(update->first.get()); @@ -408,7 +408,7 @@ bool AnimationCleanerVisitor::isValidChannel(const osgAnimation::Channel& channe } else { if(update->first->getName() == target) { - // check if channel contains necessary data or just mimick the UpdateCallback's StackedTransform + // check if channel contains necessary data or just mimic the UpdateCallback's StackedTransform bool channelMimickingTransform = isChannelEqualToStackedTransform(channel, dynamic_cast(update->first.get())); if(channelMimickingTransform) { diff --git a/src/osgPlugins/gles/DetachPrimitiveVisitor.cpp b/src/osgPlugins/gles/DetachPrimitiveVisitor.cpp index b7b8e18bb..bf899d8f6 100644 --- a/src/osgPlugins/gles/DetachPrimitiveVisitor.cpp +++ b/src/osgPlugins/gles/DetachPrimitiveVisitor.cpp @@ -68,7 +68,7 @@ osg::Geometry* DetachPrimitiveVisitor::makeDetachedGeometry(osg::Geometry& geome osg::Geometry* DetachPrimitiveVisitor::createDetachedGeometry(osg::Geometry& source) { osg::Geometry* detached = new osg::Geometry(source, osg::CopyOp::SHALLOW_COPY); if(!_keepGeometryAttributes) { - // we keep only vertexes and clean all other attributes and values + // we keep only vertices and clean all other attributes and values detached->setNormalArray(0); detached->setColorArray(0); detached->setSecondaryColorArray(0); @@ -119,7 +119,7 @@ osg::Geometry* DetachPrimitiveVisitor::createDetachedGeometry(osgAnimation::RigG detached = new osgAnimation::RigGeometry(); detached->setSourceGeometry(makeDetachedGeometry(*source.getSourceGeometry())); - // Only keep vertexes and Bones/Weights attrib arrays + // Only keep vertices and Bones/Weights attrib arrays detached->setVertexArray(source.getVertexArray()); for(unsigned int i = 0 ; i < source.getVertexAttribArrayList().size() ; ++ i) { osg::Array* attribute = source.getVertexAttribArray(i); diff --git a/src/osgPlugins/gles/GeometryIndexSplitter.cpp b/src/osgPlugins/gles/GeometryIndexSplitter.cpp index d2452ff0b..2872e98a7 100644 --- a/src/osgPlugins/gles/GeometryIndexSplitter.cpp +++ b/src/osgPlugins/gles/GeometryIndexSplitter.cpp @@ -141,8 +141,8 @@ bool GeometryIndexSplitter::split(osg::Geometry& geometry) { } osg::notify(osg::NOTICE) << "geometry " << &geometry << " " << geometry.getName() - << " vertexes (" << geometry.getVertexArray()->getNumElements() - << ") has DrawElements index > " << _maxAllowedIndex << ", splitted to " + << " vertices (" << geometry.getVertexArray()->getNumElements() + << ") has DrawElements index > " << _maxAllowedIndex << ", split to " << _geometryList.size() << " geometry" << std::endl; return true; diff --git a/src/osgPlugins/gles/GeometrySplitterVisitor.cpp b/src/osgPlugins/gles/GeometrySplitterVisitor.cpp index dd787df68..b29f7d57e 100644 --- a/src/osgPlugins/gles/GeometrySplitterVisitor.cpp +++ b/src/osgPlugins/gles/GeometrySplitterVisitor.cpp @@ -39,7 +39,7 @@ void GeometrySplitterVisitor::apply(osg::Geode& geode) { // remove all drawables geode.removeDrawables(0, geode.getNumDrawables()); - // insert splitted geometries + // insert split geometries for(unsigned int i = 0 ; i < remappedGeometries.size() ; ++ i) { geode.addDrawable(remappedGeometries[i].get()); } diff --git a/src/osgPlugins/gles/RemapGeometryVisitor.cpp b/src/osgPlugins/gles/RemapGeometryVisitor.cpp index e389394a0..5c838da4f 100644 --- a/src/osgPlugins/gles/RemapGeometryVisitor.cpp +++ b/src/osgPlugins/gles/RemapGeometryVisitor.cpp @@ -42,7 +42,7 @@ void RemapGeometryVisitor::apply(osg::Geode& geode) { // remove all drawables geode.removeDrawables(0, geode.getNumDrawables()); - // insert splitted geometries + // insert split geometries for(unsigned int i = 0 ; i < remappedGeometries.size() ; ++ i) { geode.addDrawable(remappedGeometries[i].get()); } diff --git a/src/osgPlugins/gles/TriangleMeshGraph b/src/osgPlugins/gles/TriangleMeshGraph index 1c48e3832..77f42bc5b 100644 --- a/src/osgPlugins/gles/TriangleMeshGraph +++ b/src/osgPlugins/gles/TriangleMeshGraph @@ -95,7 +95,7 @@ public: } inline float angleCosine(const Triangle& other) const { - // Triangle._normal is normalized so no need to divide by lengthes + // Triangle._normal is normalized so no need to divide by lengths return (_normal * other._normal); } diff --git a/src/osgPlugins/gles/UnIndexMeshVisitor.cpp b/src/osgPlugins/gles/UnIndexMeshVisitor.cpp index b08e22ede..785cdbc99 100644 --- a/src/osgPlugins/gles/UnIndexMeshVisitor.cpp +++ b/src/osgPlugins/gles/UnIndexMeshVisitor.cpp @@ -69,7 +69,7 @@ void UnIndexMeshVisitor::process(osg::Geometry& geom) case(osg::PrimitiveSet::QUAD_STRIP): case(osg::PrimitiveSet::POLYGON): { - // for each geometry list indexes of vertexes + // for each geometry list indexes of vertices // to makes triangles TriangleIndexor triangleIndexList; (*itr)->accept(triangleIndexList); diff --git a/src/osgPlugins/hdr/hdrloader.h b/src/osgPlugins/hdr/hdrloader.h index 11a0fac52..bdd638a5f 100644 --- a/src/osgPlugins/hdr/hdrloader.h +++ b/src/osgPlugins/hdr/hdrloader.h @@ -28,7 +28,7 @@ * Class to load a HDR file * An HDR file is an image file where each pixel is stored as float values in opposite * of traditional other formats (BMP, TGA, etc.) where integerer values are used. -* see http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-HDRImageReader&forum=cotd&id=-1 for more informations +* see http://www.flipcode.com/cgi-bin/msg.cgi?showThread=COTD-HDRImageReader&forum=cotd&id=-1 for more information */ #ifndef HDRLOADER_H diff --git a/src/osgPlugins/ive/DataOutputStream.h b/src/osgPlugins/ive/DataOutputStream.h index 262c5cb9a..c8cfce531 100644 --- a/src/osgPlugins/ive/DataOutputStream.h +++ b/src/osgPlugins/ive/DataOutputStream.h @@ -110,7 +110,7 @@ public: void writeVolumeLayer(const osgVolume::Layer* layer); void writeVolumeLocator(const osgVolume::Locator* locator); - void writeVolumeProperty(const osgVolume::Property* propety); + void writeVolumeProperty(const osgVolume::Property* property); void writeObject(const osg::Object* object); diff --git a/src/osgPlugins/ive/Geometry.cpp b/src/osgPlugins/ive/Geometry.cpp index eeb825b9e..95187d94e 100644 --- a/src/osgPlugins/ive/Geometry.cpp +++ b/src/osgPlugins/ive/Geometry.cpp @@ -176,7 +176,7 @@ void Geometry::read(DataInputStream* in) in_THROW_EXCEPTION("Geometry::read(): Could not cast this osg::Geometry to an osg::Drawable."); - // Read geoemtry properties + // Read geometry properties // Read primitiveset list. int size = in->readInt(); diff --git a/src/osgPlugins/ktx/ReaderWriterKTX.cpp b/src/osgPlugins/ktx/ReaderWriterKTX.cpp index 5ca6cd705..a14d35c57 100644 --- a/src/osgPlugins/ktx/ReaderWriterKTX.cpp +++ b/src/osgPlugins/ktx/ReaderWriterKTX.cpp @@ -333,7 +333,7 @@ osgDB::ReaderWriter::WriteResult ReaderWriterKTX::writeImage(const osg::Image &i DELETEFILE(file.c_str()); OSG_WARN << "ReaderWriterKTX::writeImage Failed to write " << file << "." << std::endl; } - OSG_INFO << "ReaderWriterKTX::writeImage write " << file << " sucess;" << image.s() << "x" << image.t() << "x" << image.r() << std::endl; + OSG_INFO << "ReaderWriterKTX::writeImage write " << file << " success;" << image.s() << "x" << image.t() << "x" << image.r() << std::endl; return res; } diff --git a/src/osgPlugins/lua/LuaScriptEngine.cpp b/src/osgPlugins/lua/LuaScriptEngine.cpp index 0c58136ae..85b7a8dae 100644 --- a/src/osgPlugins/lua/LuaScriptEngine.cpp +++ b/src/osgPlugins/lua/LuaScriptEngine.cpp @@ -3979,7 +3979,7 @@ void LuaScriptEngine::pushContainer(osg::Object* object, const std::string& prop } else { - OSG_NOTICE<<"Container type not suppported."<ref(); } - std::string::size_type seperator = compoundClassName.find("::"); - std::string libraryName = (seperator==std::string::npos) ? object->libraryName() : compoundClassName.substr(0, seperator); - std::string className = (seperator==std::string::npos) ? object->className() : compoundClassName.substr(seperator+2,std::string::npos); + std::string::size_type separator = compoundClassName.find("::"); + std::string libraryName = (separator==std::string::npos) ? object->libraryName() : compoundClassName.substr(0, separator); + std::string className = (separator==std::string::npos) ? object->className() : compoundClassName.substr(separator+2,std::string::npos); lua_pushstring(_lua, "libraryName"); lua_pushstring(_lua, libraryName.c_str()); lua_settable(_lua, -3); lua_pushstring(_lua, "className"); lua_pushstring(_lua, className.c_str()); lua_settable(_lua, -3); @@ -4168,7 +4168,7 @@ void LuaScriptEngine::addPaths(const osgDB::FilePathList& paths) lua_pushstring( _lua, path.c_str() ); lua_setfield( _lua, -2, "path" ); - lua_pop( _lua, 1 ); // return stack to orignal + lua_pop( _lua, 1 ); // return stack to original } void LuaScriptEngine::addPaths(const osgDB::Options* options) diff --git a/src/osgPlugins/lwo/ReaderWriterLWO.cpp b/src/osgPlugins/lwo/ReaderWriterLWO.cpp index 779bf7c34..e2365c7f8 100644 --- a/src/osgPlugins/lwo/ReaderWriterLWO.cpp +++ b/src/osgPlugins/lwo/ReaderWriterLWO.cpp @@ -141,7 +141,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterLWO::readNode_LWO2(const std::string } -// collect all the data relavent to a particular osg::Geometry being created. +// collect all the data relevant to a particular osg::Geometry being created. struct GeometryCollection { GeometryCollection(): @@ -298,7 +298,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterLWO::readNode_LWO1(const std::string // "By convention, the +X direction is to the right or east, the +Y // direction is upward, and the +Z direction is forward or north" // However, the osg sticks to the more conventional, y to the north, - // z upwards, x is the same - rigth/east. To handle this difference + // z upwards, x is the same - right/east. To handle this difference // simple exchange osg_z for lwo_y, and osg_y for lwo_z. // add the corners in reverse order to reverse the windings, to keep the anticlockwise rotation of polys. diff --git a/src/osgPlugins/obj/ReaderWriterOBJ.cpp b/src/osgPlugins/obj/ReaderWriterOBJ.cpp index f958c515c..00cc880dc 100644 --- a/src/osgPlugins/obj/ReaderWriterOBJ.cpp +++ b/src/osgPlugins/obj/ReaderWriterOBJ.cpp @@ -61,7 +61,7 @@ public: supportsOption("noRotation","Do not do the default rotate about X axis"); supportsOption("noTesselateLargePolygons","Do not do the default tesselation of large polygons"); supportsOption("noTriStripPolygons","Do not do the default tri stripping of polygons"); - supportsOption("generateFacetNormals","generate facet normals for verticies without normals"); + supportsOption("generateFacetNormals","generate facet normals for vertices without normals"); supportsOption("noReverseFaces","avoid to reverse faces when normals and triangles orientation are reversed"); supportsOption("DIFFUSE=", "Set texture unit for diffuse texture"); @@ -794,7 +794,7 @@ osg::Node* ReaderWriterOBJ::convertModelToSceneGraph(obj::Model& model, ObjOptio tessellator.retessellatePolygons(*geometry); } - // tri strip polygons to improve graphics peformance + // tri strip polygons to improve graphics performance if (!localOptions.noTriStripPolygons) { osgUtil::optimizeMesh(geometry); diff --git a/src/osgPlugins/ogr/ReaderWriterOGR.cpp b/src/osgPlugins/ogr/ReaderWriterOGR.cpp index 6e27aa652..907ae3bd3 100644 --- a/src/osgPlugins/ogr/ReaderWriterOGR.cpp +++ b/src/osgPlugins/ogr/ReaderWriterOGR.cpp @@ -284,7 +284,7 @@ public: if (pointGeom->getVertexArray()) { - OSG_INFO << "osgOgrFeature::multiPointToDrawable " << pointGeom->getVertexArray()->getNumElements() << " vertexes"<< std::endl; + OSG_INFO << "osgOgrFeature::multiPointToDrawable " << pointGeom->getVertexArray()->getNumElements() << " vertices"<< std::endl; } return pointGeom; @@ -338,7 +338,7 @@ public: if (geom->getVertexArray()) { - OSG_INFO << "osgOgrFeature::multiPolygonToDrawable " << geom->getVertexArray()->getNumElements() << " vertexes"<< std::endl; + OSG_INFO << "osgOgrFeature::multiPolygonToDrawable " << geom->getVertexArray()->getNumElements() << " vertices"<< std::endl; } return geom; diff --git a/src/osgPlugins/osc/OscSendingDevice.hpp b/src/osgPlugins/osc/OscSendingDevice.hpp index 0ba922249..ab72ddf09 100644 --- a/src/osgPlugins/osc/OscSendingDevice.hpp +++ b/src/osgPlugins/osc/OscSendingDevice.hpp @@ -36,7 +36,7 @@ * The sending device knows how to handle Vec2, Vec3, Vec4, Quat, Plane and Matrix values * * TUIO-specific notes: - * If you want to explicitely set the application-name when sending multi-touch-events, use + * If you want to explicitly set the application-name when sending multi-touch-events, use * osc_device->setUserValue("tuio_application_name", ""); * You'll also have to add the address-part, e.g. * osc_device->setUserValue("tuio_application_name", "my_tuio_application@192.168.1.1"); diff --git a/src/osgPlugins/osc/ip/win32/NetworkingUtils.cpp b/src/osgPlugins/osc/ip/win32/NetworkingUtils.cpp index 0f1f4dca3..0e6591bf4 100644 --- a/src/osgPlugins/osc/ip/win32/NetworkingUtils.cpp +++ b/src/osgPlugins/osc/ip/win32/NetworkingUtils.cpp @@ -44,7 +44,7 @@ NetworkInitializer::NetworkInitializer() // there is a race condition here if one thread tries to access // the library while another is still initializing it. // i can't think of an easy way to fix it so i'm telling you here - // incase you need to init the library from two threads at once. + // in case you need to init the library from two threads at once. // this is why the header file advises to instantiate one of these // in main() so that the initialization happens globally diff --git a/src/osgPlugins/osga/OSGA_Archive.cpp b/src/osgPlugins/osga/OSGA_Archive.cpp index 5c7ca5a14..cc81adf34 100644 --- a/src/osgPlugins/osga/OSGA_Archive.cpp +++ b/src/osgPlugins/osga/OSGA_Archive.cpp @@ -37,7 +37,7 @@ Purpose: But, when such situation occurs more elaborate conversion methods from/to std::streampos are needed. Functions below employ such methods. - I made this fix for use with 32 bit Windows OSG. Acutally this + I made this fix for use with 32 bit Windows OSG. Actually this solution is not dependent on OS but standard C++ library. Microsoft SDKs always use some version of Dinkumware libs. diff --git a/src/osgPlugins/osgjs/ReaderWriterJSON.cpp b/src/osgPlugins/osgjs/ReaderWriterJSON.cpp index c22abb172..7dc464961 100644 --- a/src/osgPlugins/osgjs/ReaderWriterJSON.cpp +++ b/src/osgPlugins/osgjs/ReaderWriterJSON.cpp @@ -69,7 +69,7 @@ public: supportsOption("mergeAllBinaryFiles","merge all binary files into one to avoid multi request on a server"); supportsOption("inlineImages","insert base64 encoded images instead of referring to them"); supportsOption("varint","Use varint encoding to serialize integer buffers"); - supportsOption("useSpecificBuffer=userkey1[=uservalue1][:buffername1],userkey2[=uservalue2][:buffername2]","uses specific buffers for unshared buffers attached to geometries having a specified user key/value. Buffer name *may* be specificed after ':' and will be set to uservalue by default. If no value is set then only the existence of a uservalue with key string is performed."); + supportsOption("useSpecificBuffer=userkey1[=uservalue1][:buffername1],userkey2[=uservalue2][:buffername2]","uses specific buffers for unshared buffers attached to geometries having a specified user key/value. Buffer name *may* be specified after ':' and will be set to uservalue by default. If no value is set then only the existence of a uservalue with key string is performed."); supportsOption("disableCompactBuffer","keep source types and do not try to optimize buffers size"); supportsOption("disableStrictJson","do not clean string (to utf8) or floating point (should be finite) values"); } diff --git a/src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp b/src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp index 9fa7bc5e3..8c28fd83e 100644 --- a/src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp +++ b/src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp @@ -102,7 +102,7 @@ class sgReaderWriterOSGTGZ : public osgDB::ReaderWriter #if defined(_WIN32) && !defined(__CYGWIN__) // note, is this the right command for windows? - // is there any way of overiding the Y/N option? RO. + // is there any way of overriding the Y/N option? RO. sprintf( command, "erase %s", dirname ); #else diff --git a/src/osgPlugins/p3d/ReaderWriterP3D.cpp b/src/osgPlugins/p3d/ReaderWriterP3D.cpp index 774a2d1bc..8991174c7 100644 --- a/src/osgPlugins/p3d/ReaderWriterP3D.cpp +++ b/src/osgPlugins/p3d/ReaderWriterP3D.cpp @@ -123,7 +123,7 @@ public: if (l>='a' && l<='z') l = (l-'a')+'A'; if (r>='a' && r<='z') r = (r-'a')+'A'; - // if both charaters are equal then move to the next character + // if both characters are equal then move to the next character if (l==r) { lhs_itr++; diff --git a/src/osgPlugins/ply/vertexData.cpp b/src/osgPlugins/ply/vertexData.cpp index d3f396025..f2db29e00 100644 --- a/src/osgPlugins/ply/vertexData.cpp +++ b/src/osgPlugins/ply/vertexData.cpp @@ -28,7 +28,7 @@ using namespace std; using namespace ply; -/* Contructor. */ +/* Constructor. */ VertexData::VertexData() : _invertFaces( false ) { diff --git a/src/osgPlugins/quicktime/QTLiveUtils.cpp b/src/osgPlugins/quicktime/QTLiveUtils.cpp index 9c86e1551..ee00cdfcd 100644 --- a/src/osgPlugins/quicktime/QTLiveUtils.cpp +++ b/src/osgPlugins/quicktime/QTLiveUtils.cpp @@ -281,9 +281,9 @@ void probe_video_digitizer_components() // #define videoDigitizerComponentType = 'vdig' ComponentDescription video_component_description; - video_component_description.componentType = 'vdig'; /* A unique 4-byte code indentifying the command set */ + video_component_description.componentType = 'vdig'; /* A unique 4-byte code identifying the command set */ video_component_description.componentSubType = 0; /* Particular flavor of this instance */ - video_component_description.componentManufacturer = 0; /* Vendor indentification */ + video_component_description.componentManufacturer = 0; /* Vendor identification */ video_component_description.componentFlags = 0; /* 8 each for Component,Type,SubType,Manuf/revision */ video_component_description.componentFlagsMask = 0; /* Mask for specifying which flags to consider in search, zero during registration */ long num_video_components = CountComponents (&video_component_description); @@ -378,9 +378,9 @@ std::vector probe_sequence_grabber_components() // #define videoDigitizerComponentType = 'vdig' ComponentDescription sg_component_description; - sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code indentifying the command set */ + sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code identifying the command set */ sg_component_description.componentSubType = 0L; /* Particular flavor of this instance */ - sg_component_description.componentManufacturer = 'appl'; /* Vendor indentification */ + sg_component_description.componentManufacturer = 'appl'; /* Vendor identification */ sg_component_description.componentFlags = 0L; /* 8 each for Component,Type,SubType,Manuf/revision */ sg_component_description.componentFlagsMask = 0L; /* Mask for specifying which flags to consider in search, zero during registration */ long num_sg_components = CountComponents (&sg_component_description); @@ -547,9 +547,9 @@ void get_video_device_bounds_idstr(short deviceID, short deviceInputID, short& o QTScopedMovieInitialiser qt_movie_init; ComponentDescription sg_component_description; - sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code indentifying the command set */ + sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code identifying the command set */ sg_component_description.componentSubType = 0L; /* Particular flavor of this instance */ - sg_component_description.componentManufacturer = 0L; /* Vendor indentification */ + sg_component_description.componentManufacturer = 0L; /* Vendor identification */ sg_component_description.componentFlags = 0L; /* 8 each for Component,Type,SubType,Manuf/revision */ sg_component_description.componentFlagsMask = 0L; /* Mask for specifying which flags to consider in search, zero during registration */ long num_sg_components = CountComponents (&sg_component_description); @@ -689,9 +689,9 @@ void get_sound_device_idstr(short soundDeviceID, short soundDeviceInputID, Str63 // #define videoDigitizerComponentType = 'vdig' ComponentDescription sg_component_description; - sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code indentifying the command set */ + sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code identifying the command set */ sg_component_description.componentSubType = 0L; /* Particular flavor of this instance */ - sg_component_description.componentManufacturer = 0L; /* Vendor indentification */ + sg_component_description.componentManufacturer = 0L; /* Vendor identification */ sg_component_description.componentFlags = 0L; /* 8 each for Component,Type,SubType,Manuf/revision */ sg_component_description.componentFlagsMask = 0L; /* Mask for specifying which flags to consider in search, zero during registration */ long num_sg_components = CountComponents (&sg_component_description); @@ -775,7 +775,7 @@ void get_sound_device_idstr(short soundDeviceID, short soundDeviceInputID, Str63 // You can use the VDSetDigitizerRect function to set the size and location of the digitizer rectangle. // The VDGetDigitizerRect function lets you retrieve the size and location of this rectangle. -// Imput Source +// Input Source // Some of these functions provide information about the available video inputs. Applications can use // the VDGetNumberOfInputs function to determine the number of video inputs supported by the digitizer component. // The VDGetInputFormat function allows applications to find out the video format (composite, s-video, or component) employed by a specified input. diff --git a/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp b/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp index bc3ad7994..e4e4fa0a8 100644 --- a/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp +++ b/src/osgPlugins/quicktime/QuicktimeLiveImageStream.cpp @@ -226,9 +226,9 @@ void QuicktimeLiveImageStream::createAndRunWithSequenceGrabber(std::string fileN void QuicktimeLiveImageStream::createSequenceGrabber() { ComponentDescription sg_component_description; - sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code indentifying the command set */ + sg_component_description.componentType = SeqGrabComponentType; /* A unique 4-byte code identifying the command set */ sg_component_description.componentSubType = 0L; /* Particular flavor of this instance */ - sg_component_description.componentManufacturer = 'appl'; /* Vendor indentification */ + sg_component_description.componentManufacturer = 'appl'; /* Vendor identification */ sg_component_description.componentFlags = 0L; /* 8 each for Component,Type,SubType,Manuf/revision */ sg_component_description.componentFlagsMask = 0L; /* Mask for specifying which flags to consider in search, zero during registration */ long num_sg_components = CountComponents (&sg_component_description); @@ -519,14 +519,14 @@ void QuicktimeLiveImageStream::createAndRunWithVideoDigitizer(std::string fileNa } // 2. -// Create the Video Digitizer (using GWorld Pixmap as target mamory) +// Create the Video Digitizer (using GWorld Pixmap as target memory) void QuicktimeLiveImageStream::createVideoDigitizer() { // #define videoDigitizerComponentType = 'vdig' ComponentDescription video_component_description; - video_component_description.componentType = 'vdig'; /* A unique 4-byte code indentifying the command set */ + video_component_description.componentType = 'vdig'; /* A unique 4-byte code identifying the command set */ video_component_description.componentSubType = 0; /* Particular flavor of this instance */ - video_component_description.componentManufacturer = 0; /* Vendor indentification */ + video_component_description.componentManufacturer = 0; /* Vendor identification */ video_component_description.componentFlags = 0; /* 8 each for Component,Type,SubType,Manuf/revision */ video_component_description.componentFlagsMask = 0; /* Mask for specifying which flags to consider in search, zero during registration */ long num_video_components = CountComponents (&video_component_description); diff --git a/src/osgPlugins/quicktime/QuicktimeLiveImageStream.h b/src/osgPlugins/quicktime/QuicktimeLiveImageStream.h index 5b98a1c80..5c2949e42 100644 --- a/src/osgPlugins/quicktime/QuicktimeLiveImageStream.h +++ b/src/osgPlugins/quicktime/QuicktimeLiveImageStream.h @@ -91,7 +91,7 @@ public: // 2. // CreateAndRunWithVideoDigitizer void createAndRunWithVideoDigitizer(std::string fileName); - // Create the Video Digitizer (using GWorld Pixmap as target mamory) + // Create the Video Digitizer (using GWorld Pixmap as target memory) void createVideoDigitizer(); // Thread run method diff --git a/src/osgPlugins/quicktime/ReaderWriterQT.cpp b/src/osgPlugins/quicktime/ReaderWriterQT.cpp index 1c033dc02..a0846abf9 100644 --- a/src/osgPlugins/quicktime/ReaderWriterQT.cpp +++ b/src/osgPlugins/quicktime/ReaderWriterQT.cpp @@ -229,9 +229,9 @@ public: QTScopedMovieInitialiser qt_movie_init; // ComponentDescription video_component_description; - video_component_description.componentType = 'vdig'; /* A unique 4-byte code indentifying the command set */ + video_component_description.componentType = 'vdig'; /* A unique 4-byte code identifying the command set */ video_component_description.componentSubType = 0L; /* Particular flavor of this instance */ - video_component_description.componentManufacturer = 0L; /* Vendor indentification */ + video_component_description.componentManufacturer = 0L; /* Vendor identification */ video_component_description.componentFlags = 0L; /* 8 each for Component,Type,SubType,Manuf/revision */ video_component_description.componentFlagsMask = 0L; /* Mask for specifying which flags to consider in search, zero during registration */ num_video_components = CountComponents (&video_component_description); diff --git a/src/osgPlugins/stl/ReaderWriterSTL.cpp b/src/osgPlugins/stl/ReaderWriterSTL.cpp index 456322ad3..7d7571086 100644 --- a/src/osgPlugins/stl/ReaderWriterSTL.cpp +++ b/src/osgPlugins/stl/ReaderWriterSTL.cpp @@ -741,7 +741,7 @@ ReaderWriterSTL::ReaderObject::ReadResult ReaderWriterSTL::BinaryReaderObject::r * * The magics files may use whether per-face or per-object colors * for a given face, according to the value of the last bit (0 = per-face, 1 = per-object) - * Moreover, magics uses RGB instead of BGR (as the other softwares) + * Moreover, magics uses RGB instead of BGR (as the other software) */ if (!_color.valid()) { diff --git a/src/osgPlugins/tiff/ReaderWriterTIFF.cpp b/src/osgPlugins/tiff/ReaderWriterTIFF.cpp index 0d6b31fc5..19471bf56 100644 --- a/src/osgPlugins/tiff/ReaderWriterTIFF.cpp +++ b/src/osgPlugins/tiff/ReaderWriterTIFF.cpp @@ -269,7 +269,7 @@ simage_tiff_error(char * buffer, int buflen) /// Generates a std::string from a printf format string and a va_list. /// Took & adapted from the man page of printf. -///\todo Externalize this function to make is useable for all OSG? +///\todo Externalize this function to make is usable for all OSG? std::string doFormat(const char* fmt, va_list ap) { static const int MSG_BUFSIZE = 256; // Initial size of the buffer used for formatting static const int MAX_BUFSIZE = 256*1024; // Maximum size of the buffer used for formatting diff --git a/src/osgPlugins/txp/TXPArchive.h b/src/osgPlugins/txp/TXPArchive.h index 1efe670fc..e81fe3780 100644 --- a/src/osgPlugins/txp/TXPArchive.h +++ b/src/osgPlugins/txp/TXPArchive.h @@ -107,7 +107,7 @@ namespace txp return _lights[i]; }; - // Gets some informations for a given tile + // Gets some information for a given tile struct TileInfo { osg::Vec3 center; diff --git a/src/osgPlugins/txp/TXPParser.h b/src/osgPlugins/txp/TXPParser.h index 5508b66a0..aad6e7ca0 100644 --- a/src/osgPlugins/txp/TXPParser.h +++ b/src/osgPlugins/txp/TXPParser.h @@ -59,7 +59,7 @@ osg::Texture2D* getTemplateTexture(trpgrImageHelper& image_helper, trpgLocalMate // It is better since all the geometry children will be // added into one Geode node as drawables, then having one // geode node per child -// Means, instad of having +// Means, instead of having // Group // +----------- // | | diff --git a/src/osgPlugins/txp/trpage_geom.h b/src/osgPlugins/txp/trpage_geom.h index 117abf8ab..f318d5a17 100644 --- a/src/osgPlugins/txp/trpage_geom.h +++ b/src/osgPlugins/txp/trpage_geom.h @@ -1681,7 +1681,7 @@ TX_EXDECL class TX_CLDECL trpgTileTable : public trpgReadWriteable { public: // Tiles can be stored individually (External and ExternalSaved) or in grouped files (Local). - // ExternalSaved still have an entry in the table. In this case the addess data is not valid. + // ExternalSaved still have an entry in the table. In this case the address data is not valid. enum TileMode {Local,External, ExternalSaved}; @@ -1943,7 +1943,7 @@ public: */ bool GetLocalMaterial(int32 nth,trpgLocalMaterial &locMat) const; /* Return a pointer to the list of locally defined materials. - See GetLocalMaterial for an explantion of local materials. + See GetLocalMaterial for an explanation of local materials. */ const std::vector *GetLocalMaterialList(void) const; // {secret} @@ -2618,7 +2618,7 @@ protected: In TerraPage 2.0 we added the Range Index field. This field is here to help run-time systems gracefully degrade visual fidelity. The trpgLod node still acts like a normal LOD and you can safely ignore the range index field. If, however, - you want to use it, please read the documention on the trpgRangeTable for further + you want to use it, please read the documentation on the trpgRangeTable for further information. {group:Read/Write Classes} @@ -2692,7 +2692,7 @@ protected: don't sweat it. If you're doing a TerraPage writer, this is fairly simple. Obey the ordering - contraints and try to keep this simple. Ideally that would mean just a few + constraints and try to keep this simple. Ideally that would mean just a few trpgGeometry nodes below this node. Also keep in mind that layering works very poorly on most OpenGL systems. {group:Read/Write Classes} diff --git a/src/osgPlugins/txp/trpage_io.h b/src/osgPlugins/txp/trpage_io.h index 6c32f407d..bc9d1b49a 100644 --- a/src/osgPlugins/txp/trpage_io.h +++ b/src/osgPlugins/txp/trpage_io.h @@ -357,7 +357,7 @@ public: virtual void Add(const std::string &); /* Endianness is something the child class buffer type must set and use. - This function returns the endiannes of the current buffer. */ + This function returns the endianness of the current buffer. */ virtual trpgEndian GetEndian(void) { return ness; } protected: diff --git a/src/osgPlugins/txp/trpage_managers.h b/src/osgPlugins/txp/trpage_managers.h index 5f8fd8c91..658d9d3ef 100644 --- a/src/osgPlugins/txp/trpage_managers.h +++ b/src/osgPlugins/txp/trpage_managers.h @@ -296,7 +296,7 @@ protected: // loaded list. virtual void AckLoad(); - // Get the lsit of + // Get the list of //bool GetLoadedTile // Return the next tile to unload for this terrain lod diff --git a/src/osgPlugins/txp/trpage_print.h b/src/osgPlugins/txp/trpage_print.h index be52d96fe..e6093c92c 100644 --- a/src/osgPlugins/txp/trpage_print.h +++ b/src/osgPlugins/txp/trpage_print.h @@ -112,7 +112,7 @@ public: // After parsing this will return the number of trpgChildRef node found. unsigned int GetNbChildrenRef() const; // This will return the trpgChildRef node associated with the index. - // this will retrun 0 if idx is out of bound + // this will return 0 if idx is out of bound const trpgChildRef* GetChildRef(unsigned int idx) const; protected: trpgPrintBuffer *pBuf; diff --git a/src/osgPlugins/xine/video_out_rgb.h b/src/osgPlugins/xine/video_out_rgb.h index 1fb6a2e25..3c68b49e2 100644 --- a/src/osgPlugins/xine/video_out_rgb.h +++ b/src/osgPlugins/xine/video_out_rgb.h @@ -77,7 +77,7 @@ typedef enum * RGBout will pass it a buffer containing pixels in the format * specified by "format" (generally you have only to BLIT * the buffer if you want to display the frame). - * "levels" selects which RGB level is visible (if you dont't + * "levels" selects which RGB level is visible (if you don't * need this feature, set it to PXLEVEL_ALL). * * N.B.: DO NOT FREE THE BUFFER diff --git a/src/osgPlugins/zip/unzip.cpp b/src/osgPlugins/zip/unzip.cpp index 88a30004e..0bec28f0c 100644 --- a/src/osgPlugins/zip/unzip.cpp +++ b/src/osgPlugins/zip/unzip.cpp @@ -3705,7 +3705,7 @@ int unzOpenCurrentFile (unzFile file, const char *password) // Read bytes from the current file. // buf contain buffer where data must be copied // len the size of buf. -// return the number of byte copied if somes bytes are copied (and also sets *reached_eof) +// return the number of byte copied if some bytes are copied (and also sets *reached_eof) // return 0 if the end of file was reached. (and also sets *reached_eof). // return <0 with error code if there is an error. (in which case *reached_eof is meaningless) // (UNZ_ERRNO for IO error, or zLib error for uncompress error) diff --git a/src/osgPresentation/SlideEventHandler.cpp b/src/osgPresentation/SlideEventHandler.cpp index 0bfa3078c..83b3bfea1 100644 --- a/src/osgPresentation/SlideEventHandler.cpp +++ b/src/osgPresentation/SlideEventHandler.cpp @@ -926,7 +926,7 @@ double SlideEventHandler::getDuration(const osg::Node* node) const void SlideEventHandler::set(osg::Node* model) { #if 0 - // pause all slides, then just reenable the current slide. + // pause all slides, then just re-enable the current slide. ActivityUpdateCallbacksVisitor aucv(ALL_OBJECTS, true); aucv.setTraversalMode(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN); model->accept(aucv); diff --git a/src/osgPresentation/SlideShowConstructor.cpp b/src/osgPresentation/SlideShowConstructor.cpp index d4ee8b266..8bfc2c22e 100644 --- a/src/osgPresentation/SlideShowConstructor.cpp +++ b/src/osgPresentation/SlideShowConstructor.cpp @@ -1002,7 +1002,7 @@ osg::Geometry* SlideShowConstructor::createTexturedQuadGeometry(const osg::Vec3& #endif #endif - // pass back info on wether texture 2D is used. + // pass back info on whether texture 2D is used. usedTextureRectangle = useTextureRectangle; if (!texture) @@ -1053,7 +1053,7 @@ osg::Geometry* SlideShowConstructor::createTexturedQuadGeometry(const osg::Vec3& OSG_INFO<<"Reading video "<getFileName()<setClientStorageHint(true); #endif } @@ -1392,7 +1392,7 @@ void SlideShowConstructor::addImage(const std::string& filename, const PositionD subgraph = picture; } - // attach any meterial animation. + // attach any material animation. if (positionData.requiresMaterialAnimation()) subgraph = attachMaterialAnimation(subgraph,positionData); @@ -1638,7 +1638,7 @@ void SlideShowConstructor::addStereoImagePair(const std::string& filenameLeft, c } } - // attach any meterial animation. + // attach any material animation. if (positionData.requiresMaterialAnimation()) subgraph = attachMaterialAnimation(subgraph,positionData)->asGroup(); @@ -1883,7 +1883,7 @@ osg::ref_ptr SlideShowConstructor::addInteractiveImage(const std::st subgraph = picture; } - // attach any meterial animation. + // attach any material animation. if (positionData.requiresMaterialAnimation()) subgraph = attachMaterialAnimation(subgraph,positionData); @@ -2308,7 +2308,7 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos - // attach any meterial animation. + // attach any material animation. if (positionData.requiresMaterialAnimation()) subgraph = attachMaterialAnimation(subgraph,positionData); diff --git a/src/osgPresentation/Timeout.cpp b/src/osgPresentation/Timeout.cpp index fd9c498be..e7737849c 100644 --- a/src/osgPresentation/Timeout.cpp +++ b/src/osgPresentation/Timeout.cpp @@ -395,7 +395,7 @@ void Timeout::traverse(osg::NodeVisitor& nv) { if (strcmp(nv.className(),"FindOperatorsVisitor")==0) { - OSG_NOTICE<<"Timout::traverse() "< PointMap; typedef std::set< osg::Vec3d > VertexSet; @@ -1392,7 +1392,7 @@ void ConvexPolyhedron::cut(const osg::Plane& plane, const std::string& name) // This may happen if face polygon is not planar or convex. // It may happen when face was distorted by projection transform // or when some polygon vertices land in incorrect positions after - // some transformation by badly conditioned matrix (weak precison) + // some transformation by badly conditioned matrix (weak precision) WARN << "ConvexPolyhedron::cut - Slicing face polygon returns " diff --git a/src/osgShadow/MinimalShadowMap.cpp b/src/osgShadow/MinimalShadowMap.cpp index be58ccf1f..f396f8316 100644 --- a/src/osgShadow/MinimalShadowMap.cpp +++ b/src/osgShadow/MinimalShadowMap.cpp @@ -191,7 +191,7 @@ void MinimalShadowMap::ViewData::frameShadowCastingCamera osg::Matrix transform = osg::Matrix::inverse( mvp ); // Code below was working only for directional lights ie when projection was ortho - // osg::Vec3d normal = osg::Matrix::transform3x3( osg::Vec3d( 0,0,-1)., transfrom ); + // osg::Vec3d normal = osg::Matrix::transform3x3( osg::Vec3d( 0,0,-1)., transform ); // So I replaced it with safer code working with spot lights as well osg::Vec3d normal = @@ -299,7 +299,7 @@ void MinimalShadowMap::ViewData::cullShadowReceivingScene( ) _cv->clampProjectionMatrix( _clampedProjection, n, f ); } - // Aditionally clamp far plane if shadows don't need to be cast as + // Additionally clamp far plane if shadows don't need to be cast as // far as main projection far plane if( 0 < *_maxFarPlanePtr ) clampProjection( _clampedProjection, 0.f, *_maxFarPlanePtr ); diff --git a/src/osgShadow/ParallelSplitShadowMap.cpp b/src/osgShadow/ParallelSplitShadowMap.cpp index ee5507344..ea47ee0cc 100644 --- a/src/osgShadow/ParallelSplitShadowMap.cpp +++ b/src/osgShadow/ParallelSplitShadowMap.cpp @@ -104,7 +104,7 @@ std::string ParallelSplitShadowMap::FragmentShaderGenerator::generateGLSL_Fragme for (unsigned int i=0;i cull_face = new osg::CullFace; cull_face->setMode(osg::CullFace::FRONT); stateset->setAttribute(cull_face.get(), osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE); diff --git a/src/osgSim/DOFTransform.cpp b/src/osgSim/DOFTransform.cpp index 2ef0ea797..545693772 100644 --- a/src/osgSim/DOFTransform.cpp +++ b/src/osgSim/DOFTransform.cpp @@ -226,7 +226,7 @@ void DOFTransform::updateCurrentHPR(const osg::Vec3& hpr) //if there is constrain on animation if (_limitationFlags & ROTATION_ROLL_LIMIT_BIT) { - //if we have min == max, it is efective constrain, so don't change + //if we have min == max, it is effective constrain, so don't change if(_minHPR[2] != _maxHPR[2]) { _currentHPR[2] = hpr[2]; diff --git a/src/osgSim/ImpostorSprite.cpp b/src/osgSim/ImpostorSprite.cpp index 21373e78d..50fa12568 100644 --- a/src/osgSim/ImpostorSprite.cpp +++ b/src/osgSim/ImpostorSprite.cpp @@ -159,7 +159,7 @@ void ImpostorSpriteManager::push_back(ImpostorSprite* is) { if (is==NULL || is==_last) return; - // remove entry for exisiting position in linked list + // remove entry for existing position in linked list // if it is already inserted. if (is->_previous) { @@ -198,7 +198,7 @@ void ImpostorSpriteManager::remove(ImpostorSprite* is) { if (is==NULL) return; - // remove entry for exisiting position in linked list + // remove entry for existing position in linked list // if it is already inserted. if (is->_previous) { diff --git a/src/osgSim/LightPointNode.cpp b/src/osgSim/LightPointNode.cpp index 15909c0a0..4bfe9a20f 100644 --- a/src/osgSim/LightPointNode.cpp +++ b/src/osgSim/LightPointNode.cpp @@ -271,7 +271,7 @@ void LightPointNode::traverse(osg::NodeVisitor& nv) // slip light point if its intensity is 0.0 or negative. if (intensity<=minimumIntensity) continue; - // (SIB) Clip on distance, if close to limit, add transparancy + // (SIB) Clip on distance, if close to limit, add transparency float distanceFactor = 1.0f; if (_maxVisibleDistance2!=FLT_MAX) { diff --git a/src/osgSim/OverlayNode.cpp b/src/osgSim/OverlayNode.cpp index 343d20878..63d38f711 100644 --- a/src/osgSim/OverlayNode.cpp +++ b/src/osgSim/OverlayNode.cpp @@ -358,7 +358,7 @@ public: void projectDowntoBase(const osg::Vec3d& control, const osg::Vec3d& normal) { - // OSG_NOTICE<<"CustomPolytope::projectDowntoBase not implementated yet."<osg::Group::traverse(*uv); } void TerrainTechnique::cull(osgUtil::CullVisitor* cv) { - OSG_NOTICE<osg::Group::traverse(*cv); } void TerrainTechnique::cleanSceneGraph() { - OSG_NOTICE<screenNum, error); + reportErrorForScreen("GraphicsWindowWin32::setWindowDecoration() - Unable to set window extended style", _traits->screenNum, error); return false; } @@ -2825,7 +2825,7 @@ LRESULT GraphicsWindowWin32::handleNativeWindowingEvent( HWND hwnd, UINT uMsg, W { // Wojciech Lewandowski: 2011/09/12 // Skip CONTROL | MENU | SHIFT tests because we are polling exact left or right keys - // above return press for both right and left so we may end up with incosistent + // above return press for both right and left so we may end up with inconsistent // modifier mask if we report left control & right control while only right was pressed LONG rightSideCode = 0; switch( i ) diff --git a/src/osgViewer/IOSUtils.mm b/src/osgViewer/IOSUtils.mm index c673a08b6..c73fba88c 100644 --- a/src/osgViewer/IOSUtils.mm +++ b/src/osgViewer/IOSUtils.mm @@ -80,7 +80,7 @@ void IOSWindowingSystemInterface::getScreenSettings(const osg::GraphicsContext:: resolution.width = [screen bounds].size.width * scale; resolution.height = [screen bounds].size.height * scale; resolution.colorDepth = 24; - resolution.refreshRate = 60; //i've read 60 is max, not sure if thats true + resolution.refreshRate = 60; //i've read 60 is max, not sure if that's true } else { @@ -96,7 +96,7 @@ void IOSWindowingSystemInterface::getScreenSettings(const osg::GraphicsContext:: resolution.width = size.width; resolution.height = size.height; resolution.colorDepth = 24; - resolution.refreshRate = 60; //i've read 60 is max, not sure if thats true + resolution.refreshRate = 60; //i've read 60 is max, not sure if that's true OSG_INFO << "new resolution for screen " << si.screenNum << ": " << size.width << "x" << size.height << std::endl; } @@ -130,7 +130,7 @@ void IOSWindowingSystemInterface::enumerateScreenSettings(const osg::GraphicsCon resolution.width = [screen bounds].size.width * scale; resolution.height = [screen bounds].size.height * scale; resolution.colorDepth = 24; - resolution.refreshRate = 60; //i've read 60 is max, not sure if thats true + resolution.refreshRate = 60; //i've read 60 is max, not sure if that's true resolutionList.push_back(resolution); @@ -151,7 +151,7 @@ void IOSWindowingSystemInterface::enumerateScreenSettings(const osg::GraphicsCon resolution.width = size.width; resolution.height = size.height; resolution.colorDepth = 24; - resolution.refreshRate = 60; //i've read 60 is max, not sure if thats true + resolution.refreshRate = 60; //i've read 60 is max, not sure if that's true resolutionList.push_back(resolution); OSG_INFO << "new resolution: " << size.width << "x" << size.height << std::endl; diff --git a/src/osgViewer/PixelBufferWin32.cpp b/src/osgViewer/PixelBufferWin32.cpp index 0512a85eb..567ae3386 100644 --- a/src/osgViewer/PixelBufferWin32.cpp +++ b/src/osgViewer/PixelBufferWin32.cpp @@ -633,7 +633,7 @@ void PixelBufferWin32::init() if (_traits->width != iWidth || _traits->height != iHeight) { - OSG_NOTICE << "PixelBufferWin32::init(), pbuffer created with different size then requsted" << std::endl; + OSG_NOTICE << "PixelBufferWin32::init(), pbuffer created with different size then requested" << std::endl; OSG_NOTICE << "\tRequested size (" << _traits->width << "," << _traits->height << ")" << std::endl; OSG_NOTICE << "\tPbuffer size (" << iWidth << "," << iHeight << ")" << std::endl; _traits->width = iWidth; diff --git a/src/osgViewer/PixelBufferX11.cpp b/src/osgViewer/PixelBufferX11.cpp index 5e7f9b280..45a3baf20 100644 --- a/src/osgViewer/PixelBufferX11.cpp +++ b/src/osgViewer/PixelBufferX11.cpp @@ -289,7 +289,7 @@ void PixelBufferX11::init() if (_traits->width != iWidth || _traits->height != iHeight) { - OSG_NOTICE << "PixelBufferX11::init(), pbuffer created with different size then requsted" << std::endl; + OSG_NOTICE << "PixelBufferX11::init(), pbuffer created with different size then requested" << std::endl; OSG_NOTICE << "\tRequested size (" << _traits->width << "," << _traits->height << ")" << std::endl; OSG_NOTICE << "\tPbuffer size (" << iWidth << "," << iHeight << ")" << std::endl; _traits->width = iWidth; @@ -323,7 +323,7 @@ void PixelBufferX11::init() if (_traits->width != iWidth || _traits->height != iHeight) { - OSG_NOTICE << "PixelBufferX11::init(), SGIX_pbuffer created with different size then requsted" << std::endl; + OSG_NOTICE << "PixelBufferX11::init(), SGIX_pbuffer created with different size then requested" << std::endl; OSG_NOTICE << "\tRequested size (" << _traits->width << "," << _traits->height << ")" << std::endl; OSG_NOTICE << "\tPbuffer size (" << iWidth << "," << iHeight << ")" << std::endl; _traits->width = iWidth; diff --git a/src/osgViewer/ViewerEventHandlers.cpp b/src/osgViewer/ViewerEventHandlers.cpp index 7bd3c695e..50f78cbae 100644 --- a/src/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgViewer/ViewerEventHandlers.cpp @@ -488,7 +488,7 @@ bool RecordCameraPathHandler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GU OSG_NOTICE << "Recording camera path to file " << ss.str() << std::endl; _fout.open( ss.str().c_str() ); - // make sure doubles are not trucated by default stream precision = 6 + // make sure doubles are not truncated by default stream precision = 6 _fout.precision( 15 ); } else diff --git a/src/osgVolume/VolumeTechnique.cpp b/src/osgVolume/VolumeTechnique.cpp index 21da95973..d657fc1de 100644 --- a/src/osgVolume/VolumeTechnique.cpp +++ b/src/osgVolume/VolumeTechnique.cpp @@ -34,24 +34,24 @@ VolumeTechnique::~VolumeTechnique() void VolumeTechnique::init() { - OSG_NOTICE<osg::Group::traverse(*uv); } void VolumeTechnique::cull(osgUtil::CullVisitor* cv) { - OSG_NOTICE<osg::Group::traverse(*cv); } void VolumeTechnique::cleanSceneGraph() { - OSG_NOTICE<(w); diff --git a/src/osgWrappers/deprecated-dotosg/osg/Box.cpp b/src/osgWrappers/deprecated-dotosg/osg/Box.cpp index 870977814..d60584533 100644 --- a/src/osgWrappers/deprecated-dotosg/osg/Box.cpp +++ b/src/osgWrappers/deprecated-dotosg/osg/Box.cpp @@ -45,11 +45,11 @@ bool Box_readLocalData(Object& obj, Input& fr) if (fr.matchSequence("HalfLengths %f %f %f")) { - osg::Vec3 lenghts; - fr[1].getFloat(lenghts.x()); - fr[2].getFloat(lenghts.y()); - fr[3].getFloat(lenghts.z()); - box.setHalfLengths(lenghts); + osg::Vec3 lengths; + fr[1].getFloat(lengths.x()); + fr[2].getFloat(lengths.y()); + fr[3].getFloat(lengths.z()); + box.setHalfLengths(lengths); fr+=4; iteratorAdvanced = true; } diff --git a/src/osgWrappers/deprecated-dotosg/osg/StateSet.cpp b/src/osgWrappers/deprecated-dotosg/osg/StateSet.cpp index 9dd5c5a28..7d4d29b30 100644 --- a/src/osgWrappers/deprecated-dotosg/osg/StateSet.cpp +++ b/src/osgWrappers/deprecated-dotosg/osg/StateSet.cpp @@ -266,7 +266,7 @@ bool GeoState_readLocalData(Object& obj, Input& fr) if (fr[0].matchWord("texgening") && StateSet_matchModeStr(fr[1].getStr(),mode)) { // leave up to a tex gen object to set modes associated with TexGen - // as there are mutiple modes associated with TexGen. See below + // as there are multiple modes associated with TexGen. See below // attribute reading code. texgening = mode; fr+=2; diff --git a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleEffect.cpp b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleEffect.cpp index 14075fd70..e03791499 100644 --- a/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleEffect.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgParticle/IO_ParticleEffect.cpp @@ -180,7 +180,7 @@ bool ParticleEffect_readLocalData(osg::Object& object, osgDB::Input& fr) if (!effect.getAutomaticSetup()) { // since by default the clone of the ParticleEffect is done with automatic setup off to prevent premature loading of - // imagery, we still want to make sure the ParticleEffect is properly built so we'll now mannually enable the automatic setup + // imagery, we still want to make sure the ParticleEffect is properly built so we'll now manually enable the automatic setup // run the buildEffect(). effect.setAutomaticSetup(true); effect.buildEffect(); diff --git a/src/osgWrappers/deprecated-dotosg/osgText/IO_TextBase.cpp b/src/osgWrappers/deprecated-dotosg/osgText/IO_TextBase.cpp index eb383a3f0..84e94999d 100644 --- a/src/osgWrappers/deprecated-dotosg/osgText/IO_TextBase.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgText/IO_TextBase.cpp @@ -312,7 +312,7 @@ bool TextBase_writeLocalData(const osg::Object &obj, osgDB::Output &fw) // font resolution fw.indent() << "fontResolution " << text.getFontWidth() << " " << text.getFontHeight() << std::endl; - // charater size. + // character size. fw.indent() << "characterSize " << text.getCharacterHeight() << " " << text.getCharacterAspectRatio() << std::endl; fw.indent() << "characterSizeMode ";