Ran script to remove trailing spaces and tabs

This commit is contained in:
Robert Osfield
2012-03-21 17:36:20 +00:00
parent 1e35f8975d
commit 14a563dc9f
1495 changed files with 21873 additions and 21873 deletions

View File

@@ -1,13 +1,13 @@
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
*
* This library is open source and may be redistributed and/or modified under
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
* This library is open source and may be redistributed and/or modified under
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
* (at your option) any later version. The full license is in LICENSE file
* included with this distribution, and on the openscenegraph.org website.
*
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* OpenSceneGraph Public License for more details.
*/
@@ -19,9 +19,9 @@
namespace osg {
/** Texture2DArray state class which encapsulates OpenGL 2D array texture functionality.
/** Texture2DArray state class which encapsulates OpenGL 2D array texture functionality.
* Texture arrays were introduced with Shader Model 4.0 hardware.
*
*
* A 2D texture array does contain textures sharing the same properties (e.g. size, bitdepth,...)
* in a layered structure. See http://www.opengl.org/registry/specs/EXT/texture_array.txt for more info.
*/
@@ -29,14 +29,14 @@ class OSG_EXPORT Texture2DArray : public Texture
{
public :
Texture2DArray();
/** Copy constructor using CopyOp to manage deep vs shallow copy. */
Texture2DArray(const Texture2DArray& cm,const CopyOp& copyop=CopyOp::SHALLOW_COPY);
META_StateAttribute(osg, Texture2DArray, TEXTURE);
/** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
virtual int compare(const StateAttribute& rhs) const;
@@ -51,12 +51,12 @@ class OSG_EXPORT Texture2DArray : public Texture
/** Get the const texture image for specified layer. */
virtual const Image* getImage(unsigned int layer) const;
/** Get the number of images that are assigned to the Texture.
/** Get the number of images that are assigned to the Texture.
* The number is equal to the texture depth. To get the maximum possible
* image/layer count, you have to use the extension subclass, since it provides
* graphic context dependent information.
*/
virtual unsigned int getNumImages() const { return getTextureDepth(); }
virtual unsigned int getNumImages() const { return getTextureDepth(); }
/** Check how often was a certain layer in the given context modified */
inline unsigned int& getModifiedCount(unsigned int layer, unsigned int contextID) const
@@ -85,15 +85,15 @@ class OSG_EXPORT Texture2DArray : public Texture
virtual void load(const Texture2DArray& texture,State& state) const = 0;
virtual void subload(const Texture2DArray& texture,State& state) const = 0;
};
void setSubloadCallback(SubloadCallback* cb) { _subloadCallback = cb;; }
SubloadCallback* getSubloadCallback() { return _subloadCallback.get(); }
const SubloadCallback* getSubloadCallback() const { return _subloadCallback.get(); }
/** Set the number of mip map levels the the texture has been created with.
* Should only be called within an osg::Texture::apply() and custom OpenGL texture load.
@@ -101,25 +101,25 @@ class OSG_EXPORT Texture2DArray : public Texture
void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; }
/** Get the number of mip map levels the the texture has been created with. */
unsigned int getNumMipmapLevels() const { return _numMipmapLevels; }
unsigned int getNumMipmapLevels() const { return _numMipmapLevels; }
/** Copies a two-dimensional texture subimage, as per
* glCopyTexSubImage3D. Updates a portion of an existing OpenGL
* texture object from the current OpenGL background framebuffer
* contents at position \a x, \a y with width \a width and height
* \a height. Loads framebuffer data into the texture using offsets
* \a xoffset and \a yoffset. \a zoffset specifies the layer of the texture
* array to which the result is copied.
* \a xoffset and \a yoffset. \a zoffset specifies the layer of the texture
* array to which the result is copied.
*/
void copyTexSubImage2DArray(State& state, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height );
/** Bind the texture if already compiled. Otherwise recompile.
*/
virtual void apply(State& state) const;
/** Extensions class which encapsulates the querying of extensions and
* associated function pointers, and provides convenience 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
@@ -128,29 +128,29 @@ class OSG_EXPORT Texture2DArray : public Texture
Extensions(unsigned int contextID);
Extensions(const Extensions& rhs);
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtensions(unsigned int contextID);
void setTexture2DArraySupported(bool flag) { _isTexture2DArraySupported=flag; }
bool isTexture2DArraySupported() const { return _isTexture2DArraySupported; }
void setTexture3DSupported(bool flag) { _isTexture3DSupported=flag; }
bool isTexture3DSupported() const { return _isTexture3DSupported; }
void setMaxLayerCount(GLint count) { _maxLayerCount = count; }
GLint maxLayerCount() const { return _maxLayerCount; }
void setMax2DSize(GLint size) { _max2DSize = size; }
GLint max2DSize() const { return _max2DSize; }
void glTexImage3D( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels) const;
void glTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels) const;
void glCopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) const;
bool isCompressedTexImage3DSupported() const { return _glCompressedTexImage3D!=0; }
void glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data) const;
@@ -160,10 +160,10 @@ class OSG_EXPORT Texture2DArray : public Texture
protected:
~Extensions() {}
bool _isTexture2DArraySupported;
bool _isTexture3DSupported;
GLint _maxLayerCount;
GLint _max2DSize;
@@ -178,13 +178,13 @@ class OSG_EXPORT Texture2DArray : public Texture
CompressedTexImage3DArbProc _glCompressedTexImage3D;
CompressedTexSubImage3DArbProc _glCompressedTexSubImage3D;
GLCopyTexSubImageProc _glCopyTexSubImage3D;
};
/** Function to call to get the extension of a specified context.
* 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
* If 'createIfNotInitalized' is true then the Extensions object is
* automatically created. However, in this case the extension object will
* only be created with the graphics context associated with ContextID.
*/
@@ -200,9 +200,9 @@ class OSG_EXPORT Texture2DArray : public Texture
protected :
virtual ~Texture2DArray();
bool imagesValid() const;
virtual void computeInternalFormat() const;
void allocateMipmap(State& state) const;
@@ -215,8 +215,8 @@ 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 the texture has been created with,
mutable GLsizei _numMipmapLevels;
ref_ptr<SubloadCallback> _subloadCallback;