Changeset 3693 in orxonox.OLD

Timestamp:

Mar 31, 2005, 3:16:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/brnaches/textEngine: working with some default text, but far from finished

Location:

orxonox/branches/textEngine/src

Files:

• lib/graphics/font/glfont.cc (modified) (7 diffs)
• lib/graphics/font/glfont.h (modified) (4 diffs)
• orxonox.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (3 diffs)
• story_entities/world.h (modified) (2 diffs)

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

@@ -53 +53 @@
 #include "debug.h"
 
-
-#define DEFAULT_SIZE    18
-#define DEFAULT_TEXT    "orxonox 1234567890"
-#define DEFAULT_COLOR_R 256
-#define DEFAULT_COLOR_G 256
-#define DEFAULT_COLOR_B 256
-#define NUM_COLORS      256
-
-
-
-GLFont::GLFont()
-{
-  this->init("");
-
-}
-
-
-GLFont::GLFont(const char* fontFile)
-{
-  this->init(fontFile);
-}
-
-GLFont::~GLFont()
+GLFont::GLFont(const char* fontFile, unsigned int fontSize)
+{
+  this->init(fontFile, fontSize);
+}
+
+GLFont::~GLFont(void)
 {
   if (this->font)
@@ -117 +100 @@
 
 
-bool GLFont::init(const char* fontFile)
-{
+bool GLFont::init(const char* fontFile, unsigned int fontSize)
+{
+  if (!GLFont::ttfInitialized)
+    GLFont::enableFonts();
+
   // setting default values.
   this->font = NULL;
   this->fontFile = NULL;
-  this->fontSize = 16;
+
+  
+  this->setSize(fontSize);
   
   this->renderStyle = TTF_STYLE_NORMAL;
 
-
-  if (!GLFont::ttfInitialized)
-    GLFont::enableFonts();
+  this->setFont(fontFile);
+
+  this->setText( FONT_DEFAULT_TEXT);
+
 }
 
@@ -155 +144 @@
   this->text = new char[strlen(text)+1];
   strcpy(this->text, text);
+
+  this->createTexture();
 }
 
@@ -193 +184 @@
 
 
+void GLFont::setPosition(int x, int y)
+{
+  this->positionX = x;
+  this->positionY = y;
+}
+
+void GLFont::draw(void)
+{
+  this->enter2DMode();
+  glBindTexture(GL_TEXTURE_2D, texture);
+  glEnable(GL_TEXTURE_2D);
+  glBegin(GL_QUADS);
+  glTexCoord2f(0, 0); glVertex2i(20,   20  );
+  glTexCoord2f(1, 0); glVertex2i(200, 20  );
+  glTexCoord2f(1, 1); glVertex2i(200,   80);
+  glTexCoord2f(0, 1); glVertex2i(20, 80);
+  glEnd();
+  this->leave2DMode();
+
+}
+
+
 
 void GLFont::createTexture(void)
@@ -198 +211 @@
   GLfloat texcoord[4];
   SDL_Surface* tmpSurf = TTF_RenderText_Blended(this->font, this->text, this->color);
-  texture = loadTexture(tmpSurf, texcoord);
-
+  if (tmpSurf)
+    this->texture = loadTexture(tmpSurf, texcoord);
 }
 
@@ -263 +276 @@
 }
 
-void GLFont::setPosition(int x, int y)
-{
-
-}
-
 void GLFont::renderText(void)
 {
@@ -274 +282 @@
 
 
-void GLFont::renderText(const char* text, int x, int y)
-{
-  // enter the 2D-Mode
-
-  SDL_Surface *screen = SDL_GetVideoSurface();
-  
-  /* Note, there may be other things you need to change,
-     depending on how you have your OpenGL state set up.
-  */
-  glPushAttrib(GL_ENABLE_BIT);
-  glDisable(GL_DEPTH_TEST);
-  glDisable(GL_CULL_FACE);
-  glEnable(GL_TEXTURE_2D);
-  
-  /* This allows alpha blending of 2D textures with the scene */
-  glEnable(GL_BLEND);
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-  
-  glViewport(0, 0, screen->w, screen->h);
-  
-  glMatrixMode(GL_PROJECTION);
-  glPushMatrix();
-  glLoadIdentity();
-  
-  glOrtho(0.0, (GLdouble)screen->w, (GLdouble)screen->h, 0.0, 0.0, 1.0);
-  
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  glLoadIdentity();
-  
-  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-
-
-
-
-  // Leave the 2D-Mode
-  glMatrixMode(GL_MODELVIEW);
-  glPopMatrix();
-  
-  glMatrixMode(GL_PROJECTION);
-  glPopMatrix();
-  
-  glPopAttrib();
-}
 
 void GLFont::enter2DMode()

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

@@ -9 +9 @@
 #include "glincl.h"
 #include "SDL_ttf.h"
+
+
+/* some default values */
+#define FONT_DEFAULT_SIZE       18
+#define FONT_DEFAULT_TEXT       "orxonox 1234567890"
+#define FONT_DEFAULT_COLOR_R    256
+#define FONT_DEFAULT_COLOR_G    256
+#define FONT_DEFAULT_COLOR_B    256
+#define FONT_NUM_COLORS         256
+
 
 
@@ -29 +39 @@
 class GLFont
 {
-  
- private:
-
-    
-
  public:
-  GLFont();
-  GLFont(const char* fontFile);
+  GLFont(const char* fontFile, unsigned int fontSize = FONT_DEFAULT_SIZE);
   virtual ~GLFont();
 
   static void enableFonts(void);
   static void disableFonts(void);
-
 
   bool setFont(const char* fontFile);
@@ -55 +58 @@
   void renderText(void);
   void renderText(const char* text, int x, int y);
+
+  virtual void draw(void);
 
  private:
@@ -72 +77 @@
   GLfloat* texcoord;
 
-  bool init(const char* fontFile);
+  bool init(const char* fontFile, unsigned int fontSize = FONT_DEFAULT_SIZE);
   int getMaxHeight(void);
   int getMaxAscent(void);

orxonox/branches/textEngine/src/orxonox.cc

@@ -33 +33 @@
 #include "graphics_engine.h"
 #include "resource_manager.h"
+#include "glfont.h"
 
 #include <string.h>
@@ -58 +59 @@
   delete GraphicsEngine::getInstance(); // deleting the Graphics
   delete ResourceManager::getInstance(); // deletes the Resource Manager
+  GLFont::disableFonts();
 }
 
@@ -167 +169 @@
   resourceManager->setDataDir("../data/");
   return 0;
+  PRINT(3)("initializing TextEngine\n");
+  GLFont::enableFonts();
 }
 

orxonox/branches/textEngine/src/story_entities/world.cc

@@ -39 +39 @@
 #include "glmenu_imagescreen.h"
 #include "fontset.h"
+#include "glfont.h"
 #include "list.h"
 
@@ -202 +203 @@
       testFont = new FontSet();
       testFont->buildFont("../data/pictures/font.tga");
+      tmpFont = new GLFont("Alpha Sentry.ttf", 20);
       this->glmis->step();
 
@@ -594 +596 @@
 
   testFont->printText(0, 0, 1, "orxonox_" PACKAGE_VERSION);
+  tmpFont->draw();
 
   lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //

orxonox/branches/textEngine/src/story_entities/world.h

@@ -22 +22 @@
 class LightManager;
 class FontSet;
+class GLFont;
 class Terrain;
 class GarbageCollector;
@@ -96 +97 @@
 
   FontSet* testFont;            //!< A test Font. \todo fix this, so it is for real.
+  GLFont* tmpFont;              //!< tmpFont \todo fix
   GLMenuImageScreen* glmis;     //!< The Level-Loader Display