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@14882 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-06-01 13:11:49 +00:00
parent e0028bef6e
commit d14a602a59
42 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osg/GraphicsContext
View File

@@ -272,7 +272,7 @@ class OSG_EXPORT GraphicsContext : public Object
typedef std::list< ref_ptr<Operation> > GraphicsOperationQueue;
/** Get the operations queue, not you must use the OperationsMutex when accessing the queue.*/
/** Get the operations queue, note you must use the OperationsMutex when accessing the queue.*/
GraphicsOperationQueue& getOperationsQueue() { return _operations; }
/** Get the operations queue mutex.*/
@@ -467,10 +467,10 @@ class OSG_EXPORT GraphicsContext : public Object
typedef std::list< osg::Camera* > Cameras;
/** Get the the list of cameras associated with this graphics context.*/
/** Get the list of cameras associated with this graphics context.*/
Cameras& getCameras() { return _cameras; }
/** Get the the const list of cameras associated with this graphics context.*/
/** Get the const list of cameras associated with this graphics context.*/
const Cameras& getCameras() const { return _cameras; }
/** set the default FBO-id, this id will be used when the rendering-backend is finished with RTT FBOs */

2
include/osg/StateAttribute
View File

@@ -118,7 +118,7 @@ class OSG_EXPORT StateAttribute : public Object
* extending the osg's StateAttribute's simply define your
* own Type value which is unique, using the StateAttribute::Type
* enum as a guide of what values to use. If your new subclass
* needs to override a standard StateAttriubte then simply use
* needs to override a standard StateAttribute then simply use
* that type's value. */
enum Type
{

6
include/osg/Texture2DArray
View File

@@ -98,12 +98,12 @@ class OSG_EXPORT Texture2DArray : public Texture
/** Set the number of mip map levels the the texture has been created with.
/** Set the number of mip map levels the texture has been created with.
* Should only be called within an osg::Texture::apply() and custom OpenGL texture load.
*/
void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; }
/** Get the number of mip map levels the the texture has been created with. */
/** Get the number of mip map levels the texture has been created with. */
unsigned int getNumMipmapLevels() const { return _numMipmapLevels; }
/** Copies a two-dimensional texture subimage, as per
@@ -138,7 +138,7 @@ class OSG_EXPORT Texture2DArray : public Texture
// subloaded images can have different texture and image sizes.
mutable GLsizei _textureWidth, _textureHeight, _textureDepth;
// number of mip map levels the the texture has been created with,
// number of mip map levels the texture has been created with,
mutable GLsizei _numMipmapLevels;
ref_ptr<SubloadCallback> _subloadCallback;

2
include/osg/Texture3D
View File

@@ -152,7 +152,7 @@ class OSG_EXPORT Texture3D : public Texture
/** Subloaded images can have different texture and image sizes. */
mutable GLsizei _textureWidth, _textureHeight, _textureDepth;
/** Number of mip map levels the the texture has been created with, */
/** Number of mip map levels the texture has been created with, */
mutable GLsizei _numMipmapLevels;
ref_ptr<SubloadCallback> _subloadCallback;

6
include/osg/TextureCubeMap
View File

@@ -94,12 +94,12 @@ class OSG_EXPORT TextureCubeMap : public Texture
const SubloadCallback* getSubloadCallback() const { return _subloadCallback.get(); }
/** Set the number of mip map levels the the texture has been created with.
/** Set the number of mip map levels the texture has been created with.
* Should only be called within an osg::Texuture::apply() and custom OpenGL texture load.
*/
void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; }
/** Get the number of mip map levels the the texture has been created with. */
/** Get the number of mip map levels the texture has been created with. */
unsigned int getNumMipmapLevels() const { return _numMipmapLevels; }
/** Copies a two-dimensional texture subimage, as per
@@ -131,7 +131,7 @@ class OSG_EXPORT TextureCubeMap : public Texture
// subloaded images can have different texture and image sizes.
mutable GLsizei _textureWidth, _textureHeight;
// number of mip map levels the the texture has been created with,
// number of mip map levels the texture has been created with,
mutable GLsizei _numMipmapLevels;
ref_ptr<SubloadCallback> _subloadCallback;

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 number of seconds per tick. */
/** Get the number of seconds per tick. */
inline double getSecondsPerTick() const { return _secsPerTick; }
protected :

4
include/osg/TransferFunction
View File

@@ -107,10 +107,10 @@ class OSG_EXPORT TransferFunction1D : public osg::TransferFunction
/** set the color map and automatically update the image to make sure they are in sync.*/
void setColorMap(const ColorMap& vcm) { assign(vcm); }
/** Get the color map that stores the mapping between the the transfer function value and the colour it maps to.*/
/** Get the color map that stores the mapping between 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 transfer function value and the colour it maps to.*/
/** Get the const color map that stores the mapping between 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/Uniform
View File

@@ -573,7 +573,7 @@ class OSG_EXPORT Uniform : public Object
/** Return the name of a Type enum as string. */
static const char* getTypename( Type t );
/** Return the the number of components for a GLSL type. */
/** Return the number of components for a GLSL type. */
static int getTypeNumComponents( Type t );
/** Return the Type enum of a Uniform typename string */

2
include/osgAnimation/RigTransformSoftware
View File

@@ -26,7 +26,7 @@ namespace osgAnimation
class RigGeometry;
/// This class manage format for hardware skinning
/// This class manage format for software skinning
class OSGANIMATION_EXPORT RigTransformSoftware : public RigTransform
{
public:

2
include/osgDB/DatabasePager
View File

@@ -69,7 +69,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
/** Add a request to load a node file to end the the database request list.*/
/** Add a request to load a node file to end the database request list.*/
virtual void requestNodeFile(const std::string& fileName, osg::NodePath& nodePath,
float priority, const osg::FrameStamp* framestamp,
osg::ref_ptr<osg::Referenced>& databaseRequest,

2
include/osgDB/ExternalFileWriter
View File

@@ -91,7 +91,7 @@ namespace osgDB
const unsigned int _allowUpDirs;
/// Generates a unique name for an object to be written on disk.
/// Side effect: updates _lastGeneratedObjectIndex to the index associated withe the returned name.
/// Side effect: updates _lastGeneratedObjectIndex to the index associated with the returned name.
void generateObjectName(std::string & out_relativePath, std::string & out_absolutePath, int type);
bool absoluteObjectPathExists(const std::string & path);

2
include/osgDB/Registry
View File

@@ -63,7 +63,7 @@ class OSGDB_EXPORT Registry : public osg::Referenced
void readCommandLine(osg::ArgumentParser& commandLine);
/** register an .fileextension alias to mapExt toExt, the later
* should the the extension name of the readerwriter plugin library.
* should be the extension name of the readerwriter plugin library.
* For example to map .tif files to the tiff loader, use
* addExtAlias("tif","tiff") which will enable .tif to be read
* by the libdb_tiff readerwriter plugin.*/

2
include/osgSim/ScalarBar
View File

@@ -63,7 +63,7 @@ public:
/**
TextProperties allows users to specify a number of properties for the
text used to display the labels & title on the ScalarBar. Specifiying a character
text used to display the labels & title on the ScalarBar. Specifying a character
size of 0 will cause the ScalarBar to estimate an appropriate size. Note that
the attributes are public, and may be set directly.
*/

4
include/osgViewer/View
View File

@@ -227,7 +227,7 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter
/** deprecated, use view.apply(new osgViewer::AcrossAllWindows()). */
void setUpViewAcrossAllScreens();
/** depreacted, use view.apply(new osgViewer::SingleWindow(x,y,width,screenNum)). */
/** deprecated, use view.apply(new osgViewer::SingleWindow(x,y,width,screenNum)). */
void setUpViewInWindow(int x, int y, int width, int height, unsigned int screenNum=0);
/** deprecated, use view.apply(new osgViewer::SingleScreen(screenNum)). */
@@ -236,7 +236,7 @@ class OSGVIEWER_EXPORT View : public osg::View, public osgGA::GUIActionAdapter
/** deprecated, use view.apply(new osgViewer::SphericalDisplay(radius, collar, screenNum, intensityMap, projectorMatrix)). */
void setUpViewFor3DSphericalDisplay(double radius=1.0, double collar=0.45, unsigned int screenNum=0, osg::Image* intensityMap=0, const osg::Matrixd& projectorMatrix = osg::Matrixd());
/** depreacted, use view.apply(new osgViewer::PanoramicSphericalDisplay(radius, collar, screenNum, intensityMap, projectorMatrix)). */
/** deprecated, use view.apply(new osgViewer::PanoramicSphericalDisplay(radius, collar, screenNum, intensityMap, projectorMatrix)). */
void setUpViewForPanoramicSphericalDisplay(double radius=1.0, double collar=0.45, unsigned int screenNum=0, osg::Image* intensityMap=0, const osg::Matrixd& projectorMatrix = osg::Matrixd());
/** deprecated. use view.apply(new osgViewer::WoWVxDisplay(type (20 to 42), screenNum). */