Changeset 8755 in orxonox.OLD

Timestamp:

Jun 23, 2006, 8:24:28 PM (18 years ago)

Author:

bensch

Message:

better with fonts

Location:

branches/fontdata/src/lib/graphics/text_engine

Files:

• font.cc (modified) (12 diffs)
• font.h (modified) (6 diffs)
• text.cc (modified) (1 diff)

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

@@ -17 +17 @@
 
 #include "font.h"
-#include "text.h"
 
 #ifdef HAVE_SDL_IMAGE_H
@@ -24 +23 @@
 #include <SDL/SDL_image.h>
 #endif
+
 #include "default_font.xpm"
 
@@ -33 +33 @@
   : data(Font::defaultFontData)
 {
+  printf("Font()\n");
   this->init();
 
@@ -45 +46 @@
   : data(Font::defaultFontData)
 {
+  printf("Font(const std::string& fontFile, unsigned int renderSize)\n");
   this->init();
 
-
+  assert(data.get() != NULL);
   this->data->renderSize = renderSize;
   this->setStyle("c");
@@ -62 +64 @@
   : data(Font::defaultFontData)
 {
+  printf("Font(const std::string& imageFile)\n");
   this->init();
 
@@ -87 +90 @@
   : data(Font::defaultFontData)
 {
+  printf("Font(char** xpmArray)\n");
+
   this->init();
   this->setName("XPM-array-font");
@@ -99 +104 @@
   }
   else
-    PRINTF(1)("loading from surface failed: %s\n", IMG_GetError());
+    PRINTF(1)("Loading from XPM-array failed: %s\n", IMG_GetError());
 }
 
@@ -119 +124 @@
   this->setClassID(CL_FONT, "Font");
   if (Font::defaultFontData.get() == NULL)
-    Font::defaultFontData = initDefaultFont();
-}
-
-FontDataPointer Font::defaultFontData = FontDataPointer(NULL); //initDefaultFont();
-
+  {
+     Font::initDefaultFont();
+    this->data = Font::defaultFontData;
+  }
+}
+
+FontDataPointer Font::defaultFontData(NULL);
+
+/**
+ * @brief initializes the default font
+ */
+void Font::initDefaultFont()
+{
+  // temporarily create a Font.
+  Font::defaultFontData = FontDataPointer(new FontData);
+  // apply the Data.
+  printf("before: %p\n", defaultFontData.get());
+  Font::defaultFontData = Font(font_xpm).data;
+  printf("after: %p\n", defaultFontData.get());
+}
 
 /**
@@ -140 +160 @@
   {
     this->createFastTexture();
-    return (this->getTexture() != 0);
+    if (this->getTexture() != 0)
+      return true;
+    else
+    {
+      this->data = Font::defaultFontData;
+      return false;
+    }
   }
   else
   {
     PRINTF(1)("TTF_OpenFont: %s\n", TTF_GetError());
+    this->data = Font::defaultFontData;
     return false;
   }
@@ -156 +183 @@
 bool Font::loadFontFromSDL_Surface(SDL_Surface* surface)
 {
+  if(surface == NULL)
+    return false;
+
   this->data = FontDataPointer (new FontData());
   // loading to a texture.
-  if(surface == NULL)
+
+  bool hasAlpha;
+  SDL_Surface* newSurf = Texture::prepareSurface(surface, hasAlpha);
+  if (newSurf != NULL)
+  {
+    this->data->setSurface(newSurf);
+    this->data->setAlpha(hasAlpha);
+    this->data->setTexture(Texture::loadTexToGL(newSurf));
+  }
+  else
+  {
+    this->data = Font::defaultFontData;
     return false;
-
-  if (this->data->fontTTF != NULL)
-  {
-    TTF_CloseFont(this->data->fontTTF);
-    this->data->fontTTF = NULL;
-  }
-  bool hasAlpha;
-  SDL_Surface* newSurf = this->prepareSurface(surface, hasAlpha);
-  if (newSurf != NULL)
-  {
-    this->setSurface(newSurf);
-    this->setAlpha(hasAlpha);
-    this->setTexture(Texture::loadTexToGL(newSurf));
   }
 
@@ -289 +317 @@
 }
 
-/**
- * @brief initializes the default font
- */
-FontDataPointer Font::initDefaultFont()
-{
-  Font::defaultFontData = FontDataPointer(new FontData);
-  return Font(font_xpm).data;
-}
 
 /**
@@ -466 +486 @@
 //       sprintf( outName, "%s-glyphs.bmp", this->getName());
 //       SDL_SaveBMP(tmpSurf, outName);
-  this->setAlpha(true);
-  if (this->setSurface(tmpSurf))
-    (this->setTexture(Texture::loadTexToGL(tmpSurf)));
+  this->data->setAlpha(true);
+  if (this->data->setSurface(tmpSurf))
+    (this->data->setTexture(Texture::loadTexToGL(tmpSurf)));
   return true;
 }

branches/fontdata/src/lib/graphics/text_engine/font.h

@@ -11 +11 @@
 #define _FONT_H
 
-#include "texture.h"
+#include "material.h"
 
 #include "font_data.h"
@@ -17 +17 @@
 
 //! A class to handle a Font of a certain ttf-File/image-file, Size.
-class Font : public Texture
+class Font : public BaseObject /* TODO Material it should be */
 {
 
 public:
   Font();
-  Font(const std::string& fontFile,
-       unsigned int renderSize);
+  Font(const std::string& fontFile, unsigned int renderSize);
   Font(const std::string& imageFile);
   Font(char** xpmArray);
@@ -31 +30 @@
   bool operator==(const Font& font) const { return this->data == font.data; };
 
-  //  font
+
+  /// LOADING new Fonts
   bool loadFontFromTTF(const std::string& fontFile);
   bool loadFontFromSDL_Surface(SDL_Surface* surface);
@@ -42 +42 @@
   inline TTF_Font* getTTF() const { return this->data->getTTF(); };
 
+  inline GLuint getTexture() const { return this->data->getTexture(); };
+
+
   int getMaxHeight() const;
   int getMaxAscent() const;
@@ -49 +52 @@
   //inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
 
-
-
   void createAsciiImage(const std::string& fileName, unsigned int size) const;
 
   void debug() const ;
+
 private:
   void init();
@@ -60 +62 @@
   bool createFastTexture();
 
-
   void initGlyphs(Uint16 from, Uint16 count);
   int findOptimalFastTextureSize();
 
-
-  static FontDataPointer initDefaultFont();
+  static void initDefaultFont();
 
 private:

branches/fontdata/src/lib/graphics/text_engine/text.cc

@@ -33 +33 @@
 
   // initialize this Text
-  this->_font = NULL;
   this->_size = textSize;
   this->setSizeY2D(textSize);