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

OpenSceneGraph/trunk/src/osg/TextureCubeMap.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 @@
     _modifiedCount[5].setAllElementsTo(0);
 
-}    
+}
 
 
@@ -82 +82 @@
         if (noImages && _images[n].valid()) noImages = false;
         if (noImages && rhs._images[n].valid()) noImages = false;
-    
+
         if (_images[n]!=rhs._images[n]) // smart pointer comparison.
         {
@@ -94 +94 @@
                 else
                 {
-                    return 1; // valid lhs._image is greater than null. 
+                    return 1; // valid lhs._image is greater than null.
                 }
             }
-            else if (rhs._images[n].valid()) 
-            {
-                return -1; // valid rhs._image is greater than null. 
+            else if (rhs._images[n].valid())
+            {
+                return -1; // valid rhs._image is greater than null.
             }
         }
@@ -185 +185 @@
 void TextureCubeMap::computeInternalFormat() const
 {
-    if (imagesValid()) computeInternalFormatWithImage(*_images[0]); 
+    if (imagesValid()) computeInternalFormatWithImage(*_images[0]);
     else computeInternalFormatType();
 }
@@ -191 +191 @@
 void TextureCubeMap::apply(State& state) const
 {
-    // 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();
@@ -287 +287 @@
         textureObject = generateTextureObject(
                 this, contextID,GL_TEXTURE_CUBE_MAP,_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,1,0);
-        
+
         textureObject->bind();
 
@@ -318 +318 @@
             TextureCubeMap* non_const_this = const_cast<TextureCubeMap*>(this);
             for (int n=0; n<6; n++)
-            {                
+            {
                 if (_images[n].valid() && _images[n]->getDataVariance()==STATIC)
                 {
@@ -325 +325 @@
             }
         }
-        
+
     }
     else if ( (_textureWidth!=0) && (_textureHeight!=0) && (_internalFormat!=0) )
@@ -331 +331 @@
         _textureObjectBuffer[contextID] = textureObject = generateTextureObject(
                 this, contextID,GL_TEXTURE_CUBE_MAP,_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,1,0);
-        
+
         textureObject->bind();
 
@@ -337 +337 @@
 
         for (int n=0; n<6; n++)
-        {                
+        {
             // no image present, but dimensions at set so less create the texture
             glTexImage2D( faceTarget[n], 0, _internalFormat,
@@ -343 +343 @@
                          _sourceFormat ? _sourceFormat : _internalFormat,
                          _sourceType ? _sourceType : GL_UNSIGNED_BYTE,
-                         0);                
-        }
-        
+                         0);
+        }
+
     }
     else
@@ -380 +380 @@
         // create texture object.
         apply(state);
-        
+
         textureObject = getTextureObject(contextID);
-        
+
         if (!textureObject)
         {
@@ -389 +389 @@
             return;
         }
-        
+
     }
 
     GLenum target = faceTarget[face];
-    
+
     if (textureObject)
     {
         // we have a valid image
         textureObject->bind();
-        
+
         applyTexParameters(GL_TEXTURE_CUBE_MAP, state);
 
@@ -433 +433 @@
     // get the texture object for the current contextID.
     TextureObject* textureObject = getTextureObject(contextID);
-    
+
     if (textureObject && _textureWidth != 0 && _textureHeight != 0)
     {
@@ -447 +447 @@
         width >>= 1;
         height >>= 1;
-        
+
         for( GLsizei k = 1; k < numMipmapLevels  && (width || height); k++)
         {
@@ -463 +463 @@
                             0);
             }
-        
+
             width >>= 1;
             height >>= 1;
         }
-                
+
         // inform state that this texture is the current one bound.
-        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);        
+        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);
     }
 }