Changeset 5924 in orxonox.OLD for branches/avi_play/src/lib/graphics/text_engine/font.cc

Timestamp:

Dec 4, 2005, 11:37:49 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: merged the Trunk back into the branche avi_play again

merged with command svn merge ../trunk/ avi_play/ -r5845:HEAD
no conflicts

File:

• branches/avi_play/src/lib/graphics/text_engine/font.cc (modified) (2 diffs)

branches/avi_play/src/lib/graphics/text_engine/font.cc

@@ -181 +181 @@
     this->fontTTF = NULL;
   }
-  if (this->prepareSurface(surface))
-    this->loadTexToGL( );
+  bool hasAlpha;
+  SDL_Surface* newSurf = this->prepareSurface(surface, hasAlpha);
+  if (newSurf != NULL)
+  {
+    this->setSurface(newSurf);
+    this->setAlpha(hasAlpha);
+    this->setTexture(Texture::loadTexToGL(newSurf));
+  }
 
   // initializing the Glyphs.
@@ -491 +497 @@
 
   if (this->setSurface(tmpSurf))
-    loadTexToGL();
+    (this->setTexture(Texture::loadTexToGL(tmpSurf)));
 }