Changeset 5340 in orxonox.OLD

Timestamp:

Oct 9, 2005, 11:38:38 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loading of text more modular

Location:

trunk/src/lib/graphics

Files:

• text_engine.cc (modified) (4 diffs)
• text_engine.h (modified) (1 diff)

trunk/src/lib/graphics/text_engine.cc

@@ -422 +422 @@
   int value = 1;
 
-  while ( value < input ) {
+  while ( value < input )
     value <<= 1;
-  }
   return value;
 }
@@ -472 +471 @@
 
 //  this->setSize(fontSize);
-
+  SDL_Surface* image = NULL;
   if (xpmArray != NULL)
-    this->loadFontFromXPMArray(xpmArray);
+    image = IMG_ReadXPMFromArray(xpmArray);
+  if (image != NULL)
+  {
+    this->loadFontFromSDL_Surface(image);
+    SDL_FreeSurface(image);
+  }
+  else
+    PRINTF(1)("loading from surface failed: %s\n", IMG_GetError());
 
 }
@@ -537 +543 @@
  * @param xpmArray the array of the XPM to load the font from.
  */
-bool Font::loadFontFromXPMArray(char** xpmArray)
-{
-  if (xpmArray == NULL)
+bool Font::loadFontFromSDL_Surface(SDL_Surface* surface)
+{
+  // loading to a texture.
+  if(surface == NULL)
     return false;
-
-  // loading to a texture.
-  SDL_Surface* image = IMG_ReadXPMFromArray(xpmArray);
-  if(image == NULL)
-  {
-    PRINTF(1)("loading from XPM-array failed: %s\n", IMG_GetError());
-    return false;
-  }
   TexCoord texCoord;
-  this->fastTextureID = Text::loadTexture(image, &texCoord);
+  this->fastTextureID = Text::loadTexture(surface, &texCoord);
 
   // initializing the Glyphs.
@@ -587 +586 @@
     }
   }
-  SDL_FreeSurface(image);
   return true;
 }

trunk/src/lib/graphics/text_engine.h

@@ -171 +171 @@
   // font
   bool loadFont(const char* fontFile);
-  bool loadFontFromXPMArray(char** xpmArray);
+  bool loadFontFromSDL_Surface(SDL_Surface* surface);
 
   void setSize(unsigned int fontSize);