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

From Jannik Heller, typo fixes

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14832 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-04-13 10:43:56 +00:00
parent 166c49eedd
commit 0a1db3d6fc
60 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/OpenThreads/Thread
View File

@@ -191,19 +191,19 @@ 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 carefull
* entity implemenation (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 senario in mind). Unless
* you have explicit need to set the schedule pirorites for a given
* constructs have been designed with this scenario in mind). Unless
* you have explicit need to set the schedule priorities for a given
* task, it is best to leave them alone.
*
* @note some implementations (notably LinuxThreads and IRIX Sprocs)
* only alow you to decrease thread priorities dynamically. Thus,
* only allow you to decrease thread priorities dynamically. Thus,
* a lower priority thread will not allow it's priority to be raised
* on the fly.
*
* @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
* @note setting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
* will output scheduling information for each thread to stdout.
*
* @return 0 if normal, -1 if errno set, errno code otherwise.
@@ -213,7 +213,7 @@ public:
/**
* Get the thread's schedule priority (if able)
*
* @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
* @note setting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
* will output scheduling information for each thread to stdout.
*
* @return 0 if normal, -1 if errno set, errno code otherwise.
@@ -229,7 +229,7 @@ public:
* the danger of deadlocking the machine when used as super-user.
* In such cases, the command is a no-op.
*
* @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
* @note setting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
* will output scheduling information for each thread to stdout.
*
* @return 0 if normal, -1 if errno set, errno code otherwise.
@@ -239,7 +239,7 @@ public:
/**
* Get the thread's policy (if able)
*
* @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
* @note setting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
* will output scheduling information for each thread to stdout.
*
* @return policy if normal, -1 if errno set, errno code otherwise.
@@ -287,14 +287,14 @@ public:
int join();
/**
* Disable thread cancelation altogether. Thread::cancel() has no effect.
* Disable thread cancellation altogether. Thread::cancel() has no effect.
*
* @return 0 if normal, -1 if errno set, errno code otherwise.
*/
int setCancelModeDisable();
/**
* Mark the thread to cancel aysncronously on Thread::cancel().
* Mark the thread to cancel asynchronously on Thread::cancel().
* (May not be available with process-level implementations).
*
* @return 0 if normal, -1 if errno set, errno code otherwise.
@@ -324,7 +324,7 @@ public:
/**
* Thread's cancel cleanup routine, called upon cancel(), after the
* cancelation has taken place, but before the thread exits completely.
* cancellation has taken place, but before the thread exits completely.
* This method should be used to repair parts of the thread's data
* that may have been damaged by a pre-mature cancel. No-op by default.
*/
@@ -346,7 +346,7 @@ public:
* This is not strictly thread API but is used
* so often with threads. It's basically UNIX usleep. Parameter is
* number of microseconds we current thread to sleep. Returns 0 on
* succes, non-zero on failure (UNIX errno or GetLastError() will give
* success, non-zero on failure (UNIX errno or GetLastError() will give
* detailed description.
*/
static int microSleep( unsigned int microsec);

2
include/osg/Billboard
View File

@@ -21,7 +21,7 @@ namespace osg {
/** Billboard is a derived form of Geode that orients its osg::Drawable
* children to face the eye point. Typical uses include trees and
* particle explosions,
* particle explosions.
*/
class OSG_EXPORT Billboard : public Geode
{

2
include/osg/BoundingSphere
View File

@@ -180,7 +180,7 @@ void BoundingSphereImpl<VT>::expandRadiusBy(const vector_type& v)
template<typename VT>
void BoundingSphereImpl<VT>::expandBy(const BoundingSphereImpl& sh)
{
// ignore operation if incomming BoundingSphere is invalid.
// ignore operation if incoming BoundingSphere is invalid.
if (!sh.valid()) return;
// This sphere is not set so use the inbound sphere

2
include/osg/BufferIndexBinding
View File

@@ -45,7 +45,7 @@ class OSG_EXPORT BufferIndexBinding : public StateAttribute
BufferIndexBinding(const BufferIndexBinding& rhs, const CopyOp& copyop=CopyOp::SHALLOW_COPY);
public:
// The member value is part of the key to this state attribute in
// the State class. Using the index target, we can seperately
// the State class. Using the index target, we can separately
// track the bindings for many different index targets.
virtual unsigned getMember() const { return static_cast<unsigned int>(_index); }

2
include/osg/BufferTemplate
View File

@@ -23,7 +23,7 @@ namespace osg
{
/** Template buffer class to be used with a struct as template parameter.
* This class is usefull to send C++ structures on the GPU (e.g. for uniform blocks) but be carefull to the alignments rules on the GPU side !
* This class is useful to send C++ structures on the GPU (e.g. for uniform blocks) but be careful to the alignments rules on the GPU side !
*/
template <typename T>
class BufferTemplate : public BufferData

2
include/osg/ImageSequence
View File

@@ -137,7 +137,7 @@ protected:
int imageIndex(double time);
// setImage without aquiring mutex.
// setImage without acquiring mutex.
void _setImage(unsigned int pos, osg::Image* image);
double _referenceTime;

2
include/osg/ScriptEngine
View File

@@ -101,7 +101,7 @@ class ScriptEngine : public osg::Object
/** run a Script.*/
bool run(osg::Script* script)
{
// assumpt empty input and output paramters lists
// assumpt empty input and output parameters lists
Parameters inputParameters, outputParameters;
return run(script, "", inputParameters, outputParameters);
}

2
include/osg/Shader
View File

@@ -136,7 +136,7 @@ class OSG_EXPORT Shader : public osg::Object
enum ShaderDefinesMode
{
USE_SHADER_PRAGAMA,
USE_SHADER_PRAGMA,
USE_MANUAL_SETTINGS
};

2
include/osg/Shape
View File

@@ -22,7 +22,7 @@
namespace osg {
// forward decare visitors.
// forward declare visitors.
class ShapeVisitor;
class ConstShapeVisitor;

6
include/osg/State
View File

@@ -132,7 +132,7 @@ class OSG_EXPORT State : public Referenced
/** Set the current OpenGL context uniqueID.
* The ContextID is used by classes like osg::StateAttribute's and osg::Drawable's to
* help manage seperate OpenGL objects, such as display lists, vertex buffer objects
* help manage separate OpenGL objects, such as display lists, vertex buffer objects
* and texture object for each graphics context. The ContextID simply acts as an index
* into arrays that these classes maintain for the purpose of storing GL object handles.
*
@@ -1461,9 +1461,9 @@ class OSG_EXPORT State : public Referenced
enum CheckForGLErrors
{
/** NEVER_CHECK_GL_ERRORS hints that OpenGL need not be checked for, this
is the fastest option since checking for errors does incurr a small overhead.*/
is the fastest option since checking for errors does incur a small overhead.*/
NEVER_CHECK_GL_ERRORS,
/** ONCE_PER_FRAME means that OpenGl errors will be checked for once per
/** ONCE_PER_FRAME means that OpenGL errors will be checked for once per
frame, the overhead is still small, but at least OpenGL errors that are occurring
will be caught, the reporting isn't fine grained enough for debugging purposes.*/
ONCE_PER_FRAME,

4
include/osg/StateSet
View File

@@ -312,10 +312,10 @@ class OSG_EXPORT StateSet : public Object
typedef std::pair<std::string, StateAttribute::OverrideValue> DefinePair;
typedef std::map<std::string, DefinePair> DefineList;
/** Added define pass on to shaders that use utilize that define, as secified by the GLSL #pragma import_defines(..) and #pragam requires(..). */
/** Added define pass on to shaders that use utilize that define, as specified by the GLSL #pragma import_defines(..) and #pragma requires(..). */
void setDefine(const std::string& defineName, StateAttribute::OverrideValue value=StateAttribute::ON);
/** Added define with value to pass on to shaders that use utilize that define, as secified by the GLSL #pragma import_defines(..) and #pragam requires(..). */
/** Added define with value to pass on to shaders that use utilize that define, as specified by the GLSL #pragma import_defines(..) and #pragma requires(..). */
void setDefine(const std::string& defineName, const std::string& defineValue, StateAttribute::OverrideValue value=StateAttribute::ON);
DefinePair* getDefinePair(const std::string& defineName) { DefineList::iterator itr = _defineList.find(defineName); return (itr!=_defineList.end()) ? &(itr->second) : 0; }

2
include/osg/ValueObject
View File

@@ -21,7 +21,7 @@
namespace osg {
// foward declare core OSG math classes
// forward declare core OSG math classes
class Vec2f;
class Vec3f;
class Vec4f;

2
include/osgAnimation/Action
View File

@@ -112,7 +112,7 @@ namespace osgAnimation
unsigned int getNumFrames() const { return _numberFrame;}
double getDuration() const { return _numberFrame * 1.0 / _fps; }
// 0 means infini else it's the number of loop
// 0 means infinite else it's the number of loop
virtual void setLoop(unsigned int nb) { _loop = nb; }
virtual unsigned int getLoop() const { return _loop;}

2
include/osgAnimation/RigGeometry
View File

@@ -144,7 +144,7 @@ namespace osgAnimation
if(!finder._root.valid())
{
osg::notify(osg::WARN) << "A RigGeometry did not find a parent skeleton for RigGeomtry ( " << geom->getName() << " )" << std::endl;
osg::notify(osg::WARN) << "A RigGeometry did not find a parent skeleton for RigGeometry ( " << geom->getName() << " )" << std::endl;
return;
}
geom->buildVertexInfluenceSet();

2
include/osgDB/Callbacks
View File

@@ -33,7 +33,7 @@ enum CaseSensitivity
CASE_INSENSITIVE
};
// forward decare
// forward declare
class Options;
class OSGDB_EXPORT FindFileCallback : public virtual osg::Referenced

2
include/osgManipulator/Dragger
View File

@@ -264,7 +264,7 @@ class OSGMANIPULATOR_EXPORT Dragger : public osg::MatrixTransform
/**
* Set/Get the traversal mask used by this dragger when looking for intersections during event handling.
* This is usefull to "hide" some geometry during event handling.
* This is useful to "hide" some geometry during event handling.
*/
virtual void setIntersectionMask(osg::Node::NodeMask intersectionMask) { _intersectionMask = intersectionMask; }
osg::Node::NodeMask getIntersectionMask() const { return _intersectionMask; }

6
include/osgPresentation/SlideEventHandler
View File

@@ -294,7 +294,7 @@ public:
ActiveOperators();
~ActiveOperators();
void collect(osg::Node* incommingNode, osg::NodeVisitor::TraversalMode tm = osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN);
void collect(osg::Node* incomingNode, osg::NodeVisitor::TraversalMode tm = osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN);
void process(SlideEventHandler* seh);
@@ -310,7 +310,7 @@ public:
protected:
void processOutgoing(SlideEventHandler* seh);
void processIncomming(SlideEventHandler* seh);
void processIncoming(SlideEventHandler* seh);
void processMaintained(SlideEventHandler* seh);
bool _pause;
@@ -319,7 +319,7 @@ protected:
OperatorList _current;
OperatorList _outgoing;
OperatorList _incomming;
OperatorList _incoming;
OperatorList _maintained;
};

2
include/osgShadow/OccluderGeometry
View File

@@ -29,7 +29,7 @@ class ShadowVolumeGeometry;
/** OccluderGeometry provides a sepecialised geometry representation of objects in scene that occlude light and therefore cast shadows.
* OccluderGeometry supports the computation of silhouette edges and shadow volume geometries, as well as use as geometry that one can rendering
* into a shadow map or end caps for the ZP+ algorithm. OccluderGeometry may be of the same resolution as an underlying geometry that it
* represents, or can be of lower resolution and combine manager seperate geometries together into a single shadow casting object.
* represents, or can be of lower resolution and combine manager separate geometries together into a single shadow casting object.
* OccluderGeometry may be attached as UserData to Nodes or to Drawables. */
class OSGSHADOW_EXPORT OccluderGeometry : public osg::Drawable
{

2
include/osgShadow/ViewDependentShadowMap
View File

@@ -187,7 +187,7 @@ protected:
osg::ref_ptr<osg::Texture2D> _fallbackShadowMapTexture;
typedef std::vector< osg::ref_ptr<osg::Uniform> > Uniforms;
mutable OpenThreads::Mutex _accessUnfiromsAndProgramMutex;
mutable OpenThreads::Mutex _accessUniformsAndProgramMutex;
Uniforms _uniforms;
osg::ref_ptr<osg::Program> _program;
};

2
include/osgUtil/Optimizer
View File

@@ -793,7 +793,7 @@ class OSGUTIL_EXPORT Optimizer
/** Optimize texture usage in the scene graph by combining textures into texture atlas
* Use of texture atlas cuts down on the number of seperate states in the scene, reducing
* Use of texture atlas cuts down on the number of separate states in the scene, reducing
* state changes and improving the chances of using larger batches of geometry.*/
class OSGUTIL_EXPORT TextureAtlasVisitor : public BaseOptimizerVisitor
{

2
include/osgWidget/EventInterface
View File

@@ -280,7 +280,7 @@ class OSGWIDGET_EXPORT EventInterface
// Notify the EventInterface object that is has been focused or unfocused; since
// this isn't always bound to a mouse event (i.e., if you want to be able to use
// the TAB key to focus), we need seperate events here.
// the TAB key to focus), we need separate events here.
virtual bool focus (const WindowManager*) { return false; }
virtual bool unfocus (const WindowManager*) { return false; }