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

From Alexander Wiebel, "I did some spell checking in my spare time. Here come 20 files."

Browse Source
This commit is contained in:
Robert Osfield 2010-09-24 14:53:10 +00:00
parent 73a4e775c0
commit f6517d2f8b
20 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/AlphaFunc
View File

@ -58,7 +58,7 @@ class OSG_EXPORT AlphaFunc : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(AlphaFunc,sa)
// Compare each parameter in turn against the rhs.

2
include/osg/AnimationPath
View File

@ -255,7 +255,7 @@ class OSG_EXPORT AnimationPathCallback : public NodeCallback
_pause(false),
_pauseTime(0.0) {}
/** Construct an AnimationPathCallback and automatical create an animation path to produce a rotation about a point.*/
/** Construct an AnimationPathCallback and automatically create an animation path to produce a rotation about a point.*/
AnimationPathCallback(const osg::Vec3d& pivot,const osg::Vec3d& axis,float angularVelocity);

2
include/osg/ArgumentParser
View File

@ -191,7 +191,7 @@ class OSG_EXPORT ArgumentParser
void writeErrorMessages(std::ostream& output,ErrorSeverity sevrity=BENIGN);
/** This convinience method handles help requests on the command line.
/** This convenience method handles help requests on the command line.
* Return the type(s) of help requested. The return value of this
* function is suitable for passing into getApplicationUsage()->write().
* If ApplicationUsage::NO_HELP is returned then no help commandline option

2
include/osg/TexEnv
View File

@ -58,7 +58,7 @@ class OSG_EXPORT TexEnv : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(TexEnv,sa)
// Compare each parameter in turn against the rhs.

2
include/osg/TexEnvFilter
View File

@ -44,7 +44,7 @@ class OSG_EXPORT TexEnvFilter : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// used by the COMPARE_StateAttribute_Parameter macro's below.
COMPARE_StateAttribute_Types(TexEnvFilter, sa)
// compare each parameter in turn against the rhs.

2
include/osg/TexGen
View File

@ -62,7 +62,7 @@ class OSG_EXPORT TexGen : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(TexGen,sa)
// Compare each parameter in turn against the rhs.

2
include/osg/TexGenNode
View File

@ -43,7 +43,7 @@ class OSG_EXPORT TexGenNode : public Group
* parent reference frame. */
void setReferenceFrame(ReferenceFrame rf);
/** Ge thte TexGenNode's ReferenceFrame.*/
/** Get the TexGenNode's ReferenceFrame.*/
ReferenceFrame getReferenceFrame() const { return _referenceFrame; }
/** Set the texture unit that this TexGenNode is associated with.*/

2
include/osg/TexMat
View File

@ -43,7 +43,7 @@ class OSG_EXPORT TexMat : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// Check for equal types, then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macros below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(TexMat,sa)
// Compare each parameter in turn against the rhs.

6
include/osg/Texture
View File

@ -233,7 +233,7 @@
#define GL_TEXTURE_2D_MULTISAMPLE 0x9100
#endif
// Integer teture extension as in http://www.opengl.org/registry/specs/EXT/texture_integer.txt
// Integer texture extension as in http://www.opengl.org/registry/specs/EXT/texture_integer.txt
#ifndef GL_EXT_texture_integer
#define GL_RGBA32UI_EXT 0x8D70
#define GL_RGB32UI_EXT 0x8D71
@ -294,7 +294,7 @@
namespace osg {
/** Texture pure virtual base class that encapsulates OpenGl texture
/** Texture pure virtual base class that encapsulates OpenGL texture
* functionality common to the various types of OSG textures.
*/
class OSG_EXPORT Texture : public osg::StateAttribute
@ -506,7 +506,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute
class TextureObject;
/** Returns a pointer to the TextureBbject for the current context. */
/** Returns a pointer to the TextureObject for the current context. */
inline TextureObject* getTextureObject(unsigned int contextID) const
{
return _textureObjectBuffer[contextID].get();

2
include/osg/Texture1D
View File

@ -24,7 +24,7 @@
namespace osg {
/** Encapsulates OpenGl 1D texture functionality. Doesn't support cube maps,
/** Encapsulates OpenGL 1D texture functionality. Doesn't support cube maps,
* so ignore \a face parameters.
*/
class OSG_EXPORT Texture1D : public Texture

2
include/osg/Texture2D
View File

@ -18,7 +18,7 @@
namespace osg {
/** Encapsulates OpenGl 2D texture functionality. Doesn't support cube maps,
/** Encapsulates OpenGL 2D texture functionality. Doesn't support cube maps,
* so ignore \a face parameters.
*/
class OSG_EXPORT Texture2D : public Texture

2
include/osg/Texture2DArray
View File

@ -210,7 +210,7 @@ class OSG_EXPORT Texture2DArray : public Texture
/**
* Use std::vector to encapsulate referenced pointers to images of different layers.
* Vectors gives us a random access iterator. The overhead of non-used elements is negligeable */
* Vectors gives us a random access iterator. The overhead of non-used elements is negligible */
std::vector<ref_ptr<Image> > _images;
// subloaded images can have different texture and image sizes.

2
include/osg/Texture3D
View File

@ -22,7 +22,7 @@
namespace osg {
/** Encapsulates OpenGl 2D texture functionality. Doesn't support cube maps,
/** Encapsulates OpenGL 2D texture functionality. Doesn't support cube maps,
* so ignore \a face parameters.
*/
class OSG_EXPORT Texture3D : public Texture

6
include/osg/TextureCubeMap
View File

@ -77,7 +77,7 @@ class OSG_EXPORT TextureCubeMap : 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
{
@ -131,7 +131,7 @@ class OSG_EXPORT TextureCubeMap : 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
@ -157,7 +157,7 @@ class OSG_EXPORT TextureCubeMap : 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 Extensions 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

2
include/osg/Timer
View File

@ -49,7 +49,7 @@ class OSG_EXPORT Timer {
/** Get elapsed time in milliseconds.*/
inline double time_m() const { return delta_m(_startTick, tick()); }
/** Get elapsed time in micoseconds.*/
/** Get elapsed time in microseconds.*/
inline double time_u() const { return delta_u(_startTick, tick()); }
/** Get elapsed time in nanoseconds.*/

10
include/osg/TransferFunction
View File

@ -63,7 +63,7 @@ class OSG_EXPORT TransferFunction1D : public osg::TransferFunction
META_Object(osg, TransferFunction1D)
/** Get the mnimum transfer function value.*/
/** Get the minimum transfer function value.*/
float getMinimum() const { return _colorMap.empty() ? 0.0f : _colorMap.begin()->first; }
/** Get the maximum transfer function value.*/
@ -73,7 +73,7 @@ class OSG_EXPORT TransferFunction1D : public osg::TransferFunction
* transfer function when download to GPU.*/
void allocate(unsigned int numImageCells);
/** Clear the whole range to just represet a single color.*/
/** Clear the whole range to just represent a single color.*/
void clear(const osg::Vec4& color = osg::Vec4(1.0f,1.0f,1.0f,1.0f));
/** Get pixel value from the image. */
@ -95,7 +95,7 @@ class OSG_EXPORT TransferFunction1D : public osg::TransferFunction
/** Set the color for a specified transfer function value.
* updateImage defaults to true, and tells the setColor function to update the associate osg::Image that
* tracks the color map. Pass in false as the updateImage parameter if you are setting up many values
* at once to avoid recomputating og the image data, then once all setColor calls are made explictly call
* at once to avoid recomputation of the image data, then once all setColor calls are made explictly call
* updateImage() to bring the osg::Image back into sync with the color map. */
void setColor(float v, const osg::Vec4& color, bool updateImage=true);
@ -104,10 +104,10 @@ class OSG_EXPORT TransferFunction1D : public osg::TransferFunction
typedef std::map<float, osg::Vec4> ColorMap;
/** Get the color map that stores the mapping between the the tranfser function value and the colour it maps to.*/
/** Get the color map that stores the mapping between the the transfer function value and the colour it maps to.*/
ColorMap& getColorMap() { return _colorMap; }
/** Get the const color map that stores the mapping between the the tranfser function value and the colour it maps to.*/
/** Get the const color map that stores the mapping between the the transfer function value and the colour it maps to.*/
const ColorMap& getColorMap() const { return _colorMap; }
/** Assign a color map and automatically update the image to make sure they are in sync.*/

2
include/osg/Vec2f
View File

@ -35,7 +35,7 @@ class Vec2f
/** Number of vector components. */
enum { num_components = 2 };
/** Vec member varaible. */
/** Vec member variable. */
value_type _v[2];

2
include/osg/Vec3s
View File

@ -129,7 +129,7 @@ class Vec3s
return *this;
}
/** Binary vector substract. */
/** Binary vector subtract. */
inline Vec3s operator - (const Vec3s& rhs) const
{
return Vec3s(_v[0]-rhs._v[0], _v[1]-rhs._v[1], _v[2]-rhs._v[2]);

2
include/osg/VertexProgram
View File

@ -127,7 +127,7 @@ class OSG_EXPORT VertexProgram : public StateAttribute
virtual int compare(const osg::StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// used by the COMPARE_StateAttribute_Parameter macro's below.
COMPARE_StateAttribute_Types(VertexProgram,sa)
// compare each parameter in turn against the rhs.

2
include/osg/Viewport
View File

@ -52,7 +52,7 @@ class OSG_EXPORT Viewport : public StateAttribute
virtual int compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// used by the COMPARE_StateAttribute_Parameter macro's below.
COMPARE_StateAttribute_Types(Viewport,sa)
// compare each parameter in turn against the rhs.