Changeset 13041 for OpenSceneGraph/trunk/src/osg/Texture2D.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/Texture2D.cpp (modified) (20 diffs)

OpenSceneGraph/trunk/src/osg/Texture2D.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.
 */
@@ -67 +67 @@
             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.
         }
     }
@@ -91 +91 @@
 
     // compare each parameter in turn against the rhs.
-#if 1    
+#if 1
     if (_textureWidth != 0 && rhs._textureWidth != 0)
     {
@@ -151 +151 @@
     //state.setReportGLErrors(true);
 
-    // 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();
@@ -197 +197 @@
             applyTexImage2D_subload(state,GL_TEXTURE_2D,_image.get(),
                                     _textureWidth, _textureHeight, _internalFormat, _numMipmapLevels);
- 
+
             // update the modified tag to show that it is up to date.
             getModifiedCount(contextID) = _image->getModifiedCount();
-     
+
         }
         else if (_readPBuffer.valid())
@@ -217 +217 @@
 
         _subloadCallback->load(*this,state);
-        
+
         textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,1,_borderWidth);
 
@@ -278 +278 @@
         // perhaps it is the first glBind which is not required...
         //glBindTexture( GL_TEXTURE_2D, handle );
-        
+
     }
     else if ( (_textureWidth!=0) && (_textureHeight!=0) && (_internalFormat!=0) )
@@ -284 +284 @@
         _textureObjectBuffer[contextID] = textureObject = generateTextureObject(
                 this, contextID,GL_TEXTURE_2D,_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,1,_borderWidth);
-        
+
         textureObject->bind();
 
@@ -294 +294 @@
                      _sourceFormat ? _sourceFormat : _internalFormat,
                      _sourceType ? _sourceType : GL_UNSIGNED_BYTE,
-                     0);                
-                     
+                     0);
+
         if (_readPBuffer.valid())
         {
             _readPBuffer->bindPBufferToTexture(GL_FRONT);
         }
-        
+
     }
     else
@@ -316 +316 @@
 void Texture2D::computeInternalFormat() const
 {
-    if (_image.valid()) computeInternalFormatWithImage(*_image); 
+    if (_image.valid()) computeInternalFormatWithImage(*_image);
     else computeInternalFormatType();
 }
@@ -323 +323 @@
 {
     const unsigned int contextID = state.getContextID();
-    
+
     if (_internalFormat==0) _internalFormat=GL_RGBA;
 
     // get the globj for the current contextID.
     TextureObject* textureObject = getTextureObject(contextID);
-    
+
     if (textureObject)
     {
@@ -341 +341 @@
         }
         // 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
@@ -349 +349 @@
         // RO July 2001.
     }
-    
-    
+
+
     // remove any previously assigned images as these are nolonger valid.
     _image = NULL;
@@ -356 +356 @@
     // switch off mip-mapping.
     //
-  
+
     bool needHardwareMipMap = (_min_filter != LINEAR && _min_filter != NEAREST);
     bool hardwareMipMapOn = false;
@@ -362 +362 @@
     {
         hardwareMipMapOn = isHardwareMipmapGenerationEnabled(state);
-        
+
         if (!hardwareMipMapOn)
         {
@@ -383 +383 @@
 
     textureObject->bind();
-    
+
     applyTexParameters(GL_TEXTURE_2D,state);
 
-    
+
     GenerateMipmapMode mipmapResult = mipmapBeforeTexImage(state, hardwareMipMapOn);
 
@@ -407 +407 @@
     // get the texture object for the current contextID.
     TextureObject* textureObject = getTextureObject(contextID);
-    
+
     if (textureObject)
     {
         // we have a valid image
         textureObject->bind();
-        
+
         applyTexParameters(GL_TEXTURE_2D,state);
 
@@ -453 +453 @@
     // get the texture object for the current contextID.
     TextureObject* textureObject = getTextureObject(contextID);
-    
+
     if (textureObject && _textureWidth != 0 && _textureHeight != 0)
     {
@@ -467 +467 @@
         width >>= 1;
         height >>= 1;
-        
+
         for( GLsizei k = 1; k < numMipmapLevels  && (width || height); k++)
         {
@@ -483 +483 @@
             height >>= 1;
         }
-                
+
         // inform state that this texture is the current one bound.
-        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);        
-    }
-}
-
+        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);
+    }
+}
+