Changeset 8766 in orxonox.OLD for trunk

Timestamp:

Jun 24, 2006, 3:54:58 AM (19 years ago)

Author:

bensch

Message:

font: no more friends

Location:

trunk/src/lib/graphics/text_engine

Files:

• font.cc (modified) (3 diffs)
• font.h (modified) (1 diff)
• font_data.h (modified) (4 diffs)

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

@@ -165 +165 @@
     this->data = Font::defaultFontData;
 
-  this->setTexture(this->data->texData);
+  this->setTexture(this->data->textureData());
   return retVal;
 }
@@ -180 +180 @@
     this->data = Font::defaultFontData;
 
-  this->setTexture(this->data->texData);
+  this->setTexture(this->data->textureData());
   return retVal;
 }
@@ -274 +274 @@
   Material::debug();
 
-  PRINT(0)("TEST %p and %p\n", this->data.get(), this->data->texData.get());
+  PRINT(0)("TEST %p and %p\n", this->data.get(), this->data->textureData().get());
   // print the loaded font's style
 /*  int style = TTF_STYLE_NORMAL;

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

@@ -17 +17 @@
 
 //! A class to handle a Font of a certain ttf-File/image-file, Size.
-class Font : public Material /* TODO Material it should be */
+class Font : public Material
 {
 

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

@@ -50 +50 @@
 class FontData
 {
-  friend class Font;
 public:
+  FontData();
   ~FontData();
-
 
   /// LOADING new Fonts
@@ -60 +59 @@
 
   void setStyle(TTF_Font* font, const std::string& renderStyle);
-
-
 
   /** @returns a Pointer to the Array of Glyphs */
@@ -70 +67 @@
   int getMaxDescent() const { return maxDescent; };
 
+  /** @returns the Texture-Data of this FontData */
+  const TextureDataPointer& textureData() const { return texData; };
 
   bool rebuild();
 
-
-
-
-
 private:
-  FontData();
 
   void initGlyphs(TTF_Font* font, Uint16 from, Uint16 count);
@@ -86 +80 @@
   bool createFastTexture(TTF_Font* font);
 
+
 private:
   std::string   fontFile;            //!< The FileName the Font was loaded from.
-
   int           renderStyle;         //!< The Renderstyle
   unsigned int  renderSize;          //!< How big the Font should be rendered.