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

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/util

Files:

• resource_manager.cc (modified) (3 diffs)
• track/track_manager.cc (modified) (2 diffs)

trunk/src/util/resource_manager.cc

@@ -30 +30 @@
 #endif /* NO_TEXTURES */
 #ifndef NO_TEXT
-#include "text_engine.h"
+#include "font.h"
+#include "text.h" //!< @todo this should not be included here. -> make FONT independant of SIZE...
 #endif /* NO_TEXT */
 #ifndef NO_AUDIO
@@ -359 +360 @@
               tmpResource->ttfSize = *(unsigned int*)param1;
             else
-              tmpResource->ttfSize = FONT_DEFAULT_SIZE;
+              tmpResource->ttfSize = TEXT_DEFAULT_SIZE;
 
           if(isFile(fullName))
@@ -613 +614 @@
               if (param1 == NULL)
                 {
-                  if (enumRes->ttfSize == FONT_DEFAULT_SIZE)
+                  if (enumRes->ttfSize == TEXT_DEFAULT_SIZE)
                     match = true;
                 }

trunk/src/util/track/track_manager.cc

@@ -24 +24 @@
 #include "stdincl.h"
 #include "list.h"
-#include "text_engine.h"
+#include "text.h"
 #include "t_animation.h"
 
@@ -380 +380 @@
   this->setBindSlave(this->trackNode);
   // initializing the Text
-  this->trackText = TextEngine::getInstance()->createText("fonts/earth.ttf", 30, TEXT_RENDER_DYNAMIC);
+  this->trackText = new Text("fonts/earth.ttf", 30, TEXT_RENDER_DYNAMIC);
   this->trackText->setAlignment(E2D_ALIGN_SCREEN_CENTER);
   // initializing the Animation for the Text.