Changeset 4536 in orxonox.OLD

Timestamp:

Jun 7, 2005, 10:33:17 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: saver font: now the implementation of NON-loading font must be done

Location:

orxonox/trunk/src/lib/graphics

Files:

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

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -302 +302 @@
       if( unlikely(this->currentFPS < this->minFPS)) this->minFPS = this->currentFPS;
       
+#ifndef NO_TEXT
       char tmpChar1[20];
       sprintf(tmpChar1, "Current:  %4.0f", this->currentFPS);
@@ -311 +312 @@
       sprintf(tmpChar3, "Min:    %4.0f", this->minFPS);
       this->geTextMinFPS->setText(tmpChar3);
+#endif /* NO_TEXT */
     }
 }
@@ -324 +326 @@
   if( display)
     {
+#ifndef NO_TEXT
       this->geTextCFPS = TextEngine::getInstance()->createText("fonts/druid.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
       this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
@@ -333 +336 @@
       this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextMinFPS->setPosition(5, 560);  
+#endif /* NO_TEXT */
     }
   this->bDisplayFPS = display;

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -76 +76 @@
   float          minFPS;          //!< minimal frame rate we ever got since start
 
+#ifndef NO_TEXT
   Text*          geTextCFPS;      //!< Text for the current FPS
   Text*          geTextMaxFPS;    //!< Text for the max FPS
   Text*          geTextMinFPS;    //!< Text for the min FPS
-
+#endif /* NO_TEXT */
 };
 

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

@@ -91 +91 @@
 void Text::setType(int type)
 {
-  this->type = type;
-}
-
+  if (this->font->font)
+    this->type = type;
+  else
+    this->type = TEXT_DYNAMIC;
+}
 
 /**
@@ -163 +165 @@
 
    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(void)
@@ -169 +172 @@
   if (this->texture)
     glDeleteTextures(1, &this->texture);
-  tmpSurf = TTF_RenderText_Blended(this->font->font,
-                                   this->text,
-                                   this->color);
+  if (likely(this->font != NULL))
+    tmpSurf = TTF_RenderText_Blended(this->font->font,
+                                     this->text,
+                                     this->color);
   if (tmpSurf)
     this->texture = loadTexture(tmpSurf, &this->texCoord);
@@ -424 +428 @@
 
   // erease this font out of the memory.
-  if (this->font)
+  if (likely(this->font != NULL))
     TTF_CloseFont(this->font);
 }
@@ -441 +445 @@
       
       this->font = TTF_OpenFont(this->fontFile, this->fontSize);
-      if(!this->font) 
+      if(!this->font)
         {
           PRINTF(1)("TTF_OpenFont: %s\n", TTF_GetError());
@@ -447 +451 @@
         }
       else
-        return true;
+          return true;
     }
   else
@@ -473 +477 @@
       this->renderStyle |= TTF_STYLE_UNDERLINE;
 
-  if (this->font)
+  if (likely(this->font != NULL))
     TTF_SetFontStyle(this->font, this->renderStyle);
   else
     PRINTF(2)("Font was not initialized, please do so before setting the Font-Style.\n");
 }
-
-
 
 /**
@@ -508 +510 @@
 int Font::getMaxHeight(void)
 {
-  if (this->font)
+  if (likely (this->font != NULL))
     return TTF_FontHeight(this->font);
   else
@@ -521 +523 @@
 int Font::getMaxAscent(void)
 {
-  if (this->font)
+  if (likely(this->font != NULL))
     return TTF_FontAscent(this->font);
   else
@@ -534 +536 @@
 int Font::getMaxDescent(void)
 {
-  if (this->font)
+  if (likely(this->font != NULL))
     return TTF_FontDescent(this->font);
   else
@@ -553 +555 @@
   Glyph* rg = new Glyph;
   rg->character = character;
-  TTF_GlyphMetrics(this->font, rg->character,
-                   &rg->minX, &rg->maxX,
-                   &rg->minY, &rg->maxY,
-                   &rg->advance);
+  if (likely (this->font!= NULL))
+    TTF_GlyphMetrics(this->font, rg->character,
+                     &rg->minX, &rg->maxX,
+                     &rg->minY, &rg->maxY,
+                     &rg->advance);
   rg->height = rg->maxY - rg->minY;
   rg->width = rg->maxX - rg->minX;
@@ -605 +608 @@
 
   // all the interessting Glyphs
-  for (int i = 32; i <= 122; i++)
+  for (int i = 0; i <= 127; i++)
     {
       SDL_Surface* glyphSurf = NULL;
@@ -627 +630 @@
             }
           // reading in the new Glyph
-          glyphSurf = TTF_RenderGlyph_Blended(this->font, i, this->fastColor);
-          if( glyphSurf ) 
+          if (likely(this->font != NULL))
+            glyphSurf = TTF_RenderGlyph_Blended(this->font, i, this->fastColor);
+          if( glyphSurf != NULL )
             {
 
@@ -671 +675 @@
         }
     }
+  SDL_SaveBMP(tmpSurf, "text");
 
   GLuint texture;
@@ -723 +728 @@
 
    This function searches for a 2^n sizes texture-size, this is for 
-   openGL-version < 1.2 compatibility. and because it is realy easy like this.
+   openGL-version < 1.2 compatibility ( and because it is realy easy like this :))
 */
 int Font::findOptimalFastTextureSize(void)
@@ -764 +769 @@
     }
   return size;
-  
 }
 
@@ -773 +777 @@
 void Font::debug(void)
 {
-
   // print the loaded font's style
   int style;
-  style = TTF_GetFontStyle(this->font);
+  if (likely(this->font != NULL))
+    style = TTF_GetFontStyle(this->font);
   PRINTF(0)("The font style is:");
   if(style==TTF_STYLE_NORMAL)
@@ -789 +793 @@
   }
   PRINTF(0)("\n");
-
-
 }
 
@@ -824 +826 @@
 
   TextEngine::singletonRef = NULL;
-
 }
 

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

@@ -30 +30 @@
 
 //! An enumerator for the text alignment.
-enum TEXT_ALIGNMENT {TEXT_ALIGN_LEFT, TEXT_ALIGN_RIGHT, TEXT_ALIGN_CENTER, TEXT_ALIGN_SCREEN_CENTER};
+enum TEXT_ALIGNMENT { TEXT_ALIGN_LEFT,
+                      TEXT_ALIGN_RIGHT,
+                      TEXT_ALIGN_CENTER,
+                      TEXT_ALIGN_SCREEN_CENTER };
 
 /* some default values */
@@ -85 +88 @@
   
   // OpenGL-specific
-  //  TexCoord texCoord;         //!< A Texture Coordinate for this glyph.
-  GLuint displayList;         //!< DiplayList to render this Glyph.
+  //  TexCoord texCoord;      //!< A Texture Coordinate for this glyph.
+  GLuint   displayList;       //!< DiplayList to render this Glyph.
 };