From d64ad2e654001a4323a7fb39fa3d937ae71f1646 Mon Sep 17 00:00:00 2001 From: Alberto Luaces Date: Wed, 28 Oct 2020 17:05:06 +0100 Subject: [PATCH] Code comments, log strings and some variable spell fixes. --- applications/present3D/Cluster.cpp | 2 +- applications/present3D/present3D.cpp | 6 +++--- examples/osgautocapture/osgautocapture.cpp | 2 +- examples/osgbindlesstext/osgbindlesstext.cpp | 2 +- examples/osgcallback/osgcallback.cpp | 2 +- examples/osgcopy/osgcopy.cpp | 2 +- examples/osgframerenderer/osgframerenderer.cpp | 2 +- examples/osggeometry/osggeometry.cpp | 2 +- examples/osgkeyboard/osgkeyboard.cpp | 2 +- examples/osgkeyboardmouse/osgkeyboardmouse.cpp | 4 ++-- .../osgparticleshader/osgparticleshader.cpp | 2 +- .../osgpersistentbufferstorage.cpp | 2 +- examples/osgposter/osgposter.cpp | 2 +- examples/osgreflect/osgreflect.cpp | 2 +- examples/osgscreencapture/osgscreencapture.cpp | 8 ++++---- examples/osgsequence/osgsequence.cpp | 6 +++--- .../oldshadercomposition.cpp | 4 ++-- examples/osgshaderterrain/osgshaderterrain.cpp | 2 +- examples/osgtessellate/osgtessellate.cpp | 2 +- .../osgtessellationshaders.cpp | 6 +++--- examples/osgtext/osgtext.cpp | 4 ++-- examples/osgtexture2D/osgtexture2D.cpp | 2 +- .../osgtexturecompression.cpp | 2 +- examples/osgunittests/osgunittests.cpp | 2 +- src/OpenThreads/pthreads/PThread.cpp | 2 +- src/OpenThreads/pthreads/PThreadCondition.cpp | 2 +- src/OpenThreads/win32/Win32Thread.cpp | 2 +- src/osg/ApplicationUsage.cpp | 6 +++--- src/osg/BufferObject.cpp | 2 +- src/osg/DisplaySettings.cpp | 18 +++++++++--------- src/osg/Group.cpp | 2 +- src/osg/Image.cpp | 2 +- src/osg/PrimitiveSetIndirect.cpp | 2 +- src/osg/Shader.cpp | 2 +- src/osg/ShaderComposer.cpp | 2 +- src/osg/State.cpp | 6 +++--- src/osg/Texture.cpp | 2 +- src/osg/Texture1D.cpp | 2 +- src/osg/Texture2D.cpp | 4 ++-- src/osg/Texture3D.cpp | 2 +- src/osg/TextureCubeMap.cpp | 2 +- src/osgDB/FileUtils.cpp | 8 ++++---- src/osgDB/OutputStream.cpp | 4 ++-- src/osgDB/Registry.cpp | 2 +- src/osgPlugins/3ds/WriterCompareTriangle.cpp | 8 ++++---- .../OpenCASCADE/ReaderWriterOpenCASCADE.cpp | 4 ++-- src/osgPlugins/OpenFlight/ExportOptions.cpp | 2 +- src/osgPlugins/QTKit/ReaderWriterQTKit.cpp | 2 +- .../ReaderWriterRestHttpDevice.cpp | 2 +- src/osgPlugins/ac/Geode.cpp | 4 ++-- src/osgPlugins/ac/ac3d.cpp | 2 +- .../avfoundation/ReaderWriterAVFoundation.cpp | 2 +- src/osgPlugins/dae/daeRGeometry.cpp | 2 +- src/osgPlugins/dae/daeRMaterials.cpp | 4 ++-- src/osgPlugins/dae/daeWMaterials.cpp | 2 +- src/osgPlugins/dicom/ReaderWriterDICOM.cpp | 2 +- .../directshow/DirectShowTexture.cpp | 4 ++-- src/osgPlugins/dxf/ReaderWriterDXF.cpp | 4 ++-- .../gles/AnimationCleanerVisitor.cpp | 2 +- src/osgPlugins/gles/TangentSpaceVisitor.cpp | 2 +- src/osgPlugins/hdr/hdrwriter.cpp | 2 +- .../ive/VolumeTransferFunctionProperty.cpp | 2 +- src/osgPlugins/jpeg/EXIF_Orientation.cpp | 2 +- src/osgPlugins/las/ReaderWriterLAS.cpp | 2 +- src/osgPlugins/obj/ReaderWriterOBJ.cpp | 2 +- src/osgPlugins/osga/OSGA_Archive.cpp | 2 +- src/osgPlugins/ply/vertexData.cpp | 2 +- src/osgPlugins/rot/ReaderWriterROT.cpp | 2 +- .../shadow/ReaderWriterOsgShadow.cpp | 2 +- src/osgPlugins/trans/ReaderWriterTRANS.cpp | 2 +- src/osgPlugins/trk/ReaderWriterTRK.cpp | 2 +- src/osgPlugins/txf/TXFFont.cpp | 6 +++--- src/osgPlugins/txp/TXPPagedLOD.cpp | 2 +- src/osgPlugins/txp/TileMapper.cpp | 2 +- src/osgShadow/ConvexPolyhedron.cpp | 6 +++--- .../LightSpacePerspectiveShadowMap.cpp | 4 ++-- src/osgShadow/ViewDependentShadowMap.cpp | 2 +- src/osgSim/LightPointNode.cpp | 4 ++-- src/osgSim/SphereSegment.cpp | 8 ++++---- src/osgUI/Widget.cpp | 2 +- src/osgUtil/IncrementalCompileOperation.cpp | 2 +- src/osgUtil/RenderBin.cpp | 6 +++--- src/osgUtil/ShaderGen.cpp | 2 +- src/osgUtil/Simplifier.cpp | 4 ++-- src/osgViewer/View.cpp | 16 ++++++++-------- src/osgViewer/Viewer.cpp | 2 +- src/osgVolume/FixedFunctionTechnique.cpp | 2 +- src/osgVolume/MultipassTechnique.cpp | 8 ++++---- src/osgVolume/RayTracedTechnique.cpp | 2 +- .../volume_multipass_cube_and_hull_frag.cpp | 10 +++++----- .../osgGA/KeySwitchMatrixManipulator.cpp | 2 +- 91 files changed, 154 insertions(+), 154 deletions(-) diff --git a/applications/present3D/Cluster.cpp b/applications/present3D/Cluster.cpp index 86785b1c6..0fe5d5fd4 100644 --- a/applications/present3D/Cluster.cpp +++ b/applications/present3D/Cluster.cpp @@ -305,7 +305,7 @@ bool Receiver::init( void ) if (result) { - OSG_NOTICE<<"Warning: Reciever::init() setsockopt(..) failed, errno="<getTraversalMode(); @@ -690,7 +690,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 ocured when parsing the program aguments. + // report any errors if they have ocured when parsing the program arguments. if (arguments.errors()) { arguments.writeErrorMessages(osg::notify(osg::INFO)); diff --git a/examples/osgautocapture/osgautocapture.cpp b/examples/osgautocapture/osgautocapture.cpp index 938570320..9add26db0 100644 --- a/examples/osgautocapture/osgautocapture.cpp +++ b/examples/osgautocapture/osgautocapture.cpp @@ -312,7 +312,7 @@ int main( int argc, char **argv ) osg::CoordinateSystemNode* csn = findTopMostNodeOfType(loadedModel.get()); if(!csn) return 1; - // Compute eye point in world coordiantes + // Compute eye point in world coordinates osg::Vec3d eye; csn->getEllipsoidModel()->convertLatLongHeightToXYZ(lat, lon, alt, eye.x(), eye.y(), eye.z()); diff --git a/examples/osgbindlesstext/osgbindlesstext.cpp b/examples/osgbindlesstext/osgbindlesstext.cpp index e67702f64..1fdb3fdde 100644 --- a/examples/osgbindlesstext/osgbindlesstext.cpp +++ b/examples/osgbindlesstext/osgbindlesstext.cpp @@ -150,7 +150,7 @@ std::string fragShader = "} \n" ; -///This class provides a basic wraper for a Uniform Buffer Object +///This class provides a basic wrapper for a Uniform Buffer Object ///or UBO, and provides the storage for the texture handles class BindlessBuffer: public osg::Referenced{ public: diff --git a/examples/osgcallback/osgcallback.cpp b/examples/osgcallback/osgcallback.cpp index 661b8e08e..0d5ab8ea6 100644 --- a/examples/osgcallback/osgcallback.cpp +++ b/examples/osgcallback/osgcallback.cpp @@ -184,7 +184,7 @@ int main( int argc, char **argv ) // use an ArgumentParser object to manage the program arguments. osg::ArgumentParser arguments(&argc,argv); - // set the osgDB::Registy read file callback to catch all requests for reading files. + // set the osgDB::Registry read file callback to catch all requests for reading files. osgDB::Registry::instance()->setReadFileCallback(new MyReadFileCallback()); // initialize the viewer. diff --git a/examples/osgcopy/osgcopy.cpp b/examples/osgcopy/osgcopy.cpp index 6e9087c6a..ef60b33d6 100644 --- a/examples/osgcopy/osgcopy.cpp +++ b/examples/osgcopy/osgcopy.cpp @@ -211,7 +211,7 @@ int main( int argc, char **argv ) // ------------- Start of copy specific code ------------------------------------------------------- - // do a deep copy, using MyCopyOp to reveal whats going on under the hood, + // do a deep copy, using MyCopyOp to reveal what's going on under the hood, // in your own code you'd typically just use the basic osg::CopyOp something like osg::ref_ptr mycopy = dynamic_cast(rootnode->clone(osg::CopyOp::DEEP_COPY_ALL)); std::cout << "Doing a deep copy of scene graph"<addCommandLineOption("-o ","Base output filename of the images, recommended to use something like Images/image.png"); arguments.getApplicationUsage()->addCommandLineOption("--cs ","Load pre-generated configuration file for run."); arguments.getApplicationUsage()->addCommandLineOption("--ouput-cs ","Output configuration file with settings provided on commandline."); - arguments.getApplicationUsage()->addCommandLineOption("-p ","Use specificied camera path file to control camera position."); + arguments.getApplicationUsage()->addCommandLineOption("-p ","Use specified camera path file to control camera position."); arguments.getApplicationUsage()->addCommandLineOption("--offscreen","Use an pbuffer to render the images offscreen."); arguments.getApplicationUsage()->addCommandLineOption("--screen","Use an window to render the images."); arguments.getApplicationUsage()->addCommandLineOption("--width ","Window/output image width."); diff --git a/examples/osggeometry/osggeometry.cpp b/examples/osggeometry/osggeometry.cpp index b3541ba18..6195417be 100644 --- a/examples/osggeometry/osggeometry.cpp +++ b/examples/osggeometry/osggeometry.cpp @@ -148,7 +148,7 @@ osg::Node* createScene() // create a Vec3Array and add to it all my coordinates. // Like all the *Array variants (see include/osg/Array) , Vec3Array is derived from both osg::Array - // and std::vector<>. osg::Array's are reference counted and hence sharable, + // and std::vector<>. osg::Array's are reference counted and hence shareable, // which std::vector<> provides all the convenience, flexibility and robustness // of the most popular of all STL containers. osg::Vec3Array* vertices = new osg::Vec3Array; diff --git a/examples/osgkeyboard/osgkeyboard.cpp b/examples/osgkeyboard/osgkeyboard.cpp index e5c5b1dfa..b709f1fa2 100644 --- a/examples/osgkeyboard/osgkeyboard.cpp +++ b/examples/osgkeyboard/osgkeyboard.cpp @@ -64,7 +64,7 @@ void KeyboardModel::keyChange(int key, int virtualKey, int value) { osg::notify(osg::INFO) << "key value change, code="<getNumChildren()>0) { - std::cout<<"Writing selected compoents to 'selected_model.osgt'"<push_back( osg::Vec4(1,0,1,1) ); osg::ref_ptr vbo = new osg::VertexBufferObject; vbo->setDataVariance(osg::Object::STATIC); - vbo->setUsage(GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT ); // enable persistant bufferStorage + vbo->setUsage(GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT ); // enable persistent bufferStorage vbo->setMappingBitfield(GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT| GL_MAP_FLUSH_EXPLICIT_BIT );// set mapping flags vAry->setBufferObject(vbo); diff --git a/examples/osgposter/osgposter.cpp b/examples/osgposter/osgposter.cpp index 6f5cb820e..6cdcbcf45 100644 --- a/examples/osgposter/osgposter.cpp +++ b/examples/osgposter/osgposter.cpp @@ -76,7 +76,7 @@ void computeViewMatrixOnEarth( osg::Camera* camera, osg::Node* scene, osg::CoordinateSystemNode* csn = findTopMostNodeOfType(scene); if ( !csn ) return; - // Compute eye point in world coordiantes + // Compute eye point in world coordinates osg::Vec3d eye; csn->getEllipsoidModel()->convertLatLongHeightToXYZ( latLongHeight.x(), latLongHeight.y(), latLongHeight.z(), eye.x(), eye.y(), eye.z() ); diff --git a/examples/osgreflect/osgreflect.cpp b/examples/osgreflect/osgreflect.cpp index 6837a6691..ac37bf662 100644 --- a/examples/osgreflect/osgreflect.cpp +++ b/examples/osgreflect/osgreflect.cpp @@ -39,7 +39,7 @@ // // A simple demo demonstrating planar reflections using multiple renderings -// of a subgraph, overriding of state attribures and use of the stencil buffer. +// of a subgraph, overriding of state attributes and use of the stencil buffer. // // The multipass system implemented here is a variation of Mark Kilgard's // paper "Improving Shadows and Reflections via the Stencil Buffer" which diff --git a/examples/osgscreencapture/osgscreencapture.cpp b/examples/osgscreencapture/osgscreencapture.cpp index 0169853b0..771c698ae 100644 --- a/examples/osgscreencapture/osgscreencapture.cpp +++ b/examples/osgscreencapture/osgscreencapture.cpp @@ -99,19 +99,19 @@ class WindowCaptureCallback : public osg::Camera::DrawCallback switch(_mode) { case(READ_PIXELS): - osg::notify(osg::NOTICE)<<"Reading window usig glReadPixels, with out PixelBufferObject."<setInterval(osg::Sequence::LOOP, 0,-1); - // real-time playback, repeat indefinitively + // real-time playback, repeat indefinitely seq->setDuration(1.0f, -1); // must be started explicitly @@ -157,7 +157,7 @@ osg::Sequence* createSequence(osg::ArgumentParser& arguments) // loop through all children seq->setInterval(osg::Sequence::LOOP, 0,-1); - // real-time playback, repeat indefinitively + // real-time playback, repeat indefinitely seq->setDuration(1.0f, -1); seq->setMode(osg::Sequence::START); @@ -244,7 +244,7 @@ int main( int argc, char **argv ) "- is subclassed from osg::Switch", "- assigns a display duration to each child", "- can loop or swing through an interval of it's children", - "- can repeat the interval a number of times or indefinitively", + "- can repeat the interval a number of times or indefinitely", "- press 's' to start/pause/resume", "- press 'l' to toggle loop/swing mode", NULL diff --git a/examples/osgshadercomposition/oldshadercomposition.cpp b/examples/osgshadercomposition/oldshadercomposition.cpp index 2c9e7cacf..b9b804008 100644 --- a/examples/osgshadercomposition/oldshadercomposition.cpp +++ b/examples/osgshadercomposition/oldshadercomposition.cpp @@ -99,7 +99,7 @@ osg::Node* createOldShaderCompositionScene(osg::ArgumentParser& arguments) group->addChild(pat); } - // resuse the first ShaderAttribute's type and ShaderComponent, just use new uniform + // reuse the first ShaderAttribute's type and ShaderComponent, just use new uniform { osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform; pat->setPosition(position); @@ -119,7 +119,7 @@ osg::Node* createOldShaderCompositionScene(osg::ArgumentParser& arguments) } - // resuse the first ShaderAttribute's type and ShaderComponent, just use new uniform + // reuse the first ShaderAttribute's type and ShaderComponent, just use new uniform { osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform; pat->setPosition(position); diff --git a/examples/osgshaderterrain/osgshaderterrain.cpp b/examples/osgshaderterrain/osgshaderterrain.cpp index cb2f5459b..ac7ea1dcf 100644 --- a/examples/osgshaderterrain/osgshaderterrain.cpp +++ b/examples/osgshaderterrain/osgshaderterrain.cpp @@ -314,7 +314,7 @@ int main(int, char **) osg::ref_ptr testSupportOperation = new TestSupportOperation; #if 0 - // temporily commenting out as its causing the viewer to crash... no clue yet to why + // temporarily commenting out as its causing the viewer to crash... no clue yet to why viewer.setRealizeOperation(testSupportOperation.get()); #endif // create the windows and run the threads. diff --git a/examples/osgtessellate/osgtessellate.cpp b/examples/osgtessellate/osgtessellate.cpp index e2e6b2b3e..53dfed360 100644 --- a/examples/osgtessellate/osgtessellate.cpp +++ b/examples/osgtessellate/osgtessellate.cpp @@ -470,7 +470,7 @@ osg::Geometry *makePols (void) { gtess->setStateSet( stateset ); int nstart=0; - // the contours accepoted are polygons; quads & tris. Trifans can bve added later. + // the contours accepted are polygons; quads & tris. Trifans can be added later. gtess->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,nstart,12));nstart+=12; gtess->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,nstart,12));nstart+=12; gtess->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::POLYGON,nstart,16));nstart+=16; diff --git a/examples/osgtessellationshaders/osgtessellationshaders.cpp b/examples/osgtessellationshaders/osgtessellationshaders.cpp index 766e7fd7e..15e6bcad9 100644 --- a/examples/osgtessellationshaders/osgtessellationshaders.cpp +++ b/examples/osgtessellationshaders/osgtessellationshaders.cpp @@ -1,9 +1,9 @@ /* A demonstration of Tessellation Shaders in OpenScenegraph. * * Instructions: - * Press plus to increase tesselation and minus to decrease it. - * Press right arrow to increase inner tesselation and left arrow to decrease it. - * Press up arrow to increase outer tesselation and down arrow to decrease it. + * Press plus to increase tessellation and minus to decrease it. + * Press right arrow to increase inner tessellation and left arrow to decrease it. + * Press up arrow to increase outer tessellation and down arrow to decrease it. * * Original code by Philip Rideout * Adapted to OpenScenegraph by John Kaniarz diff --git a/examples/osgtext/osgtext.cpp b/examples/osgtext/osgtext.cpp index cb9e3c736..b9327912d 100644 --- a/examples/osgtext/osgtext.cpp +++ b/examples/osgtext/osgtext.cpp @@ -683,7 +683,7 @@ int main(int argc, char** argv) text->setFont("fonts/times.ttf"); text->setAxisAlignment(osgText::Text::XZ_PLANE); text->setAlignment(osgText::Text::RIGHT_TOP); - text->setText("Alingment\nBefore:"); + text->setText("Alignment\nBefore:"); group->addChild(text); } @@ -691,7 +691,7 @@ int main(int argc, char** argv) osg::ref_ptr text = new osgText::Text; text->setFont("fonts/times.ttf"); text->setAxisAlignment(osgText::Text::XZ_PLANE); - text->setText("Alingment\nAfter:"); + text->setText("Alignment\nAfter:"); text->setAlignment(osgText::Text::LEFT_TOP); group->addChild(text); } diff --git a/examples/osgtexture2D/osgtexture2D.cpp b/examples/osgtexture2D/osgtexture2D.cpp index 20b4c7226..29a0a417c 100644 --- a/examples/osgtexture2D/osgtexture2D.cpp +++ b/examples/osgtexture2D/osgtexture2D.cpp @@ -543,7 +543,7 @@ public: // now assign the appropriate portion data from the originalImage subImage->setImage(originalImage->s()/2, originalImage->t()/2, originalImage->r(), // half the width and height originalImage->getInternalTextureFormat(), // same internal texture format - originalImage->getPixelFormat(),originalImage->getDataType(), // same pixel foramt and data type + originalImage->getPixelFormat(),originalImage->getDataType(), // same pixel format and data type originalImage->data(originalImage->s()/4,originalImage->t()/4), // offset the start point to 1/4 into the image osg::Image::NO_DELETE, // don't attempt to delete the image data, leave this to the originalImage originalImage->getPacking(), // use the same packing diff --git a/examples/osgtexturecompression/osgtexturecompression.cpp b/examples/osgtexturecompression/osgtexturecompression.cpp index 7a284764b..b830bec1b 100644 --- a/examples/osgtexturecompression/osgtexturecompression.cpp +++ b/examples/osgtexturecompression/osgtexturecompression.cpp @@ -124,7 +124,7 @@ int main(int argc, char** argv) if (arguments.argc()<=1) { - std::cout<<"Please supply an image filename on the commnand line."<(mutex->_prvData); - // wait time is now in ms milliseconds, so need to convert to seconds and nanoseconds for timespec strucuture. + // wait time is now in ms milliseconds, so need to convert to seconds and nanoseconds for timespec structure. unsigned int sec = ms / 1000; unsigned int nsec = (ms % 1000) * 1000000; diff --git a/src/OpenThreads/win32/Win32Thread.cpp b/src/OpenThreads/win32/Win32Thread.cpp index 6b06ff564..731889c7a 100644 --- a/src/OpenThreads/win32/Win32Thread.cpp +++ b/src/OpenThreads/win32/Win32Thread.cpp @@ -132,7 +132,7 @@ namespace OpenThreads { }; //------------------------------------------------------------------------- - // Print information related to thread schduling parameters. + // Print information related to thread scheduling parameters. // static void PrintThreadSchedulingInfo(Thread *thread) { diff --git a/src/osg/ApplicationUsage.cpp b/src/osg/ApplicationUsage.cpp index 325662cfe..b83e59c77 100644 --- a/src/osg/ApplicationUsage.cpp +++ b/src/osg/ApplicationUsage.cpp @@ -198,7 +198,7 @@ void ApplicationUsage::getFormattedString(std::string& str, const UsageMap& um,u std::string::size_type slashn_pos = explanation.find('\n',pos); unsigned int extraSkip = 0; - bool concatinated = false; + bool concatenated = false; if (slashn_pos!=std::string::npos) { if (slashn_pos_previous; } diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp index d16ea46ae..a2ed46e7f 100644 --- a/src/osg/DisplaySettings.cpp +++ b/src/osg/DisplaySettings.cpp @@ -399,7 +399,7 @@ static ApplicationUsageProxy DisplaySetting_e34(ApplicationUsage::ENVIRONMENTAL_ "Specify the shader files to use for when Shader Pipeline is enabled"); static ApplicationUsageProxy DisplaySetting_e35(ApplicationUsage::ENVIRONMENTAL_VARIABLE, "OSG_SHADER_PIPELINE_NUM_TEXTURE_UNITS ", - "Specifiy number of texture units Shader Pipeline shaders support"); + "Specify number of texture units Shader Pipeline shaders support"); static ApplicationUsageProxy DisplaySetting_e36(ApplicationUsage::ENVIRONMENTAL_VARIABLE, "OSG_TEXT_SHADER_TECHNIQUE ", "Set the defafult osgText::ShaderTechnique. ALL_FEATURES | ALL | GREYSCALE | SIGNED_DISTANCE_FIELD | SDF | NO_TEXT_SHADER | NONE"); @@ -734,9 +734,9 @@ void DisplaySettings::readEnvironmentalVariables() if (getEnvVar("OSG_KEYSTONE_FILES", value)) { #if defined(WIN32) && !defined(__CYGWIN__) - char delimitor = ';'; + char delimiter = ';'; #else - char delimitor = ':'; + char delimiter = ':'; #endif std::string paths(value); @@ -744,7 +744,7 @@ void DisplaySettings::readEnvironmentalVariables() { std::string::size_type start = 0; std::string::size_type end; - while ((end = paths.find_first_of(delimitor,start))!=std::string::npos) + while ((end = paths.find_first_of(delimiter,start))!=std::string::npos) { _keystoneFileNames.push_back(std::string(paths,start,end-start)); start = end+1; @@ -798,9 +798,9 @@ void DisplaySettings::readEnvironmentalVariables() if (getEnvVar("OSG_SHADER_PIPELINE_FILES", value)) { #if defined(WIN32) && !defined(__CYGWIN__) - char delimitor = ';'; + char delimiter = ';'; #else - char delimitor = ':'; + char delimiter = ':'; #endif _shaderPipelineFiles.clear(); @@ -810,7 +810,7 @@ void DisplaySettings::readEnvironmentalVariables() { std::string::size_type start = 0; std::string::size_type end; - while ((end = paths.find_first_of(delimitor,start))!=std::string::npos) + while ((end = paths.find_first_of(delimiter,start))!=std::string::npos) { _shaderPipelineFiles.push_back(std::string(paths,start,end-start)); start = end+1; @@ -1045,7 +1045,7 @@ osg::Matrixd DisplaySettings::computeLeftEyeProjectionImplementation(const osg:: else { // all other display types assume working like a projected power wall - // need to shjear projection matrix to account for asymetric frustum due to eye offset. + // need to shjear projection matrix to account for asymmetric frustum due to eye offset. return osg::Matrixd(1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, iod/(2.0*sd),0.0,1.0,0.0, @@ -1098,7 +1098,7 @@ osg::Matrixd DisplaySettings::computeRightEyeProjectionImplementation(const osg: else { // all other display types assume working like a projected power wall - // need to shjear projection matrix to account for asymetric frustum due to eye offset. + // need to shjear projection matrix to account for asymmetric frustum due to eye offset. return osg::Matrixd(1.0,0.0,0.0,0.0, 0.0,1.0,0.0,0.0, -iod/(2.0*sd),0.0,1.0,0.0, diff --git a/src/osg/Group.cpp b/src/osg/Group.cpp index 34ccadb76..f7c9c53b4 100644 --- a/src/osg/Group.cpp +++ b/src/osg/Group.cpp @@ -169,7 +169,7 @@ bool Group::removeChildren(unsigned int pos,unsigned int numChildrenToRemove) if (endOfRemoveRange>_children.size()) { OSG_DEBUG<<"Warning: Group::removeChild(i,numChildrenToRemove) has been passed an excessive number"<()-> glDrawElementsIndirect(mode, GL_UNSIGNED_INT, (const GLvoid *)(dibo->getOffset(_indirectCommandArray->getBufferIndex()) //command array address - +_firstCommand* _indirectCommandArray->getElementSize())// runtime offset computaion can be sizeof(*_indirectCommandArray->begin()) + +_firstCommand* _indirectCommandArray->getElementSize())// runtime offset computation can be sizeof(*_indirectCommandArray->begin()) ); } diff --git a/src/osg/Shader.cpp b/src/osg/Shader.cpp index ad5de74ab..3897c9496 100644 --- a/src/osg/Shader.cpp +++ b/src/osg/Shader.cpp @@ -810,7 +810,7 @@ bool Shader::_parseShaderDefines(const std::string& str, ShaderDefines& defines, bool indexSet = false; do { - // skip spaces, tabs, commans + // skip spaces, tabs, commands start_of_parameter = find_first(str, NoneOf(" \t,"), start_of_parameter); if (start_of_parameter==std::string::npos) break; diff --git a/src/osg/ShaderComposer.cpp b/src/osg/ShaderComposer.cpp index 82c0c4872..4da4f156d 100644 --- a/src/osg/ShaderComposer.cpp +++ b/src/osg/ShaderComposer.cpp @@ -103,7 +103,7 @@ osg::Program* ShaderComposer::getOrCreateProgram(const ShaderComponents& shaderC computeShaders.push_back(shader); break; case(Shader::UNDEFINED): - OSG_WARN<<"Warning: ShaderCompose::getOrCreateProgam(ShaderComponts) encounterd invalid Shader::Type."<_previous; } diff --git a/src/osg/Texture1D.cpp b/src/osg/Texture1D.cpp index e7a002561..335820460 100644 --- a/src/osg/Texture1D.cpp +++ b/src/osg/Texture1D.cpp @@ -194,7 +194,7 @@ void Texture1D::apply(State& state) const textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,1,1,0); - // in theory the following line is redundent, but in practice + // in theory the following line is redundant, but in practice // have found that the first frame drawn doesn't apply the textures // unless a second bind is called?!! // perhaps it is the first glBind which is not required... diff --git a/src/osg/Texture2D.cpp b/src/osg/Texture2D.cpp index 3a82c2fac..a123db793 100644 --- a/src/osg/Texture2D.cpp +++ b/src/osg/Texture2D.cpp @@ -232,7 +232,7 @@ void Texture2D::apply(State& state) const textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,1,_borderWidth); - // in theory the following line is redundent, but in practice + // in theory the following line is redundant, but in practice // have found that the first frame drawn doesn't apply the textures // unless a second bind is called?!! // perhaps it is the first glBind which is not required... @@ -288,7 +288,7 @@ void Texture2D::apply(State& state) const non_const_this->_image = NULL; } - // in theory the following line is redundent, but in practice + // in theory the following line is redundant, but in practice // have found that the first frame drawn doesn't apply the textures // unless a second bind is called?!! // perhaps it is the first glBind which is not required... diff --git a/src/osg/Texture3D.cpp b/src/osg/Texture3D.cpp index 5e87cc7e4..eee88858f 100644 --- a/src/osg/Texture3D.cpp +++ b/src/osg/Texture3D.cpp @@ -276,7 +276,7 @@ void Texture3D::apply(State& state) const textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,_textureDepth,0); - // in theory the following line is redundent, but in practice + // in theory the following line is redundant, but in practice // have found that the first frame drawn doesn't apply the textures // unless a second bind is called?!! // perhaps it is the first glBind which is not required... diff --git a/src/osg/TextureCubeMap.cpp b/src/osg/TextureCubeMap.cpp index 940201be1..0a5f33192 100644 --- a/src/osg/TextureCubeMap.cpp +++ b/src/osg/TextureCubeMap.cpp @@ -271,7 +271,7 @@ void TextureCubeMap::apply(State& state) const _subloadCallback->load(*this,state); - // in theory the following line is redundent, but in practice + // in theory the following line is redundant, but in practice // have found that the first frame drawn doesn't apply the textures // unless a second bind is called?!! // perhaps it is the first glBind which is not required... diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp index c0c8cec88..73c62f54c 100644 --- a/src/osgDB/FileUtils.cpp +++ b/src/osgDB/FileUtils.cpp @@ -275,16 +275,16 @@ bool osgDB::setCurrentWorkingDirectory( const std::string &newCurrentWorkingDire void osgDB::convertStringPathIntoFilePathList(const std::string& paths,FilePathList& filepath) { #if defined(WIN32) && !defined(__CYGWIN__) - char delimitor = ';'; + char delimiter = ';'; #else - char delimitor = ':'; + char delimiter = ':'; #endif if (!paths.empty()) { std::string::size_type start = 0; std::string::size_type end; - while ((end = paths.find_first_of(delimitor,start))!=std::string::npos) + while ((end = paths.find_first_of(delimiter,start))!=std::string::npos) { filepath.push_back(std::string(paths,start,end-start)); start = end+1; @@ -988,7 +988,7 @@ bool osgDB::containsCurrentWorkingDirectoryReference(const FilePathList& paths) // The Carbon version is noticeably longer. // Unfortunately, the Cocoa version requires -lobjc to be // linked in when creating an executable. - // Rumor is that this will be done autmatically in gcc 3.5/Tiger, + // Rumor is that this will be done automatically in gcc 3.5/Tiger, // but for now, this will cause a lot of headaches for people // who aren't familiar with this concept, so the Carbon version // is preferable. diff --git a/src/osgDB/OutputStream.cpp b/src/osgDB/OutputStream.cpp index 6db556d55..86848060e 100644 --- a/src/osgDB/OutputStream.cpp +++ b/src/osgDB/OutputStream.cpp @@ -576,7 +576,7 @@ void OutputStream::writeImage( const osg::Image* img ) std::string encodedData; e.encode((char*)img_itr.data(), img_itr.size(), encodedData); // Each set of data is written into a separate string so we can - // distiguish between main data and all mipmap levels, so writing + // distinguish between main data and all mipmap levels, so writing // mipmap size is not required for ASCII mode. writeWrappedString(encodedData); } @@ -781,7 +781,7 @@ void OutputStream::start( OutputIterator* outIterator, OutputStream::WriteType t } // From SOVERSION 98, start to support binary begin/end brackets so we can easily ignore - // errors and unsupport classes, enabling the attribute bit + // errors and unsupported classes, enabling the attribute bit if ( _useRobustBinaryFormat ) { outIterator->setSupportBinaryBrackets( true ); diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index caa12a0af..78e46790a 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -432,7 +432,7 @@ Registry::Registry() addFileExtensionAlias("fnt", "freetype"); // Windows bitmap fonts addFileExtensionAlias("text3d", "freetype"); // use 3D Font instead of 2D Font - // wont't add type1 and type2 until resolve extension collision with Performer binary and ascii files. + // won't add type1 and type2 until resolve extension collision with Performer binary and ascii files. // addFileExtensionAlias("pfb", "freetype"); // type1 binary // addFileExtensionAlias("pfa", "freetype"); // type2 ascii diff --git a/src/osgPlugins/3ds/WriterCompareTriangle.cpp b/src/osgPlugins/3ds/WriterCompareTriangle.cpp index 6dbe9313d..cf3e10d1a 100644 --- a/src/osgPlugins/3ds/WriterCompareTriangle.cpp +++ b/src/osgPlugins/3ds/WriterCompareTriangle.cpp @@ -49,14 +49,14 @@ void WriterCompareTriangle::cutscene(int nbVertices, const osg::BoundingBox & sc int nbVerticesY = static_cast( (nbVertices * k) / (length.z() * length.x()) ); int nbVerticesZ = static_cast( (nbVertices * k) / (length.x() * length.y()) ); - setMaxMin (nbVerticesX, nbVerticesY, nbVerticesZ); // This function prevent from cutting the scene in too many blocs + setMaxMin (nbVerticesX, nbVerticesY, nbVerticesZ); // This function prevent from cutting the scene in too many blocks OSG_INFO << "Cutting x by " << nbVerticesX << std::endl << "Cutting y by " << nbVerticesY << std::endl << "Cutting z by " << nbVerticesZ << std::endl; - osg::BoundingBox::value_type blocX = length.x() / nbVerticesX; // These 3 lines set the size of a bloc in x, y and z + osg::BoundingBox::value_type blocX = length.x() / nbVerticesX; // These 3 lines set the size of a block in x, y and z osg::BoundingBox::value_type blocY = length.y() / nbVerticesY; osg::BoundingBox::value_type blocZ = length.z() / nbVerticesZ; @@ -95,7 +95,7 @@ void WriterCompareTriangle::cutscene(int nbVertices, const osg::BoundingBox & sc if (z == nbVerticesZ - 1) //to prevent from mesh with no case zMax += 10; - boxList.push_back(osg::BoundingBox(xMin, // Add a bloc to the list + boxList.push_back(osg::BoundingBox(xMin, // Add a block to the list yMin, zMin, xMax, @@ -129,7 +129,7 @@ WriterCompareTriangle::inWhichBox(const osg::BoundingBox::value_type x, return i; } } - assert(false && "Point is not in any blocs"); + assert(false && "Point is not in any blocks"); return 0; } diff --git a/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp b/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp index bca1c0ecc..91a142200 100644 --- a/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp +++ b/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp @@ -124,7 +124,7 @@ osgDB::ReaderWriter::WriteResult ReaderWritterOpenCASCADE::writeNode(const osg:: /// \detail http://www.opencascade.org/org/forum/thread_12716/?forum=3 /// Usually IGES files suffer from precision problems (when transferring from /// one CAD system to another).It might be the case that faces are not sewed -/// properly, or do not have the right precision, and so the tesselator does +/// properly, or do not have the right precision, and so the tessellator does /// not treat them like "sewed". this needs to be done for sewing /// \param shape opencascade shape to be healed void ReaderWritterOpenCASCADE::OCCTKReader::_healShape(TopoDS_Shape& shape) @@ -386,7 +386,7 @@ void ReaderWritterOpenCASCADE::OCCTKReader::_traverse(const TDF_Label &shapeTree } /// if referred shape has children traverse them first else - /// travese the shape itself + /// traverse the shape itself if(referredShape.HasChild()) { TDF_ChildIterator it; diff --git a/src/osgPlugins/OpenFlight/ExportOptions.cpp b/src/osgPlugins/OpenFlight/ExportOptions.cpp index 06894d540..f03c10109 100644 --- a/src/osgPlugins/OpenFlight/ExportOptions.cpp +++ b/src/osgPlugins/OpenFlight/ExportOptions.cpp @@ -150,7 +150,7 @@ ExportOptions::parseOptionsString() else pos += (count+1); - // See if it's a Boolen/toggle + // See if it's a Boolean/toggle if ( token == _validateOption ) { OSG_INFO << "fltexp: Found: " << token << std::endl; diff --git a/src/osgPlugins/QTKit/ReaderWriterQTKit.cpp b/src/osgPlugins/QTKit/ReaderWriterQTKit.cpp index e1f8553ae..b3ed7153e 100644 --- a/src/osgPlugins/QTKit/ReaderWriterQTKit.cpp +++ b/src/osgPlugins/QTKit/ReaderWriterQTKit.cpp @@ -87,7 +87,7 @@ class ReaderWriterQTKit : public osgDB::ReaderWriter if (ext=="QTKit") { fileName = osgDB::getNameLessExtension(fileName); - OSG_INFO<<"ReaderWriterQTKit stipped filename = "<> texCoord[0] >> texCoord[1]; if (!stream) { diff --git a/src/osgPlugins/avfoundation/ReaderWriterAVFoundation.cpp b/src/osgPlugins/avfoundation/ReaderWriterAVFoundation.cpp index f6504e273..21e82e0af 100644 --- a/src/osgPlugins/avfoundation/ReaderWriterAVFoundation.cpp +++ b/src/osgPlugins/avfoundation/ReaderWriterAVFoundation.cpp @@ -52,7 +52,7 @@ class ReaderWriterAVFoundation : public osgDB::ReaderWriter if (ext=="avfoundation") { fileName = osgDB::getNameLessExtension(fileName); - OSG_INFO<<"AVFoundation stipped filename = "<Release(); } - void displayDevicesFound(const std::string& prefixForMessage, osg::NotifySeverity serverity = osg::NOTICE) const + void displayDevicesFound(const std::string& prefixForMessage, osg::NotifySeverity severity = osg::NOTICE) const { for (int i = 0; i < (int)_listDevice.size(); i++) { - OSG_NOTIFY(serverity) << prefixForMessage << " device \"" << _listDevice[i]._name << "\" clsid " << _listDevice[i]._clsid << std::endl; + OSG_NOTIFY(severity) << prefixForMessage << " device \"" << _listDevice[i]._name << "\" clsid " << _listDevice[i]._clsid << std::endl; } } diff --git a/src/osgPlugins/dxf/ReaderWriterDXF.cpp b/src/osgPlugins/dxf/ReaderWriterDXF.cpp index c45e792b7..ecc14ddcd 100644 --- a/src/osgPlugins/dxf/ReaderWriterDXF.cpp +++ b/src/osgPlugins/dxf/ReaderWriterDXF.cpp @@ -40,8 +40,8 @@ public: supportsOption("UTF8", "Assuming UTF8 encoding of dxf text"); supportsOption("UTF16", "Assuming UTF16 encoding of dxf text"); supportsOption("UTF32", "Assuming UTF32 encoding of dxf text"); - supportsOption("SIGNATURE", "Detrmine encoding of dxf text from it's signative"); - supportsOption("WideChar | CurrentCodePage", "Detrmine encoding of dxf text using CurrentCodePage (Windows only.)"); + supportsOption("SIGNATURE", "Determine encoding of dxf text from it's signative"); + supportsOption("WideChar | CurrentCodePage", "Determine encoding of dxf text using CurrentCodePage (Windows only.)"); supportsOption("FontFile=", "Set the font file for dxf text"); } diff --git a/src/osgPlugins/gles/AnimationCleanerVisitor.cpp b/src/osgPlugins/gles/AnimationCleanerVisitor.cpp index ffa8e8d77..ab3ccb51b 100644 --- a/src/osgPlugins/gles/AnimationCleanerVisitor.cpp +++ b/src/osgPlugins/gles/AnimationCleanerVisitor.cpp @@ -177,7 +177,7 @@ void AnimationCleanerVisitor::cleanInvalidMorphGeometries() { void AnimationCleanerVisitor::cleanInvalidRigGeometries() { // Replace rig geometries by static geometries if: - // * empty or inexistant vertex influence map + // * empty or inexistent vertex influence map // * no *strictly* positive influence coefficient for(RigGeometryList::iterator iterator = _rigGeometries.begin() ; iterator != _rigGeometries.end() ; ) { osg::ref_ptr rigGeometry = *iterator; diff --git a/src/osgPlugins/gles/TangentSpaceVisitor.cpp b/src/osgPlugins/gles/TangentSpaceVisitor.cpp index aa7264a63..f029aba89 100644 --- a/src/osgPlugins/gles/TangentSpaceVisitor.cpp +++ b/src/osgPlugins/gles/TangentSpaceVisitor.cpp @@ -24,7 +24,7 @@ void TangentSpaceVisitor::process(osg::Geometry& geometry) { return; } else { - OSG_WARN << "Anomaly: [TangentSpaceVisitor] Missing tangent array at specificied index." << std::endl; + OSG_WARN << "Anomaly: [TangentSpaceVisitor] Missing tangent array at specified index." << std::endl; } } diff --git a/src/osgPlugins/hdr/hdrwriter.cpp b/src/osgPlugins/hdr/hdrwriter.cpp index 5d760258c..07c29460b 100644 --- a/src/osgPlugins/hdr/hdrwriter.cpp +++ b/src/osgPlugins/hdr/hdrwriter.cpp @@ -8,7 +8,7 @@ developed by Greg Ward. It handles the conversions between rgbe and pixels consisting of floats. The data is assumed to be an array of floats. By default there are three floats per pixel in the order red, green, blue. - (RGBE_DATA_??? values control this.) Only the mimimal header reading and + (RGBE_DATA_??? values control this.) Only the minimal header reading and writing is implemented. Each routine does error checking and will return a status value as defined below. This code is intended as a skeleton so feel free to modify it to suit your needs. diff --git a/src/osgPlugins/ive/VolumeTransferFunctionProperty.cpp b/src/osgPlugins/ive/VolumeTransferFunctionProperty.cpp index 2d313f527..1ae3663b4 100644 --- a/src/osgPlugins/ive/VolumeTransferFunctionProperty.cpp +++ b/src/osgPlugins/ive/VolumeTransferFunctionProperty.cpp @@ -53,7 +53,7 @@ void VolumeTransferFunctionProperty::write(DataOutputStream* out) // write out the num of colours out->writeUInt(numColours); - // write out the colour map entires + // write out the colour map entries for(osg::TransferFunction1D::ColorMap::const_iterator itr = colourMap.begin(); itr != colourMap.end(); ++itr) diff --git a/src/osgPlugins/jpeg/EXIF_Orientation.cpp b/src/osgPlugins/jpeg/EXIF_Orientation.cpp index 388a6ac43..e8f4726f1 100644 --- a/src/osgPlugins/jpeg/EXIF_Orientation.cpp +++ b/src/osgPlugins/jpeg/EXIF_Orientation.cpp @@ -140,7 +140,7 @@ int EXIF_Orientation (j_decompress_ptr cinfo) a pointer to the actual value, are packed into these 12 byte entries. */ if ((i + tags * 12) > exif_marker->data_length) { - OSG_INFO<<"Not enough length for requied tags"< 4 GiB size_t BlockHeaderSize = sizeof( unsigned int /*_blockSize*/ ) + diff --git a/src/osgPlugins/ply/vertexData.cpp b/src/osgPlugins/ply/vertexData.cpp index f2db29e00..999c52d51 100644 --- a/src/osgPlugins/ply/vertexData.cpp +++ b/src/osgPlugins/ply/vertexData.cpp @@ -535,7 +535,7 @@ osg::Node* VertexData::readPlyFile( const char* filename, const bool ignoreColor osgUtil::SmoothingVisitor::smooth((*geom), osg::PI/2); } - // set flage true to activate the vertex buffer object of drawable + // set flags true to activate the vertex buffer object of drawable geom->setUseVertexBufferObjects(true); osg::ref_ptr image; diff --git a/src/osgPlugins/rot/ReaderWriterROT.cpp b/src/osgPlugins/rot/ReaderWriterROT.cpp index 121a71d2f..e624ccbd5 100644 --- a/src/osgPlugins/rot/ReaderWriterROT.cpp +++ b/src/osgPlugins/rot/ReaderWriterROT.cpp @@ -54,7 +54,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename return false; } - // clear the params sting of any brackets. + // clear the params string of any brackets. std::string::size_type params_pos = params.size(); for(; params_pos>0; ) { diff --git a/src/osgPlugins/shadow/ReaderWriterOsgShadow.cpp b/src/osgPlugins/shadow/ReaderWriterOsgShadow.cpp index 767fe5769..470ca0863 100644 --- a/src/osgPlugins/shadow/ReaderWriterOsgShadow.cpp +++ b/src/osgPlugins/shadow/ReaderWriterOsgShadow.cpp @@ -49,7 +49,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename return false; } - // clear the params sting of any brackets. + // clear the params string of any brackets. std::string::size_type params_pos = params.size(); for(; params_pos>0; ) { diff --git a/src/osgPlugins/trans/ReaderWriterTRANS.cpp b/src/osgPlugins/trans/ReaderWriterTRANS.cpp index c20cae108..72cfd95f0 100644 --- a/src/osgPlugins/trans/ReaderWriterTRANS.cpp +++ b/src/osgPlugins/trans/ReaderWriterTRANS.cpp @@ -55,7 +55,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename return false; } - // clear the params sting of any brackets. + // clear the params string of any brackets. std::string::size_type params_pos = params.size(); for(; params_pos>0; ) { diff --git a/src/osgPlugins/trk/ReaderWriterTRK.cpp b/src/osgPlugins/trk/ReaderWriterTRK.cpp index 729afd5e3..0150eb2fc 100644 --- a/src/osgPlugins/trk/ReaderWriterTRK.cpp +++ b/src/osgPlugins/trk/ReaderWriterTRK.cpp @@ -311,7 +311,7 @@ class ReaderWriterTRK : public osgDB::ReaderWriter vertices->push_back(osg::Vec3(vptr[0],vptr[1],vptr[2])); } - // add the line segmenets for track + // add the line segments for track for(int pi=0; pipush_back(vi); diff --git a/src/osgPlugins/txf/TXFFont.cpp b/src/osgPlugins/txf/TXFFont.cpp index 412a5a5a7..a201ecb26 100644 --- a/src/osgPlugins/txf/TXFFont.cpp +++ b/src/osgPlugins/txf/TXFFont.cpp @@ -182,7 +182,7 @@ TXFFont::loadFont(std::istream& stream) stream.read(reinterpret_cast(image->data()), ntexels); if (!stream) { - OSG_FATAL << "osgdb_txf: unxpected end of file in txf file \"" << _filename << "\"!" << std::endl; + OSG_FATAL << "osgdb_txf: unexpected end of file in txf file \"" << _filename << "\"!" << std::endl; return false; } } @@ -194,7 +194,7 @@ TXFFont::loadFont(std::istream& stream) if (!stream) { delete [] texbitmap; - OSG_FATAL << "osgdb_txf: unxpected end of file in txf file \"" << _filename << "\"!" << std::endl; + OSG_FATAL << "osgdb_txf: unexpected end of file in txf file \"" << _filename << "\"!" << std::endl; return false; } @@ -217,7 +217,7 @@ TXFFont::loadFont(std::istream& stream) } else { - OSG_FATAL << "osgdb_txf: unxpected txf file!" << std::endl; + OSG_FATAL << "osgdb_txf: unexpected txf file!" << std::endl; return false; } diff --git a/src/osgPlugins/txp/TXPPagedLOD.cpp b/src/osgPlugins/txp/TXPPagedLOD.cpp index 9500db304..5e1373511 100644 --- a/src/osgPlugins/txp/TXPPagedLOD.cpp +++ b/src/osgPlugins/txp/TXPPagedLOD.cpp @@ -103,7 +103,7 @@ void TXPPagedLOD::traverse(osg::NodeVisitor& nv) // modify the priority according to the child's priority offset and scale. priority = _perRangeDataList[numChildren]._priorityOffset + priority * _perRangeDataList[numChildren]._priorityScale; - //std::cout<<" requesting child "<<_fileNameList[numChildren]<<" priotity = "<(object); } @@ -260,7 +260,7 @@ void LightPointNode::traverse(osg::NodeVisitor& nv) const osg::Vec3& position = lp._position; - // skip light point if it is not contianed in the view frustum. + // skip light point if it is not contained in the view frustum. if (computeClipping && !clipvol.contains(position)) continue; // delta vector between eyepoint and light point. diff --git a/src/osgSim/SphereSegment.cpp b/src/osgSim/SphereSegment.cpp index ace87c28f..38d603e44 100644 --- a/src/osgSim/SphereSegment.cpp +++ b/src/osgSim/SphereSegment.cpp @@ -2491,7 +2491,7 @@ void SphereSegment::updatePrimitives() { unsigned int rowSize = _density+1; - // add primitve set + // add primitive set osg::ref_ptr elements = new osg::DrawElementsUShort(GL_TRIANGLES); elements->reserve(2*rowSize*rowSize); _surfaceGeometry->getPrimitiveSetList().clear(); @@ -2557,7 +2557,7 @@ void SphereSegment::updatePrimitives() { unsigned int rowSize = _density+1; - // add primitve set + // add primitive set osg::ref_ptr elements = new osg::DrawElementsUShort(GL_LINES); elements->reserve(8); _spokesGeometry->getPrimitiveSetList().clear(); @@ -2581,7 +2581,7 @@ void SphereSegment::updatePrimitives() { unsigned int rowSize = _density+1; - // add primitve set + // add primitive set osg::ref_ptr elements = new osg::DrawElementsUShort(GL_LINE_STRIP); elements->reserve((rowSize-1)*4+1); _edgeLineGeometry->getPrimitiveSetList().clear(); @@ -2618,7 +2618,7 @@ void SphereSegment::updatePrimitives() { unsigned int rowSize = _density+1; - // add primitve set + // add primitive set osg::ref_ptr elements = new osg::DrawElementsUShort(GL_TRIANGLE_FAN); elements->reserve((rowSize-1)*4+2); _sidesGeometry->getPrimitiveSetList().clear(); diff --git a/src/osgUI/Widget.cpp b/src/osgUI/Widget.cpp index 1b9aafd13..7831e4892 100644 --- a/src/osgUI/Widget.cpp +++ b/src/osgUI/Widget.cpp @@ -441,7 +441,7 @@ bool Widget::computeIntersections(osgGA::EventVisitor* ev, osgGA::GUIEventAdapte typedef std::vector IntersectionPointerList; IntersectionPointerList intersectionsToSort; - // populate the temporay vector of poiners to the original intersection pointers. + // populate the temporary vector of pointers to the original intersection pointers. for(osgUtil::LineSegmentIntersector::Intersections::iterator itr = source_intersections.begin(); itr != source_intersections.end(); ++itr) diff --git a/src/osgUtil/IncrementalCompileOperation.cpp b/src/osgUtil/IncrementalCompileOperation.cpp index e023367e0..d91a5ddea 100644 --- a/src/osgUtil/IncrementalCompileOperation.cpp +++ b/src/osgUtil/IncrementalCompileOperation.cpp @@ -45,7 +45,7 @@ namespace osgUtil // glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_RESIDENT, &p); // #endif -static osg::ApplicationUsageProxy ICO_e1(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_MINIMUM_COMPILE_TIME_PER_FRAME ","minimum compile time alloted to compiling OpenGL objects per frame in database pager."); +static osg::ApplicationUsageProxy ICO_e1(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_MINIMUM_COMPILE_TIME_PER_FRAME ","minimum compile time allotted to compiling OpenGL objects per frame in database pager."); static osg::ApplicationUsageProxy UCO_e2(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_MAXIMUM_OBJECTS_TO_COMPILE_PER_FRAME ","maximum number of OpenGL objects to compile per frame in database pager."); static osg::ApplicationUsageProxy UCO_e3(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_FORCE_TEXTURE_DOWNLOAD ","should the texture compiles be forced to download using a dummy Geometry."); diff --git a/src/osgUtil/RenderBin.cpp b/src/osgUtil/RenderBin.cpp index 540bfc540..7c3fc4e37 100644 --- a/src/osgUtil/RenderBin.cpp +++ b/src/osgUtil/RenderBin.cpp @@ -305,7 +305,7 @@ void RenderBin::sortFrontToBack() { copyLeavesFromStateGraphListToRenderLeafList(); - // now sort the list into acending depth order. + // now sort the list into ascending depth order. std::sort(_renderLeafList.begin(),_renderLeafList.end(),FrontToBackSortFunctor()); // cout << "sort front to back"<getModeList(); diff --git a/src/osgUtil/Simplifier.cpp b/src/osgUtil/Simplifier.cpp index 7ab24b693..56d02fd50 100644 --- a/src/osgUtil/Simplifier.cpp +++ b/src/osgUtil/Simplifier.cpp @@ -753,7 +753,7 @@ public: EdgeSet::iterator itr = _edgeSet.find(edge); if (itr!=_edgeSet.end()) { - // remove the edge from the list, as its positoin in the list + // remove the edge from the list, as its position in the list // may need to change once its values have been amended _edgeSet.erase(itr); } @@ -883,7 +883,7 @@ public: //OSG_NOTICE<<" pNew="<_triangles; for(TriangleSet::iterator teitr=trianglesToRemove.begin(); teitr!=trianglesToRemove.end(); diff --git a/src/osgViewer/View.cpp b/src/osgViewer/View.cpp index e4e138ec8..106e5ce39 100644 --- a/src/osgViewer/View.cpp +++ b/src/osgViewer/View.cpp @@ -1461,7 +1461,7 @@ void View::assignStereoOrKeystoneToCamera(osg::Camera* camera, osg::DisplaySetti { case(osg::DisplaySettings::QUAD_BUFFER): { - // disconect the camera from the graphics context. + // disconnect the camera from the graphics context. camera->setGraphicsContext(0); // left Camera left buffer @@ -1548,7 +1548,7 @@ void View::assignStereoOrKeystoneToCamera(osg::Camera* camera, osg::DisplaySetti } case(osg::DisplaySettings::ANAGLYPHIC): { - // disconect the camera from the graphics context. + // disconnect the camera from the graphics context. camera->setGraphicsContext(0); // left Camera red @@ -1681,7 +1681,7 @@ void View::assignStereoOrKeystoneToCamera(osg::Camera* camera, osg::DisplaySetti } case(osg::DisplaySettings::HORIZONTAL_SPLIT): { - // disconect the camera from the graphics context. + // disconnect the camera from the graphics context. camera->setGraphicsContext(0); bool left_eye_left_viewport = ds->getSplitStereoHorizontalEyeMapping()==osg::DisplaySettings::LEFT_EYE_LEFT_VIEWPORT; @@ -1773,7 +1773,7 @@ void View::assignStereoOrKeystoneToCamera(osg::Camera* camera, osg::DisplaySetti } case(osg::DisplaySettings::VERTICAL_SPLIT): { - // disconect the camera from the graphics context. + // disconnect the camera from the graphics context. camera->setGraphicsContext(0); bool left_eye_bottom_viewport = ds->getSplitStereoVerticalEyeMapping()==osg::DisplaySettings::LEFT_EYE_BOTTOM_VIEWPORT; @@ -1785,7 +1785,7 @@ void View::assignStereoOrKeystoneToCamera(osg::Camera* camera, osg::DisplaySetti 0, left_start, traits->width, traits->height/2, traits->doubleBuffer ? GL_BACK : GL_FRONT, -1.0); - // top vieport camera + // top viewport camera osg::ref_ptr right_camera = assignStereoCamera(ds, gc.get(), 0, right_start, traits->width, traits->height/2, traits->doubleBuffer ? GL_BACK : GL_FRONT, 1.0); @@ -1872,7 +1872,7 @@ void View::assignStereoOrKeystoneToCamera(osg::Camera* camera, osg::DisplaySetti } case(osg::DisplaySettings::LEFT_EYE): { - // disconect the camera from the graphics context. + // disconnect the camera from the graphics context. camera->setGraphicsContext(0); // single window, whole window, just left eye offsets @@ -1923,7 +1923,7 @@ void View::assignStereoOrKeystoneToCamera(osg::Camera* camera, osg::DisplaySetti } case(osg::DisplaySettings::RIGHT_EYE): { - // disconect the camera from the graphics context. + // disconnect the camera from the graphics context. camera->setGraphicsContext(0); // single window, whole window, just right eye offsets @@ -1975,7 +1975,7 @@ void View::assignStereoOrKeystoneToCamera(osg::Camera* camera, osg::DisplaySetti case(osg::DisplaySettings::VERTICAL_INTERLACE): case(osg::DisplaySettings::CHECKERBOARD): { - // disconect the camera from the graphics context. + // disconnect the camera from the graphics context. camera->setGraphicsContext(0); // set up the stencil buffer diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp index 978109422..99ae1d236 100644 --- a/src/osgViewer/Viewer.cpp +++ b/src/osgViewer/Viewer.cpp @@ -688,7 +688,7 @@ void Viewer::generateSlavePointerData(osg::Camera* camera, osgGA::GUIEventAdapte if (!gw) return; // What type of Camera is it? - // 1) Master Camera : do nothin extra + // 1) Master Camera : do nothing extra // 2) Slave Camera, Relative RF, Same scene graph as master : transform coords into Master Camera and add to PointerData list // 3) Slave Camera, Relative RF, Different scene graph from master : do nothing extra? // 4) Slave Camera, Absolute RF, Same scene graph as master : do nothing extra? diff --git a/src/osgVolume/FixedFunctionTechnique.cpp b/src/osgVolume/FixedFunctionTechnique.cpp index 19e94315c..4a4538158 100644 --- a/src/osgVolume/FixedFunctionTechnique.cpp +++ b/src/osgVolume/FixedFunctionTechnique.cpp @@ -106,7 +106,7 @@ void FixedFunctionTechnique::init() if (_volumeTile->getLayer()==0) { - OSG_NOTICE<<"FixedFunctionTechnique::init(), error no layer assigend to volume tile."<getLayer()==0) { - OSG_NOTICE<<"MultipassTechnique::init(), error no layer assigend to volume tile."<accept(*cv); break; case(HULL): - // OSG_NOTICE<<"Travering children for HULL rendering"<osg::Group::traverse(*cv); break; case(CUBE_AND_HULL): - // OSG_NOTICE<<"Travering Transform for CUBE_AND_HULL rendering"<accept(*cv); //getVolumeTile()->osg::Group::traverse(*cv); break; diff --git a/src/osgVolume/RayTracedTechnique.cpp b/src/osgVolume/RayTracedTechnique.cpp index 67cab2843..1605ecbb0 100644 --- a/src/osgVolume/RayTracedTechnique.cpp +++ b/src/osgVolume/RayTracedTechnique.cpp @@ -63,7 +63,7 @@ void RayTracedTechnique::init() if (_volumeTile->getLayer()==0) { - OSG_NOTICE<<"RayTracedTechnique::init(), error no layer assigend to volume tile."<=1.0) return fragColor;\n" "\n" - " // compute rear segement color and blend with accumulated_color\n" + " // compute rear segment color and blend with accumulated_color\n" " return mix( fragColor, computeRayColor(fragColor, px, py, depth_start, scene_depth), transparencyFactor);\n" " }\n" " else\n" @@ -39,7 +39,7 @@ char volume_multipass_cube_and_hull_frag[] = "#version 110\n" " fragColor = mix(scene_color, fragColor, fragColor.a);\n" " if (fragColor.a>=1.0) return fragColor;\n" "\n" - " // compute rear segement color and blend with accumulated_color\n" + " // compute rear segment color and blend with accumulated_color\n" " return computeRayColor(fragColor, px, py, depth_start, scene_depth) * transparencyFactor;\n" " }\n" " else\n" @@ -78,7 +78,7 @@ char volume_multipass_cube_and_hull_frag[] = "#version 110\n" "\n" " if (back_depth