diff --git a/CMakeModules/FindSDL2.cmake b/CMakeModules/FindSDL2.cmake index af2ebd19e..91724d663 100644 --- a/CMakeModules/FindSDL2.cmake +++ b/CMakeModules/FindSDL2.cmake @@ -5,12 +5,12 @@ # SDL2_INCLUDE_DIR, where to find SDL.h # SDL2_VERSION_STRING, human-readable string containing the version of SDL # -# This module responds to the the flag: +# This module responds to the flag: # SDL2_BUILDING_LIBRARY # If this is defined, then no SDL2_main will be linked in because # only applications need main(). # Otherwise, it is assumed you are building an application and this -# module will attempt to locate and set the the proper link flags +# module will attempt to locate and set the proper link flags # as part of the returned SDL2_LIBRARY variable. # # Don't forget to include SDLmain.h and SDLmain.m your project for the diff --git a/applications/present3D/present3D.cpp b/applications/present3D/present3D.cpp index 947b62572..d7c8de735 100644 --- a/applications/present3D/present3D.cpp +++ b/applications/present3D/present3D.cpp @@ -930,7 +930,7 @@ int main( int argc, char **argv ) } } - // update the scene by traversing it with the the update visitor which will + // update the scene by traversing it with the update visitor which will // call all node update callbacks and animations. viewer.eventTraversal(); @@ -959,7 +959,7 @@ int main( int argc, char **argv ) } - // update the scene by traversing it with the the update visitor which will + // update the scene by traversing it with the update visitor which will // call all node update callbacks and animations. viewer.updateTraversal(); diff --git a/examples/osgcluster/osgcluster.cpp b/examples/osgcluster/osgcluster.cpp index 3c7ee6670..85aac589a 100644 --- a/examples/osgcluster/osgcluster.cpp +++ b/examples/osgcluster/osgcluster.cpp @@ -615,7 +615,7 @@ int main( int argc, char **argv ) osg::notify(osg::INFO)<<"Time to do cluster sync "<delta_m(startTick,endTick)<setUpdateCallback(elbc); diff --git a/examples/osgparticleeffects/osgparticleeffects.cpp b/examples/osgparticleeffects/osgparticleeffects.cpp index 4b9ae93e4..03be3c077 100644 --- a/examples/osgparticleeffects/osgparticleeffects.cpp +++ b/examples/osgparticleeffects/osgparticleeffects.cpp @@ -316,7 +316,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 the main particle effects group which contains the emitters and programs. + // 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 // moving models is easy - just a single line of code! diff --git a/examples/osgscribe/osgscribe.cpp b/examples/osgscribe/osgscribe.cpp index 0ac0b5eed..02b0df9ad 100644 --- a/examples/osgscribe/osgscribe.cpp +++ b/examples/osgscribe/osgscribe.cpp @@ -47,7 +47,7 @@ int main( int argc, char **argv ) if (!loadedModel) { - osg::notify(osg::NOTICE)<<"Please specifiy a model filename on the command line."<getPixelFormat(),originalImage->getDataType(), // same pixel foramt and data type originalImage->data(originalImage->s()/4,originalImage->t()/4), // offset teh start point to 1/4 into the image osg::Image::NO_DELETE, // don't attempt to delete the image data, leave this to the originalImage - originalImage->getPacking(), // use the the same packing + originalImage->getPacking(), // use the same packing originalImage->s()); // use the width of the original image as the row width diff --git a/examples/osgunittests/UnitTestFramework.h b/examples/osgunittests/UnitTestFramework.h index f908fa8f3..25eb7531c 100644 --- a/examples/osgunittests/UnitTestFramework.h +++ b/examples/osgunittests/UnitTestFramework.h @@ -307,7 +307,7 @@ class TestGraph This was written to aid the auto-registration of tests at specific points in the test tree, where the tests' AutoRegistrationAgents may be distributed across several files, and cannot be guaranteed to run in a given order. E.g. You cannot - register a test "root.osg.MyTest" unless you know that the the suite "root.osg" + register a test "root.osg.MyTest" unless you know that the suite "root.osg" already exists. @@ -481,9 +481,9 @@ public: TestRunner( TestContext& ctx ); /** - Tests may be specified by partial names. E.g. specifiying "root" + Tests may be specified by partial names. E.g. specifying "root" will run all tests below root, i.e. all tests. - Specifiying "root.osg" will run all tests below \em root.osg. + Specifying "root.osg" will run all tests below \em root.osg. Specifying "root.osg.de" will run all tests (and suites) below \em root.osg with names beginning with the \em de. */ diff --git a/examples/osgvolume/osgvolume.cpp b/examples/osgvolume/osgvolume.cpp index 47dade211..113a0d12c 100644 --- a/examples/osgvolume/osgvolume.cpp +++ b/examples/osgvolume/osgvolume.cpp @@ -1224,7 +1224,7 @@ int main( int argc, char **argv ) // set the scene to render viewer.setSceneData(loadedModel.get()); - // the the viewers main frame loop + // the viewers main frame loop viewer.run(); } diff --git a/include/osg/GraphicsContext b/include/osg/GraphicsContext index 149394262..ec06b29ef 100644 --- a/include/osg/GraphicsContext +++ b/include/osg/GraphicsContext @@ -272,7 +272,7 @@ class OSG_EXPORT GraphicsContext : public Object typedef std::list< ref_ptr > GraphicsOperationQueue; - /** Get the operations queue, not you must use the OperationsMutex when accessing the queue.*/ + /** Get the operations queue, note you must use the OperationsMutex when accessing the queue.*/ GraphicsOperationQueue& getOperationsQueue() { return _operations; } /** Get the operations queue mutex.*/ @@ -467,10 +467,10 @@ class OSG_EXPORT GraphicsContext : public Object typedef std::list< osg::Camera* > Cameras; - /** Get the the list of cameras associated with this graphics context.*/ + /** Get the list of cameras associated with this graphics context.*/ Cameras& getCameras() { return _cameras; } - /** Get the the const list of cameras associated with this graphics context.*/ + /** Get the const list of cameras associated with this graphics context.*/ const Cameras& getCameras() const { return _cameras; } /** set the default FBO-id, this id will be used when the rendering-backend is finished with RTT FBOs */ diff --git a/include/osg/StateAttribute b/include/osg/StateAttribute index c4a221a04..dee906af7 100644 --- a/include/osg/StateAttribute +++ b/include/osg/StateAttribute @@ -118,7 +118,7 @@ class OSG_EXPORT StateAttribute : public Object * extending the osg's StateAttribute's simply define your * own Type value which is unique, using the StateAttribute::Type * enum as a guide of what values to use. If your new subclass - * needs to override a standard StateAttriubte then simply use + * needs to override a standard StateAttribute then simply use * that type's value. */ enum Type { diff --git a/include/osg/Texture2DArray b/include/osg/Texture2DArray index 2ce170e9f..0f866d670 100644 --- a/include/osg/Texture2DArray +++ b/include/osg/Texture2DArray @@ -98,12 +98,12 @@ class OSG_EXPORT Texture2DArray : public Texture - /** Set the number of mip map levels the the texture has been created with. + /** Set the number of mip map levels the texture has been created with. * Should only be called within an osg::Texture::apply() and custom OpenGL texture load. */ void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } - /** Get the number of mip map levels the the texture has been created with. */ + /** Get the number of mip map levels the texture has been created with. */ unsigned int getNumMipmapLevels() const { return _numMipmapLevels; } /** Copies a two-dimensional texture subimage, as per @@ -138,7 +138,7 @@ class OSG_EXPORT Texture2DArray : public Texture // subloaded images can have different texture and image sizes. mutable GLsizei _textureWidth, _textureHeight, _textureDepth; - // number of mip map levels the the texture has been created with, + // number of mip map levels the texture has been created with, mutable GLsizei _numMipmapLevels; ref_ptr _subloadCallback; diff --git a/include/osg/Texture3D b/include/osg/Texture3D index b3d1d5d0a..b13caead4 100644 --- a/include/osg/Texture3D +++ b/include/osg/Texture3D @@ -152,7 +152,7 @@ class OSG_EXPORT Texture3D : public Texture /** Subloaded images can have different texture and image sizes. */ mutable GLsizei _textureWidth, _textureHeight, _textureDepth; - /** Number of mip map levels the the texture has been created with, */ + /** Number of mip map levels the texture has been created with, */ mutable GLsizei _numMipmapLevels; ref_ptr _subloadCallback; diff --git a/include/osg/TextureCubeMap b/include/osg/TextureCubeMap index 8752ce215..b8ce1cae3 100644 --- a/include/osg/TextureCubeMap +++ b/include/osg/TextureCubeMap @@ -94,12 +94,12 @@ class OSG_EXPORT TextureCubeMap : public Texture const SubloadCallback* getSubloadCallback() const { return _subloadCallback.get(); } - /** Set the number of mip map levels the the texture has been created with. + /** Set the number of mip map levels the texture has been created with. * Should only be called within an osg::Texuture::apply() and custom OpenGL texture load. */ void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } - /** Get the number of mip map levels the the texture has been created with. */ + /** Get the number of mip map levels the texture has been created with. */ unsigned int getNumMipmapLevels() const { return _numMipmapLevels; } /** Copies a two-dimensional texture subimage, as per @@ -131,7 +131,7 @@ class OSG_EXPORT TextureCubeMap : public Texture // subloaded images can have different texture and image sizes. mutable GLsizei _textureWidth, _textureHeight; - // number of mip map levels the the texture has been created with, + // number of mip map levels the texture has been created with, mutable GLsizei _numMipmapLevels; ref_ptr _subloadCallback; diff --git a/include/osg/Timer b/include/osg/Timer index bf1c8c74f..c7eb77019 100644 --- a/include/osg/Timer +++ b/include/osg/Timer @@ -67,7 +67,7 @@ class OSG_EXPORT Timer { /** Get the time in nanoseconds between timer ticks t1 and t2.*/ inline double delta_n( Timer_t t1, Timer_t t2 ) const { return delta_s(t1,t2)*1e9; } - /** Get the the number of seconds per tick. */ + /** Get the number of seconds per tick. */ inline double getSecondsPerTick() const { return _secsPerTick; } protected : diff --git a/include/osg/TransferFunction b/include/osg/TransferFunction index f5456d11b..370e79cb0 100644 --- a/include/osg/TransferFunction +++ b/include/osg/TransferFunction @@ -107,10 +107,10 @@ class OSG_EXPORT TransferFunction1D : public osg::TransferFunction /** set the color map and automatically update the image to make sure they are in sync.*/ void setColorMap(const ColorMap& vcm) { assign(vcm); } - /** Get the color map that stores the mapping between the the transfer function value and the colour it maps to.*/ + /** Get the color map that stores the mapping between the transfer function value and the colour it maps to.*/ ColorMap& getColorMap() { return _colorMap; } - /** Get the const color map that stores the mapping between the the transfer function value and the colour it maps to.*/ + /** Get the const color map that stores the mapping between the transfer function value and the colour it maps to.*/ const ColorMap& getColorMap() const { return _colorMap; } /** Assign a color map and automatically update the image to make sure they are in sync.*/ diff --git a/include/osg/Uniform b/include/osg/Uniform index 6e880a924..b5130f911 100644 --- a/include/osg/Uniform +++ b/include/osg/Uniform @@ -573,7 +573,7 @@ class OSG_EXPORT Uniform : public Object /** Return the name of a Type enum as string. */ static const char* getTypename( Type t ); - /** Return the the number of components for a GLSL type. */ + /** Return the number of components for a GLSL type. */ static int getTypeNumComponents( Type t ); /** Return the Type enum of a Uniform typename string */ diff --git a/include/osgAnimation/RigTransformSoftware b/include/osgAnimation/RigTransformSoftware index 550940c72..ab2f60c78 100644 --- a/include/osgAnimation/RigTransformSoftware +++ b/include/osgAnimation/RigTransformSoftware @@ -26,7 +26,7 @@ namespace osgAnimation class RigGeometry; - /// This class manage format for hardware skinning + /// This class manage format for software skinning class OSGANIMATION_EXPORT RigTransformSoftware : public RigTransform { public: diff --git a/include/osgDB/DatabasePager b/include/osgDB/DatabasePager index 77ad479cc..8bd9954e4 100644 --- a/include/osgDB/DatabasePager +++ b/include/osgDB/DatabasePager @@ -69,7 +69,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl - /** Add a request to load a node file to end the the database request list.*/ + /** Add a request to load a node file to end the database request list.*/ virtual void requestNodeFile(const std::string& fileName, osg::NodePath& nodePath, float priority, const osg::FrameStamp* framestamp, osg::ref_ptr& databaseRequest, diff --git a/include/osgDB/ExternalFileWriter b/include/osgDB/ExternalFileWriter index 86e37b132..007774e9d 100644 --- a/include/osgDB/ExternalFileWriter +++ b/include/osgDB/ExternalFileWriter @@ -91,7 +91,7 @@ namespace osgDB const unsigned int _allowUpDirs; /// Generates a unique name for an object to be written on disk. - /// Side effect: updates _lastGeneratedObjectIndex to the index associated withe the returned name. + /// Side effect: updates _lastGeneratedObjectIndex to the index associated with the returned name. void generateObjectName(std::string & out_relativePath, std::string & out_absolutePath, int type); bool absoluteObjectPathExists(const std::string & path); diff --git a/include/osgDB/Registry b/include/osgDB/Registry index 4b2cd7f44..6851ccc55 100644 --- a/include/osgDB/Registry +++ b/include/osgDB/Registry @@ -63,7 +63,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced void readCommandLine(osg::ArgumentParser& commandLine); /** register an .fileextension alias to mapExt toExt, the later - * should the the extension name of the readerwriter plugin library. + * should be the extension name of the readerwriter plugin library. * For example to map .tif files to the tiff loader, use * addExtAlias("tif","tiff") which will enable .tif to be read * by the libdb_tiff readerwriter plugin.*/ diff --git a/include/osgSim/ScalarBar b/include/osgSim/ScalarBar index 6d25d27e5..b65e3431f 100644 --- a/include/osgSim/ScalarBar +++ b/include/osgSim/ScalarBar @@ -63,7 +63,7 @@ public: /** TextProperties allows users to specify a number of properties for the - text used to display the labels & title on the ScalarBar. Specifiying a character + text used to display the labels & title on the ScalarBar. Specifying a character size of 0 will cause the ScalarBar to estimate an appropriate size. Note that the attributes are public, and may be set directly. */ diff --git a/include/osgViewer/View b/include/osgViewer/View index 280a784e4..8d17aff38 100644 --- a/include/osgViewer/View +++ b/include/osgViewer/View @@ -227,7 +227,7 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter /** deprecated, use view.apply(new osgViewer::AcrossAllWindows()). */ void setUpViewAcrossAllScreens(); - /** depreacted, use view.apply(new osgViewer::SingleWindow(x,y,width,screenNum)). */ + /** deprecated, use view.apply(new osgViewer::SingleWindow(x,y,width,screenNum)). */ void setUpViewInWindow(int x, int y, int width, int height, unsigned int screenNum=0); /** deprecated, use view.apply(new osgViewer::SingleScreen(screenNum)). */ @@ -236,7 +236,7 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter /** deprecated, use view.apply(new osgViewer::SphericalDisplay(radius, collar, screenNum, intensityMap, projectorMatrix)). */ void setUpViewFor3DSphericalDisplay(double radius=1.0, double collar=0.45, unsigned int screenNum=0, osg::Image* intensityMap=0, const osg::Matrixd& projectorMatrix = osg::Matrixd()); - /** depreacted, use view.apply(new osgViewer::PanoramicSphericalDisplay(radius, collar, screenNum, intensityMap, projectorMatrix)). */ + /** deprecated, use view.apply(new osgViewer::PanoramicSphericalDisplay(radius, collar, screenNum, intensityMap, projectorMatrix)). */ void setUpViewForPanoramicSphericalDisplay(double radius=1.0, double collar=0.45, unsigned int screenNum=0, osg::Image* intensityMap=0, const osg::Matrixd& projectorMatrix = osg::Matrixd()); /** deprecated. use view.apply(new osgViewer::WoWVxDisplay(type (20 to 42), screenNum). */ diff --git a/src/osg/BufferObject.cpp b/src/osg/BufferObject.cpp index 38c473d33..f23386970 100644 --- a/src/osg/BufferObject.cpp +++ b/src/osg/BufferObject.cpp @@ -71,12 +71,12 @@ GLBufferObject::GLBufferObject(unsigned int contextID, BufferObject* bufferObjec _extensions->glGenBuffers(1, &_glObjectID); } - // OSG_NOTICE<<"Constucting BufferObject "<getCurrGLBufferObjectPoolSize() - _parent->getMaxGLBufferObjectPoolSize(); unsigned int maxNumObjectsToDelete = static_cast(ceil(double(sizeRequired) / double(_profile._size))); OSG_INFO<<"_parent->getCurrGLBufferObjectPoolSize()="<<_parent->getCurrGLBufferObjectPoolSize() <<" _parent->getMaxGLBufferObjectPoolSize()="<< _parent->getMaxGLBufferObjectPoolSize()<setCurrGLBufferObjectPoolSize( _parent->getCurrGLBufferObjectPoolSize() - numDeleted*_profile._size ); - // update the number of active and orphaned TextureOjects + // update the number of active and orphaned TextureObjects _parent->getNumberOrphanedGLBufferObjects() -= numDeleted; _parent->getNumberDeleted() += numDeleted; diff --git a/src/osg/GraphicsContext.cpp b/src/osg/GraphicsContext.cpp index 486ff59fe..1d4c25bc1 100644 --- a/src/osg/GraphicsContext.cpp +++ b/src/osg/GraphicsContext.cpp @@ -295,7 +295,7 @@ unsigned int GraphicsContext::createNewContextID() OSG_INFO<<"GraphicsContext::createNewContextID() creating contextID="<setMaxNumberOfGraphicsContexts( contextID + 1 ); @@ -586,7 +586,7 @@ void GraphicsContext::close(bool callCloseImplementation) // now discard any deleted deleted OpenGL objects that the are still hanging around - such as due to - // the the flushDelete*() methods not being invoked, such as when using GraphicContextEmbedded where makeCurrent + // the flushDelete*() methods not being invoked, such as when using GraphicContextEmbedded where makeCurrent // does not work. if ( !sharedContextExists && _state.valid()) { diff --git a/src/osg/Notify.cpp b/src/osg/Notify.cpp index 7b722d7a3..b6f68aece 100644 --- a/src/osg/Notify.cpp +++ b/src/osg/Notify.cpp @@ -183,7 +183,7 @@ bool osg::initNotifyLevel() return true; } -// Use a proxy to force the initialization of the the NotifySingleton during static initialization +// Use a proxy to force the initialization of the NotifySingleton during static initialization OSG_INIT_SINGLETON_PROXY(NotifySingletonProxy, osg::initNotifyLevel()) void osg::setNotifyLevel(osg::NotifySeverity severity) diff --git a/src/osg/OperationThread.cpp b/src/osg/OperationThread.cpp index defa2ae9e..389931736 100644 --- a/src/osg/OperationThread.cpp +++ b/src/osg/OperationThread.cpp @@ -339,7 +339,7 @@ int OperationThread::cancel() if (_currentOperation.valid()) _currentOperation->release(); } - // then wait for the the thread to stop running. + // then wait for the thread to stop running. while(isRunning()) { diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index 5b973c112..082a4d888 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -579,7 +579,7 @@ void Texture::TextureObjectSet::discardAllDeletedTextureObjects() // update the TextureObjectManager's running total of current pool size _parent->getCurrTexturePoolSize() -= numDiscarded*_profile._size; - // update the number of active and orphaned TextureOjects + // update the number of active and orphaned TextureObjects _parent->getNumberOrphanedTextureObjects() -= numDiscarded; _parent->getNumberDeleted() += numDiscarded; @@ -623,7 +623,7 @@ void Texture::TextureObjectSet::flushDeletedTextureObjects(double /*currentTime* _orphanedTextureObjects.size(); OSG_INFO<<"_parent->getCurrTexturePoolSize()="<<_parent->getCurrTexturePoolSize() <<" _parent->getMaxTexturePoolSize()="<< _parent->getMaxTexturePoolSize()<getCurrTexturePoolSize() -= numDeleted*_profile._size; - // update the number of active and orphaned TextureOjects + // update the number of active and orphaned TextureObjects _parent->getNumberOrphanedTextureObjects() -= numDeleted; _parent->getNumberDeleted() += numDeleted; @@ -691,7 +691,7 @@ osg::ref_ptr Texture::TextureObjectSet::takeFromOrphans( // assign to new texture to->setTexture(texture); - // update the number of active and orphaned TextureOjects + // update the number of active and orphaned TextureObjects _parent->getNumberOrphanedTextureObjects() -= 1; _parent->getNumberActiveTextureObjects() += 1; diff --git a/src/osg/dxtctool.h b/src/osg/dxtctool.h index 5d5f252d5..f24cf9c90 100644 --- a/src/osg/dxtctool.h +++ b/src/osg/dxtctool.h @@ -2,7 +2,7 @@ // ////////////////////////////////////////////////////////////////////// // -// Copyright (C) 2002 Tanguy Fautré. +// Copyright (C) 2002 Tanguy Fautr. // // This software is provided 'as-is', without any express or implied // warranty. In no event will the authors be held liable for any damages @@ -20,7 +20,7 @@ // misrepresented as being the original software. // 3. This notice may not be removed or altered from any source distribution. // -// Tanguy Fautré +// Tanguy Fautr // softdev@telenet.be // ////////////////////////////////////////////////////////////////////// @@ -197,7 +197,7 @@ inline void dxtc_pixels::BVF_Color_H2(void * const pBlock) const { inline void dxtc_pixels::BVF_Color_H4(void * const pBlock) const { - // Swap the the first row of pixels with the last one, then the 2 middle row of pixels + // Swap the first row of pixels with the last one, then the 2 middle row of pixels dxtc_int8 * pP = ((dxtc_int8 *) pBlock) + 4; std::swap(pP[0], pP[3]); @@ -232,7 +232,7 @@ inline void dxtc_pixels::BVF_Alpha_DXT3_H2(void * const pBlock) const { inline void dxtc_pixels::BVF_Alpha_DXT3_H4(void * const pBlock) const { - // Swap the the first row of pixels with the last one, then the 2 middle row of pixels + // Swap the first row of pixels with the last one, then the 2 middle row of pixels dxtc_int16 * pP = (dxtc_int16 * ) pBlock; std::swap(pP[0], pP[3]); @@ -268,7 +268,7 @@ inline void dxtc_pixels::BVF_Alpha_DXT5_H2(void * const pBlock) const { inline void dxtc_pixels::BVF_Alpha_DXT5_H4(void * const pBlock) const { - // Swap the the first row of pixels with the last one, then the 2 middle row of pixels (tricky again) + // Swap the first row of pixels with the last one, then the 2 middle row of pixels (tricky again) dxtc_int64 * pB = (dxtc_int64 * ) pBlock; dxtc_int64 TmpQWord = (pB[0] & HEX_0x000000000000FFFF); diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp index e8d9651f6..035e5f26b 100644 --- a/src/osgDB/FileUtils.cpp +++ b/src/osgDB/FileUtils.cpp @@ -1094,7 +1094,7 @@ bool osgDB::containsCurrentWorkingDirectoryReference(const FilePathList& paths) FSRef f; OSErr errCode; - // Start with the the Bundle PlugIns directory. + // Start with the Bundle PlugIns directory. // Get the main bundle first. No need to retain or release it since // we are not keeping a reference diff --git a/src/osgDB/ImagePager.cpp b/src/osgDB/ImagePager.cpp index 55948b074..603b0141f 100644 --- a/src/osgDB/ImagePager.cpp +++ b/src/osgDB/ImagePager.cpp @@ -157,7 +157,7 @@ int ImagePager::ImageThread::cancel() // release the frameBlock and _databasePagerThreadBlock in case its holding up thread cancellation. // _databasePagerThreadBlock->release(); - // then wait for the the thread to stop running. + // then wait for the thread to stop running. join(); // _startThreadCalled = false; diff --git a/src/osgGA/StateSetManipulator.cpp b/src/osgGA/StateSetManipulator.cpp index a3553776a..cd75cb06a 100644 --- a/src/osgGA/StateSetManipulator.cpp +++ b/src/osgGA/StateSetManipulator.cpp @@ -41,7 +41,7 @@ void StateSetManipulator::setStateSet(StateSet *stateset) // specify that this stateset is dynamic so it prevents // the draw and update phase from overlapping - good for // stability but breaks all the performance advantage of - // DrawThreadPerContex. + // DrawThreadPerContext. _stateset->setDataVariance(osg::Object::DYNAMIC); #endif } diff --git a/src/osgPlugins/3ds/ReaderWriter3DS.cpp b/src/osgPlugins/3ds/ReaderWriter3DS.cpp index 51873bc13..80452a36d 100644 --- a/src/osgPlugins/3ds/ReaderWriter3DS.cpp +++ b/src/osgPlugins/3ds/ReaderWriter3DS.cpp @@ -1418,7 +1418,7 @@ ReaderWriter3DS::StateSetInfo ReaderWriter3DS::ReaderObject::createStateSet(Lib3 // Set back face culling state if single sided material applied. // This seems like a reasonable assumption given that the backface cull option // doesn't appear to be encoded directly in the 3DS format, and also because - // it mirrors the effect of code in 3DS writer which uses the the face culling + // it mirrors the effect of code in 3DS writer which uses the face culling // attribute to determine the state of the 'two_sided' 3DS material being written. if (!mat->two_sided) { diff --git a/src/osgPlugins/ac/ac3d.cpp b/src/osgPlugins/ac/ac3d.cpp index 199daf8d4..11eebe329 100644 --- a/src/osgPlugins/ac/ac3d.cpp +++ b/src/osgPlugins/ac/ac3d.cpp @@ -1005,7 +1005,7 @@ class SurfaceBin : public PrimitiveBin { shadeModel->setMode(osg::ShadeModel::FLAT); stateSet->setAttribute(shadeModel); - // Set up the arrays, allways store texture coords, may be we need them later ... + // Set up the arrays, always store texture coords, may be we need them later ... osg::Geometry* geometry = new osg::Geometry; _geode->addDrawable(geometry); geometry->setDataVariance(osg::Object::STATIC); @@ -1021,7 +1021,7 @@ class SurfaceBin : public PrimitiveBin { geometry->setTexCoordArray(0, texcoordArray); } - // At first handle the the polygons to tessellate, fix them and append the other polygons later + // At first handle the polygons to tessellate, fix them and append the other polygons later if (!_toTessellatePolygons.empty()) { for (unsigned i = 0; i < _toTessellatePolygons.size(); ++i) diff --git a/src/osgPlugins/cfg/RenderSurface.h b/src/osgPlugins/cfg/RenderSurface.h index b7d66a1c2..09e4baa86 100644 --- a/src/osgPlugins/cfg/RenderSurface.h +++ b/src/osgPlugins/cfg/RenderSurface.h @@ -258,7 +258,7 @@ class RenderSurface : public osg::Referenced */ static void shareAllGLContexts(bool); - /** Returns true or false indicating the the state flag for sharing contexts + /** Returns true or false indicating the state flag for sharing contexts * between RenderSurfaces */ static bool allGLContextsAreShared(); diff --git a/src/osgPlugins/zip/unzip.cpp b/src/osgPlugins/zip/unzip.cpp index 7bd83bed1..8e698fb28 100644 --- a/src/osgPlugins/zip/unzip.cpp +++ b/src/osgPlugins/zip/unzip.cpp @@ -3131,7 +3131,7 @@ unzFile unzOpenInternal(LUFILE *fin) uLong number_disk=0; // number of the current dist, used for spanning ZIP, unsupported, always 0 if (err==UNZ_OK && unzlocal_getShort(fin,&number_disk)!=UNZ_OK) err=UNZ_ERRNO; // number of the disk with the start of the central directory - uLong number_disk_with_CD=0; // number the the disk with central dir, used for spaning ZIP, unsupported, always 0 + uLong number_disk_with_CD=0; // number the disk with central dir, used for spaning ZIP, unsupported, always 0 if (err==UNZ_OK && unzlocal_getShort(fin,&number_disk_with_CD)!=UNZ_OK) err=UNZ_ERRNO; // total number of entries in the central dir on this disk if (err==UNZ_OK && unzlocal_getShort(fin,&us.gi.number_entry)!=UNZ_OK) err=UNZ_ERRNO; diff --git a/src/osgPresentation/Timeout.cpp b/src/osgPresentation/Timeout.cpp index 1beaa8c21..5718441ef 100644 --- a/src/osgPresentation/Timeout.cpp +++ b/src/osgPresentation/Timeout.cpp @@ -228,7 +228,7 @@ void Timeout::traverse(osg::NodeVisitor& nv) cv->setCurrentRenderBin(previousRenderBin); // and the render to texture stage to the current stages - // dependancy list. + // dependency list. cv->getCurrentRenderBin()->getStage()->addPostRenderStage(rs.get(),0); } } diff --git a/src/osgUtil/CullVisitor.cpp b/src/osgUtil/CullVisitor.cpp index 2e696cf24..e68092068 100644 --- a/src/osgUtil/CullVisitor.cpp +++ b/src/osgUtil/CullVisitor.cpp @@ -1596,7 +1596,7 @@ void CullVisitor::apply(osg::Camera& camera) rtts->reset(); } - // set up clera masks/values + // set up clear masks/values rtts->setClearDepth(camera.getClearDepth()); rtts->setClearAccum(camera.getClearAccum()); rtts->setClearStencil(camera.getClearStencil()); @@ -1664,7 +1664,7 @@ void CullVisitor::apply(osg::Camera& camera) // and the render to texture stage to the current stages - // dependancy list. + // dependency list. switch(camera.getRenderOrder()) { case osg::Camera::PRE_RENDER: diff --git a/src/osgUtil/IntersectVisitor.cpp b/src/osgUtil/IntersectVisitor.cpp index 41140d51e..e2011422a 100644 --- a/src/osgUtil/IntersectVisitor.cpp +++ b/src/osgUtil/IntersectVisitor.cpp @@ -205,7 +205,7 @@ void IntersectVisitor::reset() { _intersectStateStack.clear(); - // create a empty IntersectState on the the intersectStateStack. + // create a empty IntersectState on the intersectStateStack. _intersectStateStack.push_back(new IntersectState); _segHitList.clear(); diff --git a/src/osgUtil/RenderBin.cpp b/src/osgUtil/RenderBin.cpp index 1f6b348ad..edd23293f 100644 --- a/src/osgUtil/RenderBin.cpp +++ b/src/osgUtil/RenderBin.cpp @@ -54,7 +54,7 @@ static RenderBinPrototypeList* renderBinPrototypeList() return s_renderBinPrototypeList.get(); } -// Use a proxy to force the initialization of the the RenderBinPrototypeListSingleton during static initialization +// Use a proxy to force the initialization of the RenderBinPrototypeListSingleton during static initialization OSG_INIT_SINGLETON_PROXY(RenderBinSingletonProxy, renderBinPrototypeList()) diff --git a/src/osgUtil/SceneView.cpp b/src/osgUtil/SceneView.cpp index b9ab69256..3340f61e9 100644 --- a/src/osgUtil/SceneView.cpp +++ b/src/osgUtil/SceneView.cpp @@ -998,7 +998,7 @@ void SceneView::draw() flushDeletedGLObjects(availableTime); } - // assume the the draw which is about to happen could generate GL objects that need flushing in the next frame. + // assume the draw which is about to happen could generate GL objects that need flushing in the next frame. _requiresFlush = _automaticFlush; RenderLeaf* previous = NULL;