From f4afa427a7bd94b503a0fb095b74714aa23ed5f2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 10 Dec 2007 17:30:18 +0000 Subject: [PATCH] From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)." --- applications/osgarchive/osgarchive.cpp | 2 +- applications/osgconv/osgconv.cpp | 8 +- examples/osgcatch/osgcatch.cpp | 6 +- examples/osgdelaunay/osgdelaunay.cpp | 2 +- examples/osgdepthpeeling/DePee.cpp | 12 +-- examples/osgdepthpeeling/osgdepthpeeling.cpp | 2 +- examples/osgfxbrowser/osgfxbrowser.cpp | 4 +- examples/osggeometry/osggeometry.cpp | 98 +++++++++---------- examples/osgimpostor/osgimpostor.cpp | 2 +- examples/osglogo/osglogo.cpp | 2 +- examples/osgmovie/osgmovie.cpp | 4 +- examples/osgpagedlod/osgpagedlod.cpp | 2 +- examples/osgphotoalbum/osgphotoalbum.cpp | 6 +- examples/osgplanets/osgplanets.cpp | 2 +- examples/osgpoints/osgpoints.cpp | 2 +- examples/osgprerender/osgprerender.cpp | 14 +-- .../osgprerendercubemap.cpp | 8 +- examples/osgreflect/osgreflect.cpp | 2 +- examples/osgslice/osgslice.cpp | 2 +- .../osgspheresegment/osgspheresegment.cpp | 2 +- examples/osgstereoimage/osgstereoimage.cpp | 8 +- examples/osgtexture1D/osgtexture1D.cpp | 2 +- examples/osgunittests/osgunittests.cpp | 2 +- examples/osgvolume/osgvolume.cpp | 12 +-- include/osg/ApplicationUsage | 2 +- include/osg/ArgumentParser | 14 +-- include/osg/Billboard | 4 +- include/osg/BlendColor | 4 +- include/osg/BlendEquation | 4 +- include/osg/BlendFunc | 2 +- include/osg/BoundingBox | 2 +- include/osg/BufferObject | 4 +- include/osg/Camera | 6 +- include/osg/CameraView | 12 +-- include/osg/ClampColor | 4 +- include/osg/CollectOccludersVisitor | 2 +- include/osg/CullSettings | 4 +- include/osg/DeleteHandler | 6 +- include/osg/Depth | 2 +- include/osg/Drawable | 10 +- include/osg/Export | 2 +- include/osg/Fog | 2 +- include/osg/FragmentProgram | 4 +- include/osg/FrameStamp | 4 +- include/osg/FrontFace | 2 +- include/osg/Geode | 2 +- include/osg/Geometry | 12 +-- include/osg/GraphicsContext | 36 +++---- include/osg/GraphicsThread | 8 +- include/osg/Group | 6 +- include/osg/Hint | 2 +- include/osg/LOD | 10 +- include/osg/Light | 2 +- include/osg/LightModel | 2 +- include/osg/Math | 4 +- include/osg/Matrixd | 6 +- include/osg/Matrixf | 6 +- include/osg/Multisample | 4 +- include/osg/Node | 6 +- include/osg/NodeVisitor | 2 +- include/osg/Object | 8 +- include/osg/Plane | 2 +- include/osg/Point | 4 +- include/osg/PolygonMode | 2 +- include/osg/PolygonOffset | 4 +- include/osg/Polytope | 2 +- include/osg/PrimitiveSet | 4 +- include/osg/ProxyNode | 2 +- include/osg/Referenced | 6 +- include/osg/Sequence | 2 +- include/osg/Shader | 2 +- include/osg/ShadowVolumeOccluder | 2 +- include/osg/ShapeDrawable | 2 +- include/osg/State | 12 +-- include/osg/StateAttribute | 4 +- include/osg/StateSet | 4 +- include/osg/StencilTwoSided | 2 +- include/osg/TemplatePrimitiveFunctor | 2 +- include/osg/TexEnvFilter | 2 +- include/osg/TexGen | 4 +- include/osg/Texture | 22 ++--- include/osg/Texture1D | 4 +- include/osg/Texture2D | 2 +- include/osg/Texture2DArray | 8 +- include/osg/Texture3D | 8 +- include/osg/TextureRectangle | 2 +- include/osg/Timer | 2 +- include/osg/Transform | 8 +- include/osg/TriangleFunctor | 2 +- include/osg/Uniform | 2 +- include/osg/Vec2b | 2 +- include/osg/Vec2d | 1 - include/osg/Vec2s | 1 - include/osg/Vec3b | 1 - include/osg/Vec3d | 1 - include/osg/Vec3f | 1 - include/osg/Vec3s | 1 - include/osg/Vec4b | 1 - include/osg/Vec4d | 1 - include/osg/Vec4f | 2 +- include/osg/Vec4s | 2 +- include/osg/Vec4ub | 2 +- include/osg/VertexProgram | 6 +- include/osg/Viewport | 4 +- include/osg/io_utils | 4 +- include/osgDB/DatabasePager | 8 +- include/osgDB/Export | 2 +- include/osgDB/FileUtils | 6 +- include/osgDB/Registry | 20 ++-- include/osgDB/SharedStateManager | 2 +- include/osgGA/AnimationPathManipulator | 4 +- include/osgGA/EventQueue | 2 +- include/osgGA/GUIActionAdapter | 4 +- include/osgGA/GUIEventAdapter | 8 +- include/osgGA/GUIEventHandler | 4 +- include/osgGA/KeySwitchMatrixManipulator | 4 +- include/osgGA/MatrixManipulator | 8 +- include/osgGA/NodeTrackerManipulator | 8 +- include/osgGA/TerrainManipulator | 4 +- include/osgGA/TrackballManipulator | 4 +- include/osgGA/UFOManipulator | 2 +- include/osgShadow/ShadowTechnique | 6 +- include/osgSim/ElevationSlice | 4 +- include/osgSim/HeightAboveTerrain | 6 +- include/osgSim/ImpostorSprite | 6 +- include/osgSim/LineOfSight | 6 +- include/osgTerrain/Locator | 4 +- include/osgTerrain/Terrain | 4 +- include/osgTerrain/TerrainTechnique | 6 +- include/osgText/Font | 2 +- include/osgText/String | 2 +- include/osgText/Text | 4 +- include/osgUtil/IntersectionVisitor | 6 +- include/osgUtil/LineSegmentIntersector | 8 +- include/osgUtil/PlaneIntersector | 2 +- include/osgUtil/PolytopeIntersector | 2 +- include/osgViewer/CompositeViewer | 2 +- include/osgViewer/Export | 4 +- include/osgViewer/GraphicsWindow | 24 ++--- include/osgViewer/Scene | 2 +- include/osgViewer/View | 14 +-- include/osgViewer/Viewer | 2 +- include/osgViewer/ViewerBase | 10 +- .../osgViewer/api/Win32/GraphicsWindowWin32 | 2 +- include/osgViewer/api/Win32/PixelBufferWin32 | 4 +- src/osg/AnimationPath.cpp | 2 +- src/osg/ApplicationUsage.cpp | 2 +- src/osg/ClipNode.cpp | 4 +- src/osg/CullingSet.cpp | 2 +- src/osg/DeleteHandler.cpp | 2 +- src/osg/DrawPixels.cpp | 2 +- src/osg/Drawable.cpp | 10 +- src/osg/FrameBufferObject.cpp | 4 +- src/osg/Geode.cpp | 4 +- src/osg/Geometry.cpp | 16 +-- src/osg/GraphicsContext.cpp | 16 +-- src/osg/GraphicsThread.cpp | 4 +- src/osg/Node.cpp | 14 +-- src/osg/OperationThread.cpp | 14 +-- src/osg/PolygonOffset.cpp | 3 +- src/osg/PolygonStipple.cpp | 2 +- src/osg/Program.cpp | 2 +- src/osg/Referenced.cpp | 4 +- src/osg/ShapeDrawable.cpp | 4 +- src/osg/State.cpp | 8 +- src/osg/StateSet.cpp | 16 +-- src/osg/Texture.cpp | 4 +- src/osg/Texture1D.cpp | 4 +- src/osg/Texture2D.cpp | 4 +- src/osg/Texture2DArray.cpp | 8 +- src/osg/Texture3D.cpp | 4 +- src/osg/TextureRectangle.cpp | 4 +- src/osg/View.cpp | 2 +- src/osg/dxtctool.cpp | 2 +- src/osgDB/DatabasePager.cpp | 12 +-- src/osgDB/DotOsgWrapper.cpp | 2 +- src/osgDB/Registry.cpp | 22 ++--- src/osgGA/DriveManipulator.cpp | 2 +- src/osgGA/TerrainManipulator.cpp | 6 +- src/osgManipulator/Projector.cpp | 2 +- src/osgPlugins/3ds/ReaderWriter3DS.cpp | 8 +- src/osgPlugins/ive/DrawArrayLengths.cpp | 2 +- src/osgPlugins/ive/DrawElementsUByte.cpp | 2 +- src/osgPlugins/ive/DrawElementsUInt.cpp | 2 +- src/osgPlugins/ive/DrawElementsUShort.cpp | 2 +- src/osgPlugins/normals/Normals.cpp | 2 +- src/osgPlugins/osgViewer/View.cpp | 4 +- src/osgShadow/ParallelSplitShadowMap.cpp | 10 +- src/osgShadow/ShadowMap.cpp | 2 +- src/osgShadow/ShadowTexture.cpp | 2 +- src/osgShadow/SoftShadowMap.cpp | 2 +- src/osgSim/Impostor.cpp | 2 +- src/osgSim/LineOfSight.cpp | 2 +- src/osgSim/SphereSegment.cpp | 42 ++++---- src/osgTerrain/GeometryTechnique.cpp | 4 +- src/osgTerrain/Layer.cpp | 2 +- src/osgTerrain/TerrainTechnique.cpp | 2 +- src/osgText/DefaultFont.cpp | 2 +- src/osgText/Font.cpp | 3 +- src/osgText/String.cpp | 2 +- src/osgText/Text.cpp | 6 +- src/osgUtil/IntersectVisitor.cpp | 4 +- src/osgUtil/IntersectionVisitor.cpp | 6 +- src/osgUtil/Optimizer.cpp | 6 +- src/osgUtil/PlaneIntersector.cpp | 2 +- src/osgUtil/RenderBin.cpp | 4 +- src/osgUtil/RenderStage.cpp | 30 +++--- src/osgUtil/Simplifier.cpp | 6 +- src/osgUtil/Tessellator.cpp | 2 +- src/osgUtil/TriStripVisitor.cpp | 2 +- src/osgViewer/CompositeViewer.cpp | 2 +- src/osgViewer/Renderer.cpp | 26 ++--- src/osgViewer/StatsHandler.cpp | 14 +-- src/osgViewer/View.cpp | 8 +- src/osgViewer/Viewer.cpp | 4 +- src/osgViewer/ViewerEventHandlers.cpp | 4 +- 216 files changed, 613 insertions(+), 619 deletions(-) diff --git a/applications/osgarchive/osgarchive.cpp b/applications/osgarchive/osgarchive.cpp index 3fb597368..449fdf64c 100644 --- a/applications/osgarchive/osgarchive.cpp +++ b/applications/osgarchive/osgarchive.cpp @@ -92,7 +92,7 @@ int main( int argc, char **argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/applications/osgconv/osgconv.cpp b/applications/osgconv/osgconv.cpp index 42fcd3680..3c97e1a9c 100644 --- a/applications/osgconv/osgconv.cpp +++ b/applications/osgconv/osgconv.cpp @@ -103,7 +103,7 @@ public: virtual void apply(osg::StateSet& stateset) { - // search for the existance of any texture object attributes + // search for the existence of any texture object attributes for(unsigned int i=0;i(stateset.getTextureAttribute(i,osg::StateAttribute::TEXTURE)); @@ -221,7 +221,7 @@ public: bool hasTexture = false; - // search for the existance of any texture object attributes + // search for the existence of any texture object attributes for(unsigned int i=0;i(stateset.getTextureAttribute(i,osg::StateAttribute::TEXTURE)); @@ -455,7 +455,7 @@ int main( int argc, char **argv ) arguments.getApplicationUsage()->setApplicationName(arguments.getApplicationName()); arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is a utility for converting between various input and output databases formats."); arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ..."); - arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display command line paramters"); + arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display command line parameters"); arguments.getApplicationUsage()->addCommandLineOption("--help-env","Display environmental variables available"); @@ -589,7 +589,7 @@ int main( int argc, char **argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgcatch/osgcatch.cpp b/examples/osgcatch/osgcatch.cpp index edf980548..0ec32334c 100644 --- a/examples/osgcatch/osgcatch.cpp +++ b/examples/osgcatch/osgcatch.cpp @@ -1393,7 +1393,7 @@ int main( int argc, char **argv ) // set up the usage document, in case we need to print out how to use this program. arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates use node masks to create stereo images."); arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] image_file_left_eye image_file_right_eye"); - arguments.getApplicationUsage()->addCommandLineOption("-d ","Time delay in sceonds between the display of successive image pairs when in auto advance mode."); + arguments.getApplicationUsage()->addCommandLineOption("-d ","Time delay in seconds between the display of successive image pairs when in auto advance mode."); arguments.getApplicationUsage()->addCommandLineOption("-a","Enter auto advance of image pairs on start up."); arguments.getApplicationUsage()->addCommandLineOption("-x ","Horizontal offset of left and right images."); arguments.getApplicationUsage()->addCommandLineOption("-y ","Vertical offset of left and right images."); @@ -1403,7 +1403,7 @@ int main( int argc, char **argv ) osgViewer::Viewer viewer; - // register the handler to add keyboard and mosue handling. + // register the handler to add keyboard and mouse handling. GameEventHandler* seh = new GameEventHandler(); viewer.addEventHandler(seh); @@ -1421,7 +1421,7 @@ int main( int argc, char **argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgdelaunay/osgdelaunay.cpp b/examples/osgdelaunay/osgdelaunay.cpp index 08bfd9cd7..ec02c4fa4 100644 --- a/examples/osgdelaunay/osgdelaunay.cpp +++ b/examples/osgdelaunay/osgdelaunay.cpp @@ -1287,7 +1287,7 @@ int main( int argc, char **argv ) return 1; } - // 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/examples/osgdepthpeeling/DePee.cpp b/examples/osgdepthpeeling/DePee.cpp index 143dfdbfd..34328688d 100644 --- a/examples/osgdepthpeeling/DePee.cpp +++ b/examples/osgdepthpeeling/DePee.cpp @@ -67,7 +67,7 @@ DePee::DePee(osg::Group* parent, osg::Group* subgraph, unsigned width, unsigned _quadGeode = Utility::getCanvasQuad(_width, _height); - //!!!Getting problems if assigning unit to texture in depth peeling subraph and removing depth peeling steps!!! + //!!!Getting problems if assigning unit to texture in depth peeling subgraph and removing depth peeling steps!!! //That's why it is done here osg::StateSet* stateset = _parent->getOrCreateStateSet(); stateset->setTextureAttributeAndModes(1, _normalDepthMap0.get(), osg::StateAttribute::ON); @@ -464,7 +464,7 @@ bool DePee::createEdgeMap(bool first) znear *= 0.9f; zfar *= 1.1f; - + // set up projection. //_dePeePasses.back()->Cameras.top()->setProjectionMatrixAsFrustum(-proj_right,proj_right,-proj_top,proj_top,znear,zfar); @@ -472,7 +472,7 @@ bool DePee::createEdgeMap(bool first) //set view _dePeePasses.back()->Cameras[EDGE_MAP]->setReferenceFrame(osg::Transform::ABSOLUTE_RF); - + _dePeePasses.back()->Cameras[EDGE_MAP]->setViewMatrixAsLookAt(osg::Vec3(0.0f,0.0f,2.0f)*bs.radius(), osg::Vec3(0.0,0.0,0.0),osg::Vec3(0.0f,1.0f,0.0f)); // set viewport @@ -483,7 +483,7 @@ bool DePee::createEdgeMap(bool first) // tell the camera to use OpenGL frame buffer object _dePeePasses.back()->Cameras[EDGE_MAP]->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER); - + //switch lighting off osg::ref_ptr stateset = new osg::StateSet; @@ -501,7 +501,7 @@ bool DePee::createEdgeMap(bool first) stateset->addUniform( new osg::Uniform("edgeMap", 3)); stateset->setMode(GL_LIGHTING,osg::StateAttribute::OVERRIDE | - osg::StateAttribute::OFF); + osg::StateAttribute::OFF); //setup shader stateset->setAttributeAndModes(_edgeMapProgram.get(), osg::StateAttribute::OVERRIDE | osg::StateAttribute::ON); stateset->addUniform(new osg::Uniform("width", (float) _width)); @@ -551,7 +551,7 @@ bool DePee::createNormalDepthColorMap(MapMode mapMode, bool first) float znear = 1.0f*bs.radius(); float zfar = 3.0f*bs.radius(); - // 2:1 aspect ratio as per flag geomtry below. + // 2:1 aspect ratio as per flag geometry below. float projTop = 0.25f*znear; float projRight = projTop * ((double)_width/(double)_height); diff --git a/examples/osgdepthpeeling/osgdepthpeeling.cpp b/examples/osgdepthpeeling/osgdepthpeeling.cpp index d81ffe727..4b9e97522 100644 --- a/examples/osgdepthpeeling/osgdepthpeeling.cpp +++ b/examples/osgdepthpeeling/osgdepthpeeling.cpp @@ -229,7 +229,7 @@ int main( int argc, char **argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgfxbrowser/osgfxbrowser.cpp b/examples/osgfxbrowser/osgfxbrowser.cpp index 84b38bf45..bc34e042b 100644 --- a/examples/osgfxbrowser/osgfxbrowser.cpp +++ b/examples/osgfxbrowser/osgfxbrowser.cpp @@ -323,7 +323,7 @@ int main(int argc, char *argv[]) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); return 1; @@ -341,7 +341,7 @@ int main(int argc, char *argv[]) return 1; } - // 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/examples/osggeometry/osggeometry.cpp b/examples/osggeometry/osggeometry.cpp index ad440a2e6..cfb5e6d69 100644 --- a/examples/osggeometry/osggeometry.cpp +++ b/examples/osggeometry/osggeometry.cpp @@ -39,17 +39,17 @@ // This demos uses the illustrates how to creates the various different types of geometry that // the osg::Geometry class can represent. This demos uses the OpenGL red books diagram of different -// OpenGL Primitives as a template for all the equivilant OpenSceneGraph Primitives. The OpenSceneGraph +// OpenGL Primitives as a template for all the equivalent OpenSceneGraph Primitives. The OpenSceneGraph // wraps OpenGL very thinly so uses all the same enum and naming conventions. The coordinate data is also -// wrapped around OpenGL's vertex arrays and draw arrays/elements calls. Familarity with +// wrapped around OpenGL's vertex arrays and draw arrays/elements calls. Familiarity with // OpenGL will help understand the the osg::Geometry class which encapsulate all this, or if you -// havn't learnt OpenGL yet, learning osg::Geometry will help you understand how OpenGL +// havn't learned OpenGL yet, learning osg::Geometry will help you understand how OpenGL // works! // The osg::Geometry class "is a" subclass of osg::Drawable base class, so is an object that provides // a draw method for drawing objects in the scene. osg::Geometry contains all the vertex, normal -// color and texture coordate arrays required to specify the coordinates of your objects, and the -// primtives join these coordinates together as the points, lines or surfaces that you will see +// color and texture coordinate arrays required to specify the coordinates of your objects, and the +// primitives join these coordinates together as the points, lines or surfaces that you will see // rendered on your screen. // // This demo is split into two functions, the createScene() function which creates the scene graph @@ -67,7 +67,7 @@ struct NormalPrint } }; -// decompose Drawable primtives into triangles, print out these triangles and computed normals. +// decompose Drawable primitives into triangles, print out these triangles and computed normals. void printTriangles(const std::string& name, osg::Drawable& drawable) { std::cout<. osg::Array's are reference counted and hence sharable, - // which std::vector<> provides all the convinience, flexibility and robustness + // which std::vector<> provides all the convenience, flexibility and robustness // of the most popular of all STL containers. osg::Vec3Array* vertices = new osg::Vec3Array; vertices->push_back(osg::Vec3(-1.02168, -2.15188e-09, 0.885735)); @@ -112,13 +112,13 @@ osg::Node* createScene() // create the color of the geometry, one single for the whole geometry. - // for consitency of design even one single color must added as an element + // for consistency of design even one single color must added as an element // in a color array. osg::Vec4Array* colors = new osg::Vec4Array; // add a white color, colors take the form r,g,b,a with 0.0 off, 1.0 full on. colors->push_back(osg::Vec4(1.0f,1.0f,0.0f,1.0f)); - // pass the color arry to points geometry, note the binding to tell the geometry + // pass the color array to points geometry, note the binding to tell the geometry // that only use one color for the whole object. pointsGeom->setColorArray(colors); pointsGeom->setColorBinding(osg::Geometry::BIND_OVERALL); @@ -131,24 +131,24 @@ osg::Node* createScene() pointsGeom->setNormalBinding(osg::Geometry::BIND_OVERALL); - // create and add a DrawArray Primitive (see include/osg/Primtive). The first - // paramter passed to the DrawArrays constructor is the Primtive::Mode which + // create and add a DrawArray Primitive (see include/osg/Primitive). The first + // parameter passed to the DrawArrays constructor is the Primitive::Mode which // in this case is POINTS (which has the same value GL_POINTS), the second // parameter is the index position into the vertex array of the first point // to draw, and the third parameter is the number of points to draw. pointsGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::POINTS,0,vertices->size())); - // add the points geomtry to the geode. + // add the points geometry to the geode. geode->addDrawable(pointsGeom); } // create LINES { - // create Geometry object to store all the vetices and lines primtive. + // create Geometry object to store all the vertices and lines primitive. osg::Geometry* linesGeom = new osg::Geometry(); - // this time we'll prealloacte the vertex array to the size we + // this time we'll preallocate the vertex array to the size we // need and then simple set them as array elements, 8 points // makes 4 line segments. osg::Vec3Array* vertices = new osg::Vec3Array(8); @@ -165,7 +165,7 @@ osg::Node* createScene() // pass the created vertex array to the points geometry object. linesGeom->setVertexArray(vertices); - // set the colors as before, plus using the aobve + // set the colors as before, plus using the above osg::Vec4Array* colors = new osg::Vec4Array; colors->push_back(osg::Vec4(1.0f,1.0f,0.0f,1.0f)); linesGeom->setColorArray(colors); @@ -184,16 +184,16 @@ osg::Node* createScene() linesGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINES,0,8)); - // add the points geomtry to the geode. + // add the points geometry to the geode. geode->addDrawable(linesGeom); } // create LINE_STRIP { - // create Geometry object to store all the vetices and lines primtive. + // create Geometry object to store all the vertices and lines primitive. osg::Geometry* linesGeom = new osg::Geometry(); - // this time we'll prealloacte the vertex array to the size + // this time we'll preallocate the vertex array to the size // and then use an iterator to fill in the values, a bit perverse // but does demonstrate that we have just a standard std::vector underneath. osg::Vec3Array* vertices = new osg::Vec3Array(5); @@ -207,7 +207,7 @@ osg::Node* createScene() // pass the created vertex array to the points geometry object. linesGeom->setVertexArray(vertices); - // set the colors as before, plus using the aobve + // set the colors as before, plus using the above osg::Vec4Array* colors = new osg::Vec4Array; colors->push_back(osg::Vec4(1.0f,1.0f,0.0f,1.0f)); linesGeom->setColorArray(colors); @@ -226,16 +226,16 @@ osg::Node* createScene() linesGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINE_STRIP,0,5)); - // add the points geomtry to the geode. + // add the points geometry to the geode. geode->addDrawable(linesGeom); } // create LINE_LOOP { - // create Geometry object to store all the vetices and lines primtive. + // create Geometry object to store all the vertices and lines primitive. osg::Geometry* linesGeom = new osg::Geometry(); - // this time we'll a C arrays to initilize the vertices. + // this time we'll a C arrays to initialize the vertices. osg::Vec3 myCoords[] = { @@ -254,7 +254,7 @@ osg::Node* createScene() // pass the created vertex array to the points geometry object. linesGeom->setVertexArray(vertices); - // set the colors as before, plus using the aobve + // set the colors as before, plus using the above osg::Vec4Array* colors = new osg::Vec4Array; colors->push_back(osg::Vec4(1.0f,1.0f,0.0f,1.0f)); linesGeom->setColorArray(colors); @@ -273,7 +273,7 @@ osg::Node* createScene() linesGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINE_LOOP,0,numCoords)); - // add the points geomtry to the geode. + // add the points geometry to the geode. geode->addDrawable(linesGeom); } @@ -305,11 +305,11 @@ osg::Node* createScene() // create POLYGON { - // create Geometry object to store all the vetices and lines primtive. + // create Geometry object to store all the vertices and lines primitive. osg::Geometry* polyGeom = new osg::Geometry(); - // this time we'll a C arrays to initilize the vertices. - // note, anticlockwsie ordering. + // this time we'll a C arrays to initialize the vertices. + // note, anticlockwise ordering. // note II, OpenGL polygons must be convex plan polygons, otherwise // undefined results will occur. If you have concave polygons or ones // that cross over themselves then use the osgUtil::Tessellator to fix @@ -346,17 +346,17 @@ osg::Node* createScene() printTriangles("Polygon",*polyGeom); - // add the points geomtry to the geode. + // add the points geometry to the geode. geode->addDrawable(polyGeom); } // create QUADS { - // create Geometry object to store all the vetices and lines primtive. + // create Geometry object to store all the vertices and lines primitive. osg::Geometry* polyGeom = new osg::Geometry(); - // note, anticlockwsie ordering. + // note, anticlockwise ordering. osg::Vec3 myCoords[] = { osg::Vec3(0.0247182, 0.0f, -0.156548), @@ -394,13 +394,13 @@ osg::Node* createScene() printTriangles("Quads",*polyGeom); - // add the points geomtry to the geode. + // add the points geometry to the geode. geode->addDrawable(polyGeom); } // create QUAD_STRIP { - // create Geometry object to store all the vetices and lines primtive. + // create Geometry object to store all the vertices and lines primitive. osg::Geometry* polyGeom = new osg::Geometry(); // note, first coord at top, second at bottom, reverse to that buggy OpenGL image.. @@ -443,25 +443,25 @@ osg::Node* createScene() printTriangles("Quads strip",*polyGeom); - // add the points geomtry to the geode. + // add the points geometry to the geode. geode->addDrawable(polyGeom); } // create TRIANGLES, TRIANGLE_STRIP and TRIANGLE_FAN all in one Geometry/ { - // create Geometry object to store all the vetices and lines primtive. + // create Geometry object to store all the vertices and lines primitive. osg::Geometry* polyGeom = new osg::Geometry(); // note, first coord at top, second at bottom, reverse to that buggy OpenGL image.. osg::Vec3 myCoords[] = { // TRIANGLES 6 vertices, v0..v5 - // note in aniclockwise order. + // note in anticlockwise order. osg::Vec3(-1.12056, -2.15188e-09, -0.840418), osg::Vec3(-0.95165, -2.15188e-09, -0.840418), osg::Vec3(-1.11644, 9.18133e-09, -0.716827), - // note in aniclockwise order. + // note in anticlockwise order. osg::Vec3(-0.840418, 9.18133e-09, -0.778623), osg::Vec3(-0.622074, 9.18133e-09, -0.613835), osg::Vec3(-1.067, 9.18133e-09, -0.609715), @@ -478,7 +478,7 @@ osg::Node* createScene() osg::Vec3(0.280139, -2.15188e-09, -0.823939), // TRIANGLE FAN 5 vertices, v12..v16 - // note defined in anticlockwsie order. + // note defined in anticlockwise order. osg::Vec3(0.844538, 9.18133e-09, -0.712708), osg::Vec3(1.0258, 9.18133e-09, -0.799221), osg::Vec3(1.03816, -2.15188e-09, -0.692109), @@ -518,7 +518,7 @@ osg::Node* createScene() printTriangles("Triangles/Strip/Fan",*polyGeom); - // add the points geomtry to the geode. + // add the points geometry to the geode. geode->addDrawable(polyGeom); } @@ -566,10 +566,10 @@ osg::Node* createBackground() if (!image) return NULL; - // create Geometry object to store all the vetices and lines primtive. + // create Geometry object to store all the vertices and lines primitive. osg::Geometry* polyGeom = new osg::Geometry(); - // note, anticlockwsie ordering. + // note, anticlockwise ordering. osg::Vec3 myCoords[] = { osg::Vec3(-1.22908f,0.0f,1.0f), @@ -620,9 +620,9 @@ osg::Node* createBackground() int numIndices = sizeof(myIndices)/sizeof(unsigned short); - // Theere are three variants of the DrawElements osg::Primitive, UByteDrawElements which - // contains unsigned char indicies, UShortDrawElements which contains unsigned short indices, - // and UIntDrawElements whcih contains ... unsigned int indices. + // There are three variants of the DrawElements osg::Primitive, UByteDrawElements which + // contains unsigned char indices, UShortDrawElements which contains unsigned short indices, + // and UIntDrawElements which contains ... unsigned int indices. // The first parameter to DrawElements is polyGeom->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::QUADS,numIndices,myIndices)); @@ -642,12 +642,12 @@ osg::Node* createBackground() // create the Geode (Geometry Node) to contain all our osg::Geometry objects. osg::Geode* geode = new osg::Geode(); - // add the points geomtry to the geode. + // add the points geometry to the geode. geode->addDrawable(polyGeom); //return geode; - // create a tranform to move the background back and forward with. + // create a transform to move the background back and forward with. osg::MatrixTransform* transform = new osg::MatrixTransform(); transform->setUpdateCallback(new MyTransformCallback(1.0f)); diff --git a/examples/osgimpostor/osgimpostor.cpp b/examples/osgimpostor/osgimpostor.cpp index 8e52032d4..ddc57eaff 100644 --- a/examples/osgimpostor/osgimpostor.cpp +++ b/examples/osgimpostor/osgimpostor.cpp @@ -106,7 +106,7 @@ void CreateHouses() // coordIndices osg::UByteArray* coordIndices = new osg::UByteArray(48,indices); - // share the primtive set. + // share the primitive set. osg::PrimitiveSet* primitives = new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES,0,48); for (int q = 0; q < HOUSES_SIZE; q++) diff --git a/examples/osglogo/osglogo.cpp b/examples/osglogo/osglogo.cpp index 7591c3cf8..5d80c7963 100644 --- a/examples/osglogo/osglogo.cpp +++ b/examples/osglogo/osglogo.cpp @@ -179,7 +179,7 @@ osg:: Node* createTextLeft(const osg::BoundingBox& bb, const std::string& label, text->setAxisAlignment(osgText::Text::XZ_PLANE); text->setCharacterSize((bb.zMax()-bb.zMin())*1.0f); text->setPosition(bb.center()-osg::Vec3((bb.xMax()-bb.xMin()),-(bb.yMax()-bb.yMin())*0.5f,(bb.zMax()-bb.zMin())*0.1f)); - //text->setColor(osg::Vec4(0.37f,0.48f,0.67f,1.0f)); // Neil's orignal OSG colour + //text->setColor(osg::Vec4(0.37f,0.48f,0.67f,1.0f)); // Neil's original OSG colour text->setColor(osg::Vec4(0.20f,0.45f,0.60f,1.0f)); // OGL logo colour text->setText(label); diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp index 12f0c3955..c33e09373 100644 --- a/examples/osgmovie/osgmovie.cpp +++ b/examples/osgmovie/osgmovie.cpp @@ -55,7 +55,7 @@ public: virtual void getUsage(osg::ApplicationUsage& usage) const; - typedef std::vector< osg::ref_ptr > ImageStreamList; + typedef std::vector< osg::observer_ptr > ImageStreamList; protected: @@ -454,7 +454,7 @@ int main(int argc, char** argv) // add the record camera path handler viewer.addEventHandler(new osgViewer::RecordCameraPathHandler); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgpagedlod/osgpagedlod.cpp b/examples/osgpagedlod/osgpagedlod.cpp index 9ca6702f7..9bb0282df 100644 --- a/examples/osgpagedlod/osgpagedlod.cpp +++ b/examples/osgpagedlod/osgpagedlod.cpp @@ -240,7 +240,7 @@ int main( int argc, char **argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgphotoalbum/osgphotoalbum.cpp b/examples/osgphotoalbum/osgphotoalbum.cpp index 0773bb4ef..b785a86ba 100644 --- a/examples/osgphotoalbum/osgphotoalbum.cpp +++ b/examples/osgphotoalbum/osgphotoalbum.cpp @@ -676,7 +676,7 @@ int main( int argc, char **argv ) // set up the usage document, in case we need to print out how to use this program. arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates use node masks to create stereo images."); arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] image_file [image_file]"); - arguments.getApplicationUsage()->addCommandLineOption("-d ","Time delay in sceonds between the display of successive image pairs when in auto advance mode."); + arguments.getApplicationUsage()->addCommandLineOption("-d ","Time delay in seconds between the display of successive image pairs when in auto advance mode."); arguments.getApplicationUsage()->addCommandLineOption("-a","Enter auto advance of image pairs on start up."); arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information"); arguments.getApplicationUsage()->addCommandLineOption("--create ","Create an photo archive of specified files"); @@ -687,7 +687,7 @@ int main( int argc, char **argv ) viewer.setThreadingModel(osgViewer::Viewer::SingleThreaded); - // register the handler to add keyboard and mosue handling. + // register the handler to add keyboard and mouse handling. SlideEventHandler* seh = new SlideEventHandler(); viewer.addEventHandler(seh); @@ -711,7 +711,7 @@ int main( int argc, char **argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgplanets/osgplanets.cpp b/examples/osgplanets/osgplanets.cpp index b62c423ef..0ac50be68 100644 --- a/examples/osgplanets/osgplanets.cpp +++ b/examples/osgplanets/osgplanets.cpp @@ -727,7 +727,7 @@ int main( int argc, char **argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgpoints/osgpoints.cpp b/examples/osgpoints/osgpoints.cpp index 38c99e808..2055b2083 100644 --- a/examples/osgpoints/osgpoints.cpp +++ b/examples/osgpoints/osgpoints.cpp @@ -149,7 +149,7 @@ int main( int argc, char **argv ) return 1; } - // 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/examples/osgprerender/osgprerender.cpp b/examples/osgprerender/osgprerender.cpp index 7fa8e1231..c839254aa 100644 --- a/examples/osgprerender/osgprerender.cpp +++ b/examples/osgprerender/osgprerender.cpp @@ -43,7 +43,7 @@ #include -// call back which cretes a deformation field to oscilate the model. +// call back which creates a deformation field to oscillate the model. class MyGeometryCallback : public osg::Drawable::UpdateCallback, public osg::Drawable::AttributeFunctor @@ -323,7 +323,7 @@ osg::Node* createPreRenderSubGraph(osg::Node* subgraph, unsigned tex_width, unsi float znear = 1.0f*bs.radius(); float zfar = 3.0f*bs.radius(); - // 2:1 aspect ratio as per flag geomtry below. + // 2:1 aspect ratio as per flag geometry below. float proj_top = 0.25f*znear; float proj_right = 0.5f*znear; @@ -360,11 +360,11 @@ osg::Node* createPreRenderSubGraph(osg::Node* subgraph, unsigned tex_width, unsi // Rather than attach the texture directly to illustrate the texture's ability to // detect an image update and to subload the image onto the texture. You needn't - // do this when using an Image for copying to, as a seperate camera->attach(..) - // would suffice as well, but we'll do it the long way round here just for demonstation + // do this when using an Image for copying to, as a separate camera->attach(..) + // would suffice as well, but we'll do it the long way round here just for demonstration // purposes (long way round meaning we'll need to copy image to main memory, then // copy it back to the graphics card to the texture in one frame). - // The long way round allows us to mannually modify the copied image via the callback + // The long way round allows us to manually modify the copied image via the callback // and then let this modified image by reloaded back. texture->setImage(0, image); } @@ -397,11 +397,11 @@ int main( int argc, char **argv ) arguments.getApplicationUsage()->addCommandLineOption("--fbo","Use Frame Buffer Object for render to texture, where supported."); arguments.getApplicationUsage()->addCommandLineOption("--fb","Use FrameBuffer for render to texture."); arguments.getApplicationUsage()->addCommandLineOption("--pbuffer","Use Pixel Buffer for render to texture, where supported."); - arguments.getApplicationUsage()->addCommandLineOption("--window","Use a seperate Window for render to texture."); + arguments.getApplicationUsage()->addCommandLineOption("--window","Use a separate Window for render to texture."); arguments.getApplicationUsage()->addCommandLineOption("--width","Set the width of the render to texture."); arguments.getApplicationUsage()->addCommandLineOption("--height","Set the height of the render to texture."); arguments.getApplicationUsage()->addCommandLineOption("--image","Render to an image, then apply a post draw callback to it, and use this image to update a texture."); - arguments.getApplicationUsage()->addCommandLineOption("--texture-rectangle","Use osg::TextureRectangle for doing the render to texure to."); + arguments.getApplicationUsage()->addCommandLineOption("--texture-rectangle","Use osg::TextureRectangle for doing the render to texture to."); // construct the viewer. osgViewer::Viewer viewer(arguments); diff --git a/examples/osgprerendercubemap/osgprerendercubemap.cpp b/examples/osgprerendercubemap/osgprerendercubemap.cpp index 37112ebe4..f9fc2e91f 100644 --- a/examples/osgprerendercubemap/osgprerendercubemap.cpp +++ b/examples/osgprerendercubemap/osgprerendercubemap.cpp @@ -142,7 +142,7 @@ class UpdateCameraAndTexGenCallback : public osg::NodeCallback virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) { - // first update subgraph to make sure objects are all moved into postion + // first update subgraph to make sure objects are all moved into position traverse(node,nv); // compute the position of the center of the reflector subgraph @@ -195,7 +195,7 @@ class TexMatCullCallback : public osg::NodeCallback virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) { - // first update subgraph to make sure objects are all moved into postion + // first update subgraph to make sure objects are all moved into position traverse(node,nv); osgUtil::CullVisitor* cv = dynamic_cast(nv); @@ -303,7 +303,7 @@ int main(int argc, char** argv) arguments.getApplicationUsage()->addCommandLineOption("--fbo","Use Frame Buffer Object for render to texture, where supported."); arguments.getApplicationUsage()->addCommandLineOption("--fb","Use FrameBuffer for render to texture."); arguments.getApplicationUsage()->addCommandLineOption("--pbuffer","Use Pixel Buffer for render to texture, where supported."); - arguments.getApplicationUsage()->addCommandLineOption("--window","Use a seperate Window for render to texture."); + arguments.getApplicationUsage()->addCommandLineOption("--window","Use a separate Window for render to texture."); arguments.getApplicationUsage()->addCommandLineOption("--width","Set the width of the render to texture"); arguments.getApplicationUsage()->addCommandLineOption("--height","Set the height of the render to texture"); @@ -333,7 +333,7 @@ int main(int argc, char** argv) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgreflect/osgreflect.cpp b/examples/osgreflect/osgreflect.cpp index d83407f5b..ba72a164a 100644 --- a/examples/osgreflect/osgreflect.cpp +++ b/examples/osgreflect/osgreflect.cpp @@ -350,7 +350,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/examples/osgslice/osgslice.cpp b/examples/osgslice/osgslice.cpp index c6ddff21d..465395e26 100644 --- a/examples/osgslice/osgslice.cpp +++ b/examples/osgslice/osgslice.cpp @@ -118,7 +118,7 @@ int main( int argc, char **argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgspheresegment/osgspheresegment.cpp b/examples/osgspheresegment/osgspheresegment.cpp index c56858ab5..052cc0d68 100644 --- a/examples/osgspheresegment/osgspheresegment.cpp +++ b/examples/osgspheresegment/osgspheresegment.cpp @@ -681,7 +681,7 @@ int main(int argc, char **argv) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgstereoimage/osgstereoimage.cpp b/examples/osgstereoimage/osgstereoimage.cpp index 5da36317b..8309b02a5 100644 --- a/examples/osgstereoimage/osgstereoimage.cpp +++ b/examples/osgstereoimage/osgstereoimage.cpp @@ -459,7 +459,7 @@ int main( int argc, char **argv ) // set up the usage document, in case we need to print out how to use this program. arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates use node masks to create stereo images."); arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] image_file_left_eye image_file_right_eye"); - arguments.getApplicationUsage()->addCommandLineOption("-d ","Time delay in sceonds between the display of successive image pairs when in auto advance mode."); + arguments.getApplicationUsage()->addCommandLineOption("-d ","Time delay in seconds between the display of successive image pairs when in auto advance mode."); arguments.getApplicationUsage()->addCommandLineOption("-a","Enter auto advance of image pairs on start up."); arguments.getApplicationUsage()->addCommandLineOption("-x ","Horizontal offset of left and right images."); arguments.getApplicationUsage()->addCommandLineOption("-y ","Vertical offset of left and right images."); @@ -475,7 +475,7 @@ int main( int argc, char **argv ) // construct the viewer. osgViewer::Viewer viewer; - // register the handler to add keyboard and mosue handling. + // register the handler to add keyboard and mouse handling. SlideEventHandler* seh = new SlideEventHandler(); viewer.addEventHandler(seh); @@ -526,7 +526,7 @@ int main( int argc, char **argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); @@ -559,7 +559,7 @@ int main( int argc, char **argv ) float height = 2*radius*tan(osg::DegreesToRadians(fovy)*0.5f); float length = osg::PI*radius; // half a cylinder. - // use a texure matrix to control the placement of the image. + // use a texture matrix to control the placement of the image. osg::TexMat* texmatLeft = new osg::TexMat; osg::TexMat* texmatRight = new osg::TexMat; diff --git a/examples/osgtexture1D/osgtexture1D.cpp b/examples/osgtexture1D/osgtexture1D.cpp index 8f847466b..d7330390e 100644 --- a/examples/osgtexture1D/osgtexture1D.cpp +++ b/examples/osgtexture1D/osgtexture1D.cpp @@ -41,7 +41,7 @@ osg::StateSet* create1DTextureStateToDecorate(osg::Node* loadedModel) int noPixels = 1024; - // allocate the image data, noPixels x 1 x 1 with 4 rgba floats - equivilant to a Vec4! + // allocate the image data, noPixels x 1 x 1 with 4 rgba floats - equivalent to a Vec4! image->allocateImage(noPixels,1,1,GL_RGBA,GL_FLOAT); image->setInternalTextureFormat(GL_RGBA); diff --git a/examples/osgunittests/osgunittests.cpp b/examples/osgunittests/osgunittests.cpp index e379c20fa..859098138 100644 --- a/examples/osgunittests/osgunittests.cpp +++ b/examples/osgunittests/osgunittests.cpp @@ -478,7 +478,7 @@ int main( int argc, char** argv ) // any option left unread are converted into errors to write out later. arguments.reportRemainingOptionsAsUnrecognized(); - // report any errors if they have occured when parsing the program aguments. + // report any errors if they have occurred when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(std::cout); diff --git a/examples/osgvolume/osgvolume.cpp b/examples/osgvolume/osgvolume.cpp index b711a6219..5b99ca873 100644 --- a/examples/osgvolume/osgvolume.cpp +++ b/examples/osgvolume/osgvolume.cpp @@ -262,7 +262,7 @@ struct ProcessRow } /////////////////////////////////////////////////////////////////////////////// - // alpha luminiance sources.. + // alpha luminance sources.. virtual void LA_to_A(unsigned int num, unsigned char* source, unsigned char* dest) const { for(unsigned int i=0;i& image_3d, osg::ref_ptrsetFilter(osg::Texture3D::MIN_FILTER,osg::Texture3D::LINEAR); texture3D->setFilter(osg::Texture3D::MAG_FILTER,osg::Texture3D::LINEAR); @@ -1138,7 +1138,7 @@ osg::Node* createModel(osg::ref_ptr& image_3d, osg::ref_ptrsetFilter(osg::Texture3D::MIN_FILTER,osg::Texture3D::LINEAR); texture3D->setFilter(osg::Texture3D::MAG_FILTER,osg::Texture3D::LINEAR); @@ -1332,7 +1332,7 @@ osg::Image* readRaw(int sizeX, int sizeY, int sizeZ, int numberBytesPerComponent { for(int t=0;taddUsageExplanation(type,option,explanation); diff --git a/include/osg/ArgumentParser b/include/osg/ArgumentParser index 9548dae08..4562c90b0 100644 --- a/include/osg/ArgumentParser +++ b/include/osg/ArgumentParser @@ -113,7 +113,7 @@ class OSG_EXPORT ArgumentParser /** Return the application name, as specified by argv[0] */ std::string getApplicationName() const; - /** Return the position of an occurance of a string in the argument list. + /** Return the position of an occurrence of a string in the argument list. * Return -1 if no string is found. */ int find(const std::string& str) const; @@ -137,8 +137,8 @@ class OSG_EXPORT ArgumentParser /** Return true if the specified argument matches the given string. */ bool match(int pos, const std::string& str) const; - /** Search for an occurance of a string in the argument list. If found, - * remove that occurance and return true. Otherwise, return false. */ + /** Search for an occurrence of a string in the argument list. If found, + * remove that occurrence and return true. Otherwise, return false. */ bool read(const std::string& str); bool read(const std::string& str, Parameter value1); bool read(const std::string& str, Parameter value1, Parameter value2); @@ -172,7 +172,7 @@ class OSG_EXPORT ArgumentParser typedef std::map ErrorMessageMap; - /** Return the error flag, true if an error has occured when reading arguments. */ + /** Return the error flag, true if an error has occurred when reading arguments. */ bool errors(ErrorSeverity severity=BENIGN) const; /** Report an error message by adding to the ErrorMessageMap. */ @@ -181,13 +181,13 @@ class OSG_EXPORT ArgumentParser /** For each remaining option, report it as unrecognized. */ void reportRemainingOptionsAsUnrecognized(ErrorSeverity severity=BENIGN); - /** Return the error message, if any has occured. */ + /** Return the error message, if any has occurred. */ ErrorMessageMap& getErrorMessageMap() { return _errorMessageMap; } - /** Return the error message, if any has occured. */ + /** Return the error message, if any has occurred. */ const ErrorMessageMap& getErrorMessageMap() const { return _errorMessageMap; } - /** Write error messages to the given ostream, if at or above the given severiity. */ + /** Write error messages to the given ostream, if at or above the given severity. */ void writeErrorMessages(std::ostream& output,ErrorSeverity sevrity=BENIGN); diff --git a/include/osg/Billboard b/include/osg/Billboard index 02f4b001e..dcec5d935 100644 --- a/include/osg/Billboard +++ b/include/osg/Billboard @@ -20,7 +20,7 @@ namespace osg { /** Billboard is a derived form of Geode that orients its osg::Drawable - * children to face the eye point. Typical uses incllude trees and + * children to face the eye point. Typical uses include trees and * particle explosions, */ class OSG_EXPORT Billboard : public Geode @@ -46,7 +46,7 @@ class OSG_EXPORT Billboard : public Geode inline Mode getMode() const { return _mode; } /** Set the rotation axis for the billboard's child Drawables. - * Only utlized when mode==AXIAL_ROT. */ + * Only utilized when mode==AXIAL_ROT. */ void setAxis(const Vec3& axis); /** Get the rotation axis. */ inline const Vec3& getAxis() const { return _axis; } diff --git a/include/osg/BlendColor b/include/osg/BlendColor index 7bfc2732d..288b8c510 100644 --- a/include/osg/BlendColor +++ b/include/osg/BlendColor @@ -70,7 +70,7 @@ class OSG_EXPORT BlendColor : public StateAttribute /** Encapsulates queries of extension availability, obtains extension - * function pointers, and provides convinience wrappers for + * function pointers, and provides convenience wrappers for * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -100,7 +100,7 @@ class OSG_EXPORT BlendColor : public StateAttribute }; /** Returns the Extensions object for the given context. - * If createIfNotInitalized is true and the Exentsions object doesn't + * If createIfNotInitalized is true and the Extensions object doesn't * exist, getExtensions() creates it on the given context. * Returns NULL if createIfNotInitalized is false and the Extensions * object doesn't exist. */ diff --git a/include/osg/BlendEquation b/include/osg/BlendEquation index d6035832c..1939c17a1 100644 --- a/include/osg/BlendEquation +++ b/include/osg/BlendEquation @@ -92,7 +92,7 @@ class OSG_EXPORT BlendEquation : public StateAttribute virtual void apply(State& state) const; /** Encapsulates queries of extension availability, obtains extension - * function pointers, and provides convinience wrappers for + * function pointers, and provides convenience wrappers for * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -127,7 +127,7 @@ class OSG_EXPORT BlendEquation : public StateAttribute }; /** Returns the Extensions object for the given context. - * If createIfNotInitalized is true and the Exentsions object doesn't + * If createIfNotInitalized is true and the Extensions object doesn't * exist, getExtensions() creates it on the given context. * Returns NULL if createIfNotInitalized is false and the Extensions * object doesn't exist. */ diff --git a/include/osg/BlendFunc b/include/osg/BlendFunc index 20ea94bcf..1a624c62d 100644 --- a/include/osg/BlendFunc +++ b/include/osg/BlendFunc @@ -167,7 +167,7 @@ class OSG_EXPORT BlendFunc : public StateAttribute }; /** Returns the Extensions object for the given context. - * If createIfNotInitalized is true and the Exentsions object doesn't + * If createIfNotInitalized is true and the Extensions object doesn't * exist, getExtensions() creates it on the given context. * Returns NULL if createIfNotInitalized is false and the Extensions * object doesn't exist. */ diff --git a/include/osg/BoundingBox b/include/osg/BoundingBox index 4e8727d88..7956df72f 100644 --- a/include/osg/BoundingBox +++ b/include/osg/BoundingBox @@ -164,7 +164,7 @@ class OSG_EXPORT BoundingBox void expandBy(const BoundingSphere& sh); - /** Returns the intesection of this bounding box and the specified bounding box. */ + /** Returns the intersection of this bounding box and the specified bounding box. */ BoundingBox intersect(const BoundingBox& bb) const { return osg::BoundingBox(osg::maximum(xMin(),bb.xMin()),osg::maximum(yMin(),bb.yMin()),osg::maximum(zMin(),bb.zMin()), osg::minimum(xMax(),bb.xMax()),osg::minimum(yMax(),bb.yMax()),osg::minimum(zMax(),bb.zMax())); diff --git a/include/osg/BufferObject b/include/osg/BufferObject index cd29d37b0..0b8424122 100644 --- a/include/osg/BufferObject +++ b/include/osg/BufferObject @@ -142,7 +142,7 @@ class OSG_EXPORT BufferObject : public Object virtual void resizeGLObjectBuffers(unsigned int maxSize); /** If State is non-zero, this function releases OpenGL objects for - * the specified graphics context. Otherwise, releases OpenGL objexts + * the specified graphics context. Otherwise, releases OpenGL objects * for all graphics contexts. */ void releaseGLObjects(State* state=0) const; @@ -216,7 +216,7 @@ class OSG_EXPORT BufferObject : public Object }; /** Function to call to get the extension of a specified context. - * If the Exentsion object for that context has not yet been created + * If the Extension object for that context has not yet been created * and the 'createIfNotInitalized' flag been set to false then returns NULL. * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object is diff --git a/include/osg/Camera b/include/osg/Camera index a2e1d082e..ba52364fa 100644 --- a/include/osg/Camera +++ b/include/osg/Camera @@ -140,10 +140,10 @@ class OSG_EXPORT Camera : public Transform, public CullSettings VERTICAL /** Adjust the VERTICAL field of view on window resizes.*/ }; - /** Set the policy used to determin if and how the projection matrix should be adjusted on window resizes. */ + /** Set the policy used to determine if and how the projection matrix should be adjusted on window resizes. */ inline void setProjectionResizePolicy(ProjectionResizePolicy policy) { _projectionResizePolicy = policy; } - /** Get the policy used to determin if and how the projection matrix should be adjusted on window resizes. */ + /** Get the policy used to determine if and how the projection matrix should be adjusted on window resizes. */ inline ProjectionResizePolicy getProjectionResizePolicy() const { return _projectionResizePolicy; } @@ -178,7 +178,7 @@ class OSG_EXPORT Camera : public Transform, public CullSettings /** Get the const projection matrix.*/ const osg::Matrixd& getProjectionMatrix() const { return _projectionMatrix; } - /** Get the othographic settings of the orthographic projection matrix. + /** Get the orthographic settings of the orthographic projection matrix. * Returns false if matrix is not an orthographic matrix, where parameter values are undefined.*/ bool getProjectionMatrixAsOrtho(double& left, double& right, double& bottom, double& top, diff --git a/include/osg/CameraView b/include/osg/CameraView index 2edc00c2c..a3a177427 100644 --- a/include/osg/CameraView +++ b/include/osg/CameraView @@ -24,7 +24,7 @@ namespace osg { /** CameraView - is a Transform that is used to specify camera views from within the scene graph. * The application must attach a camera to a CameraView via the NodePath from the top of the scene graph - * to the CameraView node itself, and accimulate the view matrix from this NodePath. + * to the CameraView node itself, and accumulate the view matrix from this NodePath. */ class OSG_EXPORT CameraView : public Transform { @@ -48,16 +48,16 @@ class OSG_EXPORT CameraView : public Transform /** Get the position of the camera view.*/ inline const Vec3d& getPosition() const { return _position; } - /** Set the attitide of the camera view.*/ + /** Set the attitude of the camera view.*/ inline void setAttitude(const Quat& quat) { _attitude = quat; dirtyBound(); } - /** Get the attitide of the camera view.*/ + /** Get the attitude of the camera view.*/ inline const Quat& getAttitude() const { return _attitude; } /** Set the field of view. - * The cameras field of view can be contrained to either the horizontal or vertex axis of the camera, or unconstrained + * The cameras field of view can be constrained to either the horizontal or vertex axis of the camera, or unconstrained * in which case the camera/application are left to choose an appropriate field of view. - * The default value if 60 degrres. */ + * The default value if 60 degrees. */ inline void setFieldOfView(double fieldOfView) { _fieldOfView = fieldOfView; } /** Get the field of view.*/ @@ -70,7 +70,7 @@ class OSG_EXPORT CameraView : public Transform VERTICAL }; - /** Set the field of view mode - controlling how the field of view of the camera is contrained by the CameaView settings.*/ + /** Set the field of view mode - controlling how the field of view of the camera is constrained by the CameaView settings.*/ inline void setFieldOfViewMode(FieldOfViewMode mode) { _fieldOfViewMode = mode; } /** Get the field of view mode.*/ diff --git a/include/osg/ClampColor b/include/osg/ClampColor index 342623069..7ee69eaf5 100644 --- a/include/osg/ClampColor +++ b/include/osg/ClampColor @@ -78,7 +78,7 @@ class OSG_EXPORT ClampColor : public StateAttribute virtual void apply(State& state) const; /** Encapsulates queries of extension availability, obtains extension - * function pointers, and provides convinience wrappers for + * function pointers, and provides convenience wrappers for * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -107,7 +107,7 @@ class OSG_EXPORT ClampColor : public StateAttribute }; /** Returns the Extensions object for the given context. - * If createIfNotInitalized is true and the Exentsions object doesn't + * If createIfNotInitalized is true and the Extensions object doesn't * exist, getExtensions() creates it on the given context. * Returns NULL if createIfNotInitalized is false and the Extensions * object doesn't exist. */ diff --git a/include/osg/CollectOccludersVisitor b/include/osg/CollectOccludersVisitor index 223678d27..49b8ac3c7 100644 --- a/include/osg/CollectOccludersVisitor +++ b/include/osg/CollectOccludersVisitor @@ -68,7 +68,7 @@ class OSG_EXPORT CollectOccludersVisitor : public osg::NodeVisitor, public osg:: /** Removes occluded occluders for the collected occluders list, then * discards all but MaximumNumberOfActiveOccluders of occluders, - * discarding the occluders with the lowests shadow occluder volume. */ + * discarding the occluders with the lowest shadow occluder volume. */ void removeOccludedOccluders(); diff --git a/include/osg/CullSettings b/include/osg/CullSettings index cacca7348..09a9d5ae1 100644 --- a/include/osg/CullSettings +++ b/include/osg/CullSettings @@ -78,10 +78,10 @@ class OSG_EXPORT CullSettings ALL_VARIABLES = 0xFFFF }; - /** Set the inheritance mask used in inheritCullSettings to control which variables get overritten by the passed in CullSettings object.*/ + /** Set the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object.*/ void setInheritanceMask(unsigned int mask) { _inheritanceMask = mask; } - /** Get the inheritance mask used in inheritCullSettings to control which variables get overritten by the passed in CullSettings object.*/ + /** Get the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object.*/ unsigned int getInheritanceMask() const { return _inheritanceMask; } /** Set the local cull settings values from specified CullSettings object.*/ diff --git a/include/osg/DeleteHandler b/include/osg/DeleteHandler index f912dd3d1..c896a379d 100644 --- a/include/osg/DeleteHandler +++ b/include/osg/DeleteHandler @@ -41,14 +41,14 @@ class OSG_EXPORT DeleteHandler /** Set the number of frames to retain objects that are have been requested for deletion. * When set to zero objects are deleted immediately, by set to 1 there are kept around for an extra frame etc. - * The ability to retain obejcts for several frames is useful to prevent premature deletion when objects - * are stil be used the graphics threads that are using double buffering of rendering data structures with + * The ability to retain objects for several frames is useful to prevent premature deletion when objects + * are still be used the graphics threads that are using double buffering of rendering data structures with * non ref_ptr<> pointers to scene graph elements.*/ void setNumFramesToRetainObjects(int numberOfFramesToRetainObjects) { _numFramesToRetainObjects = numberOfFramesToRetainObjects; } int getNumFramesToRetainObjects() const { return _numFramesToRetainObjects; } - /** Set the current frame numberso that subsequent deletes get tagged as associated with this frame.*/ + /** Set the current frame number so that subsequent deletes get tagged as associated with this frame.*/ void setFrameNumber(int frameNumber) { _currentFrameNumber = frameNumber; } /** Get the current frame number.*/ diff --git a/include/osg/Depth b/include/osg/Depth index 3ff8878a8..27962f89d 100644 --- a/include/osg/Depth +++ b/include/osg/Depth @@ -58,7 +58,7 @@ class OSG_EXPORT Depth : public StateAttribute // used by the COMPARE_StateAttribute_Parameter macro's below. COMPARE_StateAttribute_Types(Depth,sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_func) COMPARE_StateAttribute_Parameter(_depthWriteMask) COMPARE_StateAttribute_Parameter(_zNear) diff --git a/include/osg/Drawable b/include/osg/Drawable index c3ae2f807..01be3e95c 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -125,7 +125,7 @@ class OSG_EXPORT Drawable : public Object virtual const Geometry* asGeometry() const { return 0; } - /** Compute the DataVariance based on an assestment of callback etc.*/ + /** Compute the DataVariance based on an assessment of callback etc.*/ virtual void computeDataVariance(); @@ -310,7 +310,7 @@ class OSG_EXPORT Drawable : public Object virtual void resizeGLObjectBuffers(unsigned int maxSize); /** If State is non-zero, this function releases OpenGL objects for - * the specified graphics context. Otherwise, releases OpenGL objexts + * the specified graphics context. Otherwise, releases OpenGL objects * for all graphics contexts. */ virtual void releaseGLObjects(State* state=0) const; @@ -420,8 +420,8 @@ class OSG_EXPORT Drawable : public Object /** drawImplementation(RenderInfo&) is a pure virtual method for the actual implementation of OpenGL drawing calls, such as vertex arrays and primitives, that * must be implemented in concrete subclasses of the Drawable base class, examples include osg::Geometry and osg::ShapeDrawable. * drawImplementation(RenderInfo&) is called from the draw(RenderInfo&) method, with the draw method handling management of OpenGL display lists, - * and drawImplementation(RenderInfo&) handling the actuall drawing itself. - * @param renderInfo The osg::RenderInfo object that encapulates the current rendering information including the osg::State OpenGL state for the current graphics context. */ + * and drawImplementation(RenderInfo&) handling the actual drawing itself. + * @param renderInfo The osg::RenderInfo object that encapsulates the current rendering information including the osg::State OpenGL state for the current graphics context. */ virtual void drawImplementation(RenderInfo& renderInfo) const = 0; @@ -479,7 +479,7 @@ class OSG_EXPORT Drawable : public Object TEXTURE_COORDS_5 = TEXTURE_COORDS_0+5, TEXTURE_COORDS_6 = TEXTURE_COORDS_0+6, TEXTURE_COORDS_7 = TEXTURE_COORDS_0+7 - // only eight texture coord examples provided here, but underlying code can handle any no of texure units, + // only eight texture coord examples provided here, but underlying code can handle any no of texture units, // simply co them as (TEXTURE_COORDS_0+unit). }; diff --git a/include/osg/Export b/include/osg/Export index 85c01d2c9..05d26c698 100644 --- a/include/osg/Export +++ b/include/osg/Export @@ -16,7 +16,7 @@ // define USE_DEPRECATED_API is used to include in API which is being fazed out // if you can compile your apps with this turned off you are -// well placed for compatablity with future versions. +// well placed for compatibility with future versions. #define USE_DEPRECATED_API #if defined(_MSC_VER) diff --git a/include/osg/Fog b/include/osg/Fog index 8fee64afd..d1b07da29 100644 --- a/include/osg/Fog +++ b/include/osg/Fog @@ -53,7 +53,7 @@ class OSG_EXPORT Fog : public StateAttribute // used by the COMPARE_StateAttribute_Paramter macro's below. COMPARE_StateAttribute_Types(Fog,sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_mode) COMPARE_StateAttribute_Parameter(_density) COMPARE_StateAttribute_Parameter(_start) diff --git a/include/osg/FragmentProgram b/include/osg/FragmentProgram index b3c332cdd..5f34d5604 100644 --- a/include/osg/FragmentProgram +++ b/include/osg/FragmentProgram @@ -130,7 +130,7 @@ class OSG_EXPORT FragmentProgram : public StateAttribute // used by the COMPARE_StateAttribute_Paramter macro's below. COMPARE_StateAttribute_Types(FragmentProgram,sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_fragmentProgram) return 0; // passed all the above comparison macro's, must be equal. @@ -224,7 +224,7 @@ class OSG_EXPORT FragmentProgram : public StateAttribute virtual void resizeGLObjectBuffers(unsigned int maxSize); /** release an OpenGL objects in specified graphics context if State - object is passed, otherwise release OpenGL objexts for all graphics context if + object is passed, otherwise release OpenGL objects for all graphics context if State object pointer == NULL.*/ virtual void releaseGLObjects(State* state=0) const; diff --git a/include/osg/FrameStamp b/include/osg/FrameStamp index f03b507e6..3126bfa27 100644 --- a/include/osg/FrameStamp +++ b/include/osg/FrameStamp @@ -27,7 +27,7 @@ namespace osg { /** Class which encapsulates the frame number, reference time and calendar - * time of specific frame, used to synchonize operations on the scene graph + * time of specific frame, used to synchronize operations on the scene graph * and other machines when using a graphics cluster. Note the calendar * time can be an artificial simulation time or capture the real time * of day etc.*/ @@ -69,7 +69,7 @@ class OSG_EXPORT FrameStamp : public Referenced // member variables of time.h's tm structure, copied here to // ensure that all data is not dynamic. The tm structure itself - // is not completely consistent betweem implementations, which + // is not completely consistent between implementations, which // could be a problem when sending the FrameStamp across a network // with different versions of tm (i.e mixing Unix and Windows.) int tm_sec; /* Seconds. [0-60] (1 leap second) */ diff --git a/include/osg/FrontFace b/include/osg/FrontFace index 205a94783..3cd6b4515 100644 --- a/include/osg/FrontFace +++ b/include/osg/FrontFace @@ -46,7 +46,7 @@ class OSG_EXPORT FrontFace : public StateAttribute // used by the COMPARE_StateAttribute_Paramter macro's below. COMPARE_StateAttribute_Types(FrontFace,sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_mode) return 0; // passed all the above comparison macro's, must be equal. diff --git a/include/osg/Geode b/include/osg/Geode index fafec2a53..1a3a857eb 100644 --- a/include/osg/Geode +++ b/include/osg/Geode @@ -145,7 +145,7 @@ class OSG_EXPORT Geode : public Node virtual void resizeGLObjectBuffers(unsigned int maxSize); /** If State is non-zero, this function releases any associated OpenGL objects for - * the specified graphics context. Otherwise, releases OpenGL objexts + * the specified graphics context. Otherwise, releases OpenGL objects * for all graphics contexts. */ virtual void releaseGLObjects(osg::State* = 0) const; diff --git a/include/osg/Geometry b/include/osg/Geometry index 84cb94568..3ef854544 100644 --- a/include/osg/Geometry +++ b/include/osg/Geometry @@ -294,7 +294,7 @@ class OSG_EXPORT Geometry : public Drawable virtual void resizeGLObjectBuffers(unsigned int maxSize); /** If State is non-zero, this function releases OpenGL objects for - * the specified graphics context. Otherwise, releases OpenGL objexts + * the specified graphics context. Otherwise, releases OpenGL objects * for all graphics contexts. */ virtual void releaseGLObjects(State* state=0) const; @@ -345,7 +345,7 @@ class OSG_EXPORT Geometry : public Drawable /** Return the estimated size of GLObjects (display lists/vertex buffer objects) that are associated with this drawable. - * This size is used a hint for reuse of deleteed display lists/vertex buffer objects. */ + * This size is used a hint for reuse of deleted display lists/vertex buffer objects. */ virtual unsigned int getGLObjectSizeHint() const; /** Draw Geometry directly ignoring an OpenGL display list which could be attached. @@ -357,25 +357,25 @@ class OSG_EXPORT Geometry : public Drawable /** Return true, osg::Geometry does support accept(Drawable::AttributeFunctor&). */ virtual bool supports(const Drawable::AttributeFunctor&) const { return true; } - /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ + /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has. */ virtual void accept(Drawable::AttributeFunctor& af); /** Return true, osg::Geometry does support accept(Drawable::ConstAttributeFunctor&). */ virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } - /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ + /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has. */ virtual void accept(Drawable::ConstAttributeFunctor& af) const; /** Return true, osg::Geometry does support accept(PrimitiveFunctor&). */ virtual bool supports(const PrimitiveFunctor&) const { return true; } - /** Accept a PrimitiveFunctor and call its methods to tell it about the interal primitives that this Drawable has. */ + /** Accept a PrimitiveFunctor and call its methods to tell it about the internal primitives that this Drawable has. */ virtual void accept(PrimitiveFunctor& pf) const; /** Return true, osg::Geometry does support accept(PrimitiveIndexFunctor&). */ virtual bool supports(const PrimitiveIndexFunctor&) const { return true; } - /** Accept a PrimitiveFunctor and call its methods to tell it about the interal primitives that this Drawable has. */ + /** Accept a PrimitiveFunctor and call its methods to tell it about the internal primitives that this Drawable has. */ virtual void accept(PrimitiveIndexFunctor& pf) const; diff --git a/include/osg/GraphicsContext b/include/osg/GraphicsContext index 16a9671cf..5c64a82b5 100644 --- a/include/osg/GraphicsContext +++ b/include/osg/GraphicsContext @@ -81,13 +81,13 @@ class OSG_EXPORT GraphicsContext : public Object sharedContext(0), setInheritedWindowPixelFormat(false) {} - // graphics context orginal and size + // graphics context original and size int x; int y; int width; int height; - // window decoration and baviour + // window decoration and behaviour std::string windowName; bool windowDecoration; bool supportsResize; @@ -153,7 +153,7 @@ class OSG_EXPORT GraphicsContext : public Object }; - /** Set the querry the windowing system for screens and create graphics context - this functor should be supplied by the windows toolkit. */ + /** Set the query the windowing system for screens and create graphics context - this functor should be supplied by the windows toolkit. */ static void setWindowingSystemInterface(WindowingSystemInterface* wsInterface); /** Get the WindowingSystemInterface*/ @@ -169,7 +169,7 @@ class OSG_EXPORT GraphicsContext : public Object /** Get the current max ContextID.*/ static unsigned int getMaxContextID(); - /** Increment the usage count associate with a contextID. The usage count speficies how many graphics contexts a specific contextID is shared between.*/ + /** Increment the usage count associate with a contextID. The usage count specifies how many graphics contexts a specific contextID is shared between.*/ static void incrementContextIDUsageCount(unsigned int contextID); /** Decrement the usage count associate with a contextID. Once the contextID goes to 0 the contextID is then free to be reused.*/ @@ -217,7 +217,7 @@ class OSG_EXPORT GraphicsContext : public Object /** Get the operations queue mutex.*/ OpenThreads::Mutex* getOperationsMutex() { return &_operationsMutex; } - /** Get the operations queue block used to mark an empty queue, if you end items into the empty queu you must release this block.*/ + /** Get the operations queue block used to mark an empty queue, if you end items into the empty queue you must release this block.*/ osg::RefBlock* getOperationsBlock() { return _operationsBlock.get(); } /** Get the current operations that is being run.*/ @@ -261,7 +261,7 @@ class OSG_EXPORT GraphicsContext : public Object virtual void clear(); - /** Realise the GraphicsContext.*/ + /** Realize the GraphicsContext.*/ bool realize(); /** close the graphics context. @@ -274,17 +274,17 @@ class OSG_EXPORT GraphicsContext : public Object /** swap the front and back buffers.*/ void swapBuffers(); - /** Return true if the graphics context has been realised and is ready to use.*/ + /** Return true if the graphics context has been realized and is ready to use.*/ inline bool isRealized() const { return isRealizedImplementation(); } /** Make this graphics context current. - * Implementated by calling makeCurrentImplementation(). + * Implemented by calling makeCurrentImplementation(). * Returns true on success. */ bool makeCurrent(); /** Make this graphics context current with specified read context. - * Implementated by calling makeContextCurrentImplementation(). + * Implemented by calling makeContextCurrentImplementation(). * Returns true on success. */ bool makeContextCurrent(GraphicsContext* readContext); @@ -313,35 +313,35 @@ class OSG_EXPORT GraphicsContext : public Object const GraphicsThread* getGraphicsThread() const { return _graphicsThread.get(); } - /** Realise the GraphicsContext implementation, - * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ + /** Realize the GraphicsContext implementation, + * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ virtual bool realizeImplementation() = 0; - /** Return true if the graphics context has been realised, and is ready to use, implementation. - * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ + /** Return true if the graphics context has been realized, and is ready to use, implementation. + * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ virtual bool isRealizedImplementation() const = 0; /** Close the graphics context implementation. - * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ + * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ virtual void closeImplementation() = 0; /** Make this graphics context current implementation. - * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ + * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ virtual bool makeCurrentImplementation() = 0; /** Make this graphics context current with specified read context implementation. - * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ + * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ virtual bool makeContextCurrentImplementation(GraphicsContext* readContext) = 0; /** Release the graphics context implementation.*/ virtual bool releaseContextImplementation() = 0; /** Pure virtual, Bind the graphics context to associated texture implementation. - * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ + * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ virtual void bindPBufferToTextureImplementation(GLenum buffer) = 0; /** Swap the front and back buffers implementation. - * Pure virtual - must be implemented by Concrate implementations of GraphicsContext. */ + * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ virtual void swapBuffersImplementation() = 0; diff --git a/include/osg/GraphicsThread b/include/osg/GraphicsThread index f1c95e902..02dce2e56 100644 --- a/include/osg/GraphicsThread +++ b/include/osg/GraphicsThread @@ -37,7 +37,7 @@ struct OSG_EXPORT GraphicsOperation : public Operation GraphicsOperation(const std::string& name, bool keep): Operation(name,keep) {} - /** Override the standard Operation opertator and dynamic cast object to a GraphicsContext, + /** Override the standard Operation operator and dynamic cast object to a GraphicsContext, * on success call operation()(GraphicsContext*).*/ virtual void operator () (Object* object); @@ -54,7 +54,7 @@ struct OSG_EXPORT SwapBuffersOperation : public GraphicsOperation virtual void operator () (GraphicsContext* context); }; -/** BarrierOperation allows one to syncronize multiple GraphicsThreads with each other.*/ +/** BarrierOperation allows one to synchronize multiple GraphicsThreads with each other.*/ struct OSG_EXPORT BarrierOperation : public Operation, public OpenThreads::Barrier { enum PreBlockOp @@ -76,8 +76,8 @@ struct OSG_EXPORT BarrierOperation : public Operation, public OpenThreads::Barri PreBlockOp _preBlockOp; }; -/** ReleaseContext_Block_MakeCurrentOperation releases the context for another thread to aquire, - * then blocks waiting for context to be released, once the block is release the context is re-aqquired.*/ +/** ReleaseContext_Block_MakeCurrentOperation releases the context for another thread to acquire, + * then blocks waiting for context to be released, once the block is release the context is re-acquired.*/ struct OSG_EXPORT ReleaseContext_Block_MakeCurrentOperation : public GraphicsOperation, public RefBlock { ReleaseContext_Block_MakeCurrentOperation(): diff --git a/include/osg/Group b/include/osg/Group index 923b841d7..19bd96c0e 100644 --- a/include/osg/Group +++ b/include/osg/Group @@ -92,11 +92,11 @@ class OSG_EXPORT Group : public Node /** Replace specified Node with another Node. * Equivalent to setChild(getChildIndex(orignChild),node) - * See docs for setChild for futher details on implementation. + * See docs for setChild for further details on implementation. */ virtual bool replaceChild( Node *origChild, Node* newChild ); - /** Return the number of chilren nodes. */ + /** Return the number of children nodes. */ inline unsigned int getNumChildren() const { return _children.size(); } /** Set child node at position i. @@ -149,7 +149,7 @@ class OSG_EXPORT Group : public Node virtual void resizeGLObjectBuffers(unsigned int maxSize); /** If State is non-zero, this function releases any associated OpenGL objects for - * the specified graphics context. Otherwise, releases OpenGL objexts + * the specified graphics context. Otherwise, releases OpenGL objects * for all graphics contexts. */ virtual void releaseGLObjects(osg::State* = 0) const; diff --git a/include/osg/Hint b/include/osg/Hint index 196b125e6..5ec5cd6a9 100644 --- a/include/osg/Hint +++ b/include/osg/Hint @@ -50,7 +50,7 @@ public: // used by the COMPARE_StateAttribute_Parameter macro's below. COMPARE_StateAttribute_Types(Hint,sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_target) COMPARE_StateAttribute_Parameter(_mode) diff --git a/include/osg/LOD b/include/osg/LOD index 94d2c323d..6f652b329 100644 --- a/include/osg/LOD +++ b/include/osg/LOD @@ -76,7 +76,7 @@ class OSG_EXPORT LOD : public Group /** Set the object-space reference radius of the volume enclosed by the LOD. - * Used to detmine the bounding sphere of the LOD in the absense of any children.*/ + * Used to determine the bounding sphere of the LOD in the absence of any children.*/ inline void setRadius(float radius) { _radius = radius; } /** Get the object-space radius of the volume enclosed by the LOD.*/ @@ -84,21 +84,21 @@ class OSG_EXPORT LOD : public Group - /** Modes that control how the range values should be intepreted when computing which child is active.*/ + /** Modes that control how the range values should be interpreted when computing which child is active.*/ enum RangeMode { DISTANCE_FROM_EYE_POINT, PIXEL_SIZE_ON_SCREEN }; - /** Set how the range values should be intepreted when computing which child is active.*/ + /** Set how the range values should be interpreted when computing which child is active.*/ void setRangeMode(RangeMode mode) { _rangeMode = mode; } - /** Get how the range values should be intepreted when computing which child is active.*/ + /** Get how the range values should be interpreted when computing which child is active.*/ RangeMode getRangeMode() const { return _rangeMode; } - /** Sets the min and max visible ranges of range of specifiec child. + /** Sets the min and max visible ranges of range of specific child. Values are floating point distance specified in local objects coordinates.*/ void setRange(unsigned int childNo, float min,float max); diff --git a/include/osg/Light b/include/osg/Light index 9fa2d0b8e..db9d25a13 100644 --- a/include/osg/Light +++ b/include/osg/Light @@ -58,7 +58,7 @@ class OSG_EXPORT Light : public StateAttribute // used by the COMPARE_StateAttribute_Paramter macro's below. COMPARE_StateAttribute_Types(Light,sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_lightnum) COMPARE_StateAttribute_Parameter(_ambient) COMPARE_StateAttribute_Parameter(_diffuse) diff --git a/include/osg/LightModel b/include/osg/LightModel index 5c9e19634..a12c28cce 100644 --- a/include/osg/LightModel +++ b/include/osg/LightModel @@ -43,7 +43,7 @@ class OSG_EXPORT LightModel : public StateAttribute // used by the COMPARE_StateAttribute_Paramter macro's below. COMPARE_StateAttribute_Types(LightModel,sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_ambient) COMPARE_StateAttribute_Parameter(_colorControl) COMPARE_StateAttribute_Parameter(_localViewer) diff --git a/include/osg/Math b/include/osg/Math index ec8eb0942..4f6c1ec82 100644 --- a/include/osg/Math +++ b/include/osg/Math @@ -139,14 +139,14 @@ inline bool equivalent(float lhs,float rhs,float epsilon=1e-6) inline bool equivalent(double lhs,double rhs,double epsilon=1e-6) { double delta = rhs-lhs; return delta<0.0?delta>=-epsilon:delta<=epsilon; } -/** return the minimum of two values, equivilent to std::min. +/** return the minimum of two values, equivalent to std::min. * std::min not used because of STL implementation under IRIX not containing * std::min. */ template inline T minimum(T lhs,T rhs) { return lhsIn OSG, each \c Drawable and each \c Node has a reference to a * \c StateSet. These StateSets can be shared between @@ -92,7 +92,7 @@ class OSG_EXPORT StateSet : public Object inline unsigned int getNumParents() const { return _parents.size(); } - /** Compute the DataVariance based on an assestment of callback etc.*/ + /** Compute the DataVariance based on an assessment of callback etc.*/ virtual void computeDataVariance(); diff --git a/include/osg/StencilTwoSided b/include/osg/StencilTwoSided index 8247a0ee1..f993b5fd4 100644 --- a/include/osg/StencilTwoSided +++ b/include/osg/StencilTwoSided @@ -165,7 +165,7 @@ class OSG_EXPORT StencilTwoSided : public StateAttribute }; /** Function to call to get the extension of a specified context. - * If the Exentsion object for that context has not yet been created + * If the Extension object for that context has not yet been created * and the 'createIfNotInitalized' flag been set to false then returns NULL. * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object diff --git a/include/osg/TemplatePrimitiveFunctor b/include/osg/TemplatePrimitiveFunctor index 3e875e461..d718b7251 100644 --- a/include/osg/TemplatePrimitiveFunctor +++ b/include/osg/TemplatePrimitiveFunctor @@ -275,7 +275,7 @@ namespace osg { /** Note: * begin(..),vertex(..) & end() are convenience methods for adapting * non vertex array primitives to vertex array based primitives. - * This is done to simplify the implementation of primtive functor + * This is done to simplify the implementation of primitive functor * subclasses - users only need override drawArray and drawElements. */ virtual void begin(GLenum mode) diff --git a/include/osg/TexEnvFilter b/include/osg/TexEnvFilter index 45ca2a0b6..8bd9f3d24 100644 --- a/include/osg/TexEnvFilter +++ b/include/osg/TexEnvFilter @@ -47,7 +47,7 @@ class OSG_EXPORT TexEnvFilter : public StateAttribute // used by the COMPARE_StateAttribute_Paramter macro's below. COMPARE_StateAttribute_Types(TexEnvFilter, sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_lodBias) return 0; // passed all the above comparison macro's, must be equal. diff --git a/include/osg/TexGen b/include/osg/TexGen index 4183074a8..d5fa295f6 100644 --- a/include/osg/TexGen +++ b/include/osg/TexGen @@ -70,7 +70,7 @@ class OSG_EXPORT TexGen : public StateAttribute usage.usesTextureMode(GL_TEXTURE_GEN_S); usage.usesTextureMode(GL_TEXTURE_GEN_T); - // Not happy with turning all tex gen paramters on + // Not happy with turning all tex gen parameters on // as the OSG currently only supports 2D textures and therefore // only S and T will be required, R&Q would be redundant... // So commenting out the following until OSG supports 3D textures. @@ -121,7 +121,7 @@ class OSG_EXPORT TexGen : public StateAttribute Mode _mode; - /** Additional texgen coefficents for GL_OBJECT_PLANE or + /** Additional texgen coefficients for GL_OBJECT_PLANE or * GL_EYE_PLANE, */ Plane _plane_s, _plane_t, _plane_r, _plane_q; diff --git a/include/osg/Texture b/include/osg/Texture index b0478b2ea..851fcabf4 100644 --- a/include/osg/Texture +++ b/include/osg/Texture @@ -355,7 +355,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute /** Sets the maximum anisotropy value, default value is 1.0 for no * anisotropic filtering. If hardware does not support anisotropic - * filtering, use normal filtering (equivilant to a max anisotropy + * filtering, use normal filtering (equivalent to a max anisotropy * value of 1.0. Valid range is 1.0f upwards. The maximum value * depends on the graphics system. */ void setMaxAnisotropy(float anis); @@ -371,7 +371,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute inline bool getUseHardwareMipMapGeneration() const { return _useHardwareMipMapGeneration; } /** Sets whether or not the apply() function will unreference the image - * data. If enabled, and the image data is only referened by this + * data. If enabled, and the image data is only referenced by this * Texture, apply() will delete the image data. */ inline void setUnRefImageDataAfterApply(bool flag) { _unrefImageDataAfterApply = flag; } @@ -495,7 +495,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute * The OpenGL's glGenerateMipmapEXT function is used to generate the mipmap levels. * If glGenerateMipmapEXT is not supported or texture's internal format is not supported * by the glGenerateMipmapEXT, then empty mipmap levels will - * be allocated manualy. The mipmap levels are also allocated if a non-mipmapped + * be allocated manually. The mipmap levels are also allocated if a non-mipmapped * min filter is used. */ void allocateMipmapLevels(); @@ -542,16 +542,16 @@ class OSG_EXPORT Texture : public osg::StateAttribute virtual unsigned int getNumImages() const = 0; - /** Set the PBuffer graphis context to read from when using PBuffers for RenderToTexture.*/ + /** Set the PBuffer graphics context to read from when using PBuffers for RenderToTexture.*/ void setReadPBuffer(GraphicsContext* context) { _readPBuffer = context; } - /** Get the PBuffer graphis context to read from when using PBuffers for RenderToTexture.*/ + /** Get the PBuffer graphics context to read from when using PBuffers for RenderToTexture.*/ GraphicsContext* getReadPBuffer() { return _readPBuffer.get(); } - /** Get the const PBuffer graphis context to read from when using PBuffers for RenderToTexture.*/ + /** Get the const PBuffer graphics context to read from when using PBuffers for RenderToTexture.*/ const GraphicsContext* getReadPBuffer() const { return _readPBuffer.get(); } - /** Texture is a pure virtual base class, apply must be overriden. */ + /** Texture is a pure virtual base class, apply must be overridden. */ virtual void apply(State& state) const = 0; /** Calls apply(state) to compile the texture. */ @@ -561,12 +561,12 @@ class OSG_EXPORT Texture : public osg::StateAttribute virtual void resizeGLObjectBuffers(unsigned int maxSize); /** If State is non-zero, this function releases OpenGL objects for - * the specified graphics context. Otherwise, releases OpenGL objexts + * the specified graphics context. Otherwise, releases OpenGL objects * for all graphics contexts. */ virtual void releaseGLObjects(State* state=0) const; /** Encapsulates queries of extension availability, obtains extension - * function pointers, and provides convinience wrappers for + * function pointers, and provides convenience wrappers for * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -681,7 +681,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute /** Overrides Extensions objects across graphics contexts. Typically * used to ensure the same lowest common denominator of extensions - * on sustems with different graphics pipes. */ + * on systems with different graphics pipes. */ static void setExtensions(unsigned int contextID,Extensions* extensions); /** Determine whether the given internalFormat is a compressed @@ -716,7 +716,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute void computeInternalFormatType() const; - /** Helper method. Sets texture paramters. */ + /** Helper method. Sets texture parameters. */ void applyTexParameters(GLenum target, State& state) const; /** Helper method to generate empty mipmap levels by calling of glGenerateMipmapEXT. diff --git a/include/osg/Texture1D b/include/osg/Texture1D index 51e515f59..ca14d3baa 100644 --- a/include/osg/Texture1D +++ b/include/osg/Texture1D @@ -94,7 +94,7 @@ class OSG_EXPORT Texture1D : public Texture /** Helper function. Sets the number of mipmap levels created for this - * texture. Should only be called within an osg::Texuture::apply(), or + * texture. Should only be called within an osg::Texture::apply(), or * during a custom OpenGL texture load. */ void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } @@ -126,7 +126,7 @@ class OSG_EXPORT Texture1D : public Texture virtual void computeInternalFormat() const; void allocateMipmap(State& state) const; - /** Helper method. Createa the texture without setting or using a + /** Helper method. Create the texture without setting or using a * texture binding. */ void applyTexImage1D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& numMipmapLevels) const; diff --git a/include/osg/Texture2D b/include/osg/Texture2D index f7aa09e1d..ea409764c 100644 --- a/include/osg/Texture2D +++ b/include/osg/Texture2D @@ -99,7 +99,7 @@ class OSG_EXPORT Texture2D : public Texture /** Helper function. Sets the number of mipmap levels created for this - * texture. Should only be called within an osg::Texuture::apply(), or + * texture. Should only be called within an osg::Texture::apply(), or * during a custom OpenGL texture load. */ void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } diff --git a/include/osg/Texture2DArray b/include/osg/Texture2DArray index 880a29406..b73f36e42 100644 --- a/include/osg/Texture2DArray +++ b/include/osg/Texture2DArray @@ -66,7 +66,7 @@ class OSG_EXPORT Texture2DArray : public Texture } /** Set the texture width and height. If width or height are zero then - * the repsective size value is calculated from the source image sizes. + * the respective size value is calculated from the source image sizes. * Depth parameter specifies the number of layers to be used. */ void setTextureSize(int width, int height, int depth); @@ -96,7 +96,7 @@ class OSG_EXPORT Texture2DArray : public Texture /** Set the number of mip map levels the 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::Texture::apply() and custom OpenGL texture load. */ void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } @@ -119,7 +119,7 @@ class OSG_EXPORT Texture2DArray : public Texture /** Extensions class which encapsulates the querying of extensions and - * associated function pointers, and provides convinience wrappers to + * associated function pointers, and provides convenience wrappers to * check for the extensions or use the associated functions. */ class OSG_EXPORT Extensions : public osg::Referenced @@ -182,7 +182,7 @@ class OSG_EXPORT Texture2DArray : public Texture }; /** Function to call to get the extension of a specified context. - * If the Exentsion object for that context has not yet been created + * If the Extension object for that context has not yet been created * and the 'createIfNotInitalized' flag been set to false then returns NULL. * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object will diff --git a/include/osg/Texture3D b/include/osg/Texture3D index ffe721ae6..f2a248850 100644 --- a/include/osg/Texture3D +++ b/include/osg/Texture3D @@ -108,7 +108,7 @@ class OSG_EXPORT Texture3D : public Texture /** Helper function. Sets the number of mipmap levels created for this - * texture. Should only be called within an osg::Texuture::apply(), or + * texture. Should only be called within an osg::Texture::apply(), or * during a custom OpenGL texture load. */ void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } @@ -132,7 +132,7 @@ class OSG_EXPORT Texture3D : public Texture /** Encapsulates queries of extension availability, obtains extension - * function pointers, and provides convinience wrappers for + * function pointers, and provides convenience wrappers for * calling extension functions. */ class OSG_EXPORT Extensions : public osg::Referenced { @@ -192,13 +192,13 @@ class OSG_EXPORT Texture3D : public Texture }; /** Encapsulates queries of extension availability, obtains extension - * function pointers, and provides convinience wrappers for + * function pointers, and provides convenience wrappers for * calling extension functions. */ static Extensions* getExtensions(unsigned int contextID,bool createIfNotInitalized); /** Overrides Extensions objects across graphics contexts. Typically * used to ensure the same lowest common denominator of extensions - * on sustems with different graphics pipes. */ + * on systems with different graphics pipes. */ static void setExtensions(unsigned int contextID,Extensions* extensions); protected : diff --git a/include/osg/TextureRectangle b/include/osg/TextureRectangle index 382d7ed68..b9d50aaa6 100644 --- a/include/osg/TextureRectangle +++ b/include/osg/TextureRectangle @@ -76,7 +76,7 @@ class OSG_EXPORT TextureRectangle : public Texture /** Set the texture width and height. If width or height are zero then - * the repsective size value is calculated from the source image sizes. + * the respective size value is calculated from the source image sizes. */ inline void setTextureSize(int width, int height) const { diff --git a/include/osg/Timer b/include/osg/Timer index 5255d710a..c064f1eb5 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 numer of ticks per second.*/ + /** Get the the number of ticks per second.*/ inline double getSecondsPerTick() const { return _secsPerTick; } protected : diff --git a/include/osg/Transform b/include/osg/Transform index c18b3d5b9..b7cb6c075 100644 --- a/include/osg/Transform +++ b/include/osg/Transform @@ -37,13 +37,13 @@ extern OSG_EXPORT Matrix computeWorldToLocal(const NodePath& nodePath, bool igno /** Compute the matrix which transforms objects in local coords to eye coords, * by accumulating the Transform local to world matrices along the specified node path - * and multipling by the supplied initial camera modelview. + * and multiplying by the supplied initial camera modelview. */ extern OSG_EXPORT Matrix computeLocalToEye(const Matrix& modelview, const NodePath& nodePath, bool ignoreCameras = true); /** Compute the matrix which transforms objects in eye coords to local coords, * by accumulating the Transform world to local matrices along the specified node path - * and multipling by the inverse of the supplied initialial camera modelview. + * and multiplying by the inverse of the supplied initial camera modelview. */ extern OSG_EXPORT Matrix computeEyeToLocal(const Matrix& modelview, const NodePath& nodePath, bool ignoreCameras = true); @@ -100,7 +100,7 @@ class OSG_EXPORT Transform : public Group * Note: Setting the ReferenceFrame to be ABSOLUTE_RF will * also set the CullingActive flag on the transform, and hence all * of its parents, to false, thereby disabling culling of it and - * all its parents. This is neccessary to prevent inappropriate + * all its parents. This is necessary to prevent inappropriate * culling, but may impact cull times if the absolute transform is * deep in the scene graph. It is therefore recommended to only use * absolute Transforms at the top of the scene, for such things as @@ -110,7 +110,7 @@ class OSG_EXPORT Transform : public Group * as its local viewpoint in the new coordinates frame. This is useful for * Render to texture Cameras that wish to use the main views LOD range computation * (which uses the viewpoint rather than the eye point) rather than use the local - * eye point defined by the this Transforms' abosolute view matrix. + * eye point defined by the this Transforms' absolute view matrix. */ void setReferenceFrame(ReferenceFrame rf); diff --git a/include/osg/TriangleFunctor b/include/osg/TriangleFunctor index 3bbc19dad..4b34ececb 100644 --- a/include/osg/TriangleFunctor +++ b/include/osg/TriangleFunctor @@ -355,7 +355,7 @@ public: /** Note: * begin(..),vertex(..) & end() are convenience methods for adapting * non vertex array primitives to vertex array based primitives. - * This is done to simplify the implementation of primtive functor + * This is done to simplify the implementation of primitive functor * subclasses - users only need override drawArray and drawElements. */ virtual void begin(GLenum mode) diff --git a/include/osg/Uniform b/include/osg/Uniform index 33e5ab55c..68e909f9d 100644 --- a/include/osg/Uniform +++ b/include/osg/Uniform @@ -378,7 +378,7 @@ class OSG_EXPORT Uniform : public Object const Callback* getEventCallback() const { return _eventCallback.get(); } /** Increment the modified count on the Uniform so Programs watching it know it update themselves. - * NOTE: autotomatically called during osg::Uniform::set*(); + * NOTE: automatically called during osg::Uniform::set*(); * you must call if modifying the internal data array directly. */ inline void dirty() { ++_modifiedCount; } diff --git a/include/osg/Vec2b b/include/osg/Vec2b index d859b27bc..ad7251fc8 100644 --- a/include/osg/Vec2b +++ b/include/osg/Vec2b @@ -34,7 +34,7 @@ class Vec2b /** Number of vector components. */ enum { num_components = 2 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[2]; Vec2b() { _v[0]=0; _v[1]=0; } diff --git a/include/osg/Vec2d b/include/osg/Vec2d index 94d18c44f..77eb694df 100644 --- a/include/osg/Vec2d +++ b/include/osg/Vec2d @@ -35,7 +35,6 @@ class Vec2d /** Number of vector components. */ enum { num_components = 2 }; - /** Vec member varaible. */ value_type _v[2]; Vec2d() {_v[0]=0.0; _v[1]=0.0;} diff --git a/include/osg/Vec2s b/include/osg/Vec2s index 4c0651a9a..118e2e660 100644 --- a/include/osg/Vec2s +++ b/include/osg/Vec2s @@ -26,7 +26,6 @@ class Vec2s /** Number of vector components. */ enum { num_components = 2 }; - /** Vec member varaible. */ value_type _v[2]; Vec2s() { _v[0]=0; _v[1]=0; } diff --git a/include/osg/Vec3b b/include/osg/Vec3b index 10c6676eb..d54332ca8 100644 --- a/include/osg/Vec3b +++ b/include/osg/Vec3b @@ -32,7 +32,6 @@ class Vec3b /** Number of vector components. */ enum { num_components = 3 }; - /** Vec member varaible. */ value_type _v[3]; Vec3b() { _v[0]=0; _v[1]=0; _v[2]=0; } diff --git a/include/osg/Vec3d b/include/osg/Vec3d index 243fb7be6..ca60f928d 100644 --- a/include/osg/Vec3d +++ b/include/osg/Vec3d @@ -36,7 +36,6 @@ class Vec3d /** Number of vector components. */ enum { num_components = 3 }; - /** Vec member varaible. */ value_type _v[3]; Vec3d() { _v[0]=0.0; _v[1]=0.0; _v[2]=0.0;} diff --git a/include/osg/Vec3f b/include/osg/Vec3f index 4c0eec48e..58de01350 100644 --- a/include/osg/Vec3f +++ b/include/osg/Vec3f @@ -35,7 +35,6 @@ class Vec3f /** Number of vector components. */ enum { num_components = 3 }; - /** Vec member varaible. */ value_type _v[3]; Vec3f() { _v[0]=0.0f; _v[1]=0.0f; _v[2]=0.0f;} diff --git a/include/osg/Vec3s b/include/osg/Vec3s index e6b62691d..845e02708 100644 --- a/include/osg/Vec3s +++ b/include/osg/Vec3s @@ -26,7 +26,6 @@ class Vec3s /** Number of vector components. */ enum { num_components = 3 }; - /** Vec member varaible. */ value_type _v[3]; Vec3s() { _v[0]=0; _v[1]=0; _v[2]=0; } diff --git a/include/osg/Vec4b b/include/osg/Vec4b index 9b889f72c..e7afb3258 100644 --- a/include/osg/Vec4b +++ b/include/osg/Vec4b @@ -32,7 +32,6 @@ class Vec4b /** Number of vector components. */ enum { num_components = 4 }; - /** Vec member varaible. */ value_type _v[4]; Vec4b() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; } diff --git a/include/osg/Vec4d b/include/osg/Vec4d index 4301f1b4f..a89cb6e87 100644 --- a/include/osg/Vec4d +++ b/include/osg/Vec4d @@ -35,7 +35,6 @@ class Vec4d /** Number of vector components. */ enum { num_components = 4 }; - /** Vec member varaible. */ value_type _v[4]; Vec4d() { _v[0]=0.0; _v[1]=0.0; _v[2]=0.0; _v[3]=0.0; } diff --git a/include/osg/Vec4f b/include/osg/Vec4f index 608d723dd..6100a254c 100644 --- a/include/osg/Vec4f +++ b/include/osg/Vec4f @@ -34,7 +34,7 @@ class Vec4f /** Number of vector components. */ enum { num_components = 4 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[4]; // Methods are defined here so that they are implicitly inlined diff --git a/include/osg/Vec4s b/include/osg/Vec4s index 6c78835bc..88525a941 100644 --- a/include/osg/Vec4s +++ b/include/osg/Vec4s @@ -26,7 +26,7 @@ class Vec4s /** Number of vector components. */ enum { num_components = 4 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[4]; Vec4s() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; } diff --git a/include/osg/Vec4ub b/include/osg/Vec4ub index 5000c3de1..a6ef9bcc6 100644 --- a/include/osg/Vec4ub +++ b/include/osg/Vec4ub @@ -34,7 +34,7 @@ class Vec4ub /** Number of vector components. */ enum { num_components = 4 }; - /** Vec member varaible. */ + /** Vec member variable. */ value_type _v[4]; Vec4ub() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; } diff --git a/include/osg/VertexProgram b/include/osg/VertexProgram index 2272f331f..d9dab96fc 100644 --- a/include/osg/VertexProgram +++ b/include/osg/VertexProgram @@ -130,7 +130,7 @@ class OSG_EXPORT VertexProgram : public StateAttribute // used by the COMPARE_StateAttribute_Paramter macro's below. COMPARE_StateAttribute_Types(VertexProgram,sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_vertexProgram) return 0; // passed all the above comparison macros, must be equal. @@ -225,7 +225,7 @@ class OSG_EXPORT VertexProgram : public StateAttribute virtual void resizeGLObjectBuffers(unsigned int maxSize); /** Release any OpenGL objects in specified graphics context if State - * object is passed, otherwise release OpenGL objexts for all graphics contexts if + * object is passed, otherwise release OpenGL objects for all graphics contexts if * State object pointer is NULL. */ virtual void releaseGLObjects(State* state=0) const; @@ -269,7 +269,7 @@ class OSG_EXPORT VertexProgram : public StateAttribute }; /** Function to call to get the extension of a specified context. - * If the Exentsion object for that context has not yet been created + * If the Extension object for that context has not yet been created * and the 'createIfNotInitalized' flag been set to false then returns NULL. * If 'createIfNotInitalized' is true then the Extensions object is * automatically created. However, in this case the extension object diff --git a/include/osg/Viewport b/include/osg/Viewport index db33df4d3..f8e7c7baa 100644 --- a/include/osg/Viewport +++ b/include/osg/Viewport @@ -55,7 +55,7 @@ class OSG_EXPORT Viewport : public StateAttribute // used by the COMPARE_StateAttribute_Paramter macro's below. COMPARE_StateAttribute_Types(Viewport,sa) - // compare each paramter in turn against the rhs. + // compare each parameter in turn against the rhs. COMPARE_StateAttribute_Parameter(_x) COMPARE_StateAttribute_Parameter(_y) COMPARE_StateAttribute_Parameter(_width) @@ -104,7 +104,7 @@ class OSG_EXPORT Viewport : public StateAttribute inline bool valid() const { return _width>0 && _height>0; } /** Return the aspectRatio of the viewport, which is equal to width/height. - * If height is zero, the potental division by zero is avoided by simply returning 1.0f. + * If height is zero, the potential division by zero is avoided by simply returning 1.0f. */ inline double aspectRatio() const { if (_height!=0) return (double)_width/(double)_height; else return 1.0; } diff --git a/include/osg/io_utils b/include/osg/io_utils index 524487ffb..a6d18d903 100644 --- a/include/osg/io_utils +++ b/include/osg/io_utils @@ -229,7 +229,7 @@ inline std::istream& operator >> (std::istream& input, Vec4s& vec) ////////////////////////////////////////////////////////////////////////// -// Matrxf steaming operators. +// Matrixf steaming operators. inline std::ostream& operator<< (std::ostream& os, const Matrixf& m ) { os << "{"< > StateSetSet; StateSetSet _sharedStateSetList; - // Temporary lists just to avoid unnecesary find calls + // Temporary lists just to avoid unnecessary find calls typedef std::pair TextureSharePair; typedef std::map TextureTextureSharePairMap; TextureTextureSharePairMap tmpSharedTextureList; diff --git a/include/osgGA/AnimationPathManipulator b/include/osgGA/AnimationPathManipulator index 844609cf0..f72f2970d 100644 --- a/include/osgGA/AnimationPathManipulator +++ b/include/osgGA/AnimationPathManipulator @@ -27,8 +27,8 @@ namespace osgGA{ // per line. The succession of values are: // time px py pz ax ay az aw // where: -// time = elapsed time in seconds from the begining of the animation -// px py pz = World position in catesian coordinates +// time = elapsed time in seconds from the beginning of the animation +// px py pz = World position in cartesian coordinates // ax ay az aw = Orientation (attitude) defined as a quaternion class OSGGA_EXPORT AnimationPathManipulator : public MatrixManipulator diff --git a/include/osgGA/EventQueue b/include/osgGA/EventQueue index c00dfbb43..57efd09e2 100644 --- a/include/osgGA/EventQueue +++ b/include/osgGA/EventQueue @@ -174,7 +174,7 @@ class OSGGA_EXPORT EventQueue : public osg::Referenced double getTime() const { return osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick()); } - /** convinience method for create an event ready to fill in. Clones the getCurrentEventState() to produce a up to date event state. */ + /** convenience method for create an event ready to fill in. Clones the getCurrentEventState() to produce a up to date event state. */ GUIEventAdapter* createEvent(); diff --git a/include/osgGA/GUIActionAdapter b/include/osgGA/GUIActionAdapter index 964036bf3..999ab88e8 100644 --- a/include/osgGA/GUIActionAdapter +++ b/include/osgGA/GUIActionAdapter @@ -21,7 +21,7 @@ namespace osgGA{ /** Abstract base class defining the interface by which GUIEventHandlers may request -actions of the GUI system in use. These requests for actions should then be honoured +actions of the GUI system in use. These requests for actions should then be honored by the GUI toolkit of the user's application. To provide more detail, when a GUIEventHandler (e.g. a TrackballManipulator) @@ -57,7 +57,7 @@ class GUIActionAdapter public: virtual ~GUIActionAdapter() {} - /** Provide a mechanism for getting the osg::View assocaited with this GUIActionAdapter. + /** Provide a mechanism for getting the osg::View associated with this GUIActionAdapter. * One would use this to case view to osgViewer::View(er) if supported by the subclass.*/ virtual osg::View* asView() { return 0; } diff --git a/include/osgGA/GUIEventAdapter b/include/osgGA/GUIEventAdapter index 1076968aa..2c6ebf048 100644 --- a/include/osgGA/GUIEventAdapter +++ b/include/osgGA/GUIEventAdapter @@ -142,7 +142,7 @@ public: KEY_KP_9 = 0xFFB9, /* - * Auxilliary Functions; note the duplicate definitions for left and right + * Auxiliary Functions; note the duplicate definitions for left and right * function keys; Sun keyboards and a few other manufactures have such * function key groups on the left and/or right sides of the keyboard. * We've not found a keyboard with more than 35 function keys total. @@ -322,7 +322,7 @@ public: /** get mouse maximum x. */ float getXmax() const { return _Xmax; } - /** get mmouse minimum y. */ + /** get mouse minimum y. */ float getYmin() const { return _Ymin; } /** get mouse maYimum y. */ @@ -377,13 +377,13 @@ public: ScrollingMotion getScrollingMotion() const { return _scrollingMotion; } - /** return the getX() value normalised to the range of -1 to 1. + /** return the getX() value normalized to the range of -1 to 1. * -1 would be the left hand side of the window. * 0.0 would be the middle of the window. * +1 would be the right hand side of the window.*/ inline float getXnormalized() const { return 2.0f*(getX()-getXmin())/(getXmax()-getXmin())-1.0f; } - /** return the getY() value normalised to the range of -1 to 1. + /** return the getY() value normalized to the range of -1 to 1. * -1 would be the bottom of the window. * 0.0 would be the middle of the window. * +1 would be the top of the window.*/ diff --git a/include/osgGA/GUIEventHandler b/include/osgGA/GUIEventHandler index 38efecfdd..0a09b496a 100644 --- a/include/osgGA/GUIEventHandler +++ b/include/osgGA/GUIEventHandler @@ -66,7 +66,7 @@ public: /** Handle events, return true if handled, false otherwise. */ virtual bool handle(const GUIEventAdapter& ea,GUIActionAdapter& aa, osg::Object*, osg::NodeVisitor*) { return handle(ea,aa); } - /** Convnience method that only passes on to the handle(,,,) method events that either haven't been + /** Convenience method that only passes on to the handle(,,,) method events that either haven't been * handled yet, or have been handled but haven't be set to be ignored by the IgnoreHandledEventsMask. * Note, this method is an inline method, and not appropriate for users to override, override the handle(,,,) * method instead.*/ @@ -88,7 +88,7 @@ public: /** Deprecated, Handle events, return true if handled, false otherwise. */ virtual bool handle(const GUIEventAdapter&,GUIActionAdapter&) { return false; } - /** Convnience method that only passes on to the handle(,) method events that either haven't been + /** Convenience method that only passes on to the handle(,) method events that either haven't been * handled yet, or have been handled but haven't be set to be ignored by the IgnoreHandledEventsMask. * Note, this method is an inline method, and not appropriate for users to override, override the handle(,) * method instead.*/ diff --git a/include/osgGA/KeySwitchMatrixManipulator b/include/osgGA/KeySwitchMatrixManipulator index e47d8899d..d53985c88 100644 --- a/include/osgGA/KeySwitchMatrixManipulator +++ b/include/osgGA/KeySwitchMatrixManipulator @@ -100,10 +100,10 @@ public: /** get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix.*/ virtual osg::Matrixd getInverseMatrix() const { return _current->getInverseMatrix(); } - /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/ + /** Get the FusionDistanceMode. Used by SceneView for setting up stereo convergence.*/ virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return _current->getFusionDistanceMode(); } - /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/ + /** Get the FusionDistanceValue. Used by SceneView for setting up stereo convergence.*/ virtual float getFusionDistanceValue() const { return _current->getFusionDistanceValue(); } diff --git a/include/osgGA/MatrixManipulator b/include/osgGA/MatrixManipulator index 313a92a55..cfc02ce5f 100644 --- a/include/osgGA/MatrixManipulator +++ b/include/osgGA/MatrixManipulator @@ -43,7 +43,7 @@ public: virtual const char* className() const { return "MatrixManipulator"; } - /** callback class to use to allow matrix manipulators to querry the application for the local coordinate frame.*/ + /** callback class to use to allow matrix manipulators to query the application for the local coordinate frame.*/ class CoordinateFrameCallback : public osg::Referenced { public: @@ -94,10 +94,10 @@ public: /** get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix.*/ virtual osg::Matrixd getInverseMatrix() const = 0; - /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/ + /** Get the FusionDistanceMode. Used by SceneView for setting up stereo convergence.*/ virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return osgUtil::SceneView::PROPORTIONAL_TO_SCREEN_DISTANCE; } - /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/ + /** Get the FusionDistanceValue. Used by SceneView for setting up stereo convergence.*/ virtual float getFusionDistanceValue() const { return 1.0f; } /** Set the mask to use when set up intersection traversal such as used in manipulators that follow terrain or have collision detection. @@ -129,7 +129,7 @@ public: _homeUp = up; } - /** Get the mnaully set home position. */ + /** Get the manually set home position. */ virtual void getHomePosition(osg::Vec3d& eye, osg::Vec3d& center, osg::Vec3d& up) const { eye = _homeEye; diff --git a/include/osgGA/NodeTrackerManipulator b/include/osgGA/NodeTrackerManipulator index 5b92bff54..7694f5d64 100644 --- a/include/osgGA/NodeTrackerManipulator +++ b/include/osgGA/NodeTrackerManipulator @@ -48,11 +48,11 @@ class OSGGA_EXPORT NodeTrackerManipulator : public MatrixManipulator enum TrackerMode { /** Track the center of the node's bounding sphere, but not rotations of the node. - * For datatbases which have a CoordinateSystemNode, the orientation is kept relative the coordinate frame if the center of the node. + * For databases which have a CoordinateSystemNode, the orientation is kept relative the coordinate frame if the center of the node. */ NODE_CENTER, /** Track the center of the node's bounding sphere, and the azimuth rotation (about the z axis of the current coordinate frame). - * For datatbases which have a CoordinateSystemNode, the orientation is kept relative the coordinate frame if the center of the node. + * For databases which have a CoordinateSystemNode, the orientation is kept relative the coordinate frame if the center of the node. */ NODE_CENTER_AND_AZIM, /** Tack the center of the node's bounding sphere, and the all rotations of the node. @@ -90,10 +90,10 @@ class OSGGA_EXPORT NodeTrackerManipulator : public MatrixManipulator /** get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix.*/ virtual osg::Matrixd getInverseMatrix() const; - /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/ + /** Get the FusionDistanceMode. Used by SceneView for setting up stereo convergence.*/ virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return osgUtil::SceneView::USE_FUSION_DISTANCE_VALUE; } - /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/ + /** Get the FusionDistanceValue. Used by SceneView for setting up stereo convergence.*/ virtual float getFusionDistanceValue() const { return _distance; } /** Attach a node to the manipulator. diff --git a/include/osgGA/TerrainManipulator b/include/osgGA/TerrainManipulator index 1e8ed272e..0e72b256d 100644 --- a/include/osgGA/TerrainManipulator +++ b/include/osgGA/TerrainManipulator @@ -50,10 +50,10 @@ class OSGGA_EXPORT TerrainManipulator : public MatrixManipulator /** get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix.*/ virtual osg::Matrixd getInverseMatrix() const; - /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/ + /** Get the FusionDistanceMode. Used by SceneView for setting up stereo convergence.*/ virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return osgUtil::SceneView::USE_FUSION_DISTANCE_VALUE; } - /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/ + /** Get the FusionDistanceValue. Used by SceneView for setting up stereo convergence.*/ virtual float getFusionDistanceValue() const { return _distance; } /** Attach a node to the manipulator. diff --git a/include/osgGA/TrackballManipulator b/include/osgGA/TrackballManipulator index d15929331..73557505b 100644 --- a/include/osgGA/TrackballManipulator +++ b/include/osgGA/TrackballManipulator @@ -38,10 +38,10 @@ class OSGGA_EXPORT TrackballManipulator : public MatrixManipulator /** get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix.*/ virtual osg::Matrixd getInverseMatrix() const; - /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/ + /** Get the FusionDistanceMode. Used by SceneView for setting up stereo convergence.*/ virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return osgUtil::SceneView::USE_FUSION_DISTANCE_VALUE; } - /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/ + /** Get the FusionDistanceValue. Used by SceneView for setting up stereo convergence.*/ virtual float getFusionDistanceValue() const { return _distance; } /** Attach a node to the manipulator. diff --git a/include/osgGA/UFOManipulator b/include/osgGA/UFOManipulator index 2693b202d..52186decd 100644 --- a/include/osgGA/UFOManipulator +++ b/include/osgGA/UFOManipulator @@ -70,7 +70,7 @@ class OSGGA_EXPORT UFOManipulator : public osgGA::MatrixManipulator */ virtual void setByMatrix( const osg::Matrixd &matrix ) ; - /** Set the current position with the invers matrix + /** Set the current position with the inverse matrix \param invmat The inverse of a viewpoint matrix */ virtual void setByInverseMatrix( const osg::Matrixd &invmat); diff --git a/include/osgShadow/ShadowTechnique b/include/osgShadow/ShadowTechnique index d7d8b8d45..4c37c6e29 100644 --- a/include/osgShadow/ShadowTechnique +++ b/include/osgShadow/ShadowTechnique @@ -27,7 +27,7 @@ namespace osgShadow { // forward declare ShadowedScene class ShadowedScene; -/** ShadowedScene provides a mechansim for decorating a scene that the needs to have shadows cast upon it.*/ +/** ShadowedScene provides a mechanism for decorating a scene that the needs to have shadows cast upon it.*/ class OSGSHADOW_EXPORT ShadowTechnique : public osg::Object { public : @@ -42,7 +42,7 @@ class OSGSHADOW_EXPORT ShadowTechnique : public osg::Object /** initialize the ShadowedScene and local cached data structures.*/ virtual void init(); - /** run the update traversal of the ShadowedScene and update any loca chached data structures.*/ + /** run the update traversal of the ShadowedScene and update any local cached data structures.*/ virtual void update(osg::NodeVisitor& nv); /** run the cull traversal of the ShadowedScene and set up the rendering for this ShadowTechnique.*/ @@ -53,7 +53,7 @@ class OSGSHADOW_EXPORT ShadowTechnique : public osg::Object virtual void traverse(osg::NodeVisitor& nv); - /** Dirty so that cached data structurese are updated.*/ + /** Dirty so that cached data structures are updated.*/ virtual void dirty() { _dirty = true; } protected : diff --git a/include/osgSim/ElevationSlice b/include/osgSim/ElevationSlice index 6d0fe5ba3..ba02fa478 100644 --- a/include/osgSim/ElevationSlice +++ b/include/osgSim/ElevationSlice @@ -21,7 +21,7 @@ namespace osgSim { -/** Helper class for setting up and aquiring height above terrain intersections with terrain.*/ +/** Helper class for setting up and acquiring height above terrain intersections with terrain.*/ class OSGSIM_EXPORT ElevationSlice { public : @@ -68,7 +68,7 @@ class OSGSIM_EXPORT ElevationSlice void clearDatabaseCache() { if (_dcrc.valid()) _dcrc->clearDatabaseCache(); } /** Set the ReadCallback that does the reading of external PagedLOD models, and caching of loaded subgraphs. - * Note, if you have mulitple LineOfSight or ElevationSlice objects in use at one time then you should share a single + * Note, if you have multiple LineOfSight or ElevationSlice objects in use at one time then you should share a single * DatabaseCacheReadCallback between all of them. */ void setDatabaseCacheReadCallback(DatabaseCacheReadCallback* dcrc); diff --git a/include/osgSim/HeightAboveTerrain b/include/osgSim/HeightAboveTerrain index d490730bf..e94a6767a 100644 --- a/include/osgSim/HeightAboveTerrain +++ b/include/osgSim/HeightAboveTerrain @@ -21,7 +21,7 @@ namespace osgSim { -/** Helper class for setting up and aquiring height above terrain intersections with terrain.*/ +/** Helper class for setting up and acquiring height above terrain intersections with terrain.*/ class OSGSIM_EXPORT HeightAboveTerrain { public : @@ -46,7 +46,7 @@ class OSGSIM_EXPORT HeightAboveTerrain const osg::Vec3d& getPoint(unsigned int i) const { return _HATList[i]._point; } /** Get the intersection height for a single height above terrain test. - * Note, you must call computeIntersections(..) before you can querry the HeightAboveTerrain. + * Note, you must call computeIntersections(..) before you can query the HeightAboveTerrain. * If no intersections are found then height returned will be the height above mean sea level. */ double getHeightAboveTerrain(unsigned int i) const { return _HATList[i]._hat; } @@ -72,7 +72,7 @@ class OSGSIM_EXPORT HeightAboveTerrain void clearDatabaseCache() { if (_dcrc.valid()) _dcrc->clearDatabaseCache(); } /** Set the ReadCallback that does the reading of external PagedLOD models, and caching of loaded subgraphs. - * Note, if you have mulitple LineOfSight or HeightAboveTerrain objects in use at one time then you should share a single + * Note, if you have multiple LineOfSight or HeightAboveTerrain objects in use at one time then you should share a single * DatabaseCacheReadCallback between all of them. */ void setDatabaseCacheReadCallback(DatabaseCacheReadCallback* dcrc); diff --git a/include/osgSim/ImpostorSprite b/include/osgSim/ImpostorSprite index 2b33ceab4..9e166c3cb 100644 --- a/include/osgSim/ImpostorSprite +++ b/include/osgSim/ImpostorSprite @@ -131,19 +131,19 @@ class OSGSIM_EXPORT ImpostorSprite : public osg::Drawable /** Return true, osg::ImpostorSprite does support accept(Drawable::AttributeFunctor&). */ virtual bool supports(const Drawable::AttributeFunctor&) const { return true; } - /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ + /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has. */ virtual void accept(Drawable::AttributeFunctor& af); /** Return true, osg::ImpostorSprite does support accept(Drawable::ConstAttributeFunctor&). */ virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } - /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ + /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has. */ virtual void accept(Drawable::ConstAttributeFunctor& af) const; /** Return true, osg::ImpostorSprite does support accept(PrimitiveFunctor&). */ virtual bool supports(const osg::PrimitiveFunctor&) const { return true; } - /** Accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has. */ + /** Accept a PrimtiveFunctor and call its methods to tell it about the internal primitives that this Drawable has. */ virtual void accept(osg::PrimitiveFunctor& pf) const; // for debugging purposes. diff --git a/include/osgSim/LineOfSight b/include/osgSim/LineOfSight index 1f719b148..0964b9e29 100644 --- a/include/osgSim/LineOfSight +++ b/include/osgSim/LineOfSight @@ -43,7 +43,7 @@ class OSGSIM_EXPORT DatabaseCacheReadCallback : public osgUtil::IntersectionVisi FileNameSceneMap _filenameSceneMap; }; -/** Helper class for setting up and aquiring line of sight intersections with terrain. +/** Helper class for setting up and acquiring line of sight intersections with terrain. * Supports automatic paging in of PagedLOD tiles. */ class OSGSIM_EXPORT LineOfSight { @@ -60,7 +60,7 @@ class OSGSIM_EXPORT LineOfSight /** Get the number of line of sight tests.*/ unsigned int getNumLOS() const { return _LOSList.size(); } - /** Set the start point of signel line of sight test.*/ + /** Set the start point of single line of sight test.*/ void setStartPoint(unsigned int i, const osg::Vec3d& start) { _LOSList[i]._start = start; } /** Get the start point of single line of sight test.*/ @@ -89,7 +89,7 @@ class OSGSIM_EXPORT LineOfSight void clearDatabaseCache() { if (_dcrc.valid()) _dcrc->clearDatabaseCache(); } /** Set the ReadCallback that does the reading of external PagedLOD models, and caching of loaded subgraphs. - * Note, if you have mulitple LineOfSight or HeightAboveTerrain objects in use at one time then you should share a single + * Note, if you have multiple LineOfSight or HeightAboveTerrain objects in use at one time then you should share a single * DatabaseCacheReadCallback between all of them. */ void setDatabaseCacheReadCallback(DatabaseCacheReadCallback* dcrc); diff --git a/include/osgTerrain/Locator b/include/osgTerrain/Locator index 52215b756..5f9d586a7 100644 --- a/include/osgTerrain/Locator +++ b/include/osgTerrain/Locator @@ -42,12 +42,12 @@ class OSGTERRAIN_EXPORT Locator : public osg::Object /** GEOGRAPHIC coordinate systems are ones mapped to latitude and longitude.*/ GEOGRAPHIC, - /** PROJECTED coordinate systems are ones projected to a local projected coordindate system i.e. UTMs.*/ + /** PROJECTED coordinate systems are ones projected to a local projected coordinate system i.e. UTMs.*/ PROJECTED }; /** Set the CoordinatesSyetemType. - * Note, the user must keep the CoordinateSystemString consistent with the type of the CoordindateSystem.*/ + * Note, the user must keep the CoordinateSystemString consistent with the type of the CoordinateSystem.*/ void setCoordinateSystemType(CoordinateSystemType type) { _coordinateSystemType = type; } /** Get the CoordinatesSyetemType.*/ diff --git a/include/osgTerrain/Terrain b/include/osgTerrain/Terrain index d1226e759..73dcd5015 100644 --- a/include/osgTerrain/Terrain +++ b/include/osgTerrain/Terrain @@ -24,8 +24,8 @@ namespace osgTerrain { -/** Terrain provides a framework for loosly coupling height field data with height rendering algorithms. - * This allows TerrainTechnique's to be pluged in at runtime.*/ +/** Terrain provides a framework for loosely coupling height field data with height rendering algorithms. + * This allows TerrainTechnique's to be plugged in at runtime.*/ class OSGTERRAIN_EXPORT Terrain : public osg::Group { public: diff --git a/include/osgTerrain/TerrainTechnique b/include/osgTerrain/TerrainTechnique index aaa137953..09c106176 100644 --- a/include/osgTerrain/TerrainTechnique +++ b/include/osgTerrain/TerrainTechnique @@ -48,13 +48,13 @@ class OSGTERRAIN_EXPORT TerrainTechnique : public osg::Object /** Clean scene graph from any terrain technique specific nodes.*/ virtual void cleanSceneGraph(); - /** Traverse the terain subgraph.*/ + /** Traverse the terrain subgraph.*/ virtual void traverse(osg::NodeVisitor& nv); - /** Dirty so that cached data structurese will be updated on next use.*/ + /** Dirty so that cached data structures will be updated on next use.*/ virtual void dirty(); - /** Return true if cached data structurese need updating.*/ + /** Return true if cached data structures need updating.*/ virtual bool isDirty() const { return _dirty; } protected: diff --git a/include/osgText/Font b/include/osgText/Font index 16e13c060..b1b53b6ce 100644 --- a/include/osgText/Font +++ b/include/osgText/Font @@ -266,7 +266,7 @@ public: // parameter used to compute the size and position of empty space - // in the texture which could accomodate new glyphs. + // in the texture which could accommodate new glyphs. int _margin; float _marginRatio; int _usedY; diff --git a/include/osgText/String b/include/osgText/String index 52f2bfa76..313d23bfe 100644 --- a/include/osgText/String +++ b/include/osgText/String @@ -79,7 +79,7 @@ class OSGTEXT_EXPORT String : public VectorUInt void set(const wchar_t* text); /** Set the text using a Unicode encoded std::string, which is converted to an internal TextString. - * The encoding parameter specificies which Unicode encodeding is used in the std::string. */ + * The encoding parameter specifies which Unicode encoding is used in the std::string. */ void set(const std::string& text,Encoding encoding); /** returns a UTF8 encoded version of this osgText::String.*/ diff --git a/include/osgText/Text b/include/osgText/Text index 6c0335cb5..cc8a8f2e0 100644 --- a/include/osgText/Text +++ b/include/osgText/Text @@ -263,13 +263,13 @@ public: /** return true, osgText::Text does support accept(ConstAttributeFunctor&).*/ virtual bool supports(const osg::Drawable::ConstAttributeFunctor&) const { return true; } - /** accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.*/ + /** accept an ConstAttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has.*/ virtual void accept(osg::Drawable::ConstAttributeFunctor& af) const; /** return true, osgText::Text does support accept(PrimitiveFunctor&) .*/ virtual bool supports(const osg::PrimitiveFunctor&) const { return true; } - /** accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has.*/ + /** accept a PrimtiveFunctor and call its methods to tell it about the internal primitives that this Drawable has.*/ virtual void accept(osg::PrimitiveFunctor& pf) const; diff --git a/include/osgUtil/IntersectionVisitor b/include/osgUtil/IntersectionVisitor index 638739caf..f169a520f 100644 --- a/include/osgUtil/IntersectionVisitor +++ b/include/osgUtil/IntersectionVisitor @@ -26,7 +26,7 @@ namespace osgUtil // forward declare to allow Intersector to reference it. class IntersectionVisitor; -/** Pure virtual base class for implementating custom intersection technique. +/** Pure virtual base class for implementing custom intersection technique. * To implement a specific intersection technique on must override all * the pure virtue methods, concrete examples of how to do this can be seen in * the LineSegmentIntersector. */ @@ -77,7 +77,7 @@ class Intersector : public osg::Referenced }; -/** Concrent class for passing multiple intersectors through the scene graph. +/** Concrete class for passing multiple intersectors through the scene graph. * To be used in conjunction with IntersectionVisitor. */ class OSGUTIL_EXPORT IntersectorGroup : public Intersector { @@ -124,7 +124,7 @@ class OSGUTIL_EXPORT IntersectionVisitor : public osg::NodeVisitor public: /** Callback used to implement the reading of external files, allowing support for paged databases to be - * intergrated with IntersectionVisitor. A concrete implementation can be found in osgDB. + * integrated with IntersectionVisitor. A concrete implementation can be found in osgDB. * Note, this loose coupling approach is required as osgUtil is independent from osgDB where the file reading * is implemented, and osgDB itself is dependent upon osgUtil so a circular dependency would result from * tighter integration.*/ diff --git a/include/osgUtil/LineSegmentIntersector b/include/osgUtil/LineSegmentIntersector index dd404f1da..facba2a4d 100644 --- a/include/osgUtil/LineSegmentIntersector +++ b/include/osgUtil/LineSegmentIntersector @@ -19,19 +19,19 @@ namespace osgUtil { -/** Concrent class for implementing line intersections with the scene graph. +/** Concrete class for implementing line intersections with the scene graph. * To be used in conjunction with IntersectionVisitor. */ class OSGUTIL_EXPORT LineSegmentIntersector : public Intersector { public: - /** Construct a LineSegmentIntersector the runs between the secified start and end points in MODEL coordinates. */ + /** Construct a LineSegmentIntersector the runs between the specified start and end points in MODEL coordinates. */ LineSegmentIntersector(const osg::Vec3d& start, const osg::Vec3d& end); - /** Construct a LineSegmentIntersector the runs between the secified start and end points in the specified coordinate frame. */ + /** Construct a LineSegmentIntersector the runs between the specified start and end points in the specified coordinate frame. */ LineSegmentIntersector(CoordinateFrame cf, const osg::Vec3d& start, const osg::Vec3d& end); - /** Convinience constructor for supporting picking in WINDOW, or PROJECTION coorindates + /** Convenience constructor for supporting picking in WINDOW, or PROJECTION coordinates * In WINDOW coordinates creates a start value of (x,y,0) and end value of (x,y,1). * In PROJECTION coordinates (clip space cube) creates a start value of (x,y,-1) and end value of (x,y,1). * In VIEW and MODEL coordinates creates a start value of (x,y,0) and end value of (x,y,1).*/ diff --git a/include/osgUtil/PlaneIntersector b/include/osgUtil/PlaneIntersector index f8a81c96c..c970a16fb 100644 --- a/include/osgUtil/PlaneIntersector +++ b/include/osgUtil/PlaneIntersector @@ -21,7 +21,7 @@ namespace osgUtil { -/** Concrent class for implementing polytope intersections with the scene graph. +/** Concrete class for implementing polytope intersections with the scene graph. * To be used in conjunction with IntersectionVisitor. */ class OSGUTIL_EXPORT PlaneIntersector : public Intersector { diff --git a/include/osgUtil/PolytopeIntersector b/include/osgUtil/PolytopeIntersector index 3c2207b16..2b0d7b604 100644 --- a/include/osgUtil/PolytopeIntersector +++ b/include/osgUtil/PolytopeIntersector @@ -19,7 +19,7 @@ namespace osgUtil { -/** Concrent class for implementing polytope intersections with the scene graph. +/** Concrete class for implementing polytope intersections with the scene graph. * To be used in conjunction with IntersectionVisitor. */ class OSGUTIL_EXPORT PolytopeIntersector : public Intersector { diff --git a/include/osgViewer/CompositeViewer b/include/osgViewer/CompositeViewer index a2532c673..94e538713 100644 --- a/include/osgViewer/CompositeViewer +++ b/include/osgViewer/CompositeViewer @@ -71,7 +71,7 @@ class OSGVIEWER_EXPORT CompositeViewer : public ViewerBase, public virtual osg:: const osgGA::EventQueue* getEventQueue() const { return _eventQueue.get(); } /** Execute a main frame loop. - * Equivialant to while (!viewer.done()) viewer.frame(); + * Equivalent to while (!viewer.done()) viewer.frame(); * Also calls realize() if the viewer is not already realized, * and installs trackball manipulator if one is not already assigned. */ diff --git a/include/osgViewer/Export b/include/osgViewer/Export index 5fbfe1d7a..cc053ffb6 100644 --- a/include/osgViewer/Export +++ b/include/osgViewer/Export @@ -45,9 +45,9 @@ \namespace osgViewer -The osgViewer library provides high level viewer functionality designed to make it easier to write a range of differnt types of viewers, +The osgViewer library provides high level viewer functionality designed to make it easier to write a range of different types of viewers, from viewers embedded in existing windows via SimpleViewer, through to highly scalable and flexible Viewer and Composite classes. A -set of event handlers add functionality to these viewers so that you can rapidly compose the viewer functionality taylored to your needs. +set of event handlers add functionality to these viewers so that you can rapidly compose the viewer functionality tailored to your needs. Finally the viewer classes can be adapted to work with a range of different window toolkit API's via GraphicsWindow implementations, with native Win32, X11 and Carbon implementations on Windows, Unices and OSX respectively, and other window toolkits such as WxWidgets, Qt etc. */ diff --git a/include/osgViewer/GraphicsWindow b/include/osgViewer/GraphicsWindow index 464861939..5c03831e1 100644 --- a/include/osgViewer/GraphicsWindow +++ b/include/osgViewer/GraphicsWindow @@ -30,10 +30,10 @@ extern "C" namespace osgViewer { -/** Base class for providing Windowing API agnostic access to creating and managing graphisc window and events. +/** Base class for providing Windowing API agnostic access to creating and managing graphics window and events. * Note, the GraphicsWindow is subclassed from osg::GraphicsContext, and to provide an implemention you'll need to implement its * range of pure virtual functions, you'll find these all have naming convention methodNameImplemention(..). - * GraphicsWindow adds the event queue ontop of the GraphicsContext, thereby adding a mechnism for adapting Windowing events + * GraphicsWindow adds the event queue on top of the GraphicsContext, thereby adding a mechanism for adapting Windowing events * as well as basics graphics context work, you should wire up custom GraphicsWindowImplementation to push their events through * into the EventQueue. */ class OSGVIEWER_EXPORT GraphicsWindow : public osg::GraphicsContext, public osgGA::GUIActionAdapter @@ -135,35 +135,35 @@ class OSGVIEWER_EXPORT GraphicsWindow : public osg::GraphicsContext, public osgG /** Return whether a valid and usable GraphicsContext has been created.*/ virtual bool valid() const { osg::notify(osg::NOTICE)<<"GraphicsWindow::valid() not implemented."<first - first->first; if (delta_time==0.0) diff --git a/src/osg/ApplicationUsage.cpp b/src/osg/ApplicationUsage.cpp index a36982ca4..eb889cd81 100644 --- a/src/osg/ApplicationUsage.cpp +++ b/src/osg/ApplicationUsage.cpp @@ -164,7 +164,7 @@ void ApplicationUsage::getFormattedString(std::string& str, const UsageMap& um,u if (width==0) { // word must be longer than a whole line so will need - // to concatinate it. + // to concatenate it. width = explanationWidth-1; concatinated = true; } diff --git a/src/osg/ClipNode.cpp b/src/osg/ClipNode.cpp index 7d1ef7f47..f445986b7 100644 --- a/src/osg/ClipNode.cpp +++ b/src/osg/ClipNode.cpp @@ -62,7 +62,7 @@ bool ClipNode::addClipPlane(ClipPlane* clipplane) if (std::find(_planes.begin(),_planes.end(),clipplane)==_planes.end()) { - // cliplane doesn't exist in list so add it. + // clipplane doesn't exist in list so add it. _planes.push_back(clipplane); setLocalStateSetModes(_value); return true; @@ -82,7 +82,7 @@ bool ClipNode::removeClipPlane(ClipPlane* clipplane) ClipPlaneList::iterator itr = std::find(_planes.begin(),_planes.end(),clipplane); if (itr!=_planes.end()) { - // cliplane exist in list so erase it. + // clipplane exist in list so erase it. _planes.erase(itr); setLocalStateSetModes(_value); return true; diff --git a/src/osg/CullingSet.cpp b/src/osg/CullingSet.cpp index a04a91fac..41e12e4b4 100644 --- a/src/osg/CullingSet.cpp +++ b/src/osg/CullingSet.cpp @@ -57,7 +57,7 @@ void CullingSet::popOccludersCurrentMask(NodePath& nodePath) { //std::cout<<" popping occluder "<popCurrentMask(); } diff --git a/src/osg/DeleteHandler.cpp b/src/osg/DeleteHandler.cpp index 1781ce6d0..8738eff8b 100644 --- a/src/osg/DeleteHandler.cpp +++ b/src/osg/DeleteHandler.cpp @@ -16,7 +16,7 @@ namespace osg { -// specialzed 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 reseting itself to 0. struct DeleteHandlerPointer { DeleteHandlerPointer(): diff --git a/src/osg/DrawPixels.cpp b/src/osg/DrawPixels.cpp index a8d81a895..e800e01c1 100644 --- a/src/osg/DrawPixels.cpp +++ b/src/osg/DrawPixels.cpp @@ -71,7 +71,7 @@ void DrawPixels::getSubImageDimensions(unsigned int& offsetX,unsigned int& offse BoundingBox DrawPixels::computeBound() const { - // really needs to be dependant of view poistion and projection... will implement simple version right now. + // really needs to be dependent of view position and projection... will implement simple version right now. BoundingBox bbox; float diagonal = 0.0f; if (_useSubImage) diff --git a/src/osg/Drawable.cpp b/src/osg/Drawable.cpp index e5bc5e82b..9c0b12aa8 100644 --- a/src/osg/Drawable.cpp +++ b/src/osg/Drawable.cpp @@ -206,7 +206,7 @@ void Drawable::deleteVertexBufferObject(unsigned int contextID,GLuint globj) } } -/** flush all the cached display list which need to be deleted +/** flush all the cached display lists which need to be deleted * in the OpenGL context related to contextID.*/ void Drawable::flushDeletedVertexBufferObjects(unsigned int contextID,double /*currentTime*/, double& availableTime) { @@ -415,7 +415,7 @@ void Drawable::setNumChildrenRequiringUpdateTraversal(unsigned int num) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) @@ -450,7 +450,7 @@ void Drawable::setNumChildrenRequiringEventTraversal(unsigned int num) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) @@ -500,7 +500,7 @@ void Drawable::compileGLObjects(RenderInfo& renderInfo) const // get the globj for the current contextID. GLuint& globj = _globjList[contextID]; - // call the globj if already set otherwise comple and execute. + // call the globj if already set otherwise compile and execute. if( globj != 0 ) { glDeleteLists( globj, 1 ); @@ -557,7 +557,7 @@ void Drawable::releaseGLObjects(State* state) const // get the globj for the current contextID. GLuint& globj = _globjList[contextID]; - // call the globj if already set otherwise comple and execute. + // call the globj if already set otherwise compile and execute. if( globj != 0 ) { Drawable::deleteDisplayList(contextID,globj, getGLObjectSizeHint()); diff --git a/src/osg/FrameBufferObject.cpp b/src/osg/FrameBufferObject.cpp index 8eea141dd..7df489b12 100644 --- a/src/osg/FrameBufferObject.cpp +++ b/src/osg/FrameBufferObject.cpp @@ -191,7 +191,7 @@ GLuint RenderBuffer::getObjectID(unsigned int contextID, const FBOExtensions *ex } /************************************************************************** - * FrameBufferAttachement + * FrameBufferAttachment **************************************************************************/ #ifndef GL_TEXTURE_CUBE_MAP_POSITIVE_X @@ -593,7 +593,7 @@ void FrameBufferObject::apply(State &state) const if (dirtyAttachmentList) { - // the set of of attachements appears to be thread sensitive, it shouldn't be because + // the set of of attachments appears to be thread sensitive, it shouldn't be because // OpenGL FBO handles osg::FrameBufferObject has are multi-buffered... // so as a temporary fix will stick in a mutex to ensure that only one thread passes through here // at one time. diff --git a/src/osg/Geode.cpp b/src/osg/Geode.cpp index 5808ef109..85e7ac6e6 100644 --- a/src/osg/Geode.cpp +++ b/src/osg/Geode.cpp @@ -98,7 +98,7 @@ bool Geode::removeDrawables(unsigned int pos,unsigned int numDrawablesToRemove) { // remove this Geode from the child parent list. _drawables[i]->removeParent(this); - // update the number of app calbacks removed + // update the number of app callbacks removed if (_drawables[i]->requiresUpdateTraversal()) ++updateCallbackRemoved; if (_drawables[i]->requiresEventTraversal()) ++eventCallbackRemoved; } @@ -162,7 +162,7 @@ bool Geode::setDrawable( unsigned int i, Drawable* newDrawable ) origDrawable->removeParent(this); // note ref_ptr<> automatically handles decrementing origGset's reference count, - // and inccrementing newGset's reference count. + // and incrementing newGset's reference count. _drawables[i] = newDrawable; // register as parent of child. diff --git a/src/osg/Geometry.cpp b/src/osg/Geometry.cpp index eb4cd3cff..608595dc6 100644 --- a/src/osg/Geometry.cpp +++ b/src/osg/Geometry.cpp @@ -1707,7 +1707,7 @@ void Geometry::drawImplementation(RenderInfo& renderInfo) const } - // draw primtives by the more flexible "slow" path, + // draw primitives by the more flexible "slow" path, // sending OpenGL glBegin/glVertex.../glEnd(). switch(primitiveset->getType()) { @@ -2207,7 +2207,7 @@ void Geometry::accept(PrimitiveFunctor& functor) const functor.setVertexArray(_vertexData.array->getNumElements(),static_cast(_vertexData.array->getDataPointer())); break; default: - notify(WARN)<<"Warning: Geometry::accept(PrimtiveFunctor&) cannot handle Vertex Array type"<<_vertexData.array->getType()<getType()<(_vertexData.array.get()); break; default: - notify(WARN)<<"Warning: Geometry::accept(PrimtiveFunctor&) cannot handle Vertex Array type"<<_vertexData.array->getType()<getType()<getNumElements(),static_cast(_vertexData.array->getDataPointer())); break; default: - notify(WARN)<<"Warning: Geometry::accept(PrimtiveIndexFunctor&) cannot handle Vertex Array type"<<_vertexData.array->getType()<getType()<getType()) { @@ -2685,7 +2685,7 @@ bool _verifyBindings(const osg::Geometry& geom, const A& arrayData) if (numElements!=geom.getPrimitiveSetList().size()) return false; break; case(osg::Geometry::BIND_PER_PRIMITIVE): - if (numElements!=_computeNumberOfPrimtives(geom)) return false; + if (numElements!=_computeNumberOfPrimitives(geom)) return false; break; case(osg::Geometry::BIND_PER_VERTEX): { @@ -2776,7 +2776,7 @@ void _computeCorrectBindingsAndArraySizes(std::ostream& out, const osg::Geometry } // check to see if binding might be per primitive - unsigned int numPrimitives = _computeNumberOfPrimtives(geom); + unsigned int numPrimitives = _computeNumberOfPrimitives(geom); if (numElements==numPrimitives) { if (arrayData.binding != osg::Geometry::BIND_PER_PRIMITIVE) diff --git a/src/osg/GraphicsContext.cpp b/src/osg/GraphicsContext.cpp index bf6bce280..7a4ed8434 100644 --- a/src/osg/GraphicsContext.cpp +++ b/src/osg/GraphicsContext.cpp @@ -337,7 +337,7 @@ GraphicsContext* GraphicsContext::getOrCreateCompileContext(unsigned int context { OpenThreads::ScopedLock lock(s_contextIDMapMutex); s_contextIDMap[contextID]._compileContext = gc; - osg::notify(osg::INFO)<<" succeded GraphicsContext::createCompileContext."<getContextID()]._numContexts>1) sharedContextExists = true; } - // release all the OpenGL objects in the scene graphs associted with this + // release all the OpenGL objects in the scene graphs associated with this for(Cameras::iterator itr = _cameras.begin(); itr != _cameras.end(); ++itr) @@ -504,7 +504,7 @@ bool GraphicsContext::makeCurrent() { _threadOfLastMakeCurrent = OpenThreads::Thread::CurrentThread(); - // initialize extension process, note, only initializes on first + // initialize extension process, not only initializes on first // call, will be a non-op on subsequent calls. getState()->initializeExtensionProcs(); } @@ -520,7 +520,7 @@ bool GraphicsContext::makeContextCurrent(GraphicsContext* readContext) { _threadOfLastMakeCurrent = OpenThreads::Thread::CurrentThread(); - // initialize extension proces, not only initializes on first + // initialize extension process, not only initializes on first // call, will be a non-op on subsequent calls. getState()->initializeExtensionProcs(); } @@ -590,7 +590,7 @@ void GraphicsContext::add(Operation* operation) { osg::notify(osg::INFO)<<"Doing add"< lock(_operationsMutex); // add the operation to the end of the list @@ -603,7 +603,7 @@ void GraphicsContext::remove(Operation* operation) { osg::notify(osg::INFO)<<"Doing remove operation"< lock(_operationsMutex); for(OperationQueue::iterator itr = _operations.begin(); @@ -623,10 +623,10 @@ void GraphicsContext::remove(const std::string& name) { osg::notify(osg::INFO)<<"Doing remove named operation"< lock(_operationsMutex); - // find the remove all operations with specificed name + // find the remove all operations with specified name for(OperationQueue::iterator itr = _operations.begin(); itr!=_operations.end();) { diff --git a/src/osg/GraphicsThread.cpp b/src/osg/GraphicsThread.cpp index dfab829b0..af328dfb2 100644 --- a/src/osg/GraphicsThread.cpp +++ b/src/osg/GraphicsThread.cpp @@ -86,10 +86,10 @@ void ReleaseContext_Block_MakeCurrentOperation::operator () (GraphicsContext* co // reset the block so that it the next call to block() reset(); - // block this thread, untill the block is released externally. + // block this thread, until the block is released externally. block(); - // re aquire the graphcis context. + // re acquire the graphics context. context->makeCurrent(); } diff --git a/src/osg/Node.cpp b/src/osg/Node.cpp index d60571f5d..667e011e2 100644 --- a/src/osg/Node.cpp +++ b/src/osg/Node.cpp @@ -239,7 +239,7 @@ void Node::setUpdateCallback(NodeCallback* nc) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) @@ -275,7 +275,7 @@ void Node::setNumChildrenRequiringUpdateTraversal(unsigned int num) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) @@ -317,7 +317,7 @@ void Node::setEventCallback(NodeCallback* nc) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) @@ -353,7 +353,7 @@ void Node::setNumChildrenRequiringEventTraversal(unsigned int num) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) @@ -393,7 +393,7 @@ void Node::setCullingActive(bool active) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) @@ -428,7 +428,7 @@ void Node::setNumChildrenWithCullingDisabled(unsigned int num) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) @@ -465,7 +465,7 @@ void Node::setNumChildrenWithOccluderNodes(unsigned int num) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) diff --git a/src/osg/OperationThread.cpp b/src/osg/OperationThread.cpp index d7ceda3d4..5fd975ddd 100644 --- a/src/osg/OperationThread.cpp +++ b/src/osg/OperationThread.cpp @@ -68,7 +68,7 @@ ref_ptr OperationQueue::getNextOperation(bool blockIfEmpty) if (_currentOperationIterator == _operations.end()) { - // iterator at end of operations so reset to begining. + // iterator at end of operations so reset to beginning. _currentOperationIterator = _operations.begin(); } @@ -104,7 +104,7 @@ void OperationQueue::add(Operation* operation) { osg::notify(osg::INFO)<<"Doing add"< lock(_operationsMutex); // add the operation to the end of the list @@ -117,7 +117,7 @@ void OperationQueue::remove(Operation* operation) { osg::notify(osg::INFO)<<"Doing remove operation"< lock(_operationsMutex); for(Operations::iterator itr = _operations.begin(); @@ -140,10 +140,10 @@ void OperationQueue::remove(const std::string& name) { osg::notify(osg::INFO)<<"Doing remove named operation"< lock(_operationsMutex); - // find the remove all operations with specificed name + // find the remove all operations with specified name for(Operations::iterator itr = _operations.begin(); itr!=_operations.end();) { @@ -185,7 +185,7 @@ void OperationQueue::runOperations(Object* callingObject) { OpenThreads::ScopedLock lock(_operationsMutex); - // reset current operation iterator to begining if at end. + // reset current operation iterator to beginning if at end. if (_currentOperationIterator==_operations.end()) _currentOperationIterator = _operations.begin(); for(; @@ -421,7 +421,7 @@ void OperationThread::run() if (firstTime) { // do a yield to get round a peculiar thread hang when testCancel() is called - // in certain cirumstances - of which there is no particular pattern. + // in certain circumstances - of which there is no particular pattern. YieldCurrentThread(); firstTime = false; } diff --git a/src/osg/PolygonOffset.cpp b/src/osg/PolygonOffset.cpp index 5bcfdcdf2..d58ef86ed 100644 --- a/src/osg/PolygonOffset.cpp +++ b/src/osg/PolygonOffset.cpp @@ -59,7 +59,8 @@ void PolygonOffset::setFactorAndUnitsMultipliersUsingBestGuessForDriver() if (renderer) { if ((strstr((const char*)renderer,"Radeon")!=0) || - (strstr((const char*)renderer,"RADEON")!=0)) + (strstr((const char*)renderer,"RADEON")!=0) || + (strstr((const char*)renderer,"ALL-IN-WONDER")!=0)) { setFactorMultiplier(1.0f); setUnitsMultiplier(128.0f); diff --git a/src/osg/PolygonStipple.cpp b/src/osg/PolygonStipple.cpp index a843ec2e6..291da0775 100644 --- a/src/osg/PolygonStipple.cpp +++ b/src/osg/PolygonStipple.cpp @@ -56,7 +56,7 @@ PolygonStipple::~PolygonStipple() int PolygonStipple::compare(const StateAttribute& sa) const { // check the types are equal and then create the rhs variable - // used by the COMPARE_StateAttribute_Paramter macro's below. + // used by the COMPARE_StateAttribute_Parameter macro's below. COMPARE_StateAttribute_Types(PolygonStipple,sa) // compare each parameter in turn against the rhs. diff --git a/src/osg/Program.cpp b/src/osg/Program.cpp index 2050366b6..981c20cb1 100644 --- a/src/osg/Program.cpp +++ b/src/osg/Program.cpp @@ -2007,7 +2007,7 @@ Program::~Program() int Program::compare(const osg::StateAttribute& sa) const { // check the types are equal and then create the rhs variable - // used by the COMPARE_StateAttribute_Paramter macro's below. + // used by the COMPARE_StateAttribute_Parameter macro's below. COMPARE_StateAttribute_Types(Program,sa) if( _shaderList.size() < rhs._shaderList.size() ) return -1; diff --git a/src/osg/Referenced.cpp b/src/osg/Referenced.cpp index 67715ef87..d5d0e1380 100644 --- a/src/osg/Referenced.cpp +++ b/src/osg/Referenced.cpp @@ -31,7 +31,7 @@ namespace osg { -// specialzed 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 reseting itself to 0. struct DeleteHandlerPointer { DeleteHandlerPointer(): @@ -178,7 +178,7 @@ void Referenced::setThreadSafeRefUnref(bool threadSafe) { if (!_refMutex) { - // we want thread safe ref()/unref() so assing a mutex + // we want thread safe ref()/unref() so assign a mutex _refMutex = new OpenThreads::Mutex; } } diff --git a/src/osg/ShapeDrawable.cpp b/src/osg/ShapeDrawable.cpp index 92a1fe1ec..ebee928c3 100644 --- a/src/osg/ShapeDrawable.cpp +++ b/src/osg/ShapeDrawable.cpp @@ -959,7 +959,7 @@ void DrawShapeVisitor::apply(const HeightField& field) glBegin(GL_QUAD_STRIP); - // draw skirt at begining if required. + // draw skirt at beginning if required. if (field.getSkirtHeight()!=0.0f) { vertTop.set(0.0f,dy*(float)(row+1),field.getHeight(0,row+1)-field.getSkirtHeight()); @@ -1294,7 +1294,7 @@ void ComputeBoundShapeVisitor::apply(const CompositeShape& group) /////////////////////////////////////////////////////////////////////////////// // -// Accept a primtive functor for each of the shapes. +// Accept a primitive functor for each of the shapes. // class PrimitiveShapeVisitor : public ConstShapeVisitor diff --git a/src/osg/State.cpp b/src/osg/State.cpp index 8f5f790bb..9e33202ec 100644 --- a/src/osg/State.cpp +++ b/src/osg/State.cpp @@ -110,7 +110,7 @@ void State::reset() as.changed = true; } - // we can do a straight clear, we arn't intrested in GL_DEPTH_TEST defaults in texture modes. + // we can do a straight clear, we arn't interested in GL_DEPTH_TEST defaults in texture modes. for(TextureModeMapList::iterator tmmItr=_textureModeMapList.begin(); tmmItr!=_textureModeMapList.end(); ++tmmItr) @@ -147,7 +147,7 @@ void State::reset() // reset active texture unit values and call OpenGL // note, this OpenGL op precludes the use of State::reset() without a // valid graphics context, therefore the new implementation below - // is prefered. + // is preferred. setActiveTextureUnit(0); #else // reset active texture unit values without calling OpenGL @@ -365,7 +365,7 @@ void State::apply(const StateSet* dstate) { if (_checkGLErrors==ONCE_PER_ATTRIBUTE) checkGLErrors("start of State::apply(StateSet*)"); - // equivilant to: + // equivalent to: //pushStateSet(dstate); //apply(); //popStateSet(); @@ -428,7 +428,7 @@ void State::apply(const StateSet* dstate) } else { - // no incomming stateset, so simply apply state. + // no incoming stateset, so simply apply state. apply(); } diff --git a/src/osg/StateSet.cpp b/src/osg/StateSet.cpp index 84f075c05..97f437c31 100644 --- a/src/osg/StateSet.cpp +++ b/src/osg/StateSet.cpp @@ -611,7 +611,7 @@ void StateSet::merge(const StateSet& rhs) if (!(lhs_mitr->second & StateAttribute::OVERRIDE ) || (rhs_mitr->second & StateAttribute::PROTECTED)) { - // override isn't on in rhs, so overrite it with incomming + // override isn't on in rhs, so override it with incoming // value. lhs_mitr->second = rhs_mitr->second; } @@ -636,14 +636,14 @@ void StateSet::merge(const StateSet& rhs) if (!(lhs_aitr->second.second & StateAttribute::OVERRIDE) || (rhs_aitr->second.second & StateAttribute::PROTECTED)) { - // override isn't on in rhs, so overrite it with incomming + // override isn't on in rhs, so override it with incoming // value. if (lhs_aitr->second.first!=rhs_aitr->second.first) { // new attribute so need to remove self from outgoing attribute lhs_aitr->second.first->removeParent(this); - // override isn't on in rhs, so overrite it with incomming + // override isn't on in rhs, so override it with incoming // value. lhs_aitr->second = rhs_aitr->second; lhs_aitr->second.first->addParent(this); @@ -683,7 +683,7 @@ void StateSet::merge(const StateSet& rhs) if (!(lhs_mitr->second & StateAttribute::OVERRIDE) || (rhs_mitr->second & StateAttribute::PROTECTED)) { - // override isn't on in rhs, so overrite it with incomming + // override isn't on in rhs, so override it with incoming // value. lhs_mitr->second = rhs_mitr->second; } @@ -715,7 +715,7 @@ void StateSet::merge(const StateSet& rhs) if (!(lhs_aitr->second.second & StateAttribute::OVERRIDE) || (rhs_aitr->second.second & StateAttribute::PROTECTED)) { - // override isn't on in rhs, so overrite it with incomming + // override isn't on in rhs, so override it with incoming // value. if (lhs_aitr->second.first!=rhs_aitr->second.first) @@ -751,7 +751,7 @@ void StateSet::merge(const StateSet& rhs) if (!(lhs_uitr->second.second & StateAttribute::OVERRIDE) || (rhs_uitr->second.second & StateAttribute::PROTECTED)) { - // override isn't on in rhs, so overrite it with incomming + // override isn't on in rhs, so override it with incoming // value. if (lhs_uitr->second.first!=rhs_uitr->second.first) @@ -1753,7 +1753,7 @@ void StateSet::setNumChildrenRequiringUpdateTraversal(unsigned int num) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) @@ -1798,7 +1798,7 @@ void StateSet::setNumChildrenRequiringEventTraversal(unsigned int num) { // the number of callbacks has changed, need to pass this // on to parents so they know whether app traversal is - // reqired on this subgraph. + // required on this subgraph. for(ParentList::iterator itr =_parents.begin(); itr != _parents.end(); ++itr) diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index 1968f8b83..d8acfe82e 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -510,7 +510,7 @@ void Texture::takeTextureObjects(Texture::TextureObjectListMap& toblm) { if (_textureObjectBuffer[i].valid()) { - //notify(INFO) << "releasing texure "<setCullCallback(0); } - // detatch the cameras from this View to prevent dangling pointers + // detach the cameras from this View to prevent dangling pointers for(Slaves::iterator itr = _slaves.begin(); itr != _slaves.end(); ++itr) diff --git a/src/osg/dxtctool.cpp b/src/osg/dxtctool.cpp index bdc28b960..ac011b434 100644 --- a/src/osg/dxtctool.cpp +++ b/src/osg/dxtctool.cpp @@ -49,7 +49,7 @@ bool dxtc_pixels::OpenGLSize() const bool dxtc_pixels::VFlip() const { - // Check that the given dimentions are 2^x, 2^y + // Check that the given dimensions are 2^x, 2^y if (! OpenGLSize()) return false; diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp index 8beabc9bc..6deef8329 100644 --- a/src/osgDB/DatabasePager.cpp +++ b/src/osgDB/DatabasePager.cpp @@ -225,7 +225,7 @@ int DatabasePager::cancel() // result = Thread::cancel(); //join(); - // release the frameBlock and _databasePagerThreadBlock incase its holding up thread cancelation. + // release the frameBlock and _databasePagerThreadBlock in case its holding up thread cancellation. _databasePagerThreadBlock->release(); // then wait for the the thread to stop running. @@ -361,7 +361,7 @@ void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* grou if (!foundEntry) { - osg::notify(osg::INFO)<<"In DatabasePager::requestNodeFile("< databaseRequest = new DatabaseRequest; @@ -448,7 +448,7 @@ public: { if (stateset) { - // search for the existance of any texture object attributes + // search for the existence of any texture object attributes bool foundTextureState = false; for(unsigned int i=0;igetTextureAttributeList().size();++i) { @@ -725,7 +725,7 @@ void DatabasePager::run() if (firstTime) { // do a yield to get round a peculiar thread hang when testCancel() is called - // in certain cirumstances - of which there is no particular pattern. + // in certain circumstances - of which there is no particular pattern. YieldCurrentThread(); firstTime = false; } @@ -783,7 +783,7 @@ void DatabasePager::addLoadedDataToSceneGraph(double timeStamp) } group->addChild(databaseRequest->_loadedModel.get()); - osg::notify(osg::INFO)<<"merged subgraph "<_fileName<<" after "<_numOfRequests<<" requests and time="<<(timeStamp-databaseRequest->_timestampFirstRequest)*1000.0<_fileName<<" after "<_numOfRequests<<" requests and time="<<(timeStamp-databaseRequest->_timestampFirstRequest)*1000.0<_timestampFirstRequest; @@ -1042,7 +1042,7 @@ void DatabasePager::compileGLObjects(osg::State& state, double& availableTime) osg::ref_ptr databaseRequest; - // get the first compileable entry. + // get the first compilable entry. { OpenThreads::ScopedLock lock(_dataToCompileListMutex); if (!_dataToCompileList.empty()) diff --git a/src/osgDB/DotOsgWrapper.cpp b/src/osgDB/DotOsgWrapper.cpp index 958eeaaf1..060caaeab 100644 --- a/src/osgDB/DotOsgWrapper.cpp +++ b/src/osgDB/DotOsgWrapper.cpp @@ -27,7 +27,7 @@ DotOsgWrapper::DotOsgWrapper(osg::Object* proto, _name = name; - // copy the names in the space deliminated associates input into + // copy the names in the space delimited associates input into // a vector of separated names. std::string::size_type start_of_name = associates.find_first_not_of(' '); while (start_of_name!=std::string::npos) diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index c81f8b72a..59cab982e 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -151,7 +151,7 @@ Registry* Registry::instance(bool erase) // definition of the Registry Registry::Registry() { - // comment out because it was causing problems under OSX - causing it to crash osgconv when constucting ostream in osg::notify(). + // comment out because it was causing problems under OSX - causing it to crash osgconv when constructing ostream in osg::notify(). // notify(INFO) << "Constructing osg::Registry"<getObjectCacheHint() & ReaderWriter::Options::CACHE_ARCHIVES)) ) @@ -1831,7 +1831,7 @@ void Registry::removeExpiredObjectsInCache(double expiryTime) typedef std::vector ObjectsToRemove; ObjectsToRemove objectsToRemove; - // first collect all the exprired entries in the ObjectToRemove list. + // first collect all the expired entries in the ObjectToRemove list. for(ObjectCache::iterator oitr=_objectCache.begin(); oitr!=_objectCache.end(); ++oitr) diff --git a/src/osgGA/DriveManipulator.cpp b/src/osgGA/DriveManipulator.cpp index f25b5f4f2..2bbe4e1fc 100644 --- a/src/osgGA/DriveManipulator.cpp +++ b/src/osgGA/DriveManipulator.cpp @@ -552,7 +552,7 @@ bool DriveManipulator::calcMovement() #endif #if defined(ABOSULTE_PITCH) - // abosolute pitch + // absolute pitch double dy = _ga_t0->getYnormalized(); _pitch = -dy*0.5; #elif defined(INCREMENTAL_PITCH) diff --git a/src/osgGA/TerrainManipulator.cpp b/src/osgGA/TerrainManipulator.cpp index 005e21e0a..585f8659c 100644 --- a/src/osgGA/TerrainManipulator.cpp +++ b/src/osgGA/TerrainManipulator.cpp @@ -340,7 +340,7 @@ void TerrainManipulator::computePosition(const osg::Vec3d& eye,const osg::Vec3d& !hitFound && i<2; ++i, endPoint = farPosition) { - // compute the itersection with the scene. + // compute the intersection with the scene. osgUtil::IntersectVisitor iv; iv.setTraversalMask(_intersectTraversalMask); @@ -367,7 +367,7 @@ void TerrainManipulator::computePosition(const osg::Vec3d& eye,const osg::Vec3d& } } - // note LookAt = inv(CF)*inv(RM)*inv(T) which is equivilant to: + // note LookAt = inv(CF)*inv(RM)*inv(T) which is equivalent to: // inv(R) = CF*LookAt. osg::Matrixd rotation_matrix = osg::Matrixd::lookAt(eye,center,up); @@ -480,7 +480,7 @@ bool TerrainManipulator::calcMovement() _center += dv; - // need to recompute the itersection point along the look vector. + // need to recompute the intersection point along the look vector. if (_node.valid()) { diff --git a/src/osgManipulator/Projector.cpp b/src/osgManipulator/Projector.cpp index 45d2838ec..dcda94a18 100644 --- a/src/osgManipulator/Projector.cpp +++ b/src/osgManipulator/Projector.cpp @@ -177,7 +177,7 @@ bool getCylinderLineIntersection(const osg::Cylinder& cylinder, osg::Vec3 getLocalEyeDirection(const osg::Vec3& eyeDir, const osg::Matrix& localToWorld) { // To take a normal from world to local you need to transform it by the transpose of the inverse of the - // world to local matrix. Pre-multipling is equivalent to doing a post-multiplication of the transpose. + // world to local matrix. Pre-multiplying is equivalent to doing a post-multiplication of the transpose. osg::Vec3 localEyeDir = localToWorld * eyeDir; localEyeDir.normalize(); return localEyeDir; diff --git a/src/osgPlugins/3ds/ReaderWriter3DS.cpp b/src/osgPlugins/3ds/ReaderWriter3DS.cpp index 5851e826e..8029b2c60 100644 --- a/src/osgPlugins/3ds/ReaderWriter3DS.cpp +++ b/src/osgPlugins/3ds/ReaderWriter3DS.cpp @@ -322,8 +322,8 @@ How to cope with pivot points in 3ds (short version) Objects with pivot points have a position relative to their PP, so they have to undergo this transform: invert the mesh matrix, apply this matrix to the object. This puts the object back at the origin - Transform the object by the nodes (nnegative) pivot point coords, this puts the PP at the origin - Tranform the node by the node matrix, which does the orientation about the pivot point, (and currently) transforms the object back by a translation to the PP. + Transform the object by the nodes (negative) pivot point coords, this puts the PP at the origin + Transform the node by the node matrix, which does the orientation about the pivot point, (and currently) transforms the object back by a translation to the PP. */ osg::Node* ReaderWriter3DS::ReaderObject::processNode(StateSetMap drawStateMap,Lib3dsFile *f,Lib3dsNode *node) { @@ -786,13 +786,13 @@ osg::StateSet* ReaderWriter3DS::ReaderObject::createStateSet(Lib3dsMaterial *mat // so we'll override material back to white. // and no longer require the decal hack below... #if 0 - // Eric orignal fallback + // Eric original fallback osg::Vec4 white(1.0f,1.0f,1.0f,alpha); material->setAmbient(osg::Material::FRONT_AND_BACK,white); material->setDiffuse(osg::Material::FRONT_AND_BACK,white); material->setSpecular(osg::Material::FRONT_AND_BACK,white); #else - // try alternative to avoid staturating with white + // try alternative to avoid saturating with white // setting white as per OpenGL defaults. material->setAmbient(osg::Material::FRONT_AND_BACK,osg::Vec4(0.2f,0.2f,0.2f,alpha)); material->setDiffuse(osg::Material::FRONT_AND_BACK,osg::Vec4(0.8f,0.8f,0.8f,alpha)); diff --git a/src/osgPlugins/ive/DrawArrayLengths.cpp b/src/osgPlugins/ive/DrawArrayLengths.cpp index 2b6582f7b..67b50dbab 100644 --- a/src/osgPlugins/ive/DrawArrayLengths.cpp +++ b/src/osgPlugins/ive/DrawArrayLengths.cpp @@ -52,7 +52,7 @@ void DrawArrayLengths::read(DataInputStream* in){ ((ive::PrimitiveSet*)(prim))->read(in); } else - throw Exception("DrawArrayLengths::read(): Could not cast this osg::DrawArrayLengths to an osg::PrimtiveSet."); + throw Exception("DrawArrayLengths::read(): Could not cast this osg::DrawArrayLengths to an osg::PrimitiveSet."); // Read properties setFirst(in->readInt()); diff --git a/src/osgPlugins/ive/DrawElementsUByte.cpp b/src/osgPlugins/ive/DrawElementsUByte.cpp index 942538722..40f8e2110 100644 --- a/src/osgPlugins/ive/DrawElementsUByte.cpp +++ b/src/osgPlugins/ive/DrawElementsUByte.cpp @@ -48,7 +48,7 @@ void DrawElementsUByte::read(DataInputStream* in){ ((ive::PrimitiveSet*)(prim))->read(in); } else - throw Exception("DrawElementsUByte::read(): Could not cast this osg::DrawElementsUByte to an osg::PrimtiveSet."); + throw Exception("DrawElementsUByte::read(): Could not cast this osg::DrawElementsUByte to an osg::PrimitiveSet."); // Read array length and its elements. int size = in->readInt(); diff --git a/src/osgPlugins/ive/DrawElementsUInt.cpp b/src/osgPlugins/ive/DrawElementsUInt.cpp index 473ebacd5..936b8bbdb 100644 --- a/src/osgPlugins/ive/DrawElementsUInt.cpp +++ b/src/osgPlugins/ive/DrawElementsUInt.cpp @@ -50,7 +50,7 @@ void DrawElementsUInt::read(DataInputStream* in) ((ive::PrimitiveSet*)(prim))->read(in); } else - throw Exception("DrawElementsUInt::read(): Could not cast this osg::DrawElementsUInt to an osg::PrimtiveSet."); + throw Exception("DrawElementsUInt::read(): Could not cast this osg::DrawElementsUInt to an osg::PrimitiveSet."); // Read array length and its elements. int size = in->readInt(); diff --git a/src/osgPlugins/ive/DrawElementsUShort.cpp b/src/osgPlugins/ive/DrawElementsUShort.cpp index 698ccb77e..c8b60c387 100644 --- a/src/osgPlugins/ive/DrawElementsUShort.cpp +++ b/src/osgPlugins/ive/DrawElementsUShort.cpp @@ -49,7 +49,7 @@ void DrawElementsUShort::read(DataInputStream* in){ ((ive::PrimitiveSet*)(prim))->read(in); } else - throw Exception("DrawElementsUShort::read(): Could not cast this osg::DrawElementsUShort to an osg::PrimtiveSet."); + throw Exception("DrawElementsUShort::read(): Could not cast this osg::DrawElementsUShort to an osg::PrimitiveSet."); // Read array length and its elements. int size = in->readInt(); diff --git a/src/osgPlugins/normals/Normals.cpp b/src/osgPlugins/normals/Normals.cpp index 52303248a..7a7cc8df7 100644 --- a/src/osgPlugins/normals/Normals.cpp +++ b/src/osgPlugins/normals/Normals.cpp @@ -83,7 +83,7 @@ void Normals::MakeNormalsVisitor::apply( Geode &geode ) _local_coords->push_back( v ); _local_coords->push_back( (v + n)); } - else // BIND_PER_PRIMTIVE_SET, BIND_PER_PRIMTITIV, BIND_PER_VERTEX + else // BIND_PER_PRIMITIVE_SET, BIND_PER_PRIMITIVE, BIND_PER_VERTEX { Geometry::PrimitiveSetList& primitiveSets = geom->getPrimitiveSetList(); Geometry::PrimitiveSetList::iterator itr; diff --git a/src/osgPlugins/osgViewer/View.cpp b/src/osgPlugins/osgViewer/View.cpp index 1f3aa4ee2..efc8dd404 100644 --- a/src/osgPlugins/osgViewer/View.cpp +++ b/src/osgPlugins/osgViewer/View.cpp @@ -126,7 +126,7 @@ bool View_readLocalData(osg::Object &obj, osgDB::Input &fr) if (!local_itrAdvanced) ++fr; } - // skip trainling '}' + // skip trailing '}' ++fr; iteratorAdvanced = true; @@ -197,7 +197,7 @@ bool View_readLocalData(osg::Object &obj, osgDB::Input &fr) else ++fr; } - // skip trainling '}' + // skip trailing '}' ++fr; iteratorAdvanced = true; diff --git a/src/osgShadow/ParallelSplitShadowMap.cpp b/src/osgShadow/ParallelSplitShadowMap.cpp index ec4cd4a89..6432b28dc 100644 --- a/src/osgShadow/ParallelSplitShadowMap.cpp +++ b/src/osgShadow/ParallelSplitShadowMap.cpp @@ -365,7 +365,7 @@ void ParallelSplitShadowMap::init(){ // not yet supported ! osg::Image* image = new osg::Image; - // allocate the image data, noPixels x 1 x 1 with 4 rgba floats - equivilant to a Vec4! + // allocate the image data, noPixels x 1 x 1 with 4 rgba floats - equivalent to a Vec4! int noPixels = 1; image->allocateImage(noPixels,1,1,GL_RGBA,GL_FLOAT); image->setInternalTextureFormat(GL_RGBA); @@ -392,7 +392,7 @@ void ParallelSplitShadowMap::init(){ { // texture for randomTexture (for smoothing shadow edges) osg::Image* image = new osg::Image; - // allocate the image data, noPixels x noPixels x 1 with 4 rgba floats - equivilant to a Vec4! + // allocate the image data, noPixels x noPixels x 1 with 4 rgba floats - equivalent to a Vec4! int noPixels = 128; image->allocateImage(noPixels,noPixels,1,GL_RGBA,GL_FLOAT); image->setInternalTextureFormat(GL_RGBA); @@ -493,7 +493,7 @@ void ParallelSplitShadowMap::cull(osgUtil::CullVisitor& cv){ unsigned int traversalMask = cv.getTraversalMask(); osgUtil::RenderStage* orig_rs = cv.getRenderStage(); - // do traversal of shadow recieving scene which does need to be decorated by the shadow map + // do traversal of shadow receiving scene which does need to be decorated by the shadow map for (PSSMShadowSplitTextureMap::iterator it=_PSSMShadowSplitTextureMap.begin();it!=_PSSMShadowSplitTextureMap.end();it++) { PSSMShadowSplitTexture pssmShadowSplitTexture = it->second; @@ -550,7 +550,7 @@ void ParallelSplitShadowMap::cull(osgUtil::CullVisitor& cv){ if (selectLight) { - // do traversal of shadow recieving scene which does need to be decorated by the shadow map + // do traversal of shadow receiving scene which does need to be decorated by the shadow map unsigned int iMaxSplit = _PSSMShadowSplitTextureMap.size(); for (PSSMShadowSplitTextureMap::iterator it=_PSSMShadowSplitTextureMap.begin();it!=_PSSMShadowSplitTextureMap.end();it++) @@ -751,7 +751,7 @@ void ParallelSplitShadowMap::calculateFrustumCorners( ////////////////////////////////////////////////////////////////////////// // -// compute directional light inital postion; +// compute directional light initial position; void ParallelSplitShadowMap::calculateLightInitalPosition(PSSMShadowSplitTexture &pssmShadowSplitTexture,osg::Vec3d *frustumCorners){ pssmShadowSplitTexture._frustumSplitCenter = frustumCorners[0]; for(int i=1;i<8;i++) { diff --git a/src/osgShadow/ShadowMap.cpp b/src/osgShadow/ShadowMap.cpp index 212c052dd..8c4dcfd1c 100644 --- a/src/osgShadow/ShadowMap.cpp +++ b/src/osgShadow/ShadowMap.cpp @@ -302,7 +302,7 @@ using namespace osgShadow; osgUtil::RenderStage* orig_rs = cv.getRenderStage(); - // do traversal of shadow recieving scene which does need to be decorated by the shadow map + // do traversal of shadow receiving scene which does need to be decorated by the shadow map { cv.pushStateSet(_stateset.get()); diff --git a/src/osgShadow/ShadowTexture.cpp b/src/osgShadow/ShadowTexture.cpp index 8202ac705..11c1a872e 100644 --- a/src/osgShadow/ShadowTexture.cpp +++ b/src/osgShadow/ShadowTexture.cpp @@ -119,7 +119,7 @@ void ShadowTexture::cull(osgUtil::CullVisitor& cv) _shadowedScene->osg::Group::traverse(cv); } - // do traversal of shadow recieving scene which does need to be decorated by the shadow texture + // do traversal of shadow receiving scene which does need to be decorated by the shadow texture { cv.pushStateSet(_stateset.get()); diff --git a/src/osgShadow/SoftShadowMap.cpp b/src/osgShadow/SoftShadowMap.cpp index 4f252f267..78f04a608 100755 --- a/src/osgShadow/SoftShadowMap.cpp +++ b/src/osgShadow/SoftShadowMap.cpp @@ -338,7 +338,7 @@ void SoftShadowMap::cull(osgUtil::CullVisitor& cv) osgUtil::RenderStage* orig_rs = cv.getRenderStage(); - // do traversal of shadow recieving scene which does need to be decorated by the shadow map + // do traversal of shadow receiving scene which does need to be decorated by the shadow map { cv.pushStateSet(_stateset.get()); diff --git a/src/osgSim/Impostor.cpp b/src/osgSim/Impostor.cpp index 5622cf400..ff79f0613 100644 --- a/src/osgSim/Impostor.cpp +++ b/src/osgSim/Impostor.cpp @@ -263,7 +263,7 @@ ImpostorSprite* Impostor::createImpostorSprite(osgUtil::CullVisitor* cv) // calc texture size for eye, bs. // convert the corners of the sprite (in world coords) into their - // equivilant window coordinates by using the camera's project method. + // equivalent window coordinates by using the camera's project method. const osg::Matrix& MVPW = *(cv->getMVPW()); Vec3 c00_win = c00 * MVPW; Vec3 c11_win = c11 * MVPW; diff --git a/src/osgSim/LineOfSight.cpp b/src/osgSim/LineOfSight.cpp index 423e97b75..a6d0b5ed1 100644 --- a/src/osgSim/LineOfSight.cpp +++ b/src/osgSim/LineOfSight.cpp @@ -73,7 +73,7 @@ osg::Node* DatabaseCacheReadCallback::readNodeFile(const std::string& filename) if (itr->second->referenceCount()==1) { osg::notify(osg::NOTICE)<<"Erasing "<first<start?1:-1; @@ -763,7 +763,7 @@ void SphereSegment::Side_drawImplementation(osg::State& /* state */, { start = _density; end = 0; - normal = -normal; // Make sure normals orientationint 'outwards' + normal = -normal; // Make sure normals orientated 'outwards' } else { @@ -982,7 +982,7 @@ void SphereSegment::setAllColors(const osg::Vec4& c) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // -// SphereSegment interesection code. +// SphereSegment intersection code. class PolytopeVisitor : public osg::NodeVisitor { @@ -1807,7 +1807,7 @@ namespace SphereSegmentIntersector if (hitEdges.empty()) return lineList; // now need to build the toTraverse list for each hit edge, - // but should only contain traingles that actually hit the intersection surface + // but should only contain triangles that actually hit the intersection surface EdgeList::iterator hitr; for(hitr = hitEdges.begin(); hitr != hitEdges.end(); @@ -1840,7 +1840,7 @@ namespace SphereSegmentIntersector edge->_toTraverse.push_back(tri); } - // osg::notify(osg::INFO)<<"Number active edges "< void trim(SphereSegment::LineList& lineList, osg::Vec3Array* sourceLine, I intersector1, I intersector2) @@ -2047,7 +2047,7 @@ namespace SphereSegmentIntersector // work out which intersector to use by discounting the one that - // isn't a plausible candiate. + // isn't a plausible candidate. bool possible1 = end1>=0.0; bool possible2 = end2>=0.0; if (possible1 && possible2) @@ -2106,7 +2106,7 @@ namespace SphereSegmentIntersector double start2 = intersector2.distance(start); // work out which intersector to use by discounting the one that - // isn't a plausible candiate. + // isn't a plausible candidate. bool possible1 = start1>=0.0; bool possible2 = start2>=0.0; if (possible1 && possible2) @@ -2310,7 +2310,7 @@ namespace SphereSegmentIntersector SphereSegment::LineList fusedLines; SphereSegment::LineList unfusedLines; - // first seperat the already fused lines from the unfused ones. + // first separate the already fused lines from the unfused ones. for(SphereSegment::LineList::iterator itr = _generatedLines.begin(); itr != _generatedLines.end(); ++itr) @@ -2460,7 +2460,7 @@ namespace SphereSegmentIntersector // add the newline into the unfused for further processing. unfusedLines.push_back(newline); - osg::notify(osg::INFO)<<"Fusing two seperate lines "<_p1Outside = _lowerOutside ? (d1<0.0) : (d1>0.0); edge->_p2Outside = _lowerOutside ? (d2<0.0) : (d2>0.0); - // if both points inside then disgard + // if both points inside then discard if (d1<0.0 && d2<0.0) return false; - // if both points outside then disgard + // if both points outside then discard if (d1>0.0 && d2>0.0) return false; if (d1==0.0) @@ -2627,10 +2627,10 @@ namespace SphereSegmentIntersector edge->_p1Outside = _lowerOutside ? (elev1<_elev) : (elev1>_elev); edge->_p2Outside = _lowerOutside ? (elev2<_elev) : (elev2>_elev); - // if both points inside then disgard + // if both points inside then discard if (elev1<_elev && elev2<_elev) return false; - // if both points outside then disgard + // if both points outside then discard if (elev1>_elev && elev2>_elev) return false; if (elev1==_elev) @@ -2757,10 +2757,10 @@ namespace SphereSegmentIntersector edge->_p1Outside = radius1>_tif._radius; edge->_p2Outside = radius2>_tif._radius; - // if both points inside then disgard + // if both points inside then discard if (radius1<_tif._radius && radius2<_tif._radius) return false; - // if both points outside then disgard + // if both points outside then discard if (radius1>_tif._radius && radius2>_tif._radius) return false; if (radius1==_tif._radius) @@ -2977,19 +2977,19 @@ SphereSegment::LineList SphereSegment::computeIntersection(const osg::Matrixd& m tif._generatedLines.insert(tif._generatedLines.end(), elevMinLines.begin(), elevMinLines.end()); tif._generatedLines.insert(tif._generatedLines.end(), elevMaxLines.begin(), elevMaxLines.end()); - osg::notify(osg::INFO)<<"number of seperate lines = "<setInternalTextureFormat(GL_ALPHA); - // now populate data arry by converting bitmap into a luminance_alpha map. + // now populate data array by converting bitmap into a luminance_alpha map. unsigned char* ptr = rasters[i-32]; unsigned char value_on = 255; unsigned char value_off = 0; diff --git a/src/osgText/Font.cpp b/src/osgText/Font.cpp index 57bb55839..d92c8d200 100644 --- a/src/osgText/Font.cpp +++ b/src/osgText/Font.cpp @@ -630,7 +630,8 @@ void Font::GlyphTexture::apply(osg::State& state) const if (s_renderer && (strstr((const char*)s_renderer,"Radeon")!=0) || - (strstr((const char*)s_renderer,"RADEON")!=0)) + (strstr((const char*)s_renderer,"RADEON")!=0) || + (strstr((const char*)s_renderer,"ALL-IN-WONDER")!=0)) { // we're running on an ATI, so need to work around its // subloading bugs by loading all at once. diff --git a/src/osgText/String.cpp b/src/osgText/String.cpp index fa10235a2..f752b3242 100644 --- a/src/osgText/String.cpp +++ b/src/osgText/String.cpp @@ -7,7 +7,7 @@ using namespace osgText; //////////////////////////////////////////////////////////////////////// // -// helper class to make it safer to querry std::string's for encoding. +// helper class to make it safer to query std::string's for encoding. // struct look_ahead_iterator { diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp index 5a8047089..315cf00c4 100644 --- a/src/osgText/Text.cpp +++ b/src/osgText/Text.cpp @@ -224,7 +224,7 @@ String::iterator Text::computeLastCharacterOnLine(osg::Vec2& cursor, String::ite { --lastValidChar; - //Substract off glyphs from the cursor position (to correctly center text) + // Subtract off glyphs from the cursor position (to correctly center text) Font::Glyph* glyph = activefont->getGlyph(*lastValidChar); if (glyph) { @@ -365,7 +365,7 @@ void Text::computeGlyphRepresentation() switch(_alignment) { // TODO: current behaviour top baselines lined up in both cases - need to implement - // top of characters aligment - Question is this neccesary? + // top of characters alignment - Question is this necessary? // ... otherwise, nothing to be done for these 6 cases //case LEFT_TOP: //case CENTER_TOP: @@ -1758,6 +1758,7 @@ void Text::renderOnlyForegroundText(osg::State& state, const osg::Vec4& colorMul } + void Text::renderWithPolygonOffset(osg::State& state, const osg::Vec4& colorMultiplier) const { unsigned int contextID = state.getContextID(); @@ -1818,6 +1819,7 @@ void Text::renderWithPolygonOffset(osg::State& state, const osg::Vec4& colorMult glPopAttrib(); } + void Text::renderWithNoDepthBuffer(osg::State& state, const osg::Vec4& colorMultiplier) const { diff --git a/src/osgUtil/IntersectVisitor.cpp b/src/osgUtil/IntersectVisitor.cpp index 1f0753b40..9799acbaa 100644 --- a/src/osgUtil/IntersectVisitor.cpp +++ b/src/osgUtil/IntersectVisitor.cpp @@ -180,13 +180,13 @@ void IntersectVisitor::IntersectState::addLineSegment(osg::LineSegment* seg) IntersectVisitor::IntersectVisitor() { - // overide the default node visitor mode. + // override the default node visitor mode. setTraversalMode(NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); // Initialize eyepoint to 0,0,0 setEyePoint(Vec3(0.0f,0.0f,0.0f)); - setLODSelectionMode(USE_HIGHEST_LEVEL_OF_DETAIL); // orignal IntersectVisitor behavior + setLODSelectionMode(USE_HIGHEST_LEVEL_OF_DETAIL); // original IntersectVisitor behavior //setLODSelectionMode(USE_SEGMENT_START_POINT_AS_EYE_POINT_FOR_LOD_LEVEL_SELECTION); reset(); diff --git a/src/osgUtil/IntersectionVisitor.cpp b/src/osgUtil/IntersectionVisitor.cpp index 04b02f0cf..1eca31401 100644 --- a/src/osgUtil/IntersectionVisitor.cpp +++ b/src/osgUtil/IntersectionVisitor.cpp @@ -152,7 +152,7 @@ bool IntersectorGroup::containsIntersections() IntersectionVisitor::IntersectionVisitor(Intersector* intersector, ReadCallback* readCallback) { - // overide the default node visitor mode. + // override the default node visitor mode. setTraversalMode(NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); setIntersector(intersector); @@ -162,7 +162,7 @@ IntersectionVisitor::IntersectionVisitor(Intersector* intersector, ReadCallback* void IntersectionVisitor::setIntersector(Intersector* intersector) { - // keep refernce around just in case intersector is already in the _intersectorStack, otherwsie the clear could delete it. + // keep reference around just in case intersector is already in the _intersectorStack, otherwise the clear could delete it. osg::ref_ptr temp = intersector; _intersectorStack.clear(); @@ -288,7 +288,7 @@ void IntersectionVisitor::apply(osg::Transform& transform) popModelMatrix(); - // tidy up an cached cull variabes in the current intersector. + // tidy up an cached cull variables in the current intersector. leave(); } diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp index 6c985b019..ac0dad9bc 100644 --- a/src/osgUtil/Optimizer.cpp +++ b/src/osgUtil/Optimizer.cpp @@ -2059,7 +2059,7 @@ bool Optimizer::MergeGeometryVisitor::mergeGeode(osg::Geode& geode) { // now need to clean up primitiveset so it no longer contains the rhs combined primitives. - // first swap with a empty primtiveSet to empty it completely. + // first swap with a empty primitiveSet to empty it completely. osg::Geometry::PrimitiveSetList oldPrimitives; primitives.swap(oldPrimitives); @@ -2162,7 +2162,7 @@ bool Optimizer::MergeGeometryVisitor::geometryContainsSharedArrays(osg::Geometry if (tex && tex->referenceCount()>1) return true; } - // shift the indices of the incomming primitives to account for the pre exisiting geometry. + // shift the indices of the incoming primitives to account for the pre existing geometry. for(osg::Geometry::PrimitiveSetList::iterator primItr=geom.getPrimitiveSetList().begin(); primItr!=geom.getPrimitiveSetList().end(); ++primItr) @@ -2387,7 +2387,7 @@ bool Optimizer::MergeGeometryVisitor::mergeGeometry(osg::Geometry& lhs,osg::Geom } - // shift the indices of the incomming primitives to account for the pre exisiting geometry. + // shift the indices of the incoming primitives to account for the pre existing geometry. for(osg::Geometry::PrimitiveSetList::iterator primItr=rhs.getPrimitiveSetList().begin(); primItr!=rhs.getPrimitiveSetList().end(); ++primItr) diff --git a/src/osgUtil/PlaneIntersector.cpp b/src/osgUtil/PlaneIntersector.cpp index 76af00d0d..9114d7ff5 100644 --- a/src/osgUtil/PlaneIntersector.cpp +++ b/src/osgUtil/PlaneIntersector.cpp @@ -406,7 +406,7 @@ namespace PlaneIntersectorUtils { if (de<0.0) { - // osg::notify(osg::NOTICE)<<"Disgard segment "<accept(stats); // use sub-class to find the stats for each drawable } statsCollected = true; @@ -512,7 +512,7 @@ bool RenderBin::getStats(Statistics& stats) const if (rl->_modelview.get()) stats.addMatrix(); // number of matrices if (dw) { - // then tot up the primtive types and no vertices. + // then tot up the primitive types and no vertices. dw->accept(stats); // use sub-class to find the stats for each drawable } } diff --git a/src/osgUtil/RenderStage.cpp b/src/osgUtil/RenderStage.cpp index b3b6c7705..7cf323990 100644 --- a/src/osgUtil/RenderStage.cpp +++ b/src/osgUtil/RenderStage.cpp @@ -221,15 +221,15 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) osg::Camera::RenderTargetImplementation renderTargetImplemntation = _camera->getRenderTargetImplementation(); osg::Camera::RenderTargetImplementation renderTargetFallback = _camera->getRenderTargetFallback(); - osg::Camera::BufferAttachmentMap& bufferAttachements = _camera->getBufferAttachmentMap(); + osg::Camera::BufferAttachmentMap& bufferAttachments = _camera->getBufferAttachmentMap(); // compute the required dimensions int width = static_cast(_viewport->x() + _viewport->width()); int height = static_cast(_viewport->y() + _viewport->height()); int depth = 1; osg::Camera::BufferAttachmentMap::iterator itr; - for(itr = bufferAttachements.begin(); - itr != bufferAttachements.end(); + for(itr = bufferAttachments.begin(); + itr != bufferAttachments.end(); ++itr) { width = osg::maximum(width,itr->second.width()); @@ -241,8 +241,8 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) // osg::notify(osg::NOTICE)<<"RenderStage::runCameraSetUp computed "<getGraphicsThread(); useRenderInfo.setState(useState); - // syncronize the frame stamps + // synchronize the frame stamps useState->setFrameStamp(const_cast(state.getFrameStamp())); // map the DynamicObjectCount across to the new window @@ -989,7 +989,7 @@ void RenderStage::drawImplementation(osg::RenderInfo& renderInfo,RenderLeaf*& pr return; } - // push the stages camera so that drawing code can querry it + // push the stages camera so that drawing code can query it if (_camera) renderInfo.pushCamera(_camera); // set up the back buffer. diff --git a/src/osgUtil/Simplifier.cpp b/src/osgUtil/Simplifier.cpp index 7b12400f9..2bd27b44c 100644 --- a/src/osgUtil/Simplifier.cpp +++ b/src/osgUtil/Simplifier.cpp @@ -356,7 +356,7 @@ public: void addTriangle(Triangle* triangle) { _triangles.insert(triangle); - // if (_triangles.size()>2) osg::notify(osg::NOTICE)<<"Warning too many traingles ("<<_triangles.size()<<") sharing edge "<2) osg::notify(osg::NOTICE)<<"Warning too many triangles ("<<_triangles.size()<<") sharing edge "<_vertex,p2->_vertex,p3->_vertex); } - // note return 1 - dotproduct, so that deviation is in the range of 0.0 to 2.0, where 0 is coincendent, 1.0 is 90 degrees, and 2.0 is 180 degrees. + // note return 1 - dotproduct, so that deviation is in the range of 0.0 to 2.0, where 0 is coincident, 1.0 is 90 degrees, and 2.0 is 180 degrees. float computeNormalDeviationOnEdgeCollapse(Edge* edge,Point* pNew) const { const Point* p1 = (_p1==edge->_p1 || _p1==edge->_p2) ? pNew : _p1.get(); @@ -601,7 +601,7 @@ public: triangle->_e2 = replaceEdgePoint(triangle->_e2.get(),pOriginal,pNew); triangle->_e3 = replaceEdgePoint(triangle->_e3.get(),pOriginal,pNew); - // remove the triangle form the orignal point, and possibly the point if its the last triangle to use it + // remove the triangle form the original point, and possibly the point if its the last triangle to use it removePoint(triangle, pOriginal); // add the triangle to that point diff --git a/src/osgUtil/Tessellator.cpp b/src/osgUtil/Tessellator.cpp index 7218e85e8..b40b8da56 100644 --- a/src/osgUtil/Tessellator.cpp +++ b/src/osgUtil/Tessellator.cpp @@ -622,7 +622,7 @@ unsigned int _computeNumberOfPrimitives(const osg::Geometry& geom) default: primLength=0; break; // compute later when =0. } - // draw primtives by the more flexible "slow" path, + // draw primitives by the more flexible "slow" path, // sending OpenGL glBegin/glVertex.../glEnd(). switch(primitiveset->getType()) { diff --git a/src/osgUtil/TriStripVisitor.cpp b/src/osgUtil/TriStripVisitor.cpp index c6e5c8581..34e585510 100644 --- a/src/osgUtil/TriStripVisitor.cpp +++ b/src/osgUtil/TriStripVisitor.cpp @@ -216,7 +216,7 @@ void TriStripVisitor::stripify(Geometry& geom) geom.copyToAndOptimize(geom); } - // check for the existance of surface primitives + // check for the existence of surface primitives unsigned int numSurfacePrimitives = 0; unsigned int numNonSurfacePrimitives = 0; Geometry::PrimitiveSetList& primitives = geom.getPrimitiveSetList(); diff --git a/src/osgViewer/CompositeViewer.cpp b/src/osgViewer/CompositeViewer.cpp index ba0e62355..ef5e466a7 100644 --- a/src/osgViewer/CompositeViewer.cpp +++ b/src/osgViewer/CompositeViewer.cpp @@ -922,7 +922,7 @@ void CompositeViewer::updateTraversal() if (scene->getDatabasePager()) { - // syncronize changes required by the DatabasePager thread to the scene graph + // synchronize changes required by the DatabasePager thread to the scene graph scene->getDatabasePager()->updateSceneGraph(_frameStamp->getReferenceTime()); } diff --git a/src/osgViewer/Renderer.cpp b/src/osgViewer/Renderer.cpp index 83b38f8cf..f514146ac 100644 --- a/src/osgViewer/Renderer.cpp +++ b/src/osgViewer/Renderer.cpp @@ -254,7 +254,7 @@ void Renderer::cull() if (_done || _graphicsThreadDoesCull) return; - // note we assume lock has already been aquired. + // note we assume lock has already been acquired. osgUtil::SceneView* sceneView = _availableQueue.takeFront(); DEBUG_MESSAGE<<"cull() got SceneView "<getFrameStamp(); int frameNumber = fs ? fs->getFrameNumber() : 0; - // do cull taversal + // do cull traversal osg::Timer_t beforeCullTick = osg::Timer::instance()->tick(); sceneView->inheritCullSettings(*(sceneView->getCamera())); @@ -356,15 +356,15 @@ void Renderer::draw() state->getDynamicObjectRenderingCompletedCallback()->completed(state); } - bool aquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu"); + bool acquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu"); - if (aquireGPUStats) + if (acquireGPUStats) { checkQuery(stats); } - // do draw traveral - if (aquireGPUStats) + // do draw traversal + if (acquireGPUStats) { checkQuery(stats); beginQuery(frameNumber); @@ -404,7 +404,7 @@ void Renderer::draw() sceneView->flushDeletedGLObjects(availableTime); } - if (aquireGPUStats) + if (acquireGPUStats) { endQuery(); checkQuery(stats); @@ -464,14 +464,14 @@ void Renderer::cull_draw() initialize(state); } - bool aquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu"); + bool acquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu"); - if (aquireGPUStats) + if (acquireGPUStats) { checkQuery(stats); } - // do cull taversal + // do cull traversal osg::Timer_t beforeCullTick = osg::Timer::instance()->tick(); sceneView->inheritCullSettings(*(sceneView->getCamera())); @@ -487,8 +487,8 @@ void Renderer::cull_draw() #endif - // do draw traveral - if (aquireGPUStats) + // do draw traversal + if (acquireGPUStats) { checkQuery(stats); beginQuery(frameNumber); @@ -526,7 +526,7 @@ void Renderer::cull_draw() sceneView->flushDeletedGLObjects(availableTime); } - if (aquireGPUStats) + if (acquireGPUStats) { endQuery(); checkQuery(stats); diff --git a/src/osgViewer/StatsHandler.cpp b/src/osgViewer/StatsHandler.cpp index 3a308fee2..a04eec356 100644 --- a/src/osgViewer/StatsHandler.cpp +++ b/src/osgViewer/StatsHandler.cpp @@ -566,7 +566,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer) std::string font("fonts/arial.ttf"); - // collect all the relevant camers + // collect all the relevant cameras ViewerBase::Cameras validCameras; viewer->getCameras(validCameras); @@ -581,7 +581,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer) } } - // check for querry time support + // check for query time support unsigned int numCamrasWithTimerQuerySupport = 0; for(ViewerBase::Cameras::iterator citr = cameras.begin(); citr != cameras.end(); @@ -598,7 +598,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer) } } - bool aquireGPUStats = numCamrasWithTimerQuerySupport==cameras.size(); + bool acquireGPUStats = numCamrasWithTimerQuerySupport==cameras.size(); float leftPos = 10.0f; float startBlocks = 150.0f; @@ -749,7 +749,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer) citr != cameras.end(); ++citr) { - group->addChild(createCameraStats(font, pos, startBlocks, aquireGPUStats, characterSize, viewer->getStats(), *citr)); + group->addChild(createCameraStats(font, pos, startBlocks, acquireGPUStats, characterSize, viewer->getStats(), *citr)); } @@ -886,7 +886,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer) #endif } -osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& pos, float startBlocks, bool aquireGPUStats, float characterSize, osg::Stats* viewerStats, osg::Camera* camera) +osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& pos, float startBlocks, bool acquireGPUStats, float characterSize, osg::Stats* viewerStats, osg::Camera* camera) { osg::Stats* stats = camera->getStats(); if (!stats) return 0; @@ -972,7 +972,7 @@ osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& p pos.y() -= characterSize*1.5f; } - if (aquireGPUStats) + if (acquireGPUStats) { pos.x() = leftPos; @@ -1015,7 +1015,7 @@ osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& p void StatsHandler::getUsage(osg::ApplicationUsage& usage) const { - usage.addKeyboardMouseBinding("s","Onscreen stats."); + usage.addKeyboardMouseBinding("s","On screen stats."); usage.addKeyboardMouseBinding("S","Output stats to console."); } diff --git a/src/osgViewer/View.cpp b/src/osgViewer/View.cpp index f0f3e9a13..a013bfb7e 100644 --- a/src/osgViewer/View.cpp +++ b/src/osgViewer/View.cpp @@ -59,7 +59,7 @@ public: }; -/** callback class to use to allow matrix manipulators to querry the application for the local coordinate frame.*/ +/** callback class to use to allow matrix manipulators to query the application for the local coordinate frame.*/ class ViewerCoordinateFrameCallback : public osgGA::MatrixManipulator::CoordinateFrameCallback { public: @@ -142,7 +142,7 @@ View::View(): // make sure View is safe to reference multi-threaded. setThreadSafeRefUnref(true); - // need to attach a Renderer to the maaster camera which has been default constructed + // need to attach a Renderer to the master camera which has been default constructed getCamera()->setRenderer(createRenderer(getCamera())); setEventQueue(new osgGA::EventQueue); @@ -157,7 +157,7 @@ View::View(const osgViewer::View& view, const osg::CopyOp& copyop): { _scene = new Scene; - // need to attach a Renderer to the maaster camera which has been default constructed + // need to attach a Renderer to the master camera which has been default constructed getCamera()->setRenderer(createRenderer(getCamera())); setEventQueue(new osgGA::EventQueue); @@ -271,7 +271,7 @@ void View::setSceneData(osg::Node* node) if (getSceneData()) { - // now make sure the scene graph is set up with the correct DataVariance to protect the dyamic elements of + // now make sure the scene graph is set up with the correct DataVariance to protect the dynamic elements of // the scene graph from being run in parallel. osgUtil::Optimizer::StaticObjectDetectionVisitor sodv; getSceneData()->accept(sodv); diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp index d73c7d693..d60de05b3 100644 --- a/src/osgViewer/Viewer.cpp +++ b/src/osgViewer/Viewer.cpp @@ -430,7 +430,7 @@ void Viewer::realize() // initialize the global timer to be relative to the current time. osg::Timer::instance()->setStartTick(); - // pass on the start tick to all the associated eventqueues + // pass on the start tick to all the associated event queues setStartTick(osg::Timer::instance()->getStartTick()); setUpThreading(); @@ -839,7 +839,7 @@ void Viewer::updateTraversal() if (_scene->getDatabasePager()) { - // syncronize changes required by the DatabasePager thread to the scene graph + // synchronize changes required by the DatabasePager thread to the scene graph _scene->getDatabasePager()->updateSceneGraph(_frameStamp->getReferenceTime()); } diff --git a/src/osgViewer/ViewerEventHandlers.cpp b/src/osgViewer/ViewerEventHandlers.cpp index 34affb7c4..057b5399e 100644 --- a/src/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgViewer/ViewerEventHandlers.cpp @@ -459,7 +459,7 @@ bool RecordCameraPathHandler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GU // check for a KeySwitchManipulator, create one if not present, and then add this // to either the newly created one or the existing one. However, the code do that was // EXTREMELY dirty, so I opted for a simpler solution. At a later date, someone may - // want to implement the original recomendation (which is in a mailing list reply + // want to implement the original recommendation (which is in a mailing list reply // from June 1st by Robert in a thread called "osgviewer Camera Animation (preliminary)". else if (ea.getKey() == _keyEventTogglePlayback) { @@ -483,7 +483,7 @@ bool RecordCameraPathHandler::handle(const osgGA::GUIEventAdapter &ea, osgGA::GU _animPathManipulator->home(ea,aa); - // If we succesfully found our _filename file, set it and keep a copy + // If we successfully found our _filename file, set it and keep a copy // around of the original MatrixManipulator to restore later. if (_animPathManipulator.valid() && _animPathManipulator->valid()) {