Changeset 3790 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Apr 13, 2005, 12:33:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

Location:

orxonox/trunk/src/story_entities

Files:

• world.cc (modified) (10 diffs)
• world.h (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -33 +33 @@
 #include "terrain.h"
 #include "light.h"
+#include "text_engine.h"
 
 #include "track_manager.h"
@@ -40 +41 @@
 #include "command_node.h"
 #include "glmenu_imagescreen.h"
-#include "fontset.h"
 #include "list.h"
 
@@ -157 +157 @@
   delete this->lightMan;
   delete this->trackManager;
+  TextEngine::getInstance()->flush();
 
   delete this->simpleAnimation;
   //delete garbagecollecor
   //delete animator
+
+
 }
 
@@ -207 +210 @@
     {
       // initializing Font
-      testFont = new FontSet();
-      testFont->buildFont("../data/pictures/font.tga");
       this->glmis->step();
-
       // initializing the TrackManager
       trackManager = TrackManager::getInstance();
@@ -309 +309 @@
             this->spawn (this->localPlayer);
             /*monitor progress*/
-            //this->glmis->step();          
+            //this->glmis->step();
             this->glmis->step();
 
@@ -363 +363 @@
             this->glmis->step();
 
+            this->testText = TextEngine::getInstance()->createText("fonts/earth.ttf", 30, TEXT_DYNAMIC, 0, 255, 0);
+            testText->setText("TEXT  rocks");
+            testText->setBlending(1.0);
+            testText->setBindNode(tn);
+
+            /*      
+                   tmpAnim = new Animation<Text>(testText, &Text::setBlending);
+                   tmpAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
+                   tmpAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
+                   tmpAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
+                   tmpAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
+                   tmpAnim->setInfinity(ANIM_INF_CONSTANT, ANIM_INF_REWIND);
+            */
             break;
           }
@@ -553 +566 @@
   glNewList (objectList, GL_COMPILE);
  
-  trackManager->drawGraph(.01);
+  //  trackManager->drawGraph(.01);
   trackManager->debug(2);
   glEndList();
@@ -740 +753 @@
   glCallList (objectList);
 
-  testFont->printText(0, 0, 1, "orxonox_" PACKAGE_VERSION);
-
+  TextEngine::getInstance()->draw();
   lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
 }
@@ -892 +904 @@
         {
           float fps = 1000/dt;
-          PRINTF(3)("fps = %f\n", fps);
+
+          // temporary, only for showing how fast the text-engine is
+          char tmpChar[20];
+          sprintf(tmpChar, "fps: %4.0f", fps);
         }
       else
@@ -924 +939 @@
       this->garbageCollector->tick(seconds);
       this->simpleAnimation->tick(seconds);
+
     }
   this->lastFrame = currentFrame;

orxonox/trunk/src/story_entities/world.h

@@ -21 +21 @@
 class Skysphere;
 class LightManager;
-class FontSet;
 class Terrain;
 class GarbageCollector;
 class SimpleAnimation;
+
+class Text;
 
 //! The game world Interface
@@ -96 +97 @@
   bool bPause;                        //!< pause mode
 
-  FontSet* testFont;                  //!< A test Font. \todo fix this, so it is for real.
   GLMenuImageScreen* glmis;           //!< The Level-Loader Display
+
+  Text* testText;                     //!< A text to Test the TextEngine;
 
   char* worldName;                    //!< The name of this World