Changeset 5344 in orxonox.OLD for trunk/src/lib

Timestamp:

Oct 10, 2005, 12:39:21 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new Way to load and unload Text

Location:

trunk/src/lib

Files:

• graphics/graphics_engine.cc (modified) (4 diffs)
• graphics/text_engine/font.h (modified) (1 diff)
• graphics/text_engine/text.cc (modified) (3 diffs)
• graphics/text_engine/text.h (modified) (3 diffs)
• graphics/text_engine/text_engine.cc (modified) (3 diffs)
• graphics/text_engine/text_engine.h (modified) (3 diffs)
• shell/shell.cc (modified) (2 diffs)
• shell/shell_input.h (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -27 +27 @@
 #include "ini_parser.h"
 #include "substring.h"
-
+#include "text.h"
 
 using namespace std;
@@ -564 +564 @@
 if (this->geTextCFPS == NULL)
 {
-  this->geTextCFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_RENDER_DYNAMIC);
+  this->geTextCFPS = new Text("fonts/arial_black.ttf", 15, TEXT_RENDER_DYNAMIC);
   this->geTextCFPS->setName("curFPS");
   this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
@@ -571 +571 @@
 if (this->geTextMaxFPS == NULL)
 {
-      this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_RENDER_DYNAMIC);
+      this->geTextMaxFPS = new Text("fonts/arial_black.ttf", 15, TEXT_RENDER_DYNAMIC);
       this->geTextMaxFPS->setName("MaxFPS");
       this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
@@ -578 +578 @@
 if (this->geTextMinFPS == NULL)
 {
-      this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_RENDER_DYNAMIC);
+      this->geTextMinFPS = new Text("fonts/arial_black.ttf", 15, TEXT_RENDER_DYNAMIC);
       this->geTextMinFPS->setName("MinFPS");
       this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);

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

@@ -2 +2 @@
  * @file font.h
  * brief Definition of the FONT-loading class
+ *
+ * !! IMPORTANT !! When using ttf fonts clear the license issues prior to
+ * adding them to orxonox. This is really important, because we do not want
+ * to offend anyone.
  */
 

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

@@ -38 +38 @@
   if (fontFile != NULL)
     this->setFont(fontFile, fontSize);
-  this->setType(type);
-}
-
-/**
- *  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, TEXT_RENDER_TYPE type)
-{
-  this->init();
-
-  this->font = font;
   this->setType(type);
 }
@@ -89 +73 @@
 
 /**
- * sets the Font of this Text to font
- * @param font the Font (normaly from the ResourceManager) to allocate to this Text
- */
-void Text::setFont(Font* font)
-{
-  if (this->font != NULL)
-    ResourceManager::getInstance()->unload(this->font);
-  this->font = font;
-}
-
-/**
  * sets the Font of this Text to font from fontFile
  * @param fontFile the File to load the Font from.
@@ -111 +84 @@
 
   tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
-  if (tmpFont == NULL)
+  if (tmpFont != NULL)
+  {
+    if (this->font != NULL)
+      ResourceManager::getInstance()->unload(this->font);
+    this->font = tmpFont;
+  }
+
+  else
   {
     PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile);
-    this->setFont(NULL);
-  }
-  else
-    this->setFont(tmpFont);
+    if (this->font != NULL)
+      ResourceManager::getInstance()->unload(this->font);
+    this->font = NULL;
+  }
 }
 

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

@@ -24 +24 @@
 // FORWARD DECLARATION
 class Font;
-
 
 /**
@@ -57 +56 @@
 class Text : public Element2D
 {
-  friend class TextEngine;
   public:
     Text(const char* fontFile, unsigned int fontSize = TEXT_DEFAULT_SIZE, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
@@ -86 +84 @@
 
   private:
-    Text(Font* font = NULL, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
-    void setFont(Font* font);
-
 
   private:

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

@@ -23 +23 @@
 
 #include "text_engine.h"
+#include "text.h"
+#include "font.h"
 
 using namespace std;
@@ -34 +36 @@
 #include "class_list.h"
 
-#include "p_node.h"
-#include "vector.h"
 #include "debug.h"
 #include "list.h"
@@ -126 +126 @@
 
 /**
- *  creates a new Text with a certain font.
- * @see Font::Font
- * @see Text::Text
-*/
-Text* TextEngine::createText(const char* fontFile, unsigned int fontSize, int textType)
-{
-  Font* tmpFont;
-  Text* newText;
-  Vector tmpVec;
-
-  tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
-  if (!tmpFont)
-    {
-      PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile);
-      return NULL;
-    }
-  else
-    return new Text(tmpFont, TEXT_RENDER_DYNAMIC);
-}
-
-/**
  *  outputs some nice Debug information
 

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

@@ -18 +18 @@
 
 #include "base_object.h"
-#include "font.h"
-#include "text.h"
 
 #include "vector.h"
@@ -26 +24 @@
 class PNode;
 class Font;
+class Text;
 
 ///////////////////
@@ -37 +36 @@
   /** @returns a Pointer to the only object of this Class */
   inline static TextEngine* getInstance() { if (!singletonRef) singletonRef = new TextEngine();  return singletonRef; };
-
-  Text* createText(const char* fontFile,
-                   unsigned int fontSize = TEXT_DEFAULT_SIZE,
-                   int textType = TEXT_RENDER_DYNAMIC);
 
   void debug() const;

trunk/src/lib/shell/shell.cc

@@ -22 +22 @@
 
 
-#include "text_engine.h"
+#include "text.h"
 #include "list.h"
 #include "graphics_engine.h"
@@ -225 +225 @@
   for (unsigned int i = 0; i < bufferDisplaySize; i++)
   {
-    bufferText[i] = TextEngine::getInstance()->createText(this->fontFile, this->textSize, TEXT_RENDER_DYNAMIC);
+    bufferText[i] = new Text(this->fontFile, this->textSize, TEXT_RENDER_DYNAMIC);
     bufferText[i]->setColor(1, 0, 0);
     bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);

trunk/src/lib/shell/shell_input.h

@@ -10 +10 @@
 #define _SHELL_INPUT_H
 
-#include "text_engine.h"
+#include "text.h"
 #include "event_listener.h"