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

OpenSceneGraph/trunk/src/osg/Texture3D.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.
 */
@@ -73 +73 @@
             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.
         }
     }
@@ -154 +154 @@
     if (height>extensions->maxTexture3DSize()) height = extensions->maxTexture3DSize();
     if (depth>extensions->maxTexture3DSize()) depth = extensions->maxTexture3DSize();
-    
+
     inwidth = width;
     inheight = height;
     indepth = depth;
-    
+
     bool useHardwareMipMapGeneration = !image.isMipmap() && _useHardwareMipMapGeneration && texExtensions->isGenerateMipMapSupported();
 
@@ -185 +185 @@
             height >>= 1;
             depth >>= 1;
-        }    
+        }
     }
 }
@@ -192 +192 @@
 {
 
-    // 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();
@@ -201 +201 @@
 
     const Extensions* extensions = getExtensions(contextID,true);
-                                        
+
     if (!extensions->isTexture3DSupported())
     {
@@ -311 +311 @@
         _textureObjectBuffer[contextID] = textureObject = generateTextureObject(
                 this, contextID,GL_TEXTURE_3D,_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,_textureDepth,0);
-        
+
         textureObject->bind();
 
@@ -322 +322 @@
                      _sourceFormat ? _sourceFormat : _internalFormat,
                      _sourceType ? _sourceType : GL_UNSIGNED_BYTE,
-                     0);                
-                     
+                     0);
+
         if (_readPBuffer.valid())
         {
             _readPBuffer->bindPBufferToTexture(GL_FRONT);
         }
-        
+
     }
     else
@@ -334 +334 @@
         glBindTexture( GL_TEXTURE_3D, 0 );
     }
-    
+
     // if texture object is now valid and we have to allocate mipmap levels, then
     if (textureObject != 0 && _texMipmapGenerationDirtyList[contextID])
@@ -344 +344 @@
 void Texture3D::computeInternalFormat() const
 {
-    if (_image.valid()) computeInternalFormatWithImage(*_image); 
+    if (_image.valid()) computeInternalFormatWithImage(*_image);
     else computeInternalFormatType();
 }
@@ -354 +354 @@
         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();
-    const Extensions* extensions = getExtensions(contextID,true);    
+    const Extensions* extensions = getExtensions(contextID,true);
     const Texture::Extensions* texExtensions = Texture::getExtensions(contextID,true);
 
@@ -371 +371 @@
         //OSG_WARN<<"Warning::cannot currently use compressed format with 3D textures."<<std::endl;
         //return;
-    }    
-    
+    }
+
     //Rescale if resize hint is set or NPOT not supported or dimensions exceed max size
     if( _resizeNonPowerOfTwoHint || !texExtensions->isNonPowerOfTwoTextureSupported(_min_filter)
@@ -390 +390 @@
     {
         bool hardwareMipMapOn = false;
-        if (_min_filter != LINEAR && _min_filter != NEAREST) 
+        if (_min_filter != LINEAR && _min_filter != NEAREST)
         {
             if (useHardwareMipMapGeneration) glTexParameteri(GL_TEXTURE_3D, GL_GENERATE_MIPMAP_SGIS,GL_TRUE);
@@ -415 +415 @@
             getCompressedSize(_internalFormat, inwidth, inheight, indepth, blockSize,size);
 
-            extensions->glCompressedTexImage3D(target, 0, _internalFormat, 
-                inwidth, inheight, indepth, 
+            extensions->glCompressedTexImage3D(target, 0, _internalFormat,
+                inwidth, inheight, indepth,
                 _borderWidth,
-                size, 
+                size,
                 image->data());
         }
@@ -473 +473 @@
     inheight = image->t();
     indepth  = image->r();
-    
+
 }
 
@@ -510 +510 @@
     // get the texture object for the current contextID.
     TextureObject* textureObject = getTextureObject(contextID);
-    
+
     if (textureObject && _textureWidth != 0 && _textureHeight != 0 && _textureDepth != 0)
     {
         const Extensions* extensions = getExtensions(contextID,true);
-    
+
         // bind texture
         textureObject->bind();
@@ -528 +528 @@
         height >>= 1;
         depth >>= 1;
-                
+
         for( GLsizei k = 1; k < numMipmapLevels  && (width || height || depth); k++)
         {
@@ -547 +547 @@
             depth >>= 1;
         }
-                
+
         // inform state that this texture is the current one bound.
-        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);        
+        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);
     }
 }
@@ -609 +609 @@
     if (_isTexture3DFast) _isTexture3DSupported = true;
     else _isTexture3DSupported = strncmp((const char*)glGetString(GL_VERSION),"1.2",3)>=0;
-    
+
     _maxTexture3DSize = 0;
     glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, &_maxTexture3DSize);