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

Fix typos and spelling.

Browse Source
This commit is contained in:
Alberto Luaces
2018-04-20 18:18:22 +02:00
committed by Robert Osfield
parent c3008512f1
commit 02c310982e
187 changed files with 302 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/OpenThreads/Affinity
View File

@@ -45,10 +45,10 @@ public:
Affinity& operator = (const Affinity& rhs) { if (&rhs!=this) { activeCPUs = rhs.activeCPUs; } return *this; }
/** add a specfied cpu core from the list to have affinity to. */
/** add a specified cpu core from the list to have affinity to. */
void add(unsigned int cpuNmber) { activeCPUs.insert(cpuNmber); }
/** remove a specfied cpu core from the list to have affinity to. */
/** remove a specified cpu core from the list to have affinity to. */
void remove(unsigned int cpuNmber) { activeCPUs.erase(cpuNmber); }
/** return true if affinity has been provided for specific CPU cores.*/

2
include/OpenThreads/Thread
View File

@@ -190,7 +190,7 @@ public:
/**
* Set the thread's schedule priority. This is a complex method.
* Beware of thread priorities when using a many-to-many kernel
* entity implemenation (such as IRIX pthreads). If one is not careful
* entity implementation (such as IRIX pthreads). If one is not careful
* to manage the thread priorities, a priority inversion deadlock can
* easily occur (Although the OpenThreads::Mutex & OpenThreads::Barrier
* constructs have been designed with this scenario in mind). Unless

4
include/osg/BufferObject
View File

@@ -437,10 +437,10 @@ class OSG_EXPORT BufferObject : public Object
const BufferObjectProfile& getProfile() const { return _profile; }
/** Set whether the BufferObject should use a GLBufferObject just for copying the BufferData and release it immmediately so that it may be reused.*/
/** Set whether the BufferObject should use a GLBufferObject just for copying the BufferData and release it immediately so that it may be reused.*/
void setCopyDataAndReleaseGLBufferObject(bool copyAndRelease) { _copyDataAndReleaseGLBufferObject = copyAndRelease; }
/** Get whether the BufferObject should use a GLBufferObject just for copying the BufferData and release it immmediately.*/
/** Get whether the BufferObject should use a GLBufferObject just for copying the BufferData and release it immediately.*/
bool getCopyDataAndReleaseGLBufferObject() const { return _copyDataAndReleaseGLBufferObject; }

4
include/osg/Callback
View File

@@ -158,7 +158,7 @@ public:
};
/** Convenience function for getting the CallbackObject associated with specificed name from an Object's UserDataContainer.*/
/** Convenience function for getting the CallbackObject associated with specified name from an Object's UserDataContainer.*/
inline CallbackObject* getCallbackObject(osg::Object* object, const std::string& name)
{
osg::UserDataContainer* udc = object->getUserDataContainer();
@@ -171,7 +171,7 @@ inline CallbackObject* getCallbackObject(osg::Object* object, const std::string&
}
/** Convenience function for getting the CallbackObject associated with specificed name from an Object's UserDataContainer.*/
/** Convenience function for getting the CallbackObject associated with specified name from an Object's UserDataContainer.*/
inline const CallbackObject* getCallbackObject(const osg::Object* object, const std::string& name)
{
const osg::UserDataContainer* udc = object->getUserDataContainer();

2
include/osg/Image
View File

@@ -433,7 +433,7 @@ class OSG_EXPORT Image : public BufferData
/** Ensure image dimensions are a power of two.
* Mipmapped textures require the image dimensions to be
* power of two and are within the maxiumum texture size for
* power of two and are within the maximum texture size for
* the host machine.
*/
void ensureValidSizeForTexturing(GLint maxTextureSize);

4
include/osg/Node
View File

@@ -194,11 +194,11 @@ class OSG_EXPORT Node : public Object
/** Get the list of node paths parent paths.
* The optional Node* haltTraversalAtNode allows the user to prevent traversal beyond a specifed node. */
* The optional Node* haltTraversalAtNode allows the user to prevent traversal beyond a specified node. */
NodePathList getParentalNodePaths(osg::Node* haltTraversalAtNode=0) const;
/** Get the list of matrices that transform this node from local coordinates to world coordinates.
* The optional Node* haltTraversalAtNode allows the user to prevent traversal beyond a specifed node. */
* The optional Node* haltTraversalAtNode allows the user to prevent traversal beyond a specified node. */
MatrixList getWorldMatrices(const osg::Node* haltTraversalAtNode=0) const;

2
include/osg/PagedLOD
View File

@@ -154,7 +154,7 @@ class OSG_EXPORT PagedLOD : public LOD
/** Get the number of children that the PagedLOD must keep around, even if they are older than their expiry time.*/
unsigned int getNumChildrenThatCannotBeExpired() const { return _numChildrenThatCannotBeExpired; }
/** Set wether you want to disable the paging in of external nodes.*/
/** Set whether you want to disable the paging in of external nodes.*/
void setDisableExternalChildrenPaging(bool flag) { _disableExternalChildrenPaging = flag; }
bool getDisableExternalChildrenPaging() const { return _disableExternalChildrenPaging; }

2
include/osg/Referenced
View File

@@ -47,7 +47,7 @@ class OSG_EXPORT Referenced
Referenced();
/** Deprecated, Referenced is now always uses thread safe ref/unref, use default Refernced() constructor instead */
/** Deprecated, Referenced is now always uses thread safe ref/unref, use default Referenced() constructor instead */
explicit Referenced(bool threadSafeRefUnref);
Referenced(const Referenced&);

2
include/osg/Shape
View File

@@ -747,7 +747,7 @@ class TessellationHints : public Object
// forward declare;
class Geometry;
/** Convenience class for populating an Geomtry with vertex, normals, texture coords and primitives that can render a Shape. */
/** Convenience class for populating an Geometry with vertex, normals, texture coords and primitives that can render a Shape. */
class OSG_EXPORT BuildShapeGeometryVisitor : public ConstShapeVisitor
{
public:

4
include/osg/UserDataContainer
View File

@@ -203,14 +203,14 @@ protected:
};
/** Convenience function for getting the User Object associated with specificed name from an Object's UserDataContainer.*/
/** Convenience function for getting the User Object associated with specified name from an Object's UserDataContainer.*/
inline Object* getUserObject(osg::Object* object, const std::string& name)
{
osg::UserDataContainer* udc = object->getUserDataContainer();
return udc ? udc->getUserObject(name) : 0;
}
/** Convenience function for getting the User Object associated with specificed name from an Object's UserDataContainer.*/
/** Convenience function for getting the User Object associated with specified name from an Object's UserDataContainer.*/
inline const Object* getUserObject(const osg::Object* object, const std::string& name)
{
const osg::UserDataContainer* udc = object->getUserDataContainer();

2
include/osg/Vec2i
View File

@@ -28,7 +28,7 @@ class Vec2i
/** Number of vector components. */
enum { num_components = 2 };
/** Vec member varaible. */
/** Vec member variable. */
value_type _v[2];
Vec2i() { _v[0]=0; _v[1]=0; }

2
include/osg/Vec2ui
View File

@@ -28,7 +28,7 @@ class Vec2ui
/** Number of vector components. */
enum { num_components = 2 };
/** Vec member varaible. */
/** Vec member variable. */
value_type _v[2];
Vec2ui() { _v[0]=0; _v[1]=0; }

2
include/osg/Vec3i
View File

@@ -28,7 +28,7 @@ class Vec3i
/** Number of vector components. */
enum { num_components = 3 };
/** Vec member varaible. */
/** Vec member variable. */
value_type _v[3];
Vec3i() { _v[0]=0; _v[1]=0; _v[2]=0; }

2
include/osg/Vec3ui
View File

@@ -28,7 +28,7 @@ class Vec3ui
/** Number of vector components. */
enum { num_components = 3 };
/** Vec member varaible. */
/** Vec member variable. */
value_type _v[3];
Vec3ui() { _v[0]=0; _v[1]=0; _v[2]=0; }

2
include/osg/Vec4i
View File

@@ -28,7 +28,7 @@ class Vec4i
/** Number of vector components. */
enum { num_components = 4 };
/** Vec member varaible. */
/** Vec member variable. */
value_type _v[4];
Vec4i() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; }

2
include/osg/Vec4ui
View File

@@ -28,7 +28,7 @@ class Vec4ui
/** Number of vector components. */
enum { num_components = 4 };
/** Vec member varaible. */
/** Vec member variable. */
value_type _v[4];
Vec4ui() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; }

2
include/osg/ref_ptr
View File

@@ -81,7 +81,7 @@ class ref_ptr
bool operator < (const ref_ptr& rp) const { return (_ptr<rp._ptr); }
// follows is an implmentation of the "safe bool idiom", details can be found at:
// follows is an implementation of the "safe bool idiom", details can be found at:
// http://en.wikibooks.org/wiki/More_C%2B%2B_Idioms/Safe_bool
// http://lists.boost.org/Archives/boost/2003/09/52856.php

10
include/osgAnimation/RigTransformSoftware
View File

@@ -135,15 +135,15 @@ namespace osgAnimation
template <class V>
inline void compute(const osg::Matrix& transform, const osg::Matrix& invTransform, const V* src, V* dst)
{
// the result of matrix mult should be cached to be used for vertexes transform and normal transform and maybe other computation
// the result of matrix mult should be cached to be used for vertices transform and normal transform and maybe other computation
for(VertexGroupList::iterator itvg=_uniqVertexGroupList.begin(); itvg!=_uniqVertexGroupList.end(); ++itvg)
{
VertexGroup& uniq = *itvg;
uniq.computeMatrixForVertexSet();
osg::Matrix matrix = transform * uniq.getMatrix() * invTransform;
const IndexList& vertexes = uniq.getVertices();
for(IndexList::const_iterator vertIDit=vertexes.begin(); vertIDit!=vertexes.end(); ++vertIDit)
const IndexList& vertices = uniq.getVertices();
for(IndexList::const_iterator vertIDit=vertices.begin(); vertIDit!=vertices.end(); ++vertIDit)
{
dst[*vertIDit] = src[*vertIDit] * matrix;
}
@@ -160,8 +160,8 @@ namespace osgAnimation
uniq.computeMatrixForVertexSet();
osg::Matrix matrix = transform * uniq.getMatrix() * invTransform;
const IndexList& vertexes = uniq.getVertices();
for(IndexList::const_iterator vertIDit=vertexes.begin(); vertIDit!=vertexes.end(); ++vertIDit)
const IndexList& vertices = uniq.getVertices();
for(IndexList::const_iterator vertIDit=vertices.begin(); vertIDit!=vertices.end(); ++vertIDit)
{
dst[*vertIDit] = osg::Matrix::transform3x3(src[*vertIDit],matrix);
}

2
include/osgAnimation/VertexInfluence
View File

@@ -61,7 +61,7 @@ namespace osgAnimation
///normalize per vertex weights given numvert of the attached mesh
void normalize(unsigned int numvert);
///remove weakest influences in order to fit targetted numbonepervertex
///remove weakest influences in order to fit targeted numbonepervertex
void cullInfluenceCountPerVertex(unsigned int maxnumbonepervertex, float minweight=0, bool renormalize=true);
//compute PerVertexInfluenceList

8
include/osgDB/ClassInterface
View File

@@ -110,12 +110,12 @@ DECLARE_TYPE(osg::BoundingBoxd, BOUNDINGBOXD)
DECLARE_TYPE(osg::BoundingSpheref, BOUNDINGSPHEREF)
DECLARE_TYPE(osg::BoundingSphered, BOUNDINGSPHERED)
// forward decalare
// forward declare
class PropertyOutputIterator;
class PropertyInputIterator;
/** ClassInterface provides a general means of checking for supported properties of classes, and getting/setting thoses properties.
/** ClassInterface provides a general means of checking for supported properties of classes, and getting/setting those properties.
Uses the osgDB serializers to do the actual object query/get/set.
*/
class OSGDB_EXPORT ClassInterface
@@ -166,10 +166,10 @@ public:
/// run method of object
bool run(osg::Object* object, const std::string& methodName, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const;
/// checked for support of specificed method
/// checked for support of specified method
bool hasMethod(const std::string& compoundClassName, const std::string& methodName) const;
/// checked for support of specificed method
/// checked for support of specified method
bool hasMethod(const osg::Object* object, const std::string& methodName) const;

2
include/osgDB/DatabasePager
View File

@@ -434,7 +434,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
void compileCompleted(DatabaseRequest* databaseRequest);
/** Iterate through the active PagedLOD nodes children removing
* children which havn't been visited since specified expiryTime.
* children which haven't been visited since specified expiryTime.
* note, should be only be called from the update thread. */
virtual void removeExpiredSubgraphs(const osg::FrameStamp &frameStamp);

2
include/osgDB/FileNameUtils
View File

@@ -39,7 +39,7 @@ extern OSGDB_EXPORT std::string getNameLessAllExtensions(const std::string& file
extern OSGDB_EXPORT std::string getStrippedName(const std::string& fileName);
/** If 'to' is in a subdirectory of 'from' then this function returns the subpath, otherwise it just returns the file name.
* The function does \b not automagically resolve paths as the system does, so be careful to give canonical paths.
* However, the function interprets slashes ('/') ans backslashes ('\') as they were equal.
* However, the function interprets slashes ('/') and backslashes ('\') as they were equal.
*/
extern OSGDB_EXPORT std::string getPathRelative(const std::string& from, const std::string& to);
/** Gets root part of a path ("/" or "C:"), or an empty string if none found. */

4
include/osgDB/InputStream
View File

@@ -181,10 +181,10 @@ public:
else return 0;
}
/// set an input iterator, used directly when not using InputStream with a traditional file releated stream.
/// set an input iterator, used directly when not using InputStream with a traditional file related stream.
void setInputIterator( InputIterator* ii ) { _in = ii; }
/// start reading from InputStream treating it as a traditional file releated stream, handles headers and versioning
/// start reading from InputStream treating it as a traditional file related stream, handles headers and versioning
ReadType start( InputIterator* );
void decompress();

4
include/osgDB/OutputStream
View File

@@ -173,10 +173,10 @@ public:
void writeObjectFields( const osg::Object* obj );
void writeObjectFields( const osg::Object* obj, const std::string& compoundName );
/// set an output iterator, used directly when not using OutputStream with a traditional file releated stream.
/// set an output iterator, used directly when not using OutputStream with a traditional file related stream.
void setOutputIterator( OutputIterator* oi ) { _out = oi; }
/// start writing to OutputStream treating it as a traditional file releated stream, handles headers and versioning
/// start writing to OutputStream treating it as a traditional file related stream, handles headers and versioning
void start( OutputIterator* outIterator, WriteType type );
void compress( std::ostream* ostream );

2
include/osgFX/Cartoon
View File

@@ -37,7 +37,7 @@ namespace osgFX
Cartoon();
Cartoon(const Cartoon& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
// effect class informations
// effect class information
META_Effect(
osgFX,
Cartoon,

2
include/osgFX/Scribe
View File

@@ -36,7 +36,7 @@ namespace osgFX
Scribe();
Scribe(const Scribe& copy, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
// effect class informations
// effect class information
META_Effect(
osgFX,
Scribe,

2
include/osgGA/EventVisitor
View File

@@ -107,7 +107,7 @@ class OSGGA_EXPORT EventVisitor : public osg::NodeVisitor
}
// The following overrides are technically redundant as the default implementation would eventually trickle down to
// apply(osg::Node&); - however defining these explicitely should save a couple of virtual function calls
// apply(osg::Node&); - however defining these explicitly should save a couple of virtual function calls
virtual void apply(osg::Geode& node) { handle_callbacks_and_traverse(node); }
virtual void apply(osg::Billboard& node) { handle_callbacks_and_traverse(node); }
virtual void apply(osg::LightSource& node) { handle_callbacks_and_traverse(node); }

2
include/osgGA/Export
View File

@@ -66,7 +66,7 @@ as appropriate for the viewer.
Events from the windowing environment are adpated, and then fed into the GUIEventHandlers.
The GUIEventHandlers analyse and take action, and make requests of the windowing
environemnt via the GUIActionAdapter. The viewer writer should then honour these
environment via the GUIActionAdapter. The viewer writer should then honour these
requests, translating them into calls to the windowing API.
*/

2
include/osgGA/KeySwitchMatrixManipulator
View File

@@ -44,7 +44,7 @@ class OSGGA_EXPORT KeySwitchMatrixManipulator : public CameraManipulator
void addMatrixManipulator(int key, std::string name, CameraManipulator *cm);
/**
Add a camera manipulator with an autogenerated keybinding which is '1' + previous number of camera's registerd.
Add a camera manipulator with an autogenerated keybinding which is '1' + previous number of camera's registered.
*/
void addNumberedMatrixManipulator(CameraManipulator *cm);

2
include/osgShadow/MinimalShadowMap
View File

@@ -90,7 +90,7 @@ class OSGSHADOW_EXPORT MinimalShadowMap : public StandardShadowMap
// when scene objects are put on earth ellipsoid surface.
// Other scenarios are also possible for example when models are
// built in XZY space which would require identity matrix with swapped colums
// built in XZY space which would require identity matrix with swapped columns
osg::Matrix _modellingSpaceToWorld;
float _maxFarPlane;

2
include/osgShadow/StandardShadowMap
View File

@@ -61,7 +61,7 @@ class OSGSHADOW_EXPORT StandardShadowMap : public DebugShadowMap
// Example: Imagine we want to swap base(0) and shadow(1) indices:
// We have to do an extra step to make sure both do not end up as 1
//
// // initialy change base to something else than 1
// // initially change base to something else than 1
// setBaseTextureCoordIndex( 100 );
// // now search and replace all gl_TexCord[1] to gl_TexCord[0]
// setShadowTextureCoordIndex( 0 );

20
include/osgSim/SphereSegment
View File

@@ -53,7 +53,7 @@ Caveats:
- It's possible to render the whole sphere by specifying elevation
and azimuth ranges round the full 360 degrees. When doing
so you may consider switching the planes, spokes, and edge lines
off, to avoid rendering artefacts, e.g. the upper and lower
off, to avoid rendering artifacts, e.g. the upper and lower
planes will be coincident.
*/
@@ -214,27 +214,27 @@ public:
/** A list of vertex arrays representing a list of lines.*/
typedef std::vector< osg::ref_ptr<osg::Vec3Array> > LineList;
/** Compute the interesection lines between subgraph and this sphere segment.
* The matrix is the transform that takes the subgraph into the same coordiante frame as the sphere segment.
/** Compute the intersection lines between subgraph and this sphere segment.
* The matrix is the transform that takes the subgraph into the same coordinate frame as the sphere segment.
* The resulting intersections are in the coordinate frame of the sphere segment. */
LineList computeIntersection(const osg::Matrixd& matrix, osg::Node* subgraph);
/** Compute the interesection lines between specified drawable and this sphere segment.
* The matrix is the transform that takes the subgraph into the same coordiante frame as the sphere segment.
/** Compute the intersection lines between specified drawable and this sphere segment.
* The matrix is the transform that takes the subgraph into the same coordinate frame as the sphere segment.
* The resulting intersections are in the coordinate frame of the sphere segment. */
LineList computeIntersection(const osg::Matrixd& matrix, osg::Drawable* drawable);
/** Compute the interesection lines between subgraph and this sphere segment.
* The matrix is the transform that takes the subgraph into the same coordiante frame as the sphere segment.
/** Compute the intersection lines between subgraph and this sphere segment.
* The matrix is the transform that takes the subgraph into the same coordinate frame as the sphere segment.
* The resulting intersections are in the coordinate frame of the sphere segment. */
osg::Node* computeIntersectionSubgraph(const osg::Matrixd& matrix, osg::Node* subgraph);
/** Compute the interesection lines between specified drawable and this sphere segment.
* The matrix is the transform that takes the subgraph into the same coordiante frame as the sphere segment.
/** Compute the intersection lines between specified drawable and this sphere segment.
* The matrix is the transform that takes the subgraph into the same coordinate frame as the sphere segment.
* The resulting intersections are in the coordinate frame of the sphere segment. */
osg::Node* computeIntersectionSubgraph(const osg::Matrixd& matrix, osg::Drawable* drawable);
/** recompute the vertex positions of the rendering meshes/lines thtat represent the sphere segment.*/
/** recompute the vertex positions of the rendering meshes/lines that represent the sphere segment.*/
void updatePositions();
/** recompute the primitives rendering meshes/lines thtat represent the sphere segment.*/

2
include/osgText/Text
View File

@@ -73,7 +73,7 @@ public:
* placing text against noisy backgrounds.
* The color of the background shadow text is specified by setBackdropColor().
* DROP_SHADOW_BOTTOM_RIGHT will draw backdrop text to the right and down of
* the normal text. Other DROW_SHADOW_* modes do the same for their repective directions.
* the normal text. Other DROW_SHADOW_* modes do the same for their respective directions.
* OUTLINE will draw backdrop text so that it appears the text has an outline
* or border around the normal text. This mode is particularly useful against
* really noisy backgrounds that may put text on top of things that have

2
include/osgUtil/CullVisitor
View File

@@ -466,7 +466,7 @@ inline RenderLeaf* CullVisitor::createOrReuseRenderLeaf(osg::Drawable* drawable,
while (_currentReuseRenderLeafIndex<_reuseRenderLeafList.size() &&
_reuseRenderLeafList[_currentReuseRenderLeafIndex]->referenceCount()>1)
{
osg::notify(osg::NOTICE)<<"Warning:createOrReuseRenderLeaf() skipping multiply refrenced entry."<< std::endl;
osg::notify(osg::NOTICE)<<"Warning:createOrReuseRenderLeaf() skipping multiply referenced entry."<< std::endl;
++_currentReuseRenderLeafIndex;
}

2
include/osgUtil/DelaunayTriangulator
View File

@@ -91,7 +91,7 @@ public:
virtual bool outside(const osg::Vec3 &testpoint) const;
/** Tessellate the constraint loops so that the crossing points are interpolated
* and added to the contraints for the triangulation. */
* and added to the constraints for the triangulation. */
void handleOverlaps(void);
protected:

2
include/osgUtil/IncrementalCompileOperation
View File

@@ -107,7 +107,7 @@ class OSGUTIL_EXPORT IncrementalCompileOperation : public osg::GraphicsOperation
/** ConservativeTimeRatio governs how much of the measured spare time in each frame is used for flushing deleted and compile new OpenGL objects.
* Default value is 0.5, valid range is 0.1 to 1.0.
* A ratio near 1.0 will lead to paged databases being compiled and merged quicker but increase the chances of frame drop.
* A ratio near 0.1 will lead to paged databases being compiled and merged closer but reduse the chances of frame drop.*/
* A ratio near 0.1 will lead to paged databases being compiled and merged closer but reduce the chances of frame drop.*/
void setConservativeTimeRatio(double ratio) { _conservativeTimeRatio = ratio; }
double getConservativeTimeRatio() const { return _conservativeTimeRatio; }

2
include/osgUtil/SceneView
View File

@@ -323,7 +323,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings
/** search through any pre and post RenderStages that reference a Camera, and take a reference to each of these cameras to prevent them being deleted while they are still be used by the drawing thread.*/
void collateReferencesToDependentCameras();
/** clear the refence to any any dependent cameras.*/
/** clear the reference to any any dependent cameras.*/
void clearReferencesToDependentCameras();

2
include/osgUtil/Tessellator
View File

@@ -23,7 +23,7 @@
#include <vector>
#ifndef CALLBACK
/* Win32 calling conventions. (or a least thats what the GLUT example tess.c uses.)*/
/* Win32 calling conventions. (or a least that's what the GLUT example tess.c uses.)*/
#define CALLBACK
#endif

2
include/osgUtil/UpdateVisitor
View File

@@ -74,7 +74,7 @@ class OSGUTIL_EXPORT UpdateVisitor : public osg::NodeVisitor
}
// The following overrides are technically redundant as the default implementation would eventually trickle down to
// apply(osg::Node&); - however defining these explicitely should save a couple of virtual function calls
// apply(osg::Node&); - however defining these explicitly should save a couple of virtual function calls
virtual void apply(osg::Geode& node) { handle_callbacks_and_traverse(node); }
virtual void apply(osg::Billboard& node) { handle_callbacks_and_traverse(node); }
virtual void apply(osg::LightSource& node) { handle_callbacks_and_traverse(node); }

2
include/osgViewer/View
View File

@@ -47,7 +47,7 @@ class OSGVIEWER_EXPORT ViewConfig : public osg::Object
/** configure method that is overridden by Config subclasses.*/
virtual void configure(osgViewer::View& /*view*/) const {}
/** convenience method for getting the relavent display settings to use.*/
/** convenience method for getting the relevant display settings to use.*/
virtual osg::DisplaySettings* getActiveDisplaySetting(osgViewer::View& view) const;
};

2
include/osgWidget/Lua
View File

@@ -23,7 +23,7 @@ namespace osgWidget {
// Externally defined; does this work in Windows?
struct LuaEngineData;
// The actual Engine itself. Every attempt is made to export the implemenation into the
// The actual Engine itself. Every attempt is made to export the implementation into the
// source file, rather than having it here.
class OSGWIDGET_EXPORT LuaEngine: public ScriptEngine
{

2
include/osgWidget/Window
View File

@@ -638,7 +638,7 @@ class OSGWIDGET_EXPORT Window:
// This method is passed the additional values by which width and height should be
// modified as calculed by the parent method, Window::resize. Keep in mind that these
// values can be negative (indicating a potential "shrink" request) or positive (which
// would indicate a "grow" reqeust).
// would indicate a "grow" request).
virtual void _resizeImplementation(point_type, point_type) = 0;
// These are made into implementation functions since getting the width or height