Changeset 13041 for OpenSceneGraph/trunk/src/osgText/Glyph.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/osgText/Glyph.cpp (modified) (24 diffs)

OpenSceneGraph/trunk/src/osgText/Glyph.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.
 */
@@ -40 +40 @@
 }
 
-GlyphTexture::~GlyphTexture() 
+GlyphTexture::~GlyphTexture()
 {
 }
@@ -57 +57 @@
     int maxAxis = std::max(glyph->s(), glyph->t());
     int margin = _margin + (int)((float)maxAxis * _marginRatio);
-    
+
     int width = glyph->s()+2*margin;
     int height = glyph->t()+2*margin;
@@ -69 +69 @@
         // record the position in which the texture will be stored.
         posX = _partUsedX+margin;
-        posY = _usedY+margin;        
+        posY = _usedY+margin;
 
         // move used markers on.
@@ -77 +77 @@
         return true;
     }
-    
+
     // start an new row.
     if (width <= getTextureWidth() &&
@@ -87 +87 @@
 
         posX = _partUsedX+margin;
-        posY = _usedY+margin;        
+        posY = _usedY+margin;
 
         // move used markers on.
@@ -122 +122 @@
 void GlyphTexture::apply(osg::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();
@@ -153 +153 @@
     // get the texture object for the current contextID.
     TextureObject* textureObject = getTextureObject(contextID);
-    
+
     bool newTextureObject = (textureObject == 0);
 
@@ -184 +184 @@
             return;
         }
-        
+
         // being bound for the first time, need to allocate the texture
 
@@ -194 +194 @@
 
         applyTexParameters(GL_TEXTURE_2D,state);
-        
+
         // need to look at generate mip map extension if mip mapping required.
         switch(_min_filter)
@@ -214 +214 @@
             break;
         }
-        
+
         unsigned int imageDataSize = getTextureHeight()*getTextureWidth();
         unsigned char* imageData = new unsigned char[imageDataSize];
@@ -221 +221 @@
             imageData[i] = 0;
         }
-        
+
 
         // allocate the texture memory.
@@ -229 +229 @@
                 GL_UNSIGNED_BYTE,
                 imageData );
-                
+
         delete [] imageData;
-    
+
     }
     else
@@ -237 +237 @@
         // reuse texture by binding.
         textureObject->bind();
-        
+
         if (getTextureParameterDirty(contextID))
         {
@@ -245 +245 @@
 
     }
-    
+
     static const GLubyte* s_renderer = 0;
     static bool s_subloadAllGlyphsTogether = false;
@@ -260 +260 @@
             s_subloadAllGlyphsTogether = true;
         }
-        
-        if (s_renderer && 
-            ((strstr((const char*)s_renderer,"Radeon")!=0) || 
+
+        if (s_renderer &&
+            ((strstr((const char*)s_renderer,"Radeon")!=0) ||
             (strstr((const char*)s_renderer,"RADEON")!=0) ||
             (strstr((const char*)s_renderer,"ALL-IN-WONDER")!=0)))
@@ -311 +311 @@
             }
             else // just subload the new entries.
-            {            
+            {
                 // default way of subloading as required.
                 //std::cout<<"subloading"<<std::endl;
@@ -321 +321 @@
                 }
             }
-            
+
             // clear the list since we have now subloaded them.
             glyphsWereSubloading.clear();
-            
+
         }
         else
@@ -353 +353 @@
                     {
                         int sindex = (t*(*itr)->s()+s);
-                        int dindex =  
+                        int dindex =
                             ((((*itr)->getTexturePositionY()+t) * getTextureWidth()) +
                             ((*itr)->getTexturePositionX()+s));
@@ -369 +369 @@
 
             // Subload the image once
-            glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, 
+            glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0,
                     getTextureWidth(),
                     getTextureHeight(),
@@ -408 +408 @@
     unsigned int initialSize = _glyphsToSubload.size();
     _glyphsToSubload.resize(maxSize);
-    
+
     for(unsigned i=initialSize; i<_glyphsToSubload.size(); ++i)
     {
@@ -503 +503 @@
 
     glPixelStorei(GL_UNPACK_ALIGNMENT,getPacking());
-    
+
     #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
     glPixelStorei(GL_UNPACK_ROW_LENGTH,getRowLength());
@@ -514 +514 @@
                     (GLenum)getDataType(),
                     data());
-                    
+
     errorNo = glGetError();
     if (errorNo!=GL_NO_ERROR)
@@ -530 +530 @@
                                  "\t                0x"<<(GLenum)getDataType()<<std::endl<<
                                  "\t                0x"<<(unsigned long)data()<<");"<<dec<<std::endl;
-    }                    
+    }
 }