Changeset 13041 for OpenSceneGraph/trunk/src/osg/Texture1D.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osg/Texture1D.cpp (modified) (22 diffs)

OpenSceneGraph/trunk/src/osg/Texture1D.cpp

@@ -1 @@
-/* -*-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.
 */
@@ -63 +63 @@
             else
             {
-                return 1; // valid lhs._image is greater than null. 
+                return 1; // valid lhs._image is greater than null.
             }
         }
-        else if (rhs._image.valid()) 
-        {
-            return -1; // valid rhs._image is greater than null. 
+        else if (rhs._image.valid())
+        {
+            return -1; // valid rhs._image is greater than null.
         }
     }
@@ -108 +108 @@
     _image = image;
     _modifiedCount.setAllElementsTo(0);
-    
+
     if (_image.valid() && _image->requiresUpdateCall())
     {
@@ -120 +120 @@
 {
 #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
-    // get the contextID (user defined ID of 0 upwards) for the 
+    // get the contextID (user defined ID of 0 upwards) for the
     // current OpenGL context.
     const unsigned int contextID = state.getContextID();
@@ -172 +172 @@
     {
 
-        // we don't have a applyTexImage1D_subload yet so can't reuse.. so just generate a new texture object.        
+        // we don't have a applyTexImage1D_subload yet so can't reuse.. so just generate a new texture object.
         _textureObjectBuffer[contextID] = textureObject = generateTextureObject(this, contextID, GL_TEXTURE_1D);
 
@@ -193 +193 @@
     {
 
-        // we don't have a applyTexImage1D_subload yet so can't reuse.. so just generate a new texture object.        
+        // we don't have a applyTexImage1D_subload yet so can't reuse.. so just generate a new texture object.
         textureObject = generateTextureObject(this, contextID,GL_TEXTURE_1D);
 
@@ -206 +206 @@
         // update the modified count to show that it is upto date.
         getModifiedCount(contextID) = _image->getModifiedCount();
-    
+
         _textureObjectBuffer[contextID] = textureObject;
-    
+
         // unref image data?
         if (isSafeToUnrefImageData(state) && _image->getDataVariance()==STATIC)
@@ -215 +215 @@
             non_const_this->_image = NULL;
         }
-        
+
     }
     else if ( (_textureWidth!=0) && (_internalFormat!=0) )
@@ -221 +221 @@
         _textureObjectBuffer[contextID] = textureObject = generateTextureObject(
                 this,contextID,GL_TEXTURE_1D,_numMipmapLevels,_internalFormat,_textureWidth,1,1,0);
-        
+
         textureObject->bind();
 
@@ -231 +231 @@
                      _sourceFormat ? _sourceFormat : _internalFormat,
                      _sourceType ? _sourceType : GL_UNSIGNED_BYTE,
-                     0);                
-                     
+                     0);
+
         if (_readPBuffer.valid())
         {
@@ -256 +256 @@
 void Texture1D::computeInternalFormat() const
 {
-    if (_image.valid()) computeInternalFormatWithImage(*_image); 
+    if (_image.valid()) computeInternalFormatWithImage(*_image);
     else computeInternalFormatType();
 }
@@ -267 +267 @@
         return;
 
-    // get the contextID (user defined ID of 0 upwards) for the 
+    // get the contextID (user defined ID of 0 upwards) for the
     // current OpenGL context.
     const unsigned int contextID = state.getContextID();
@@ -278 +278 @@
     // select the internalFormat required for the texture.
     bool compressed = isCompressedInternalFormat(_internalFormat);
-    
+
     //Rescale if resize hint is set or NPOT not supported or dimension exceeds max size
     if( _resizeNonPowerOfTwoHint || !extensions->isNonPowerOfTwoTextureSupported(_min_filter) || inwidth > extensions->maxTextureSize() )
@@ -289 +289 @@
     glPixelStorei(GL_UNPACK_ROW_LENGTH,image->getRowLength());
 
-    static MyCompressedTexImage1DArbProc glCompressedTexImage1D_ptr = 
+    static MyCompressedTexImage1DArbProc glCompressedTexImage1D_ptr =
         convertPointerType<MyCompressedTexImage1DArbProc, void*>(getGLExtensionFuncPtr("glCompressedTexImage1DARB"));
 
@@ -307 +307 @@
         {
             numMipmapLevels = 1;
-            GLint blockSize = ( _internalFormat == GL_COMPRESSED_RGB_S3TC_DXT1_EXT ? 8 : 16 ); 
+            GLint blockSize = ( _internalFormat == GL_COMPRESSED_RGB_S3TC_DXT1_EXT ? 8 : 16 );
             GLint size = ((image->s()+3)/4)*((image->t()+3)/4)*blockSize;
-            glCompressedTexImage1D_ptr(target, 0, _internalFormat, 
-                  image->s(), _borderWidth, 
-                  size, 
-                  image->data());                
+            glCompressedTexImage1D_ptr(target, 0, _internalFormat,
+                  image->s(), _borderWidth,
+                  size,
+                  image->data());
 
         }
@@ -352 +352 @@
             else if(glCompressedTexImage1D_ptr)
             {
-                GLint blockSize = ( _internalFormat == GL_COMPRESSED_RGB_S3TC_DXT1_EXT ? 8 : 16 ); 
-                GLint size = 0; 
+                GLint blockSize = ( _internalFormat == GL_COMPRESSED_RGB_S3TC_DXT1_EXT ? 8 : 16 );
+                GLint size = 0;
                 for( GLsizei k = 0 ; k < numMipmapLevels  && width ;k++)
                 {
 
                     size = ((width+3)/4)*blockSize;
-                    glCompressedTexImage1D_ptr(target, k, _internalFormat, 
-                        width,  _borderWidth, size, image->getMipmapData(k));                
+                    glCompressedTexImage1D_ptr(target, k, _internalFormat,
+                        width,  _borderWidth, size, image->getMipmapData(k));
 
                     width >>= 1;
@@ -394 +394 @@
         }
         // the relevent texture object is not of the right size so
-        // needs to been deleted    
-        // remove previously bound textures. 
+        // needs to been deleted
+        // remove previously bound textures.
         dirtyTextureObject();
         // note, dirtyTextureObject() dirties all the texture objects for
@@ -402 +402 @@
         // RO July 2001.
     }
-    
-    
+
+
     // remove any previously assigned images as these are nolonger valid.
     _image = NULL;
@@ -421 +421 @@
     _textureWidth = width;
     _numMipmapLevels = 1;
-    
+
     textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,1,1,0);
 
@@ -470 +470 @@
     // get the texture object for the current contextID.
     TextureObject* textureObject = getTextureObject(contextID);
-    
+
     if (textureObject && _textureWidth != 0)
     {
@@ -482 +482 @@
         // we do not reallocate the level 0, since it was already allocated
         width >>= 1;
-        
+
         for( GLsizei k = 1; k < numMipmapLevels  && width; k++)
         {
@@ -495 +495 @@
             width >>= 1;
         }
-                
+
         // inform state that this texture is the current one bound.
-        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);        
+        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);
     }
 #else