From 57fd2b4bcb024b5d1da8a31ea10079944af35b5f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 28 Sep 2001 12:36:40 +0000 Subject: [PATCH] *** empty log message *** --- include/osgDB/DotOsgWrapper | 2 +- include/osgDB/FieldReader | 2 +- include/osgDB/FieldReaderIterator | 4 ++-- include/osgDB/FileUtils | 2 +- include/osgDB/ReadFile | 6 +++--- include/osgDB/Registry | 8 ++++---- include/osgDB/Version | 4 ++-- include/osgDB/WriteFile | 6 +++--- include/osgGLUT/Export | 2 +- include/osgGLUT/GLUTEventAdapter | 4 ++-- include/osgGLUT/Version | 4 ++-- include/osgGLUT/Viewer | 8 ++++---- include/osgUtil/CullVisitor | 6 +++--- include/osgUtil/DisplayListVisitor | 6 +++--- include/osgUtil/Export | 2 +- include/osgUtil/IntersectVisitor | 2 +- include/osgUtil/RenderGraph | 10 ++++------ include/osgUtil/RenderStage | 2 +- include/osgUtil/SceneView | 6 +++--- include/osgUtil/Tesselator | 6 +++--- include/osgUtil/TriStripVisitor | 2 +- include/osgUtil/Version | 4 ++-- include/osgUtil/VisualsRequirementsVisitor | 2 +- include/osgWX/Export | 2 +- include/osgWX/Version | 4 ++-- include/osgWX/WXEventAdapter | 2 +- 26 files changed, 53 insertions(+), 55 deletions(-) diff --git a/include/osgDB/DotOsgWrapper b/include/osgDB/DotOsgWrapper index b438a6fbb..ec3eed1c9 100644 --- a/include/osgDB/DotOsgWrapper +++ b/include/osgDB/DotOsgWrapper @@ -14,7 +14,7 @@ namespace osgDB { -/** Wrapper class for specifing read and write functions for extending +/** Wrapper class for specifying read and write functions for extending * the .osg file format. */ class OSGDB_EXPORT DotOsgWrapper : public osg::Referenced { diff --git a/include/osgDB/FieldReader b/include/osgDB/FieldReader index 4d27a4a6e..3aeb01906 100644 --- a/include/osgDB/FieldReader +++ b/include/osgDB/FieldReader @@ -35,7 +35,7 @@ class OSGDB_EXPORT FieldReader bool readField(Field& fieldPtr); void ignoreField(); - /** no of unmatched `{' encounterd so far in file*/ + /** no of unmatched `{' encountered so far in file*/ int getNoNestedBrackets() const; private: diff --git a/include/osgDB/FieldReaderIterator b/include/osgDB/FieldReaderIterator index 622c9aa69..513b1da62 100644 --- a/include/osgDB/FieldReaderIterator +++ b/include/osgDB/FieldReaderIterator @@ -37,8 +37,8 @@ class OSGDB_EXPORT FieldReaderIterator FieldReaderIterator& operator ++ (); FieldReaderIterator& operator += (int no); -/** increments the itetor of the next simple field or - whole block if the current field[0] is an open bracket */ + /** increments the iterator of the next simple field or + * whole block if the current field[0] is an open bracket */ void advanceOverCurrentFieldOrBlock(); void advanceToEndOfCurrentBlock(); void advanceToEndOfBlock(int noNestBrackets); diff --git a/include/osgDB/FileUtils b/include/osgDB/FileUtils index e1d5a0a07..2d09324b7 100644 --- a/include/osgDB/FileUtils +++ b/include/osgDB/FileUtils @@ -31,7 +31,7 @@ typedef std::vector DirectoryContents; /** return the directory/filename of a file if its is contained within specified directory. * return "" if directory does not contain file. If caseInsensitive is set to true then - * a case insenstive comparision is used to compare fileName to directory contents. + * a case insensitive comparison is used to compare fileName to directory contents. * This is useful when unix programs attempt read case insentive windows filenames. */ OSGDB_EXPORT extern std::string findFileInDirectory(const std::string& fileName,const std::string& dirName,bool caseInsensitive=false); diff --git a/include/osgDB/ReadFile b/include/osgDB/ReadFile index 4d35879c1..17755a6f8 100644 --- a/include/osgDB/ReadFile +++ b/include/osgDB/ReadFile @@ -11,7 +11,7 @@ namespace osgDB { /** Read an osg::Object from file. - * Return valid osg::Object on sucess, + * Return valid osg::Object on success, * return NULL on failure. * The osgDB::Registry is used to load the appropriate ReaderWriter plugin * for the filename extension, and this plugin then handles the request @@ -19,7 +19,7 @@ namespace osgDB { OSGDB_EXPORT extern osg::Object* readObjectFile(const std::string& filename); /** Read an osg::Image from file. - * Return valid osg::Image on sucess, + * Return valid osg::Image on success, * return NULL on failure. * The osgDB::Registry is used to load the appropriate ReaderWriter plugin * for the filename extension, and this plugin then handles the request @@ -27,7 +27,7 @@ OSGDB_EXPORT extern osg::Object* readObjectFile(const std::string& filename); OSGDB_EXPORT extern osg::Image* readImageFile(const std::string& filename); /** Read an osg::Node from file. - * Return valid osg::Node on sucess, + * Return valid osg::Node on success, * return NULL on failure. * The osgDB::Registry is used to load the appropriate ReaderWriter plugin * for the filename extension, and this plugin then handles the request diff --git a/include/osgDB/Registry b/include/osgDB/Registry index d5719b256..0d9e1df12 100644 --- a/include/osgDB/Registry +++ b/include/osgDB/Registry @@ -15,12 +15,12 @@ namespace osgDB { /** Registry is a singleton factory which stores - the Objects types available at runtime for loading, - and any Object reader or writers which are linked in + the reader/writers which are linked in at runtime for reading non-native file formats. - The RegisterObjectProxy can be used to automatically register - at runtime a Object with the Registry. + The RegisterDotOsgWrapperProxy can be used to automatically register + DotOsgWrappers, at runtime with the Registry. A DotOsgWrapper encapsulates + the functions that can read and write to the .osg for each osg::Object. The RegisterReaderWriterProxy can be used to automatically register at runtime a reader/writer with the Registry. diff --git a/include/osgDB/Version b/include/osgDB/Version index 1975ee7b2..6a344cecf 100644 --- a/include/osgDB/Version +++ b/include/osgDB/Version @@ -7,9 +7,9 @@ extern "C" { /** * osgDBGetVersion() returns the library version number. - * Numbering conventon : osg_src-0.8.31 will return 0.8.31 from getVersion_osg. + * Numbering convention : osg_src-0.8.31 will return 0.8.31 from getVersion_osg. * - * This C function can be also used to check for the existance of the OpenSceneGraph + * This C function can be also used to check for the existence of the OpenSceneGraph * library using autoconf and its m4 macro AC_CHECK_LIB. * * Here is the code to add to your configure.in: diff --git a/include/osgDB/WriteFile b/include/osgDB/WriteFile index bdcb9f2ce..3e52c5d0d 100644 --- a/include/osgDB/WriteFile +++ b/include/osgDB/WriteFile @@ -11,7 +11,7 @@ namespace osgDB { /** Write an osg::Object to file. - * Return true on sucess, + * Return true on success, * return false on failure. * The osgDB::Registry is used to load the appropriate ReaderWriter plugin * for the filename extension, and this plugin then handles the request @@ -20,7 +20,7 @@ namespace osgDB { OSGDB_EXPORT extern bool writeObjectFile(const osg::Object& object, const std::string& filename); /** Write an osg::Image to file. - * Return true on sucess, + * Return true on success, * return false on failure. * The osgDB::Registry is used to load the appropriate ReaderWriter plugin * for the filename extension, and this plugin then handles the request @@ -28,7 +28,7 @@ OSGDB_EXPORT extern bool writeObjectFile(const osg::Object& object, const std::s OSGDB_EXPORT extern bool writeImageFile(const osg::Image& image, const std::string& filename); /** Write an osg::Node to file. - * Return true on sucess, + * Return true on success, * return false on failure. * The osgDB::Registry is used to load the appropriate ReaderWriter plugin * for the filename extension, and this plugin then handles the request diff --git a/include/osgGLUT/Export b/include/osgGLUT/Export index d7a3751ab..872464794 100644 --- a/include/osgGLUT/Export +++ b/include/osgGLUT/Export @@ -1,4 +1,4 @@ -// The following symbole has a underscore suffix for compatibility. +// The following symbol has a underscore suffix for compatibility. #ifndef OSGGLUT_EXPORT_ #define OSGGLUT_EXPORT_ 1 diff --git a/include/osgGLUT/GLUTEventAdapter b/include/osgGLUT/GLUTEventAdapter index 712fc6403..bfacc222c 100644 --- a/include/osgGLUT/GLUTEventAdapter +++ b/include/osgGLUT/GLUTEventAdapter @@ -18,7 +18,7 @@ class OSGGLUT_EXPORT GLUTEventAdapter : public osgUtil::GUIEventAdapter /** Get the EventType of the GUI event.*/ virtual EventType getEventType() const { return _eventType; } - /** key pressed, return -1 if inapropriate for this event. */ + /** key pressed, return -1 if inappropriate for this event. */ virtual int getKey() const { return _key; } /** button pressed/released, return -1 if inappropriate for this event.*/ @@ -70,7 +70,7 @@ class OSGGLUT_EXPORT GLUTEventAdapter : public osgUtil::GUIEventAdapter /** method for adapting keyboard events.*/ void adaptKeyboard(float t,unsigned char key, int x, int y ); - /** method for adapting frame events, i.e. iddle/display callback.*/ + /** method for adapting frame events, i.e. idle/display callback.*/ void adaptFrame(float t); void copyStaticVariables(); diff --git a/include/osgGLUT/Version b/include/osgGLUT/Version index 3a3862266..acdb6ec8b 100755 --- a/include/osgGLUT/Version +++ b/include/osgGLUT/Version @@ -8,9 +8,9 @@ extern "C" { /** * osgGLUTGetVersion() returns the library version number. - * Numbering conventon : osg_src-0.8.31 will return 0.8.31. + * Numbering convention : osg_src-0.8.31 will return 0.8.31. * - * This C function can be also used to check for the existance of the OpenSceneGraph + * This C function can be also used to check for the existence of the OpenSceneGraph * library using autoconf and its m4 macro AC_CHECK_LIB. * * Here is the code to add to your configure.in: diff --git a/include/osgGLUT/Viewer b/include/osgGLUT/Viewer index 1eb881b08..68b5af2c0 100644 --- a/include/osgGLUT/Viewer +++ b/include/osgGLUT/Viewer @@ -29,7 +29,7 @@ namespace osgGLUT{ /** A basic viewer base class which provides a window, simple keyboard and mouse interaction. * Please note, this viewer class has been developed via a rather haphazard - * path and needs a total rewrite. It currently suffices for osg demo's + * path and needs a total rewrite. It currently suffices for osg demos * but shouldn't be viewed as the be all and end of osg viewer classes. * Someone please rewrite it :-) */ @@ -83,15 +83,15 @@ class OSGGLUT_EXPORT Viewer : public osgUtil::GUIActionAdapter void help(ostream& fout); - // hande multiple camera. + // handle multiple camera. unsigned int registerCameraManipulator(osgUtil::CameraManipulator* cm, unsigned int viewport = 0); void selectCameraManipulator(unsigned int pos, unsigned int viewport = 0); // derived from osgUtil::GUIActionAdapter - virtual void requestRedraw() {} // redraw always by iddle callback done. - virtual void requestContinuousUpdate(bool /*needed*/) {} // continous update always + virtual void requestRedraw() {} // redraw always by idle callback done. + virtual void requestContinuousUpdate(bool /*needed*/) {} // continuous update always virtual void requestWarpPointer(int x,int y); protected: diff --git a/include/osgUtil/CullVisitor b/include/osgUtil/CullVisitor index 8a14c1951..28118d30b 100644 --- a/include/osgUtil/CullVisitor +++ b/include/osgUtil/CullVisitor @@ -282,7 +282,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor TransparencySortMode _tsm; - // viewport x,y,width,height respectiveyly. + // viewport x,y,width,height respectively. osg::ref_ptr _viewport; bool _impostorActive; @@ -304,7 +304,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor ++_currentReuseMatrixIndex; } - // if still within list, element must be singularily referenced + // if still within list, element must be singularly referenced // there return it to be reused. if (_currentReuseMatrixIndex<_reuseMatrixList.size()) { @@ -334,7 +334,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor ++_currentReuseRenderLeafIndex; } - // if still within list, element must be singularily referenced + // if still within list, element must be singularly referenced // there return it to be reused. if (_currentReuseRenderLeafIndex<_reuseRenderLeafList.size()) { diff --git a/include/osgUtil/DisplayListVisitor b/include/osgUtil/DisplayListVisitor index d01e64172..6ddcbc9ab 100644 --- a/include/osgUtil/DisplayListVisitor +++ b/include/osgUtil/DisplayListVisitor @@ -12,10 +12,10 @@ namespace osgUtil { /** Visitor for traversing scene graph and setting each osg::GeoSet's _useDisplayList flag, * with option to immediately compile osg::GeoSet's OpenGL Display lists. * The mode of operation - * of the vistor is controlled by setting the DisplayListMode either on visitor + * of the visitor is controlled by setting the DisplayListMode either on visitor * constructor or via the setDisplayListMode() method. DisplayListMode options are: * _displayListMode == SWITCH_ON_AND_COMPILE_DISPLAY_LISTS cals gset->compile() on - * all Geode childern. Note, the visitor must only be used within a valid + * all Geode children. Note, the visitor must only be used within a valid * OpenGL context as compile uses OpenGL calls. * _displayListMode == SWITCH_ON_DISPLAY_LISTS sets the Geode's children with * gset->setUseDisplayList(true), this method does not directly create display list, @@ -41,7 +41,7 @@ class OSGUTIL_EXPORT DisplayListVisitor : public osg::NodeVisitor }; /** Construct a CompileGeoSetsVisior to traverse all child, - * with set specfied display list mode. Default mode is to + * with set specified display list mode. Default mode is to * gset->setUseDisplayList(true). */ DisplayListVisitor(DisplayListMode mode=SWITCH_ON_DISPLAY_LISTS); diff --git a/include/osgUtil/Export b/include/osgUtil/Export index 5220152d9..f48536909 100644 --- a/include/osgUtil/Export +++ b/include/osgUtil/Export @@ -1,4 +1,4 @@ -// The following symbole has a underscore suffix for compatibility. +// The following symbol has a underscore suffix for compatibility. #ifndef OSGUTIL_EXPORT_ #define OSGUTIL_EXPORT_ 1 diff --git a/include/osgUtil/IntersectVisitor b/include/osgUtil/IntersectVisitor index 49ad3f429..29ba5d940 100644 --- a/include/osgUtil/IntersectVisitor +++ b/include/osgUtil/IntersectVisitor @@ -75,7 +75,7 @@ class OSGUTIL_EXPORT Hit : public osg::Referenced /** Basic visitor for ray based collisions of a scene. Note, still in development, current version has not - pratical functionality!*/ + practical functionality!*/ class OSGUTIL_EXPORT IntersectVisitor : public osg::NodeVisitor { public: diff --git a/include/osgUtil/RenderGraph b/include/osgUtil/RenderGraph index 50df850c6..93ac7e3a5 100644 --- a/include/osgUtil/RenderGraph +++ b/include/osgUtil/RenderGraph @@ -15,8 +15,6 @@ namespace osgUtil { -// beginings of a replacement for DrawBin. - class OSGUTIL_EXPORT RenderGraph : public osg::Referenced { public: @@ -51,7 +49,7 @@ class OSGUTIL_EXPORT RenderGraph : public osg::Referenced ~RenderGraph() {} - /** return true if all of drawables, lights and chilren are empty.*/ + /** return true if all of drawables, lights and children are empty.*/ inline const bool empty() const { return _leaves.empty() && _children.empty(); @@ -79,7 +77,7 @@ class OSGUTIL_EXPORT RenderGraph : public osg::Referenced ChildList::iterator itr = _children.find(stateset); if (itr!=_children.end()) return itr->second.get(); - // create a state group and insert it into the chilren list + // create a state group and insert it into the children list // then return the state group. RenderGraph* sg = new RenderGraph(this,stateset); _children[stateset] = sg; @@ -137,7 +135,7 @@ class OSGUTIL_EXPORT RenderGraph : public osg::Referenced } - // need to pop back upto the same depth as the new state group. + // need to pop back up to the same depth as the new state group. while (sg_curr->_depth>sg_new->_depth) { if (sg_curr->_stateset.valid()) state.popStateSet(); @@ -147,7 +145,7 @@ class OSGUTIL_EXPORT RenderGraph : public osg::Referenced // use return path to trace back steps to sg_new. std::vector return_path; - // need to pop back upto the same depth as the curr state group. + // need to pop back up to the same depth as the curr state group. while (sg_new->_depth>sg_curr->_depth) { return_path.push_back(sg_new); diff --git a/include/osgUtil/RenderStage b/include/osgUtil/RenderStage index bc757c89d..b7b5b3a19 100644 --- a/include/osgUtil/RenderStage +++ b/include/osgUtil/RenderStage @@ -12,7 +12,7 @@ namespace osgUtil { * RenderState base class. Used for encapsulate a complete stage in * rendering - setting up of viewport, the projection and model * matrices and rendering the RenderBin's enclosed with this RenderStage. - * RenderStage also has a dependancy list of other RenderStages, each + * RenderStage also has a dependency list of other RenderStages, each * of which must be called before the rendering of this stage. These * 'pre' rendering stages are used for advanced rendering techniques * like multistage pixel shading or impostors. diff --git a/include/osgUtil/SceneView b/include/osgUtil/SceneView index 67236e40e..b948769c2 100644 --- a/include/osgUtil/SceneView +++ b/include/osgUtil/SceneView @@ -12,7 +12,7 @@ namespace osgUtil { /** - * SceneView is literaly a view of a scene, encapsulating the + * SceneView is literally a view of a scene, encapsulating the * camera, global state, lights and the scene itself. Provides * methods for setting up the view and rendering it. */ @@ -20,7 +20,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced { public: - /** Constrcut a default scene view.*/ + /** Construct a default scene view.*/ SceneView(); /** Set scene view to use default global state, light, camera @@ -130,7 +130,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced internal near and far planes. Default value is true. */ void setCalcNearFar(bool calc) { _calc_nearfar = calc; } - /** return true if SceneView automatically caclculates near and + /** return true if SceneView automatically calculates near and far clipping planes for each frame. */ bool getCalcNearFar() const { return _calc_nearfar; } diff --git a/include/osgUtil/Tesselator b/include/osgUtil/Tesselator index c0fb05a78..3813fb218 100644 --- a/include/osgUtil/Tesselator +++ b/include/osgUtil/Tesselator @@ -10,9 +10,9 @@ namespace osgUtil { -/** A simple class for tesselating a single polygon boundary. - * Currently uses old style glu tesselation functions for portablity. - * It be nice to use the modern glu tesselation functions or to find +/** A simple class for tessellating a single polygon boundary. + * Currently uses old style glu tessellation functions for portability. + * It be nice to use the modern glu tessellation functions or to find * a small set of code for doing this job better.*/ class OSGUTIL_EXPORT Tesselator { diff --git a/include/osgUtil/TriStripVisitor b/include/osgUtil/TriStripVisitor index 602685676..924e843ef 100644 --- a/include/osgUtil/TriStripVisitor +++ b/include/osgUtil/TriStripVisitor @@ -23,7 +23,7 @@ class OSGUTIL_EXPORT TriStripVisitor : public osg::NodeVisitor } /** convert mesh primitives in geoset into Tri Strips using - * NvTriStrip. Converts all primtive types except points + * NvTriStrip. Converts all primitive types except points * and lines, linestrips which it leaves unchanged. */ static void stripify(osg::GeoSet& gset); diff --git a/include/osgUtil/Version b/include/osgUtil/Version index 0b9c084ec..146b5717f 100644 --- a/include/osgUtil/Version +++ b/include/osgUtil/Version @@ -8,9 +8,9 @@ extern "C" { /** * getVersion_osgUtil() returns the library version number. - * Numbering conventon : osg_src-0.8-31 will return 0.8.31 from getVersion_osgUtil. + * Numbering convention : osg_src-0.8-31 will return 0.8.31 from getVersion_osgUtil. * - * This C function can be also used to check for the existance of the OpenSceneGraph + * This C function can be also used to check for the existence of the OpenSceneGraph * library using autoconf and its m4 macro AC_CHECK_LIB. * * Here is the code to add to your configure.in: diff --git a/include/osgUtil/VisualsRequirementsVisitor b/include/osgUtil/VisualsRequirementsVisitor index a6846327c..318ee938d 100644 --- a/include/osgUtil/VisualsRequirementsVisitor +++ b/include/osgUtil/VisualsRequirementsVisitor @@ -11,7 +11,7 @@ namespace osgUtil { /** A visitor for traversing a scene graph establishing the OpenGL visuals are required * to support rendering of that scene graph. The results can then be used by - * applications to set up there windows with the corret visuals. Have a look at + * applications to set up there windows with the correct visuals. Have a look at * src/osgGLUT/Viewer.cpp's Viewer::open() method for an example how to use it. */ class OSGUTIL_EXPORT VisualsRequirementsVisitor : public osg::NodeVisitor diff --git a/include/osgWX/Export b/include/osgWX/Export index 94f264405..b70ce24ab 100644 --- a/include/osgWX/Export +++ b/include/osgWX/Export @@ -1,4 +1,4 @@ -// The following symbole has a underscore suffix for compatibility. +// The following symbol has a underscore suffix for compatibility. #ifndef OSGWX_EXPORT_ #define OSGWX_EXPORT_ 1 diff --git a/include/osgWX/Version b/include/osgWX/Version index 2c7ca857e..ddebb5da7 100644 --- a/include/osgWX/Version +++ b/include/osgWX/Version @@ -8,9 +8,9 @@ extern "C" { /** * osgWXGetVersion() returns the library version number. - * Numbering conventon : osg_src-0.8.31 will return 0.8.31. + * Numbering convention : osg_src-0.8.31 will return 0.8.31. * - * This C function can be also used to check for the existance of the OpenSceneGraph + * This C function can be also used to check for the existence of the OpenSceneGraph * library using autoconf and its m4 macro AC_CHECK_LIB. * * Here is the code to add to your configure.in: diff --git a/include/osgWX/WXEventAdapter b/include/osgWX/WXEventAdapter index 6f94cb1c1..f04fb1158 100644 --- a/include/osgWX/WXEventAdapter +++ b/include/osgWX/WXEventAdapter @@ -19,7 +19,7 @@ public: /** Get the EventType of the GUI event.*/ virtual EventType getEventType() const { return _eventType; } - /** key pressed, return -1 if inapropriate for this event. */ + /** key pressed, return -1 if inappropriate for this event. */ virtual int getKey() const { return _key; } /** button pressed/released, return -1 if inappropriate for this event.*/