Changeset 5345 in orxonox.OLD

Timestamp:

Oct 10, 2005, 12:49:53 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Text now does not segfault anymore, if Font could not be loaded

Location:

trunk/src/lib/graphics/text_engine

Files:

• text.cc (modified) (4 diffs)
• text.h (modified) (3 diffs)

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

@@ -83 +83 @@
   Vector tmpVec;
 
-  tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
-  if (tmpFont != NULL)
-  {
-    if (this->font != NULL)
-      ResourceManager::getInstance()->unload(this->font);
-    this->font = tmpFont;
-  }
-
-  else
-  {
-    PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile);
-    if (this->font != NULL)
-      ResourceManager::getInstance()->unload(this->font);
-    this->font = NULL;
+  // unloading the Font if we alrady have one loaded.
+  if (this->font != NULL)
+    ResourceManager::getInstance()->unload(this->font);
+  this->font = NULL;
+
+  // load a new Font
+  if (fontFile != NULL)
+  {
+    tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
+    if (tmpFont != NULL)
+      this->font = tmpFont;
+    else
+      PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile);
   }
 }
@@ -166 +165 @@
 }
 
+
 /**
  *  creates a texture out of the given parameters
-
-   this has to be called every time by the user, to if changes were made.
-   this is only for TEXT_STATIC-mode
+ *
+ * this has to be called every time by the user, to if changes were made.
+ * this is only for TEXT_STATIC-mode
  */
 void Text::createTexture()
 {
-  SDL_Surface* tmpSurf;
+  SDL_Surface* tmpSurf = NULL;
   if (this->texture)
     glDeleteTextures(1, &this->texture);
@@ -184 +184 @@
                                      theColor);
   }
-  if (tmpSurf)
+  if (tmpSurf != NULL)
+  {
     this->texture = loadTexture(tmpSurf, &this->texCoord);
 
-  this->width = tmpSurf->w;
-  this->height = tmpSurf->h;
-  SDL_FreeSurface(tmpSurf);
+    this->width = tmpSurf->w;
+    this->height = tmpSurf->h;
+    SDL_FreeSurface(tmpSurf);
+  }
 }
 
@@ -289 +291 @@
 ////////////
 /**
- *  Loads a Font from an SDL_surface into a texture.
+ * Loads a Font from an SDL_surface into a texture.
  * @param surface The surface to make the texture of
  * @param texCoord The texture coordinates of the 4 corners of the texture

trunk/src/lib/graphics/text_engine/text.h

@@ -59 +59 @@
     Text(const char* fontFile, unsigned int fontSize = TEXT_DEFAULT_SIZE, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
     ~Text();
-
     void init();
 
     void setFont(const char* fontFile, unsigned int fontSize);
+
     void setType(TEXT_RENDER_TYPE type);
     void setText(const char* text, bool isExtern = false);
@@ -84 +84 @@
 
   private:
-
-  private:
     Font*             font;           //!< Font of this text
 
@@ -95 +93 @@
 
   // placement in openGL
-    GLuint            texture;        //!< A GL-texture to hold the text
+    GLuint            texture;        //!< A GL-texture to hold the text (static Mode)
     TexCoord          texCoord;       //!< Texture-coordinates @todo fix this to have a struct
     float             height;