From Jannik Heller, typo fixes

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14882 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-06-01 13:11:49 +00:00
parent e0028bef6e
commit d14a602a59
42 changed files with 67 additions and 67 deletions

View File

@ -5,12 +5,12 @@
# SDL2_INCLUDE_DIR, where to find SDL.h # SDL2_INCLUDE_DIR, where to find SDL.h
# SDL2_VERSION_STRING, human-readable string containing the version of SDL # 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 # SDL2_BUILDING_LIBRARY
# If this is defined, then no SDL2_main will be linked in because # If this is defined, then no SDL2_main will be linked in because
# only applications need main(). # only applications need main().
# Otherwise, it is assumed you are building an application and this # 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. # as part of the returned SDL2_LIBRARY variable.
# #
# Don't forget to include SDLmain.h and SDLmain.m your project for the # Don't forget to include SDLmain.h and SDLmain.m your project for the

View File

@ -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. // call all node update callbacks and animations.
viewer.eventTraversal(); 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. // call all node update callbacks and animations.
viewer.updateTraversal(); viewer.updateTraversal();

View File

@ -615,7 +615,7 @@ int main( int argc, char **argv )
osg::notify(osg::INFO)<<"Time to do cluster sync "<<osg::Timer::instance()->delta_m(startTick,endTick)<<std::endl; osg::notify(osg::INFO)<<"Time to do cluster sync "<<osg::Timer::instance()->delta_m(startTick,endTick)<<std::endl;
// 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. // call all node update callbacks and animations.
viewer.eventTraversal(); viewer.eventTraversal();
viewer.updateTraversal(); viewer.updateTraversal();

View File

@ -20,7 +20,7 @@
/*! /*!
The DePee class is main class for setting up and managing depth peeling. The DePee class is main class for setting up and managing depth peeling.
A DePee object can be seen as a virtual node, that has one parent and one child. The rendering of every child and subchil of this child is managed by the the DePee node. Besides that, it handles a head up display. A DePee object can be seen as a virtual node, that has one parent and one child. The rendering of every child and subchil of this child is managed by the DePee node. Besides that, it handles a head up display.
*/ */
class DePee : public osg::Referenced class DePee : public osg::Referenced
{ {

View File

@ -401,7 +401,7 @@ int main( int argc, char **argv )
// we must assign callback as both an update and cull callback, as update callback to do the update of // we must assign callback as both an update and cull callback, as update callback to do the update of
// the the osgFX::MultiTextureControl node a thread safe way, and as a cull callback to gather the camera // the osgFX::MultiTextureControl node a thread safe way, and as a cull callback to gather the camera
// position information. // position information.
ElevationLayerBlendingCallback* elbc = new ElevationLayerBlendingCallback(mtc, elevations); ElevationLayerBlendingCallback* elbc = new ElevationLayerBlendingCallback(mtc, elevations);
terrain->setUpdateCallback(elbc); terrain->setUpdateCallback(elbc);

View File

@ -316,7 +316,7 @@ public:
{ {
// insert particle effects alongside the hit node, therefore able to track that nodes movement, // 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 // 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 // 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! // moving models is easy - just a single line of code!

View File

@ -47,7 +47,7 @@ int main( int argc, char **argv )
if (!loadedModel) if (!loadedModel)
{ {
osg::notify(osg::NOTICE)<<"Please specifiy a model filename on the command line."<<std::endl; osg::notify(osg::NOTICE)<<"Please specify a model filename on the command line."<<std::endl;
return 1; return 1;
} }

View File

@ -546,7 +546,7 @@ public:
originalImage->getPixelFormat(),originalImage->getDataType(), // same pixel foramt and data type originalImage->getPixelFormat(),originalImage->getDataType(), // same pixel foramt and data type
originalImage->data(originalImage->s()/4,originalImage->t()/4), // offset teh start point to 1/4 into the image originalImage->data(originalImage->s()/4,originalImage->t()/4), // offset 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 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 originalImage->s()); // use the width of the original image as the row width

View File

@ -307,7 +307,7 @@ class TestGraph
This was written to aid the auto-registration of tests at specific points in 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 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 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. already exists.
@ -481,9 +481,9 @@ public:
TestRunner( TestContext& ctx ); 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. 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 Specifying "root.osg.de" will run all tests (and suites) below
\em root.osg with names beginning with the \em de. \em root.osg with names beginning with the \em de.
*/ */

View File

@ -1224,7 +1224,7 @@ int main( int argc, char **argv )
// set the scene to render // set the scene to render
viewer.setSceneData(loadedModel.get()); viewer.setSceneData(loadedModel.get());
// the the viewers main frame loop // the viewers main frame loop
viewer.run(); viewer.run();
} }

View File

@ -272,7 +272,7 @@ class OSG_EXPORT GraphicsContext : public Object
typedef std::list< ref_ptr<Operation> > GraphicsOperationQueue; typedef std::list< ref_ptr<Operation> > 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; } GraphicsOperationQueue& getOperationsQueue() { return _operations; }
/** Get the operations queue mutex.*/ /** Get the operations queue mutex.*/
@ -467,10 +467,10 @@ class OSG_EXPORT GraphicsContext : public Object
typedef std::list< osg::Camera* > Cameras; 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; } 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; } 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 */ /** set the default FBO-id, this id will be used when the rendering-backend is finished with RTT FBOs */

View File

@ -118,7 +118,7 @@ class OSG_EXPORT StateAttribute : public Object
* extending the osg's StateAttribute's simply define your * extending the osg's StateAttribute's simply define your
* own Type value which is unique, using the StateAttribute::Type * own Type value which is unique, using the StateAttribute::Type
* enum as a guide of what values to use. If your new subclass * 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. */ * that type's value. */
enum Type enum Type
{ {

View File

@ -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. * Should only be called within an osg::Texture::apply() and custom OpenGL texture load.
*/ */
void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } 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; } unsigned int getNumMipmapLevels() const { return _numMipmapLevels; }
/** Copies a two-dimensional texture subimage, as per /** 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. // subloaded images can have different texture and image sizes.
mutable GLsizei _textureWidth, _textureHeight, _textureDepth; 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; mutable GLsizei _numMipmapLevels;
ref_ptr<SubloadCallback> _subloadCallback; ref_ptr<SubloadCallback> _subloadCallback;

View File

@ -152,7 +152,7 @@ class OSG_EXPORT Texture3D : public Texture
/** Subloaded images can have different texture and image sizes. */ /** Subloaded images can have different texture and image sizes. */
mutable GLsizei _textureWidth, _textureHeight, _textureDepth; 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; mutable GLsizei _numMipmapLevels;
ref_ptr<SubloadCallback> _subloadCallback; ref_ptr<SubloadCallback> _subloadCallback;

View File

@ -94,12 +94,12 @@ class OSG_EXPORT TextureCubeMap : public Texture
const SubloadCallback* getSubloadCallback() const { return _subloadCallback.get(); } 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. * Should only be called within an osg::Texuture::apply() and custom OpenGL texture load.
*/ */
void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } 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; } unsigned int getNumMipmapLevels() const { return _numMipmapLevels; }
/** Copies a two-dimensional texture subimage, as per /** 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. // subloaded images can have different texture and image sizes.
mutable GLsizei _textureWidth, _textureHeight; 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; mutable GLsizei _numMipmapLevels;
ref_ptr<SubloadCallback> _subloadCallback; ref_ptr<SubloadCallback> _subloadCallback;

View File

@ -67,7 +67,7 @@ class OSG_EXPORT Timer {
/** Get the time in nanoseconds between timer ticks t1 and t2.*/ /** 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; } 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; } inline double getSecondsPerTick() const { return _secsPerTick; }
protected : protected :

View File

@ -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.*/ /** set the color map and automatically update the image to make sure they are in sync.*/
void setColorMap(const ColorMap& vcm) { assign(vcm); } 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; } 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; } const ColorMap& getColorMap() const { return _colorMap; }
/** Assign a color map and automatically update the image to make sure they are in sync.*/ /** Assign a color map and automatically update the image to make sure they are in sync.*/

View File

@ -573,7 +573,7 @@ class OSG_EXPORT Uniform : public Object
/** Return the name of a Type enum as string. */ /** Return the name of a Type enum as string. */
static const char* getTypename( Type t ); 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 ); static int getTypeNumComponents( Type t );
/** Return the Type enum of a Uniform typename string */ /** Return the Type enum of a Uniform typename string */

View File

@ -26,7 +26,7 @@ namespace osgAnimation
class RigGeometry; class RigGeometry;
/// This class manage format for hardware skinning /// This class manage format for software skinning
class OSGANIMATION_EXPORT RigTransformSoftware : public RigTransform class OSGANIMATION_EXPORT RigTransformSoftware : public RigTransform
{ {
public: public:

View File

@ -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, virtual void requestNodeFile(const std::string& fileName, osg::NodePath& nodePath,
float priority, const osg::FrameStamp* framestamp, float priority, const osg::FrameStamp* framestamp,
osg::ref_ptr<osg::Referenced>& databaseRequest, osg::ref_ptr<osg::Referenced>& databaseRequest,

View File

@ -91,7 +91,7 @@ namespace osgDB
const unsigned int _allowUpDirs; const unsigned int _allowUpDirs;
/// Generates a unique name for an object to be written on disk. /// 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); void generateObjectName(std::string & out_relativePath, std::string & out_absolutePath, int type);
bool absoluteObjectPathExists(const std::string & path); bool absoluteObjectPathExists(const std::string & path);

View File

@ -63,7 +63,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
void readCommandLine(osg::ArgumentParser& commandLine); void readCommandLine(osg::ArgumentParser& commandLine);
/** register an .fileextension alias to mapExt toExt, the later /** 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 * For example to map .tif files to the tiff loader, use
* addExtAlias("tif","tiff") which will enable .tif to be read * addExtAlias("tif","tiff") which will enable .tif to be read
* by the libdb_tiff readerwriter plugin.*/ * by the libdb_tiff readerwriter plugin.*/

View File

@ -63,7 +63,7 @@ public:
/** /**
TextProperties allows users to specify a number of properties for the 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 size of 0 will cause the ScalarBar to estimate an appropriate size. Note that
the attributes are public, and may be set directly. the attributes are public, and may be set directly.
*/ */

View File

@ -227,7 +227,7 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter
/** deprecated, use view.apply(new osgViewer::AcrossAllWindows()). */ /** deprecated, use view.apply(new osgViewer::AcrossAllWindows()). */
void setUpViewAcrossAllScreens(); 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); void setUpViewInWindow(int x, int y, int width, int height, unsigned int screenNum=0);
/** deprecated, use view.apply(new osgViewer::SingleScreen(screenNum)). */ /** 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)). */ /** 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()); 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()); 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). */ /** deprecated. use view.apply(new osgViewer::WoWVxDisplay(type (20 to 42), screenNum). */

View File

@ -71,12 +71,12 @@ GLBufferObject::GLBufferObject(unsigned int contextID, BufferObject* bufferObjec
_extensions->glGenBuffers(1, &_glObjectID); _extensions->glGenBuffers(1, &_glObjectID);
} }
// OSG_NOTICE<<"Constucting BufferObject "<<this<<std::endl; // OSG_NOTICE<<"Constructing BufferObject "<<this<<std::endl;
} }
GLBufferObject::~GLBufferObject() GLBufferObject::~GLBufferObject()
{ {
//OSG_NOTICE<<"Destucting BufferObject "<<this<<std::endl; //OSG_NOTICE<<"Destructing BufferObject "<<this<<std::endl;
} }
void GLBufferObject::setBufferObject(BufferObject* bufferObject) void GLBufferObject::setBufferObject(BufferObject* bufferObject)
@ -529,7 +529,7 @@ void GLBufferObjectSet::flushDeletedGLBufferObjects(double /*currentTime*/, doub
unsigned int sizeRequired = _parent->getCurrGLBufferObjectPoolSize() - _parent->getMaxGLBufferObjectPoolSize(); unsigned int sizeRequired = _parent->getCurrGLBufferObjectPoolSize() - _parent->getMaxGLBufferObjectPoolSize();
unsigned int maxNumObjectsToDelete = static_cast<unsigned int>(ceil(double(sizeRequired) / double(_profile._size))); unsigned int maxNumObjectsToDelete = static_cast<unsigned int>(ceil(double(sizeRequired) / double(_profile._size)));
OSG_INFO<<"_parent->getCurrGLBufferObjectPoolSize()="<<_parent->getCurrGLBufferObjectPoolSize() <<" _parent->getMaxGLBufferObjectPoolSize()="<< _parent->getMaxGLBufferObjectPoolSize()<<std::endl; OSG_INFO<<"_parent->getCurrGLBufferObjectPoolSize()="<<_parent->getCurrGLBufferObjectPoolSize() <<" _parent->getMaxGLBufferObjectPoolSize()="<< _parent->getMaxGLBufferObjectPoolSize()<<std::endl;
OSG_INFO<<"Looking to reclaim "<<sizeRequired<<", going to look to remove "<<maxNumObjectsToDelete<<" from "<<_orphanedGLBufferObjects.size()<<" orhpans"<<std::endl; OSG_INFO<<"Looking to reclaim "<<sizeRequired<<", going to look to remove "<<maxNumObjectsToDelete<<" from "<<_orphanedGLBufferObjects.size()<<" orphans"<<std::endl;
ElapsedTime timer; ElapsedTime timer;
@ -553,7 +553,7 @@ void GLBufferObjectSet::flushDeletedGLBufferObjects(double /*currentTime*/, doub
_parent->setCurrGLBufferObjectPoolSize( _parent->getCurrGLBufferObjectPoolSize() - numDeleted*_profile._size ); _parent->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->getNumberOrphanedGLBufferObjects() -= numDeleted;
_parent->getNumberDeleted() += numDeleted; _parent->getNumberDeleted() += numDeleted;

View File

@ -295,7 +295,7 @@ unsigned int GraphicsContext::createNewContextID()
OSG_INFO<<"GraphicsContext::createNewContextID() creating contextID="<<contextID<<std::endl; OSG_INFO<<"GraphicsContext::createNewContextID() creating contextID="<<contextID<<std::endl;
OSG_INFO<<"Updating the MaxNumberOfGraphicsContexts to "<<contextID+1<<std::endl; OSG_INFO<<"Updating the MaxNumberOfGraphicsContexts to "<<contextID+1<<std::endl;
// update the the maximum number of graphics contexts, // update the maximum number of graphics contexts,
// to ensure that texture objects and display buffers are configured to the correct size. // to ensure that texture objects and display buffers are configured to the correct size.
osg::DisplaySettings::instance()->setMaxNumberOfGraphicsContexts( contextID + 1 ); osg::DisplaySettings::instance()->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 // 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. // does not work.
if ( !sharedContextExists && _state.valid()) if ( !sharedContextExists && _state.valid())
{ {

View File

@ -183,7 +183,7 @@ bool osg::initNotifyLevel()
return true; 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()) OSG_INIT_SINGLETON_PROXY(NotifySingletonProxy, osg::initNotifyLevel())
void osg::setNotifyLevel(osg::NotifySeverity severity) void osg::setNotifyLevel(osg::NotifySeverity severity)

View File

@ -339,7 +339,7 @@ int OperationThread::cancel()
if (_currentOperation.valid()) _currentOperation->release(); if (_currentOperation.valid()) _currentOperation->release();
} }
// then wait for the the thread to stop running. // then wait for the thread to stop running.
while(isRunning()) while(isRunning())
{ {

View File

@ -579,7 +579,7 @@ void Texture::TextureObjectSet::discardAllDeletedTextureObjects()
// update the TextureObjectManager's running total of current pool size // update the TextureObjectManager's running total of current pool size
_parent->getCurrTexturePoolSize() -= numDiscarded*_profile._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->getNumberOrphanedTextureObjects() -= numDiscarded;
_parent->getNumberDeleted() += numDiscarded; _parent->getNumberDeleted() += numDiscarded;
@ -623,7 +623,7 @@ void Texture::TextureObjectSet::flushDeletedTextureObjects(double /*currentTime*
_orphanedTextureObjects.size(); _orphanedTextureObjects.size();
OSG_INFO<<"_parent->getCurrTexturePoolSize()="<<_parent->getCurrTexturePoolSize() <<" _parent->getMaxTexturePoolSize()="<< _parent->getMaxTexturePoolSize()<<std::endl; OSG_INFO<<"_parent->getCurrTexturePoolSize()="<<_parent->getCurrTexturePoolSize() <<" _parent->getMaxTexturePoolSize()="<< _parent->getMaxTexturePoolSize()<<std::endl;
OSG_INFO<<"Looking to reclaim "<<sizeRequired<<", going to look to remove "<<maxNumObjectsToDelete<<" from "<<_orphanedTextureObjects.size()<<" orhpans"<<std::endl; OSG_INFO<<"Looking to reclaim "<<sizeRequired<<", going to look to remove "<<maxNumObjectsToDelete<<" from "<<_orphanedTextureObjects.size()<<" orphans"<<std::endl;
ElapsedTime timer; ElapsedTime timer;
@ -650,7 +650,7 @@ void Texture::TextureObjectSet::flushDeletedTextureObjects(double /*currentTime*
_parent->getCurrTexturePoolSize() -= numDeleted*_profile._size; _parent->getCurrTexturePoolSize() -= numDeleted*_profile._size;
// update the number of active and orphaned TextureOjects // update the number of active and orphaned TextureObjects
_parent->getNumberOrphanedTextureObjects() -= numDeleted; _parent->getNumberOrphanedTextureObjects() -= numDeleted;
_parent->getNumberDeleted() += numDeleted; _parent->getNumberDeleted() += numDeleted;
@ -691,7 +691,7 @@ osg::ref_ptr<Texture::TextureObject> Texture::TextureObjectSet::takeFromOrphans(
// assign to new texture // assign to new texture
to->setTexture(texture); to->setTexture(texture);
// update the number of active and orphaned TextureOjects // update the number of active and orphaned TextureObjects
_parent->getNumberOrphanedTextureObjects() -= 1; _parent->getNumberOrphanedTextureObjects() -= 1;
_parent->getNumberActiveTextureObjects() += 1; _parent->getNumberActiveTextureObjects() += 1;

View File

@ -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 // This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages // warranty. In no event will the authors be held liable for any damages
@ -20,7 +20,7 @@
// misrepresented as being the original software. // misrepresented as being the original software.
// 3. This notice may not be removed or altered from any source distribution. // 3. This notice may not be removed or altered from any source distribution.
// //
// Tanguy Fautré // Tanguy Fautr
// softdev@telenet.be // 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 { 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; dxtc_int8 * pP = ((dxtc_int8 *) pBlock) + 4;
std::swap(pP[0], pP[3]); 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 { 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; dxtc_int16 * pP = (dxtc_int16 * ) pBlock;
std::swap(pP[0], pP[3]); 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 { 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 * pB = (dxtc_int64 * ) pBlock;
dxtc_int64 TmpQWord = (pB[0] & HEX_0x000000000000FFFF); dxtc_int64 TmpQWord = (pB[0] & HEX_0x000000000000FFFF);

View File

@ -1094,7 +1094,7 @@ bool osgDB::containsCurrentWorkingDirectoryReference(const FilePathList& paths)
FSRef f; FSRef f;
OSErr errCode; 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 // Get the main bundle first. No need to retain or release it since
// we are not keeping a reference // we are not keeping a reference

View File

@ -157,7 +157,7 @@ int ImagePager::ImageThread::cancel()
// release the frameBlock and _databasePagerThreadBlock in case its holding up thread cancellation. // release the frameBlock and _databasePagerThreadBlock in case its holding up thread cancellation.
// _databasePagerThreadBlock->release(); // _databasePagerThreadBlock->release();
// then wait for the the thread to stop running. // then wait for the thread to stop running.
join(); join();
// _startThreadCalled = false; // _startThreadCalled = false;

View File

@ -41,7 +41,7 @@ void StateSetManipulator::setStateSet(StateSet *stateset)
// specify that this stateset is dynamic so it prevents // specify that this stateset is dynamic so it prevents
// the draw and update phase from overlapping - good for // the draw and update phase from overlapping - good for
// stability but breaks all the performance advantage of // stability but breaks all the performance advantage of
// DrawThreadPerContex. // DrawThreadPerContext.
_stateset->setDataVariance(osg::Object::DYNAMIC); _stateset->setDataVariance(osg::Object::DYNAMIC);
#endif #endif
} }

View File

@ -1418,7 +1418,7 @@ ReaderWriter3DS::StateSetInfo ReaderWriter3DS::ReaderObject::createStateSet(Lib3
// Set back face culling state if single sided material applied. // Set back face culling state if single sided material applied.
// This seems like a reasonable assumption given that the backface cull option // 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 // 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. // attribute to determine the state of the 'two_sided' 3DS material being written.
if (!mat->two_sided) if (!mat->two_sided)
{ {

View File

@ -1005,7 +1005,7 @@ class SurfaceBin : public PrimitiveBin {
shadeModel->setMode(osg::ShadeModel::FLAT); shadeModel->setMode(osg::ShadeModel::FLAT);
stateSet->setAttribute(shadeModel); 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; osg::Geometry* geometry = new osg::Geometry;
_geode->addDrawable(geometry); _geode->addDrawable(geometry);
geometry->setDataVariance(osg::Object::STATIC); geometry->setDataVariance(osg::Object::STATIC);
@ -1021,7 +1021,7 @@ class SurfaceBin : public PrimitiveBin {
geometry->setTexCoordArray(0, texcoordArray); 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()) if (!_toTessellatePolygons.empty())
{ {
for (unsigned i = 0; i < _toTessellatePolygons.size(); ++i) for (unsigned i = 0; i < _toTessellatePolygons.size(); ++i)

View File

@ -258,7 +258,7 @@ class RenderSurface : public osg::Referenced
*/ */
static void shareAllGLContexts(bool); 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 * between RenderSurfaces
*/ */
static bool allGLContextsAreShared(); static bool allGLContextsAreShared();

View File

@ -3131,7 +3131,7 @@ unzFile unzOpenInternal(LUFILE *fin)
uLong number_disk=0; // number of the current dist, used for spanning ZIP, unsupported, always 0 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; 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 // 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; 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 // 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; if (err==UNZ_OK && unzlocal_getShort(fin,&us.gi.number_entry)!=UNZ_OK) err=UNZ_ERRNO;

View File

@ -228,7 +228,7 @@ void Timeout::traverse(osg::NodeVisitor& nv)
cv->setCurrentRenderBin(previousRenderBin); cv->setCurrentRenderBin(previousRenderBin);
// and the render to texture stage to the current stages // and the render to texture stage to the current stages
// dependancy list. // dependency list.
cv->getCurrentRenderBin()->getStage()->addPostRenderStage(rs.get(),0); cv->getCurrentRenderBin()->getStage()->addPostRenderStage(rs.get(),0);
} }
} }

View File

@ -1596,7 +1596,7 @@ void CullVisitor::apply(osg::Camera& camera)
rtts->reset(); rtts->reset();
} }
// set up clera masks/values // set up clear masks/values
rtts->setClearDepth(camera.getClearDepth()); rtts->setClearDepth(camera.getClearDepth());
rtts->setClearAccum(camera.getClearAccum()); rtts->setClearAccum(camera.getClearAccum());
rtts->setClearStencil(camera.getClearStencil()); rtts->setClearStencil(camera.getClearStencil());
@ -1664,7 +1664,7 @@ void CullVisitor::apply(osg::Camera& camera)
// and the render to texture stage to the current stages // and the render to texture stage to the current stages
// dependancy list. // dependency list.
switch(camera.getRenderOrder()) switch(camera.getRenderOrder())
{ {
case osg::Camera::PRE_RENDER: case osg::Camera::PRE_RENDER:

View File

@ -205,7 +205,7 @@ void IntersectVisitor::reset()
{ {
_intersectStateStack.clear(); _intersectStateStack.clear();
// create a empty IntersectState on the the intersectStateStack. // create a empty IntersectState on the intersectStateStack.
_intersectStateStack.push_back(new IntersectState); _intersectStateStack.push_back(new IntersectState);
_segHitList.clear(); _segHitList.clear();

View File

@ -54,7 +54,7 @@ static RenderBinPrototypeList* renderBinPrototypeList()
return s_renderBinPrototypeList.get(); 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()) OSG_INIT_SINGLETON_PROXY(RenderBinSingletonProxy, renderBinPrototypeList())

View File

@ -998,7 +998,7 @@ void SceneView::draw()
flushDeletedGLObjects(availableTime); 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; _requiresFlush = _automaticFlush;
RenderLeaf* previous = NULL; RenderLeaf* previous = NULL;