Changeset 9718 in orxonox.OLD for branches/new_class_id/src/lib/graphics/text_engine

Timestamp:

Sep 1, 2006, 11:56:54 PM (18 years ago)

Author:

bensch

Message:

more thoughts on Resources, and soon going to adapt… i think i've got a clue

Location:

branches/new_class_id/src/lib/graphics/text_engine

Files:

• font.cc (modified) (5 diffs)
• font.h (modified) (3 diffs)
• font_data.h (modified) (4 diffs)
• limited_width_text.cc (modified) (1 diff)
• multi_line_text.cc (modified) (1 diff)
• text.cc (modified) (1 diff)

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

@@ -139 +139 @@
 }
 
-FontDataPointer Font::defaultFontData(NULL);
+FontData::Pointer Font::defaultFontData(NULL);
 
 /**
@@ -147 +147 @@
 {
   // temporarily create a Font.
-  Font::defaultFontData = FontDataPointer(new FontData);
+  Font::defaultFontData = FontData::Pointer(new FontData);
   // apply the Data.
   Font::defaultFontData = Font(font_xpm).data;
@@ -160 +160 @@
 bool Font::loadFontFromTTF(const std::string& fontFile, unsigned int renderSize)
 {
-  this->data = FontDataPointer (new FontData());
+  this->data = FontData::Pointer (new FontData());
   bool retVal = this->data->loadFontFromTTF(fontFile, renderSize);
   if (!retVal)
@@ -175 +175 @@
 bool Font::loadFontFromSDL_Surface(SDL_Surface* surface)
 {
-  this->data = FontDataPointer (new FontData());
+  this->data = FontData::Pointer (new FontData());
   bool retVal = this->data->loadFontFromSDL_Surface(surface);
   if (!retVal)
@@ -197 +197 @@
 
 
-void Font::setTexture(const TextureDataPointer& texDataPointer)
+void Font::setTexture(const TextureData::Pointer& texDataPointer)
 {
   this->setDiffuseMap(texDataPointer);

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

@@ -20 +20 @@
 {
   ObjectListDeclaration(Font);
-
+public:
+  typedef FontData::Glyph Glyph;
 public:
   Font();
@@ -40 +41 @@
 
   /** @returns a Pointer to the Array of Glyphs */
-  inline Glyph** getGlyphArray() const { return this->data->getGlyphArray(); };
+  inline const Glyph* const * const getGlyphArray() const { return this->data->getGlyphArray(); };
 
   inline int getMaxHeight() const { return data->getMaxHeight(); };
@@ -55 +56 @@
   static void initDefaultFont();
 
-  void setTexture(const TextureDataPointer& texDataPointer);
+  void setTexture(const TextureData::Pointer& texDataPointer);
 
 private:
-  FontDataPointer           data;                //!< A Data-Pointer to a Font.
+  FontData::Pointer         data;                //!< A Data-Pointer to a Font.
 
-  static FontDataPointer    defaultFontData;     //!< a default font, that is used, if other fonts were unable to be loaded.
+  static FontData::Pointer  defaultFontData;     //!< a default font, that is used, if other fonts were unable to be loaded.
 };
 

branches/new_class_id/src/lib/graphics/text_engine/font_data.h

@@ -26 +26 @@
 #define FONT_DEFAULT_RENDER_SIZE     50            //!< At what Resolution to render fonts.
 
+class FontData
+{
+
+
+public:
+
 //! A struct for handling glyphs
 /**
  * a Glyph is one letter of a certain font
  */
-struct Glyph
-{
+  struct Glyph
+  {
   // Glyph-specific (size and so on)
-  Uint16   character;         //!< The character
-  float    minX;              //!< The minimum distance from the origin in X
-  float    maxX;              //!< The maximum distance from the origin in X
-  float    minY;              //!< The minimum distance from the origin in Y
-  float    maxY;              //!< The maximum distance from the origin in Y
-  float    width;             //!< The width of the Glyph
-  float    height;            //!< The height of the Glyph
-  float    bearingX;          //!< How much is right of the Origin
-  float    bearingY;          //!< How much is above the Origin
-  float    advance;           //!< How big a Glyph would be in monospace-mode
+    Uint16   character;         //!< The character
+    float    minX;              //!< The minimum distance from the origin in X
+    float    maxX;              //!< The maximum distance from the origin in X
+    float    minY;              //!< The minimum distance from the origin in Y
+    float    maxY;              //!< The maximum distance from the origin in Y
+    float    width;             //!< The width of the Glyph
+    float    height;            //!< The height of the Glyph
+    float    bearingX;          //!< How much is right of the Origin
+    float    bearingY;          //!< How much is above the Origin
+    float    advance;           //!< How big a Glyph would be in monospace-mode
 
-  GLfloat texCoord[4];        //!< Texture coordinates: 0:left, 1:right, 2: top, 3: bottom.
-};
+    GLfloat texCoord[4];        //!< Texture coordinates: 0:left, 1:right, 2: top, 3: bottom.
+  };
 
-
-class FontData
-{
+  typedef CountPointer<FontData> Pointer;
 public:
   FontData();
@@ -61 +65 @@
 
   /** @returns a Pointer to the Array of Glyphs */
-  inline Glyph** getGlyphArray() const { return this->glyphArray; };
+  inline const Glyph* const * const getGlyphArray() const { return this->glyphArray; };
 
   int getMaxHeight() const { return maxHeight; };
@@ -68 +72 @@
 
   /** @returns the Texture-Data of this FontData */
-  const TextureDataPointer& textureData() const { return texData; };
+  const TextureData::Pointer& textureData() const { return texData; };
 
   bool rebuild() { return texData->rebuild(); };
@@ -91 +95 @@
   int           maxDescent;          //!< Max Desent of the Font.
 
-  TextureDataPointer   texData;
+  TextureData::Pointer   texData;
 };
 
-typedef CountPointer<FontData> FontDataPointer;
-
 #endif /* _FONT_DATA_H */

branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.cc

@@ -76 +76 @@
   glRotatef(this->getAbsDir2D(), 0, 0, 1);
 
-  Glyph* tmpGlyph;
+  const Font::Glyph* tmpGlyph;
   float posX = 0.0f;
   glBegin(GL_QUADS);

branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.cc

@@ -80 +80 @@
   glRotatef(this->getAbsDir2D(), 0, 0, 1);
 
-  Glyph* tmpGlyph;
+  const Font::Glyph* tmpGlyph;
   float posX = 0.0f;
   float posY = 0.0f;

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

@@ -235 +235 @@
   glRotatef(this->getAbsDir2D(), 0, 0, 1);
 
-  Glyph* tmpGlyph;
+  const Font::Glyph* tmpGlyph;
   float posX = 0.0f;
   glBegin(GL_QUADS);