Changeset 3773 in orxonox.OLD

Timestamp:

Apr 11, 2005, 2:07:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: unloading works

Location:

orxonox/branches/textEngine/src/lib

Files:

• graphics/font/text_engine.cc (modified) (5 diffs)
• graphics/font/text_engine.h (modified) (5 diffs)
• util/resource_manager.cc (modified) (1 diff)

orxonox/branches/textEngine/src/lib/graphics/font/text_engine.cc

@@ -41 +41 @@
 /// TEXT ///
 ////////////
+/**
+   \brief creates a new Text Element
+   \param font the Font to render this text in
+   \param type The renderType to display this font in
+
+   this constructor is private, because the user should initialize 
+   a text with the TextEngine.
+*/
 Text::Text(Font* font, int type)
 {
@@ -54 +62 @@
 }
 
-
+/**
+   \brief deletes a Text out of memory
+   
+   This also ereases the text from the textList of the TextEngine
+*/
 Text::~Text(void)
 {
@@ -807 +819 @@
    \see Text::Text
 */
-Text* TextEngine::createText(const char* fontFile, unsigned int fontSize, Uint8 r, Uint8 g, Uint8 b)
+Text* TextEngine::createText(const char* fontFile, unsigned int fontSize, int textType, Uint8 r, Uint8 g, Uint8 b)
 {
   Font* tmpFont;
   Text* newText;
+  
 
   tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME);
@@ -828 +841 @@
    \brief removes a Text from the List
    \param the text to delete
+
+   this only ereases allocated memory, and removes the text
+   The normal way to call it, is through "delete text;"
+   So you do not have to concetn yourselves with this.
 */
 void TextEngine::deleteText(Text* text)
@@ -839 +856 @@
    \brief draws all the Texts that have been initialized
 */
-void TextEngine::draw(void)
+void TextEngine::draw(void) const
 {
   tIterator<Text>* textIterator = textList->getIterator();

orxonox/branches/textEngine/src/lib/graphics/font/text_engine.h

@@ -92 +92 @@
 class Text
 {
+  friend class TextEngine;
  public:
-  Text(Font* font, int type = TEXT_DYNAMIC);
   ~Text(void);
 
@@ -113 +113 @@
   virtual void draw(void);
 
+ private:
+  Text(Font* font, int type = TEXT_DYNAMIC);
 
   Font* font;
@@ -186 +188 @@
 ///////////////////
 //! A singleton Class that operates as a Handler for generating and rendering Text in 2D
-class TextEngine : public BaseObject {
-
+class TextEngine : public BaseObject 
+{
  public:
   static TextEngine* getInstance(void);
@@ -194 +196 @@
   Text* createText(const char* fontFile,
                    unsigned int fontSize = FONT_DEFAULT_SIZE,
+                   int textType = TEXT_DYNAMIC,
                    Uint8 r = FONT_DEFAULT_COLOR_R,
                    Uint8 g = FONT_DEFAULT_COLOR_G,
@@ -200 +203 @@
   void deleteText(Text* text);
 
-  void draw(void);
-
+  void draw(void) const;
+ 
  private:
   TextEngine(void);

orxonox/branches/textEngine/src/lib/util/resource_manager.cc

@@ -309 +309 @@
               delete (Texture*)resource->pointer;
               break;
+            case TTF:
+              delete (Font*)resource->pointer;
+              break;
             default:
               PRINTF(1)("NOT YET IMPLEMENTED !!FIX FIX!!\n");