diff --git a/CMakeModules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake index ce3b11a51..0f761c566 100644 --- a/CMakeModules/FindFFmpeg.cmake +++ b/CMakeModules/FindFFmpeg.cmake @@ -14,8 +14,8 @@ #In OSG ffmpeg plugin, we used "#include " for compatibility with old version of ffmpeg #With the new version of FFmpeg, a file named "time.h" was added that breaks compatability with the old version of ffmpeg. -#We have to search the path which contain the header.h (usefull for old version) -#and search the path which contain the libname/header.h (usefull for new version) +#We have to search the path which contain the header.h (useful for old version) +#and search the path which contain the libname/header.h (useful for new version) #Then we need to include ${FFMPEG_libname_INCLUDE_DIRS} (in old version case, use by ffmpeg header and osg plugin code) # (in new version case, use by ffmpeg header) diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake index 0eab5b131..0f3d6b38a 100644 --- a/CMakeModules/OsgMacroUtils.cmake +++ b/CMakeModules/OsgMacroUtils.cmake @@ -4,7 +4,7 @@ # full path of the library name. in order to differentiate release and debug, this macro get the # NAME of the variables, so the macro gets as arguments the target name and the following list of parameters # is intended as a list of variable names each one containing the path of the libraries to link to -# The existance of a variable name with _DEBUG appended is tested and, in case it' s value is used +# The existence of a variable name with _DEBUG appended is tested and, in case it' s value is used # for linking to when in debug mode # the content of this library for linking when in debugging ####################################################################################################### diff --git a/applications/osgconv/osgconv.cpp b/applications/osgconv/osgconv.cpp index 5aaa614b7..b614a1b29 100644 --- a/applications/osgconv/osgconv.cpp +++ b/applications/osgconv/osgconv.cpp @@ -174,7 +174,7 @@ public: { texture->setInternalFormatMode(_internalFormatMode); - // need to disable the unref after apply, other the image could go out of scope. + // need to disable the unref after apply, otherwise the image could go out of scope. bool unrefImageDataAfterApply = texture->getUnRefImageDataAfterApply(); texture->setUnRefImageDataAfterApply(false); @@ -807,7 +807,7 @@ int main( int argc, char **argv ) root->accept(av); } - // optimize the scene graph, remove rendundent nodes and state etc. + // optimize the scene graph, remove redundant nodes and state etc. osgUtil::Optimizer optimizer; optimizer.optimize(root.get()); diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp index a10c201cd..4bc16613a 100644 --- a/applications/osgversion/osgversion.cpp +++ b/applications/osgversion/osgversion.cpp @@ -1,5 +1,5 @@ // The majority of the application is dedicated to building the -// current contribitors list by parsing the ChangeLog, it just takes +// current contributors list by parsing the ChangeLog, it just takes // one line in the main itself to report the version number. #include diff --git a/applications/present3D/Cluster.cpp b/applications/present3D/Cluster.cpp index 62d2313e6..5b1180fb7 100644 --- a/applications/present3D/Cluster.cpp +++ b/applications/present3D/Cluster.cpp @@ -250,7 +250,7 @@ void CameraPacket::writeEventQueue(osgViewer::Viewer& viewer) ////////////////////////////////////////////////////////////////////////////// // -// Reciever +// Receiver // Receiver::Receiver( void ) { diff --git a/applications/present3D/present3D.cpp b/applications/present3D/present3D.cpp index 1040a5024..947b62572 100644 --- a/applications/present3D/present3D.cpp +++ b/applications/present3D/present3D.cpp @@ -248,7 +248,7 @@ void processLoadedModel(osg::ref_ptr& loadedModel, int optimizer_opti loadedModel->getOrCreateStateSet()->setMode(GL_ALPHA_TEST, osg::StateAttribute::ON); #endif - // optimize the scene graph, remove rendundent nodes and state etc. + // optimize the scene graph, remove redundant nodes and state etc. osgUtil::Optimizer optimizer; optimizer.optimize(loadedModel.get(), optimizer_options); diff --git a/examples/osg2cpp/osg2cpp.cpp b/examples/osg2cpp/osg2cpp.cpp index ee306eab4..857843c65 100644 --- a/examples/osg2cpp/osg2cpp.cpp +++ b/examples/osg2cpp/osg2cpp.cpp @@ -7,7 +7,7 @@ #include -// Search in str for all occurences of spat and replace them with rpat. +// Search in str for all occurrences of spat and replace them with rpat. void searchAndReplace(std::string& str, const std::string& spat, const std::string& rpat) { std::string::size_type pos = 0; diff --git a/examples/osganimationsolid/osganimationsolid.cpp b/examples/osganimationsolid/osganimationsolid.cpp index 045bd0f74..e14f87f58 100644 --- a/examples/osganimationsolid/osganimationsolid.cpp +++ b/examples/osganimationsolid/osganimationsolid.cpp @@ -71,7 +71,7 @@ int main (int argc, char* argv[]) osg::ref_ptr geode = new osg::Geode; geode->addDrawable(new osg::ShapeDrawable(new osg::Box(osg::Vec3(0.0f,0.0f,0.0f),0.5))); - //Tranformation to be manipulated by the animation + //Transformation to be manipulated by the animation osg::ref_ptr trans = new osg::MatrixTransform(); trans->setName("AnimatedNode"); //Dynamic object, has to be updated during update traversal @@ -84,7 +84,7 @@ int main (int argc, char* argv[]) //The second element modifies the rotation around x-axis updatecb->getStackedTransforms().push_back(new osgAnimation::StackedTranslateElement("position")); updatecb->getStackedTransforms().push_back(new osgAnimation::StackedRotateAxisElement("euler",osg::Vec3(1,0,0),0)); - //connect the UpdateMatrixTransform callback to the MatrixTRanform + //connect the UpdateMatrixTransform callback to the MatrixTransform trans->setUpdateCallback(updatecb); //initialize MatrixTranform trans->setMatrix(osg::Matrix::identity()); @@ -102,7 +102,7 @@ int main (int argc, char* argv[]) //add the rest of the scene to the grp node grp->addChild(root); - // And we finaly define our channel for linear Vector interpolation + // And we finally define our channel for linear Vector interpolation osgAnimation::Vec3LinearChannel* channelAnimation1 = new osgAnimation::Vec3LinearChannel; //name of the AnimationUpdateCallback channelAnimation1->setTargetName("AnimatedCallback"); diff --git a/examples/osganimationtimeline/osganimationtimeline.cpp b/examples/osganimationtimeline/osganimationtimeline.cpp index 0324704b9..9efedbe0e 100644 --- a/examples/osganimationtimeline/osganimationtimeline.cpp +++ b/examples/osganimationtimeline/osganimationtimeline.cpp @@ -98,9 +98,9 @@ struct ExampleTimelineUsage : public osgGA::GUIEventHandler { // we add a scratch head priority 1 each 10 second // note: - // it's possible to add the same instance more then once on the timeline + // it's possible to add the same instance more than once on the timeline // the only things you need to take care is if you remove it. It will remove - // all instance that exist on the timeline. If you need to differtiate + // all instance that exist on the timeline. If you need to differentiate // it's better to create a new instance tml->addActionAt(5.0 + 10.0 * i, _scratchHead.get(), 1); } diff --git a/examples/osgautocapture/osgautocapture.cpp b/examples/osgautocapture/osgautocapture.cpp index 4a16ac8aa..48e56459b 100644 --- a/examples/osgautocapture/osgautocapture.cpp +++ b/examples/osgautocapture/osgautocapture.cpp @@ -406,7 +406,7 @@ int main( int argc, char **argv ) viewer.renderingTraversals(); osg::Timer_t afterRenderTick = osg::Timer::instance()->tick(); - std::cout<<"Rendring time = "<delta_s(beforeRenderTick, afterRenderTick) <<" seconds"<setMode(osg::Billboard::POINT_ROT_EYE); center->addDrawable( diff --git a/examples/osgcamera/osgcamera.cpp b/examples/osgcamera/osgcamera.cpp index a139c62ed..ec4fce8b2 100644 --- a/examples/osgcamera/osgcamera.cpp +++ b/examples/osgcamera/osgcamera.cpp @@ -304,7 +304,7 @@ int main( int argc, char **argv ) osgViewer::View* view = dynamic_cast(object.get()); if (view) { - osg::notify(osg::NOTICE)<<"Read config file succesfully"<addChild(wireframe_subgraph); /* - // simple approach to adding a clipnode above a subrgaph. + // simple approach to adding a clipnode above a subgraph. // create clipped part. osg::ClipNode* clipped_subgraph = new osg::ClipNode; @@ -78,7 +78,7 @@ osg::Node* decorate_with_clip_node(osg::Node* subgraph) // more complex approach to managing ClipNode, allowing - // ClipNode node to be transformed independantly from the subgraph + // ClipNode node to be transformed independently from the subgraph // that it is clipping. osg::MatrixTransform* transform= new osg::MatrixTransform; diff --git a/examples/osgcopy/osgcopy.cpp b/examples/osgcopy/osgcopy.cpp index 76d05cc28..79c614f71 100644 --- a/examples/osgcopy/osgcopy.cpp +++ b/examples/osgcopy/osgcopy.cpp @@ -211,7 +211,7 @@ int main( int argc, char **argv ) // ------------- Start of copy specific code ------------------------------------------------------- - // do a deep copy, using MyCopyOp to reveal whats going on under the good, + // do a deep copy, using MyCopyOp to reveal whats going on under the hood, // in your own code you'd typically just use the basic osg::CopyOp something like osg::ref_ptr mycopy = dynamic_cast(rootnode->clone(osg::CopyOp::DEEP_COPY_ALL)); std::cout << "Doing a deep copy of scene graph"< bounce = new osgParticle::BounceOperator; bounce->setFriction( -0.05 ); @@ -191,7 +191,7 @@ int main( int argc, char** argv ) // A floating error of delta-time should be explained here: // The particles emitter, program and updater all use a 'dt' to compute the time value in every frame. - // Because the 'dt' is a double value, it is not suitable to keep three copies of it seperately, which + // Because the 'dt' is a double value, it is not suitable to keep three copies of it separately, which // is the previous implementation. The small error makes some opeartors unable to work correctly, e.g. // the BounceOperator. // Now we make use of the getDeltaTime() of ParticleSystem to maintain and dispatch the delta time. But.. diff --git a/examples/osgreflect/osgreflect.cpp b/examples/osgreflect/osgreflect.cpp index d9367b0b4..66a5d991e 100644 --- a/examples/osgreflect/osgreflect.cpp +++ b/examples/osgreflect/osgreflect.cpp @@ -41,7 +41,7 @@ // A simple demo demonstrating planar reflections using multiple renderings // of a subgraph, overriding of state attribures and use of the stencil buffer. // -// The multipass system implemented here is a variation if Mark Kilgard's +// The multipass system implemented here is a variation of Mark Kilgard's // paper "Improving Shadows and Reflections via the Stencil Buffer" which // can be found on the developer parts of the NVidia web site. // @@ -52,7 +52,7 @@ // world poking through the mirror to be seen in the final rendering and // also obscures the world correctly when on the reverse side of the mirror. // Although there is still some unresolved issue with the clip plane needing -// to be flipped when looking at the reverse side of the mirror. Niether +// to be flipped when looking at the reverse side of the mirror. Neither // of these issues are mentioned in the Mark's paper, but trip us up when // we apply them. @@ -322,7 +322,7 @@ osg::Node* createMirroredScene(osg::Node* model) // // create the viewer // load a model -// decoate the model so it renders using a multipass stencil buffer technique for planar reflections. +// decorate the model so it renders using a multipass stencil buffer technique for planar reflections. // release the viewer // run main loop. // diff --git a/examples/osgshadercomposition/osgshadercomposition.cpp b/examples/osgshadercomposition/osgshadercomposition.cpp index 4a0008255..002ccfaa2 100644 --- a/examples/osgshadercomposition/osgshadercomposition.cpp +++ b/examples/osgshadercomposition/osgshadercomposition.cpp @@ -173,7 +173,7 @@ int main( int argc, char **argv ) } else { - // use new #pragama(tic) shader composition. + // use new #pragma(tic) shader composition. osg::ref_ptr scenegraph = createNewShaderCompositionScene(arguments); if (!scenegraph) return 1; diff --git a/examples/osgtexture2DArray/osgtexture2DArray.cpp b/examples/osgtexture2DArray/osgtexture2DArray.cpp index 4b6b58484..4671c039d 100644 --- a/examples/osgtexture2DArray/osgtexture2DArray.cpp +++ b/examples/osgtexture2DArray/osgtexture2DArray.cpp @@ -112,7 +112,7 @@ osg::StateSet* createState(osg::ArgumentParser& arguments) } else { - OSG_NOTICE<<"Assigned all images to Texture2DArray seperately."<setImage(0, image_0.get()); texture->setImage(1, image_1.get()); diff --git a/examples/osgtexture3D/osgtexture3D.cpp b/examples/osgtexture3D/osgtexture3D.cpp index a25f08949..37e293218 100644 --- a/examples/osgtexture3D/osgtexture3D.cpp +++ b/examples/osgtexture3D/osgtexture3D.cpp @@ -31,7 +31,7 @@ #include // -// A simple demo demonstrating use osg::Texture3D to create a blended animation between four seperate images packed together into a 3d texture +// A simple demo demonstrating use osg::Texture3D to create a blended animation between four separate images packed together into a 3d texture // typedef std::vector< osg::ref_ptr > ImageList; diff --git a/examples/osgwindows/osgwindows.cpp b/examples/osgwindows/osgwindows.cpp index 75f49da6b..ee3380960 100644 --- a/examples/osgwindows/osgwindows.cpp +++ b/examples/osgwindows/osgwindows.cpp @@ -96,7 +96,7 @@ int main( int argc, char **argv ) } - // optimize the scene graph, remove rendundent nodes and state etc. + // optimize the scene graph, remove redundant nodes and state etc. osgUtil::Optimizer optimizer; optimizer.optimize(loadedModel.get()); diff --git a/include/OpenThreads/Thread b/include/OpenThreads/Thread index 5eb7dd2ef..f6d694cd5 100644 --- a/include/OpenThreads/Thread +++ b/include/OpenThreads/Thread @@ -191,19 +191,19 @@ 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 carefull + * entity implemenation (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 senario in mind). Unless - * you have explicit need to set the schedule pirorites for a given + * constructs have been designed with this scenario in mind). Unless + * you have explicit need to set the schedule priorities for a given * task, it is best to leave them alone. * * @note some implementations (notably LinuxThreads and IRIX Sprocs) - * only alow you to decrease thread priorities dynamically. Thus, + * only allow you to decrease thread priorities dynamically. Thus, * a lower priority thread will not allow it's priority to be raised * on the fly. * - * @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO + * @note setting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO * will output scheduling information for each thread to stdout. * * @return 0 if normal, -1 if errno set, errno code otherwise. @@ -213,7 +213,7 @@ public: /** * Get the thread's schedule priority (if able) * - * @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO + * @note setting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO * will output scheduling information for each thread to stdout. * * @return 0 if normal, -1 if errno set, errno code otherwise. @@ -229,7 +229,7 @@ public: * the danger of deadlocking the machine when used as super-user. * In such cases, the command is a no-op. * - * @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO + * @note setting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO * will output scheduling information for each thread to stdout. * * @return 0 if normal, -1 if errno set, errno code otherwise. @@ -239,7 +239,7 @@ public: /** * Get the thread's policy (if able) * - * @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO + * @note setting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO * will output scheduling information for each thread to stdout. * * @return policy if normal, -1 if errno set, errno code otherwise. @@ -287,14 +287,14 @@ public: int join(); /** - * Disable thread cancelation altogether. Thread::cancel() has no effect. + * Disable thread cancellation altogether. Thread::cancel() has no effect. * * @return 0 if normal, -1 if errno set, errno code otherwise. */ int setCancelModeDisable(); /** - * Mark the thread to cancel aysncronously on Thread::cancel(). + * Mark the thread to cancel asynchronously on Thread::cancel(). * (May not be available with process-level implementations). * * @return 0 if normal, -1 if errno set, errno code otherwise. @@ -324,7 +324,7 @@ public: /** * Thread's cancel cleanup routine, called upon cancel(), after the - * cancelation has taken place, but before the thread exits completely. + * cancellation has taken place, but before the thread exits completely. * This method should be used to repair parts of the thread's data * that may have been damaged by a pre-mature cancel. No-op by default. */ @@ -346,7 +346,7 @@ public: * This is not strictly thread API but is used * so often with threads. It's basically UNIX usleep. Parameter is * number of microseconds we current thread to sleep. Returns 0 on - * succes, non-zero on failure (UNIX errno or GetLastError() will give + * success, non-zero on failure (UNIX errno or GetLastError() will give * detailed description. */ static int microSleep( unsigned int microsec); diff --git a/include/osg/Billboard b/include/osg/Billboard index 85fa6c9b1..02a8870e7 100644 --- a/include/osg/Billboard +++ b/include/osg/Billboard @@ -21,7 +21,7 @@ namespace osg { /** Billboard is a derived form of Geode that orients its osg::Drawable * children to face the eye point. Typical uses include trees and - * particle explosions, + * particle explosions. */ class OSG_EXPORT Billboard : public Geode { diff --git a/include/osg/BoundingSphere b/include/osg/BoundingSphere index ab6e06c59..5ec81f3eb 100644 --- a/include/osg/BoundingSphere +++ b/include/osg/BoundingSphere @@ -180,7 +180,7 @@ void BoundingSphereImpl::expandRadiusBy(const vector_type& v) template void BoundingSphereImpl::expandBy(const BoundingSphereImpl& sh) { - // ignore operation if incomming BoundingSphere is invalid. + // ignore operation if incoming BoundingSphere is invalid. if (!sh.valid()) return; // This sphere is not set so use the inbound sphere diff --git a/include/osg/BufferIndexBinding b/include/osg/BufferIndexBinding index ee58ed7af..51666b77c 100644 --- a/include/osg/BufferIndexBinding +++ b/include/osg/BufferIndexBinding @@ -45,7 +45,7 @@ class OSG_EXPORT BufferIndexBinding : public StateAttribute BufferIndexBinding(const BufferIndexBinding& rhs, const CopyOp& copyop=CopyOp::SHALLOW_COPY); public: // The member value is part of the key to this state attribute in - // the State class. Using the index target, we can seperately + // the State class. Using the index target, we can separately // track the bindings for many different index targets. virtual unsigned getMember() const { return static_cast(_index); } diff --git a/include/osg/BufferTemplate b/include/osg/BufferTemplate index 3807fbb0b..55f2af6d2 100644 --- a/include/osg/BufferTemplate +++ b/include/osg/BufferTemplate @@ -23,7 +23,7 @@ namespace osg { /** Template buffer class to be used with a struct as template parameter. - * This class is usefull to send C++ structures on the GPU (e.g. for uniform blocks) but be carefull to the alignments rules on the GPU side ! + * This class is useful to send C++ structures on the GPU (e.g. for uniform blocks) but be careful to the alignments rules on the GPU side ! */ template class BufferTemplate : public BufferData diff --git a/include/osg/ImageSequence b/include/osg/ImageSequence index ad675fce9..cd967a714 100644 --- a/include/osg/ImageSequence +++ b/include/osg/ImageSequence @@ -137,7 +137,7 @@ protected: int imageIndex(double time); - // setImage without aquiring mutex. + // setImage without acquiring mutex. void _setImage(unsigned int pos, osg::Image* image); double _referenceTime; diff --git a/include/osg/ScriptEngine b/include/osg/ScriptEngine index a6d5dd3bc..ce08ef623 100644 --- a/include/osg/ScriptEngine +++ b/include/osg/ScriptEngine @@ -101,7 +101,7 @@ class ScriptEngine : public osg::Object /** run a Script.*/ bool run(osg::Script* script) { - // assumpt empty input and output paramters lists + // assumpt empty input and output parameters lists Parameters inputParameters, outputParameters; return run(script, "", inputParameters, outputParameters); } diff --git a/include/osg/Shader b/include/osg/Shader index 9a23394dc..3869c4edd 100644 --- a/include/osg/Shader +++ b/include/osg/Shader @@ -136,7 +136,7 @@ class OSG_EXPORT Shader : public osg::Object enum ShaderDefinesMode { - USE_SHADER_PRAGAMA, + USE_SHADER_PRAGMA, USE_MANUAL_SETTINGS }; diff --git a/include/osg/Shape b/include/osg/Shape index 1e592c04c..f64ea62aa 100644 --- a/include/osg/Shape +++ b/include/osg/Shape @@ -22,7 +22,7 @@ namespace osg { -// forward decare visitors. +// forward declare visitors. class ShapeVisitor; class ConstShapeVisitor; diff --git a/include/osg/State b/include/osg/State index e4530f93b..f5992dd7a 100644 --- a/include/osg/State +++ b/include/osg/State @@ -132,7 +132,7 @@ class OSG_EXPORT State : public Referenced /** Set the current OpenGL context uniqueID. * The ContextID is used by classes like osg::StateAttribute's and osg::Drawable's to - * help manage seperate OpenGL objects, such as display lists, vertex buffer objects + * help manage separate OpenGL objects, such as display lists, vertex buffer objects * and texture object for each graphics context. The ContextID simply acts as an index * into arrays that these classes maintain for the purpose of storing GL object handles. * @@ -1461,9 +1461,9 @@ class OSG_EXPORT State : public Referenced enum CheckForGLErrors { /** NEVER_CHECK_GL_ERRORS hints that OpenGL need not be checked for, this - is the fastest option since checking for errors does incurr a small overhead.*/ + is the fastest option since checking for errors does incur a small overhead.*/ NEVER_CHECK_GL_ERRORS, - /** ONCE_PER_FRAME means that OpenGl errors will be checked for once per + /** ONCE_PER_FRAME means that OpenGL errors will be checked for once per frame, the overhead is still small, but at least OpenGL errors that are occurring will be caught, the reporting isn't fine grained enough for debugging purposes.*/ ONCE_PER_FRAME, diff --git a/include/osg/StateSet b/include/osg/StateSet index 1ae5d1fc8..25ce0a1b4 100644 --- a/include/osg/StateSet +++ b/include/osg/StateSet @@ -312,10 +312,10 @@ class OSG_EXPORT StateSet : public Object typedef std::pair DefinePair; typedef std::map DefineList; - /** Added define pass on to shaders that use utilize that define, as secified by the GLSL #pragma import_defines(..) and #pragam requires(..). */ + /** Added define pass on to shaders that use utilize that define, as specified by the GLSL #pragma import_defines(..) and #pragma requires(..). */ void setDefine(const std::string& defineName, StateAttribute::OverrideValue value=StateAttribute::ON); - /** Added define with value to pass on to shaders that use utilize that define, as secified by the GLSL #pragma import_defines(..) and #pragam requires(..). */ + /** Added define with value to pass on to shaders that use utilize that define, as specified by the GLSL #pragma import_defines(..) and #pragma requires(..). */ void setDefine(const std::string& defineName, const std::string& defineValue, StateAttribute::OverrideValue value=StateAttribute::ON); DefinePair* getDefinePair(const std::string& defineName) { DefineList::iterator itr = _defineList.find(defineName); return (itr!=_defineList.end()) ? &(itr->second) : 0; } diff --git a/include/osg/ValueObject b/include/osg/ValueObject index 7c1d76398..539deb55a 100644 --- a/include/osg/ValueObject +++ b/include/osg/ValueObject @@ -21,7 +21,7 @@ namespace osg { -// foward declare core OSG math classes +// forward declare core OSG math classes class Vec2f; class Vec3f; class Vec4f; diff --git a/include/osgAnimation/Action b/include/osgAnimation/Action index 7b2be26d2..162168c87 100644 --- a/include/osgAnimation/Action +++ b/include/osgAnimation/Action @@ -112,7 +112,7 @@ namespace osgAnimation unsigned int getNumFrames() const { return _numberFrame;} double getDuration() const { return _numberFrame * 1.0 / _fps; } - // 0 means infini else it's the number of loop + // 0 means infinite else it's the number of loop virtual void setLoop(unsigned int nb) { _loop = nb; } virtual unsigned int getLoop() const { return _loop;} diff --git a/include/osgAnimation/RigGeometry b/include/osgAnimation/RigGeometry index 2fc542ffd..42dd7a858 100644 --- a/include/osgAnimation/RigGeometry +++ b/include/osgAnimation/RigGeometry @@ -144,7 +144,7 @@ namespace osgAnimation if(!finder._root.valid()) { - osg::notify(osg::WARN) << "A RigGeometry did not find a parent skeleton for RigGeomtry ( " << geom->getName() << " )" << std::endl; + osg::notify(osg::WARN) << "A RigGeometry did not find a parent skeleton for RigGeometry ( " << geom->getName() << " )" << std::endl; return; } geom->buildVertexInfluenceSet(); diff --git a/include/osgDB/Callbacks b/include/osgDB/Callbacks index 6b0f0b84e..b15c7c396 100644 --- a/include/osgDB/Callbacks +++ b/include/osgDB/Callbacks @@ -33,7 +33,7 @@ enum CaseSensitivity CASE_INSENSITIVE }; -// forward decare +// forward declare class Options; class OSGDB_EXPORT FindFileCallback : public virtual osg::Referenced diff --git a/include/osgManipulator/Dragger b/include/osgManipulator/Dragger index acd70bb35..2c910a451 100644 --- a/include/osgManipulator/Dragger +++ b/include/osgManipulator/Dragger @@ -264,7 +264,7 @@ class OSGMANIPULATOR_EXPORT Dragger : public osg::MatrixTransform /** * Set/Get the traversal mask used by this dragger when looking for intersections during event handling. - * This is usefull to "hide" some geometry during event handling. + * This is useful to "hide" some geometry during event handling. */ virtual void setIntersectionMask(osg::Node::NodeMask intersectionMask) { _intersectionMask = intersectionMask; } osg::Node::NodeMask getIntersectionMask() const { return _intersectionMask; } diff --git a/include/osgPresentation/SlideEventHandler b/include/osgPresentation/SlideEventHandler index d090ccd36..aa27edeb4 100644 --- a/include/osgPresentation/SlideEventHandler +++ b/include/osgPresentation/SlideEventHandler @@ -294,7 +294,7 @@ public: ActiveOperators(); ~ActiveOperators(); - void collect(osg::Node* incommingNode, osg::NodeVisitor::TraversalMode tm = osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); + void collect(osg::Node* incomingNode, osg::NodeVisitor::TraversalMode tm = osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); void process(SlideEventHandler* seh); @@ -310,7 +310,7 @@ public: protected: void processOutgoing(SlideEventHandler* seh); - void processIncomming(SlideEventHandler* seh); + void processIncoming(SlideEventHandler* seh); void processMaintained(SlideEventHandler* seh); bool _pause; @@ -319,7 +319,7 @@ protected: OperatorList _current; OperatorList _outgoing; - OperatorList _incomming; + OperatorList _incoming; OperatorList _maintained; }; diff --git a/include/osgShadow/OccluderGeometry b/include/osgShadow/OccluderGeometry index 381cfbca6..e358cdfea 100644 --- a/include/osgShadow/OccluderGeometry +++ b/include/osgShadow/OccluderGeometry @@ -29,7 +29,7 @@ class ShadowVolumeGeometry; /** OccluderGeometry provides a sepecialised geometry representation of objects in scene that occlude light and therefore cast shadows. * OccluderGeometry supports the computation of silhouette edges and shadow volume geometries, as well as use as geometry that one can rendering * into a shadow map or end caps for the ZP+ algorithm. OccluderGeometry may be of the same resolution as an underlying geometry that it - * represents, or can be of lower resolution and combine manager seperate geometries together into a single shadow casting object. + * represents, or can be of lower resolution and combine manager separate geometries together into a single shadow casting object. * OccluderGeometry may be attached as UserData to Nodes or to Drawables. */ class OSGSHADOW_EXPORT OccluderGeometry : public osg::Drawable { diff --git a/include/osgShadow/ViewDependentShadowMap b/include/osgShadow/ViewDependentShadowMap index 4ede756b8..1b1c88b5f 100644 --- a/include/osgShadow/ViewDependentShadowMap +++ b/include/osgShadow/ViewDependentShadowMap @@ -187,7 +187,7 @@ protected: osg::ref_ptr _fallbackShadowMapTexture; typedef std::vector< osg::ref_ptr > Uniforms; - mutable OpenThreads::Mutex _accessUnfiromsAndProgramMutex; + mutable OpenThreads::Mutex _accessUniformsAndProgramMutex; Uniforms _uniforms; osg::ref_ptr _program; }; diff --git a/include/osgUtil/Optimizer b/include/osgUtil/Optimizer index e38fc0514..7fbf20a19 100644 --- a/include/osgUtil/Optimizer +++ b/include/osgUtil/Optimizer @@ -793,7 +793,7 @@ class OSGUTIL_EXPORT Optimizer /** Optimize texture usage in the scene graph by combining textures into texture atlas - * Use of texture atlas cuts down on the number of seperate states in the scene, reducing + * Use of texture atlas cuts down on the number of separate states in the scene, reducing * state changes and improving the chances of using larger batches of geometry.*/ class OSGUTIL_EXPORT TextureAtlasVisitor : public BaseOptimizerVisitor { diff --git a/include/osgWidget/EventInterface b/include/osgWidget/EventInterface index 5ac701b62..0b99b2ca3 100644 --- a/include/osgWidget/EventInterface +++ b/include/osgWidget/EventInterface @@ -280,7 +280,7 @@ class OSGWIDGET_EXPORT EventInterface // Notify the EventInterface object that is has been focused or unfocused; since // this isn't always bound to a mouse event (i.e., if you want to be able to use - // the TAB key to focus), we need seperate events here. + // the TAB key to focus), we need separate events here. virtual bool focus (const WindowManager*) { return false; } virtual bool unfocus (const WindowManager*) { return false; } diff --git a/src/OpenThreads/pthreads/PThreadBarrierPrivateData.h b/src/OpenThreads/pthreads/PThreadBarrierPrivateData.h index 235706a25..5a5e4b3fa 100644 --- a/src/OpenThreads/pthreads/PThreadBarrierPrivateData.h +++ b/src/OpenThreads/pthreads/PThreadBarrierPrivateData.h @@ -43,7 +43,7 @@ private: volatile int cnt; // number of waiting threads - volatile int phase; // flag to seperate two barriers + volatile int phase; // flag to separate two barriers }; diff --git a/src/osg/Referenced.cpp b/src/osg/Referenced.cpp index 5c358b86e..cedc391d4 100644 --- a/src/osg/Referenced.cpp +++ b/src/osg/Referenced.cpp @@ -32,7 +32,7 @@ namespace osg //#define ENFORCE_THREADSAFE //#define DEBUG_OBJECT_ALLOCATION_DESTRUCTION -// specialized smart pointer, used to get round auto_ptr<>'s lack of the destructor reseting itself to 0. +// specialized smart pointer, used to get round auto_ptr<>'s lack of the destructor resetting itself to 0. template struct ResetPointer { diff --git a/src/osg/Shader.cpp b/src/osg/Shader.cpp index f1332098b..d3101e79e 100644 --- a/src/osg/Shader.cpp +++ b/src/osg/Shader.cpp @@ -215,13 +215,13 @@ void Shader::discardDeletedGlShaders(unsigned int contextID) Shader::Shader(Type type) : _type(type), - _shaderDefinesMode(USE_SHADER_PRAGAMA) + _shaderDefinesMode(USE_SHADER_PRAGMA) { } Shader::Shader(Type type, const std::string& source) : _type(type), - _shaderDefinesMode(USE_SHADER_PRAGAMA) + _shaderDefinesMode(USE_SHADER_PRAGMA) { setShaderSource( source); } @@ -229,7 +229,7 @@ Shader::Shader(Type type, const std::string& source) : Shader::Shader(Type type, ShaderBinary* shaderBinary) : _type(type), _shaderBinary(shaderBinary), - _shaderDefinesMode(USE_SHADER_PRAGAMA) + _shaderDefinesMode(USE_SHADER_PRAGMA) { } diff --git a/src/osg/State.cpp b/src/osg/State.cpp index c4f6b2db1..ca31060fa 100644 --- a/src/osg/State.cpp +++ b/src/osg/State.cpp @@ -277,7 +277,7 @@ void State::reset() _lastAppliedProgramObject = 0; // what about uniforms??? need to clear them too... - // go through all active Unfirom's, setting to change to force update, + // go through all active Uniform's, setting to change to force update, // the idea is to leave only the global defaults left. for(UniformMap::iterator uitr=_uniformMap.begin(); uitr!=_uniformMap.end(); @@ -945,7 +945,7 @@ void State::setInterleavedArrays( GLenum format, GLsizei stride, const GLvoid* p OSG_NOTICE<<"Warning: State::setInterleavedArrays(..) not implemented."<getProjectionMatrixAsFrustum(left,right,bottom,top,zNear,zFar)) { diff --git a/src/osgPlugins/txp/trpage_geom.h b/src/osgPlugins/txp/trpage_geom.h index 52e7e4ee0..bbcc2c385 100644 --- a/src/osgPlugins/txp/trpage_geom.h +++ b/src/osgPlugins/txp/trpage_geom.h @@ -138,13 +138,13 @@ public: bool GetTileOriginType(trpgTileType &) const; /* Group IDs are used by TerraPage to hook level of detail structures together. A TerraPage database can have an arbitrary number of terrain LODs, each stored - seperately. To hook them together we use trpgAttach nodes and number each group & + separately. To hook them together we use trpgAttach nodes and number each group & LOD node. This returns the maximum group ID in the file, which is important to know if you're keeping an array of them. */ bool GetMaxGroupID(int &) const; /* A TerraPage archive can contain any number of terrain LODs (a typical number is 4). - Each of these terrain LODs is accessed seperately (as are the tiles within them). + Each of these terrain LODs is accessed separately (as are the tiles within them). This returns the number of terrain LODs in the file. It will be at least 1. See trpgAttach for instructions on how to hook the terrain LODs together. @@ -2551,14 +2551,14 @@ public: this node rotates around the center in the way specified by GetMode. (2) Individual - This is a little weirder. Basically, it's here for trees. It's assumed that there will be one or more trpgGeometry nodes below this node. Each single - primitive is supposed to rotate "seperately". That is, you must take into + primitive is supposed to rotate "separately". That is, you must take into account the unique center of each one and rotate it around that. If you have some optimization scheme where you can deal with groups of billboards (ala Performer) it is valid to do so in the Individual case. */ bool GetType(int &) const; /* Center of the thing to be rotated. For Group this does the obvious thing. For Individual it should be the center of the group of things you want to rotate. - This has no use if you're going to rotate each primitive seperately, but if you've + This has no use if you're going to rotate each primitive separately, but if you've got some sort of optimized scheme for doing so (ala Performer) this information is useful. */ bool GetCenter(trpg3dPoint &) const; diff --git a/src/osgPlugins/txp/trpage_pparse.cpp b/src/osgPlugins/txp/trpage_pparse.cpp index a233b7266..88d75efad 100644 --- a/src/osgPlugins/txp/trpage_pparse.cpp +++ b/src/osgPlugins/txp/trpage_pparse.cpp @@ -28,8 +28,8 @@ namespace { - // This will recursivelly call itself up until - // all the tiule are done + // This will recursively call itself up until + // all the tiles are done void printBuf(int lod, int x, int y, trpgr_Archive *archive, trpgPrintGraphParser& parser, trpgMemReadBuffer &buf, trpgPrintBuffer &pBuf) { char ls[1024]; diff --git a/src/osgPlugins/txp/trpage_write.h b/src/osgPlugins/txp/trpage_write.h index 2055d77aa..0187cedcc 100644 --- a/src/osgPlugins/txp/trpage_write.h +++ b/src/osgPlugins/txp/trpage_write.h @@ -50,7 +50,7 @@ public: int stripStat[15]; // Strip length stats int fanStat[15]; // Fan length stats - int stripGeom; // Number of seperate trpgGeometry nodes for strips + int stripGeom; // Number of separate trpgGeometry nodes for strips int fanGeom; // Same for fans int bagGeom; // Same for bags diff --git a/src/osgPresentation/SlideEventHandler.cpp b/src/osgPresentation/SlideEventHandler.cpp index b7f47fbc7..f49018ce5 100644 --- a/src/osgPresentation/SlideEventHandler.cpp +++ b/src/osgPresentation/SlideEventHandler.cpp @@ -557,7 +557,7 @@ ActiveOperators::~ActiveOperators() { } -void ActiveOperators::collect(osg::Node* incommingNode, osg::NodeVisitor::TraversalMode tm) +void ActiveOperators::collect(osg::Node* incomingNode, osg::NodeVisitor::TraversalMode tm) { _previous.swap(_current); @@ -565,21 +565,21 @@ void ActiveOperators::collect(osg::Node* incommingNode, osg::NodeVisitor::Traver FindOperatorsVisitor fov(_current, tm); - if (incommingNode) + if (incomingNode) { - incommingNode->accept(fov); + incomingNode->accept(fov); } else { - OSG_NOTICE<<"ActiveOperators::collect() incommingNode="<osg::Group::traverse(nv); } void ShadowTechnique::cull(osgUtil::CullVisitor& cv) { - OSG_NOTICE<osg::Group::traverse(cv); } void ShadowTechnique::cleanSceneGraph() { - OSG_NOTICE<getOrCreateStateSet(); ss_sv1->setRenderBinDetails(shadowVolumeBin, "RenderBin"); @@ -351,6 +351,6 @@ void ShadowVolume::cull(osgUtil::CullVisitor& cv) void ShadowVolume::cleanSceneGraph() { - OSG_NOTICE< lock(_accessUnfiromsAndProgramMutex); + OpenThreads::ScopedLock lock(_accessUniformsAndProgramMutex); _shadowCastingStateSet = new osg::StateSet; @@ -2346,7 +2346,7 @@ osg::StateSet* ViewDependentShadowMap::selectStateSetForRenderingShadow(ViewDepe osg::ref_ptr stateset = vdd.getStateSet(); - OpenThreads::ScopedLock lock(_accessUnfiromsAndProgramMutex); + OpenThreads::ScopedLock lock(_accessUniformsAndProgramMutex); vdd.getStateSet()->clear(); diff --git a/src/osgViewer/View.cpp b/src/osgViewer/View.cpp index 989cd9100..b555e9201 100644 --- a/src/osgViewer/View.cpp +++ b/src/osgViewer/View.cpp @@ -656,7 +656,7 @@ Cameras getActiveCameras(osg::View& view) } -bool View::setUpDepthPartitionForCamera(osg::Camera* cameraToPartition, DepthPartitionSettings* incomming_dps) +bool View::setUpDepthPartitionForCamera(osg::Camera* cameraToPartition, DepthPartitionSettings* incoming_dps) { osg::ref_ptr context = cameraToPartition->getGraphicsContext(); if (!context) return false; @@ -664,7 +664,7 @@ bool View::setUpDepthPartitionForCamera(osg::Camera* cameraToPartition, DepthPar osg::ref_ptr viewport = cameraToPartition->getViewport(); if (!viewport) return false; - osg::ref_ptr dps = incomming_dps; + osg::ref_ptr dps = incoming_dps; if (!dps) dps = new DepthPartitionSettings; bool useMastersSceneData = true; diff --git a/src/osgWrappers/serializers/osgManipulator/Dragger.cpp b/src/osgWrappers/serializers/osgManipulator/Dragger.cpp index 117585075..ded8e1fa7 100644 --- a/src/osgWrappers/serializers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/serializers/osgManipulator/Dragger.cpp @@ -73,7 +73,7 @@ REGISTER_OBJECT_WRAPPER( osgManipulator_Dragger, osgManipulator::Dragger, "osg::Object osg::Node osg::Transform osg::MatrixTransform osgManipulator::Dragger" ) { - // Dragger should not record children seperately, so ignore the osg::Group class wrapper + // Dragger should not record children separately, so ignore the osg::Group class wrapper ADD_BOOL_SERIALIZER( HandleEvents, false ); // _handleEvents ADD_BOOL_SERIALIZER( DraggerActive, false ); // _draggerActive