Changeset 5768 in orxonox.OLD for trunk/src/lib/graphics/text_engine/font.cc

Timestamp:

Nov 24, 2005, 8:24:52 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: font is a Texture now (this is a procedural texture)

File:

• trunk/src/lib/graphics/text_engine/font.cc (modified) (7 diffs)

trunk/src/lib/graphics/text_engine/font.cc

@@ -132 +132 @@
   this->fontTTF = NULL;
   this->glyphArray = NULL;
-  this->fastTextureID = 0;
 }
 
@@ -149 +148 @@
     this->fontTTF = NULL;
   }
-  if (this->fastTextureID != 0)
-  {
-    if(glIsTexture(this->fastTextureID))
-      glDeleteTextures(1, &this->fastTextureID);
-    this->fastTextureID = 0;
-  }
+
 
   this->setName(fontFile);
@@ -161 +155 @@
   if(this->fontTTF != NULL)
   {
-    this->fastTextureID = this->createFastTexture();
-    if (this->fastTextureID != 0)
-      return true;
-    else
-      return false;
+    this->createFastTexture();
+    return (this->getTexture() != 0);
   }
   else
@@ -190 +181 @@
     this->fontTTF = NULL;
   }
-  if (this->fastTextureID != 0)
-  {
-    if(glIsTexture(this->fastTextureID))
-      glDeleteTextures(1, &this->fastTextureID);
-    this->fastTextureID = 0;
-  }
-
-  this->fastTextureID = Text::loadTexture(surface, NULL);
+  if (this->prepareSurface(surface))
+    this->loadTexToGL( );
 
   // initializing the Glyphs.
@@ -251 +236 @@
 Font* Font::defaultFont = NULL;
 
+/**
+ * creates and exports an Image, that has all the characters
+ * stored in a Array (as an image)
+ * @param fileName the File to write the image into.
+ */
 void Font::createAsciiImage(const char* fileName)
 {
@@ -400 +390 @@
  * creates a Fast-Texture of this Font
  */
-GLuint Font::createFastTexture()
+bool Font::createFastTexture()
 {
   /* interesting GLYPHS:
@@ -500 +490 @@
   //   SDL_SaveBMP(tmpSurf, outName);
 
-  GLuint texture;
-  glGenTextures(1, &texture);
-  glBindTexture(GL_TEXTURE_2D, texture);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-  glTexImage2D(GL_TEXTURE_2D,
-               0,
-               GL_RGBA,
-               tmpSurf->w, tmpSurf->h,
-               0,
-               GL_RGBA,
-               GL_UNSIGNED_BYTE,
-               tmpSurf->pixels);
-  SDL_FreeSurface(tmpSurf);
-  return texture;
+  if (this->setSurface(tmpSurf))
+    loadTexToGL();
 }