FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

Browse Source
This commit is contained in:
Robert Osfield
2007-12-10 17:30:18 +00:00
parent 1dcb6cc4fd
commit f4afa427a7
216 changed files with 613 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/ApplicationUsage
View File

@@ -105,7 +105,7 @@ class ApplicationUsageProxy
{
public:
/** register an explanation of commandline/evironmentalvaraible/keyboard mouse usage.*/
/** register an explanation of commandline/environmentvariable/keyboard mouse usage.*/
ApplicationUsageProxy(ApplicationUsage::Type type,const std::string& option,const std::string& explanation)
{
ApplicationUsage::instance()->addUsageExplanation(type,option,explanation);

14
include/osg/ArgumentParser
View File

@@ -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<std::string,ErrorSeverity> 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);

4
include/osg/Billboard
View File

@@ -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; }

4
include/osg/BlendColor
View File

@@ -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. */

4
include/osg/BlendEquation
View File

@@ -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. */

2
include/osg/BlendFunc
View File

@@ -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. */

2
include/osg/BoundingBox
View File

@@ -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()));

4
include/osg/BufferObject
View File

@@ -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

6
include/osg/Camera
View File

@@ -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,

12
include/osg/CameraView
View File

@@ -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.*/

4
include/osg/ClampColor
View File

@@ -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. */

2
include/osg/CollectOccludersVisitor
View File

@@ -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();

4
include/osg/CullSettings
View File

@@ -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.*/

6
include/osg/DeleteHandler
View File

@@ -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.*/

2
include/osg/Depth
View File

@@ -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)

10
include/osg/Drawable
View File

@@ -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).
};

2
include/osg/Export
View File

@@ -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)

2
include/osg/Fog
View File

@@ -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)

4
include/osg/FragmentProgram
View File

@@ -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;

4
include/osg/FrameStamp
View File

@@ -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) */

2
include/osg/FrontFace
View File

@@ -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.

2
include/osg/Geode
View File

@@ -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;

12
include/osg/Geometry
View File

@@ -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;

36
include/osg/GraphicsContext
View File

@@ -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;

8
include/osg/GraphicsThread
View File

@@ -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():

6
include/osg/Group
View File

@@ -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;

2
include/osg/Hint
View File

@@ -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)

10
include/osg/LOD
View File

@@ -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);

2
include/osg/Light
View File

@@ -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)

2
include/osg/LightModel
View File

@@ -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)

4
include/osg/Math
View File

@@ -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<typename T>
inline T minimum(T lhs,T rhs) { return lhs<rhs?lhs:rhs; }
/** return the maximum of two values, equivilent to std::max.
/** return the maximum of two values, equivalent to std::max.
* std::max not used because of STL implementation under IRIX not containing
* std::max.
*/

6
include/osg/Matrixd
View File

@@ -123,13 +123,13 @@ class OSG_EXPORT Matrixd
value_type angle3, const Vec3d& axis3);
/** decompose the matrix into translation, rotation, scale and scale orietation.*/
/** decompose the matrix into translation, rotation, scale and scale orientation.*/
void decompose( osg::Vec3f& translation,
osg::Quat& rotation,
osg::Vec3f& scale,
osg::Quat& so ) const;
/** decompose the matrix into translation, rotation, scale and scale orietation.*/
/** decompose the matrix into translation, rotation, scale and scale orientation.*/
void decompose( osg::Vec3d& translation,
osg::Quat& rotation,
osg::Vec3d& scale,
@@ -143,7 +143,7 @@ class OSG_EXPORT Matrixd
double bottom, double top,
double zNear, double zFar);
/** Get the othogrraphic settings of the orthographic projection matrix.
/** Get the orthographic settings of the orthographic projection matrix.
* Note, if matrix is not an orthographic matrix then invalid values
* will be returned.
*/

6
include/osg/Matrixf
View File

@@ -123,13 +123,13 @@ class OSG_EXPORT Matrixf
value_type angle3, const Vec3d& axis3);
/** decompose the matrix into translation, rotation, scale and scale orietation.*/
/** decompose the matrix into translation, rotation, scale and scale orientation.*/
void decompose( osg::Vec3f& translation,
osg::Quat& rotation,
osg::Vec3f& scale,
osg::Quat& so ) const;
/** decompose the matrix into translation, rotation, scale and scale orietation.*/
/** decompose the matrix into translation, rotation, scale and scale orientation.*/
void decompose( osg::Vec3d& translation,
osg::Quat& rotation,
osg::Vec3d& scale,
@@ -143,7 +143,7 @@ class OSG_EXPORT Matrixf
double bottom, double top,
double zNear, double zFar);
/** Get the othogrraphic settings of the orthographic projection matrix.
/** Get the orthographic settings of the orthographic projection matrix.
* Note, if matrix is not an orthographic matrix then invalid values
* will be returned.
*/

4
include/osg/Multisample
View File

@@ -68,7 +68,7 @@ class OSG_EXPORT Multisample : public StateAttribute
// used by the COMPARE_StateAttribute_Parameter macro's below.
COMPARE_StateAttribute_Types(Multisample,sa)
// compare each paramter in turn against the rhs.
// compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_coverage)
COMPARE_StateAttribute_Parameter(_invert)
COMPARE_StateAttribute_Parameter(_mode)
@@ -127,7 +127,7 @@ class OSG_EXPORT Multisample : 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 will

6
include/osg/Node
View File

@@ -245,10 +245,10 @@ class OSG_EXPORT Node : public Object
/** Return the node's const StateSet. Returns NULL if a stateset is not attached.*/
inline const osg::StateSet* getStateSet() const { return _stateset.get(); }
/** Set the intial bounding volume to use when computing the overall bounding volume.*/
/** Set the initial bounding volume to use when computing the overall bounding volume.*/
void setInitialBound(const osg::BoundingSphere& bsphere) { _initialBound = bsphere; dirtyBound(); }
/** Set the intial bounding volume to use when computing the overall bounding volume.*/
/** Set the initial bounding volume to use when computing the overall bounding volume.*/
const BoundingSphere& getInitialBound() const { return _initialBound; }
/** Mark this node's bounding sphere dirty.
@@ -306,7 +306,7 @@ class OSG_EXPORT Node : public Object
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;

2
include/osg/NodeVisitor
View File

@@ -156,7 +156,7 @@ class OSG_EXPORT NodeVisitor : public virtual Referenced
inline TraversalMode getTraversalMode() const { return _traversalMode; }
/**
* Set user data, data must be subclased from Referenced to allow
* Set user data, data must be subclassed from Referenced to allow
* automatic memory handling. If your own data isn't directly
* subclassed from Referenced then create an adapter object
* which points to your own objects and handles the memory addressing.

8
include/osg/Object
View File

@@ -98,14 +98,14 @@ class OSG_EXPORT Object : public Referenced
/** Set the data variance of this object.
* Can be set to either STATIC for values that do not change over the lifetime of the object,
* or DYNAMIC for values that vary over the lifetime of the object. The DataVariance value
* can be used by routines such as optimzation codes that wish to share static data.
* UNSPECIFIED is used to sepecify that the DataVariance hasn't been set yet. */
* can be used by routines such as optimization codes that wish to share static data.
* UNSPECIFIED is used to specify that the DataVariance hasn't been set yet. */
inline void setDataVariance(DataVariance dv) { _dataVariance = dv; }
/** Get the data variance of this object.*/
inline DataVariance getDataVariance() const { return _dataVariance; }
/** Compute the DataVariance based on an assestment of callback etc.*/
/** Compute the DataVariance based on an assessment of callback etc.*/
virtual void computeDataVariance() {}
@@ -127,7 +127,7 @@ class OSG_EXPORT Object : public Referenced
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 {}

2
include/osg/Plane
View File

@@ -301,7 +301,7 @@ class OSG_EXPORT Plane
protected:
/** Vec member varaible. */
/** Vec member variable. */
value_type _fv[4];
// variables cached to optimize calcs against bounding boxes.

4
include/osg/Point
View File

@@ -78,7 +78,7 @@ class OSG_EXPORT Point : 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
{
@@ -119,7 +119,7 @@ class OSG_EXPORT Point : 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. */

2
include/osg/PolygonMode
View File

@@ -56,7 +56,7 @@ class OSG_EXPORT PolygonMode : public StateAttribute
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(PolygonMode,sa)
// compare each paramter in turn against the rhs.
// compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_modeFront)
COMPARE_StateAttribute_Parameter(_modeBack)

4
include/osg/PolygonOffset
View File

@@ -42,7 +42,7 @@ class OSG_EXPORT PolygonOffset : public StateAttribute
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(PolygonOffset,sa)
// compare each paramter in turn against the rhs.
// compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_factor)
COMPARE_StateAttribute_Parameter(_units)
@@ -74,7 +74,7 @@ class OSG_EXPORT PolygonOffset : public StateAttribute
static bool areFactorAndUnitsMultipliersSet();
/** Checks with the OpenGL driver to try and pick multiplier approrpriate for the hardware.
/** Checks with the OpenGL driver to try and pick multiplier appropriate for the hardware.
note, requires a valid graphics context to be current. */
static void setFactorAndUnitsMultipliersUsingBestGuessForDriver();

2
include/osg/Polytope
View File

@@ -69,7 +69,7 @@ class OSG_EXPORT Polytope
setupMask();
}
/** Create a Polytope which is a equivilant to BoundingBox.*/
/** Create a Polytope which is a equivalent to BoundingBox.*/
void setToBoundingBox(const BoundingBox& bb)
{
_planeList.clear();

4
include/osg/PrimitiveSet
View File

@@ -275,7 +275,7 @@ class OSG_EXPORT PrimitiveSet : 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 {}
@@ -485,7 +485,7 @@ class DrawElements : public PrimitiveSet
}
/** 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
{

2
include/osg/ProxyNode
View File

@@ -71,7 +71,7 @@ class OSG_EXPORT ProxyNode : public Group
/** Set the object-space reference radius of the volume enclosed by the ProxyNode.
* Used to detmine the bounding sphere of the ProxyNode in the absense of any children.*/
* Used to determine the bounding sphere of the ProxyNode in the absence of any children.*/
inline void setRadius(float radius) { _radius = radius; }
/** Get the object-space radius of the volume enclosed by the ProxyNode.*/

6
include/osg/Referenced
View File

@@ -76,17 +76,17 @@ class OSG_EXPORT Referenced
a pointer to this object is referencing it. However, do
not delete it, even if ref count goes to 0. Warning, unref_nodelete()
should only be called if the user knows exactly who will
be resonsible for, one should prefer unref() over unref_nodelete()
be responsible for, one should prefer unref() over unref_nodelete()
as the later can lead to memory leaks.*/
void unref_nodelete() const;
/** Return the number pointers currently referencing this object. */
inline int referenceCount() const { return _refCount; }
/** Add a Observer that is observering this object, notify the Observer when this object gets deleted.*/
/** Add a Observer that is observing this object, notify the Observer when this object gets deleted.*/
void addObserver(Observer* observer);
/** Add a Observer that is observering this object, notify the Observer when this object gets deleted.*/
/** Add a Observer that is observing this object, notify the Observer when this object gets deleted.*/
void removeObserver(Observer* observer);
public:

2
include/osg/Sequence
View File

@@ -37,7 +37,7 @@ class OSG_EXPORT Sequence : public Group
// the relationship between the _frameTime vector and the _children
// vector is a bit of a mess. This is how it was in previous versions,
// and there's no way out of it if upward compatability needs to be
// and there's no way out of it if upward compatibility needs to be
// maintained. New code should set defaultTime and use addChild, and
// not mess with the setTime method

2
include/osg/Shader
View File

@@ -103,7 +103,7 @@ class OSG_EXPORT Shader : public osg::Object
bool getGlShaderInfoLog(unsigned int contextID, std::string& log) const;
/** Mark internal glShader for deletion.
* Deletion requests are queued tuntil they can be executed
* Deletion requests are queued until they can be executed
* in the proper GL context. */
static void deleteGlShader(unsigned int contextID, GLuint shader);

2
include/osg/ShadowVolumeOccluder
View File

@@ -22,7 +22,7 @@ namespace osg {
class CullStack;
/** ShadowVolumeOccluder is a helper class for implementating shadow occlusion culling. */
/** ShadowVolumeOccluder is a helper class for implementing shadow occlusion culling. */
class OSG_EXPORT ShadowVolumeOccluder
{

2
include/osg/ShapeDrawable
View File

@@ -173,7 +173,7 @@ class OSG_EXPORT ShapeDrawable : public Drawable
/** Return true, osg::ShapeDrawable 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::ShapeDrawable does support accept(PrimitiveFunctor&) .*/

12
include/osg/State
View File

@@ -69,8 +69,8 @@ namespace osg {
class GraphicsContext;
/** Encapsulates the current applied OpenGL modes, attributes and vertex arrays settings,
* implements lazy state updating and provides accessors for querrying the current state.
. The venerable Red Book says that "OpenGL is a state machine", and this class
* implements lazy state updating and provides accessors for querying the current state.
* The venerable Red Book says that "OpenGL is a state machine", and this class
* represents the OpenGL state in OSG. Furthermore, \c State also has other
* important features:
* - It works as a stack of states (see \c pushStateSet() and
@@ -79,7 +79,7 @@ class GraphicsContext;
* - It implements lazy state updating. This means that, if one requests a
* state change and that particular state is already in the requested state,
* no OpenGL call will be made. This ensures that the OpenGL pipeline is not
* stalled by unncessary state changes.
* stalled by unnecessary state changes.
* - It allows to query the current OpenGL state without calls to \c glGet*(),
* which typically stall the graphics pipeline (see, for instance,
* \c captureCurrentState() and \c getModelViewMatrix()).
@@ -377,7 +377,7 @@ class OSG_EXPORT State : public Referenced
/** texture Attribute has been applied externally,
* and therefore this attribute type has been dirtied
* and will need to be re-appplied on next osg::State.apply(..).
* and will need to be re-applied on next osg::State.apply(..).
* note, if you have an osg::StateAttribute which you have applied externally
* then use the have_applied(attribute) method as this will the osg::State to
* track the current state more accurately and enable lazy state updating such
@@ -881,7 +881,7 @@ class OSG_EXPORT State : public Referenced
/** Set the current texture unit, return true if selected,
* false if selection failed such as when multitexturing is not supported.
* false if selection failed such as when multi texturing is not supported.
* note, only updates values that change.*/
bool setActiveTextureUnit( unsigned int unit );
@@ -889,7 +889,7 @@ class OSG_EXPORT State : public Referenced
unsigned int getActiveTextureUnit() const { return _currentActiveTextureUnit; }
/** Set the current tex coord array texture unit, return true if selected,
* false if selection failed such as when multitexturing is not supported.
* false if selection failed such as when multi texturing is not supported.
* note, only updates values that change.*/
bool setClientActiveTextureUnit( unsigned int unit );

4
include/osg/StateAttribute
View File

@@ -86,7 +86,7 @@ class OSG_EXPORT StateAttribute : public Object
/** list values which can be used to set either GLModeValues or OverrideValues.
* When using in conjunction with GLModeValues, all Values have meaning.
* When using in conjection with StateAttribute OverrideValue only
* When using in conjunction with StateAttribute OverrideValue only
* OFF,OVERRIDE and INHERIT are meaningful.
* However, they are useful when using GLModeValue
* and OverrideValue in conjunction with each other as when using
@@ -319,7 +319,7 @@ class OSG_EXPORT StateAttribute : public Object
virtual void resizeGLObjectBuffers(unsigned int /*maxSize*/) {}
/** Release 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* =0) const {}

4
include/osg/StateSet
View File

@@ -36,7 +36,7 @@ namespace osg {
// forward declare for the purposes of the UpdateCallback.
class NodeVisitor;
/** Stores a set of modes and attributes which respresent a set of OpenGL state.
/** Stores a set of modes and attributes which represent a set of OpenGL state.
* Notice that a \c StateSet contains just a subset of the whole OpenGL state.
* <p>In OSG, each \c Drawable and each \c Node has a reference to a
* \c StateSet. These <tt>StateSet</tt>s 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();

2
include/osg/StencilTwoSided
View File

@@ -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

2
include/osg/TemplatePrimitiveFunctor
View File

@@ -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)

2
include/osg/TexEnvFilter
View File

@@ -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.

4
include/osg/TexGen
View File

@@ -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;

22
include/osg/Texture
View File

@@ -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.

4
include/osg/Texture1D
View File

@@ -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;

2
include/osg/Texture2D
View File

@@ -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; }

8
include/osg/Texture2DArray
View File

@@ -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

8
include/osg/Texture3D
View File

@@ -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 :

2
include/osg/TextureRectangle
View File

@@ -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
{

2
include/osg/Timer
View File

@@ -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 :

8
include/osg/Transform
View File

@@ -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);

2
include/osg/TriangleFunctor
View File

@@ -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)

2
include/osg/Uniform
View File

@@ -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; }

2
include/osg/Vec2b
View File

@@ -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; }

1
include/osg/Vec2d
View File

@@ -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;}

1
include/osg/Vec2s
View File

@@ -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; }

1
include/osg/Vec3b
View File

@@ -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; }

1
include/osg/Vec3d
View File

@@ -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;}

1
include/osg/Vec3f
View File

@@ -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;}

1
include/osg/Vec3s
View File

@@ -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; }

1
include/osg/Vec4b
View File

@@ -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; }

1
include/osg/Vec4d
View File

@@ -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; }

2
include/osg/Vec4f
View File

@@ -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

2
include/osg/Vec4s
View File

@@ -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; }

2
include/osg/Vec4ub
View File

@@ -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; }

6
include/osg/VertexProgram
View File

@@ -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

4
include/osg/Viewport
View File

@@ -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; }

4
include/osg/io_utils
View File

@@ -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 << "{"<<std::endl;
@@ -245,7 +245,7 @@ inline std::ostream& operator<< (std::ostream& os, const Matrixf& m )
//////////////////////////////////////////////////////////////////////////
// Matrxd steaming operators.
// Matrixd steaming operators.
inline std::ostream& operator<< (std::ostream& os, const Matrixd& m )
{
os << "{"<<std::endl;

8
include/osgDB/DatabasePager
View File

@@ -36,7 +36,7 @@ namespace osgDB {
/** Database paging class which manages the loading of files in a background thread,
* and syncronizing of loaded models with the main scene graph.*/
* and synchronizing of loaded models with the main scene graph.*/
class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandler, public OpenThreads::Thread
{
public :
@@ -206,13 +206,13 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
addLoadedDataToSceneGraph(currentFrameTime);
}
/** Turn the compilation of rendering objects for specfied graphics context on (true) or off(false). */
/** Turn the compilation of rendering objects for specified graphics context on (true) or off(false). */
void setCompileGLObjectsForContextID(unsigned int contextID, bool on);
/** Get whether the compilation of rendering objects for specfied graphics context on (true) or off(false). */
/** Get whether the compilation of rendering objects for specified graphics context on (true) or off(false). */
bool getCompileGLObjectsForContextID(unsigned int contextID);
/** Rerturn true if an external draw thread should call compileGLObjects(..) or not.*/
/** Return true if an external draw thread should call compileGLObjects(..) or not.*/
bool requiresExternalCompileGLObjects(unsigned int contextID) const;
/** Return true if there are pending compile operations that are required.

2
include/osgDB/Export
View File

@@ -42,7 +42,7 @@
\namespace osgDB
The osgDB library provides support for reading and writing scene graphs, providing a plugin framework and file utility classes.
The plugin framework in centred around the osgDB::Registry, and allows plugins which provide specific file format support to be dynamically loaded on demand.
The plugin framework in centered around the osgDB::Registry, and allows plugins which provide specific file format support to be dynamically loaded on demand.
*/
#endif

6
include/osgDB/FileUtils
View File

@@ -43,7 +43,7 @@ extern OSGDB_EXPORT bool makeDirectory( const std::string &directoryPath );
extern OSGDB_EXPORT bool makeDirectoryForFile( const std::string &filePath );
/** return true if a file exisits. */
/** return true if a file exists. */
extern OSGDB_EXPORT bool fileExists(const std::string& filename);
/** return type of file. */
@@ -55,7 +55,7 @@ extern OSGDB_EXPORT std::string findFileInPath(const std::string& filename, cons
/** 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 insensitive comparison is used to compare fileName to directory contents.
* This is useful when unix programs attempt read case insentive windows filenames.
* This is useful when unix programs attempt read case insensitive windows filenames.
*/
extern OSGDB_EXPORT std::string findFileInDirectory(const std::string& fileName,const std::string& dirName,CaseSensitivity caseSensitivity=CASE_SENSITIVE);
@@ -92,7 +92,7 @@ inline FilePathList& getLibraryFilePathList() { return osgDB::Registry::instance
extern OSGDB_EXPORT std::string findLibraryFile(const std::string& filename,CaseSensitivity caseSensitivity=CASE_SENSITIVE);
/** convert a string containing a list of paths deliminated either with ';' (Windows) or ':' (All other platforms) into FilePath represetation.*/
/** convert a string containing a list of paths delimited either with ';' (Windows) or ':' (All other platforms) into FilePath representation.*/
extern OSGDB_EXPORT void convertStringPathIntoFilePathList(const std::string& paths,FilePathList& filepath);
extern OSGDB_EXPORT void appendPlatformSpecificLibraryFilePaths(FilePathList& filepath);

20
include/osgDB/Registry
View File

@@ -86,7 +86,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
void addFileExtensionAlias(const std::string mapExt, const std::string toExt);
/** Reads a file that configures extension mappings. File is ASCII text
* and each line contains the parameyters to the addFileExtensionAlias
* and each line contains the parameters to the addFileExtensionAlias
* method. Lines can be commented out with an initial '#' character.*/
bool readPluginAliasConfigurationFile( const std::string& file );
@@ -288,18 +288,18 @@ class OSGDB_EXPORT Registry : public osg::Referenced
const ReaderWriter::Options* getOptions() const { return _options.get(); }
/** initilize both the Data and Library FilePaths, by default called by the
/** initialize both the Data and Library FilePaths, by default called by the
* constructor, so it should only be required if you want to force
* the re-reading of environmental variables.*/
void initFilePathLists() { initDataFilePathList(); initLibraryFilePathList(); }
/** initilize the Data FilePath by reading the OSG_FILE_PATH environmental variable.*/
/** initialize the Data FilePath by reading the OSG_FILE_PATH environmental variable.*/
void initDataFilePathList();
/** Set the data file path using a list of paths stored in a FilePath, which is used when search for data files.*/
void setDataFilePathList(const FilePathList& filepath) { _dataFilePath = filepath; }
/** Set the data file path using a single string deliminated either with ';' (Windows) or ':' (All other platforms), which is used when search for data files.*/
/** Set the data file path using a single string delimited either with ';' (Windows) or ':' (All other platforms), which is used when search for data files.*/
void setDataFilePathList(const std::string& paths);
/** get the data file path which is used when search for data files.*/
@@ -308,14 +308,14 @@ class OSGDB_EXPORT Registry : public osg::Referenced
/** get the const data file path which is used when search for data files.*/
const FilePathList& getDataFilePathList() const { return _dataFilePath; }
/** initilize the Library FilePath by reading the OSG_LIBRARY_PATH
/** initialize the Library FilePath by reading the OSG_LIBRARY_PATH
* and the appropriate system environmental variables*/
void initLibraryFilePathList();
/** Set the library file path using a list of paths stored in a FilePath, which is used when search for data files.*/
void setLibraryFilePathList(const FilePathList& filepath) { _libraryFilePath = filepath; }
/** Set the library file path using a single string deliminated either with ';' (Windows) or ':' (All other platforms), which is used when search for data files.*/
/** Set the library file path using a single string delimited either with ';' (Windows) or ':' (All other platforms), which is used when search for data files.*/
void setLibraryFilePathList(const std::string& paths);
/** get the library file path which is used when search for library (dso/dll's) files.*/
@@ -329,7 +329,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
* for that object in the cache to specified time.
* This would typically be called once per frame by applications which are doing database paging,
* and need to prune objects that are no longer required.
* Time value is time in sceonds.*/
* Time value is time in seconds.*/
void updateTimeStampOfObjectsInCacheWithExternalReferences(double currentTime);
/** Removed object in the cache which have a time stamp at or before the specified expiry time.
@@ -338,13 +338,13 @@ class OSGDB_EXPORT Registry : public osg::Referenced
* after the call to updateTimeStampOfObjectsInCacheWithExternalReferences(currentTime).
* Note, the currentTime is not the expiryTime, one would typically set the expiry time
* to a fixed amount of time before currentTime, such as expiryTime = currentTime-10.0.
* Time value is time in sceonds.*/
* Time value is time in seconds.*/
void removeExpiredObjectsInCache(double expiryTime);
/** Remove all objects in the cache regardless of having external references or expiry times.*/
void clearObjectCache();
/** Add a filename,object,timestamp tripple to the Registry::ObjectCache.*/
/** Add a filename,object,timestamp triple to the Registry::ObjectCache.*/
void addEntryToObjectCache(const std::string& filename, osg::Object* object, double timestamp = 0.0);
/** Get an object from the object cache*/
@@ -460,7 +460,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
ReaderWriter::ReadResult readImplementation(const ReadFunctor& readFunctor,bool useObjectCache);
// forward declar helper class
// forward declare helper class
class AvailableReaderWriterIterator;
friend class AvailableReaderWriterIterator;

2
include/osgDB/SharedStateManager
View File

@@ -68,7 +68,7 @@ namespace osgDB {
typedef std::set< osg::ref_ptr<osg::StateSet> > StateSetSet;
StateSetSet _sharedStateSetList;
// Temporary lists just to avoid unnecesary find calls
// Temporary lists just to avoid unnecessary find calls
typedef std::pair<osg::StateAttribute*, bool> TextureSharePair;
typedef std::map<osg::StateAttribute*, TextureSharePair> TextureTextureSharePairMap;
TextureTextureSharePairMap tmpSharedTextureList;

4
include/osgGA/AnimationPathManipulator
View File

@@ -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

2
include/osgGA/EventQueue
View File

@@ -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();

4
include/osgGA/GUIActionAdapter
View File

@@ -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; }

8
include/osgGA/GUIEventAdapter
View File

@@ -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.*/

4
include/osgGA/GUIEventHandler
View File

@@ -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.*/

4
include/osgGA/KeySwitchMatrixManipulator
View File

@@ -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(); }

8
include/osgGA/MatrixManipulator
View File

@@ -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;

8
include/osgGA/NodeTrackerManipulator
View File

@@ -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.

4
include/osgGA/TerrainManipulator
View File

@@ -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.

4
include/osgGA/TrackballManipulator
View File

@@ -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.

2
include/osgGA/UFOManipulator
View File

@@ -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);

6
include/osgShadow/ShadowTechnique
View File

@@ -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 :

4
include/osgSim/ElevationSlice
View File

@@ -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);

6
include/osgSim/HeightAboveTerrain
View File

@@ -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);

Some files were not shown because too many files have changed in this diff Show More