Changeset 3696 in orxonox.OLD for orxonox

Timestamp:

Mar 31, 2005, 4:34:05 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: minor change and doxy-tags

Location:

orxonox/branches/textEngine/src

Files:

• lib/graphics/font/glfont.cc (modified) (9 diffs)
• lib/graphics/font/glfont.h (modified) (2 diffs)
• story_entities/world.cc (modified) (1 diff)

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

@@ -53 +53 @@
 #include "debug.h"
 
-GLFont::GLFont(const char* fontFile, unsigned int fontSize)
-{
-  this->init(fontFile, fontSize);
-}
-
+/**
+   \brief constructs a Font
+   \param fontFile the File to load the font from
+*/
+GLFont::GLFont(const char* fontFile)
+{
+  this->init(fontFile);
+}
+
+/**
+   \brief destructs a font
+*/
 GLFont::~GLFont(void)
 {
@@ -65 +72 @@
 
 /**
-   \function to enable TTF_Fonts
+   \brief function to enable TTF_Fonts
 */
 void GLFont::enableFonts(void)
@@ -113 +120 @@
   this->font = NULL;
   this->fontFile = NULL;
-
+  this->text = NULL;
+  this->texture = 0;
   
   this->setSize(fontSize);
@@ -121 +129 @@
   this->setFont(fontFile);
 
-  this->setText( FONT_DEFAULT_TEXT);
-
+  this->setText(FONT_DEFAULT_TEXT);
+
+  this->createTexture();
 }
 
@@ -158 +167 @@
 void GLFont::setText(const char* text)
 {
+  if (this->text)
+    delete []this->text;
   this->text = new char[strlen(text)+1];
   strcpy(this->text, text);
-
-  this->createTexture();
 }
 
@@ -216 +225 @@
 void GLFont::setPosition(int x, int y)
 {
-  this->positionX = x;
-  this->positionY = y;
+  this->textPosSize.x = x;
+  this->textPosSize.y = y;
 }
 
@@ -246 +255 @@
 {
   GLfloat texcoord[4];
-  SDL_Surface* tmpSurf = TTF_RenderText_Blended(this->font, this->text, this->color);
+  SDL_Surface* tmpSurf;
+  if (this->texture)
+    glDeleteTextures(1, &this->texture);
+  tmpSurf = TTF_RenderText_Blended(this->font, this->text, this->color);
   if (tmpSurf)
     this->texture = loadTexture(tmpSurf, texcoord);
@@ -446 +458 @@
 }
 
-
+/**
+   \brief Quick utility function for texture creation 
+   \param input an integer
+   \returns the next bigger 2^n-integer than input
+*/
+int GLFont::powerOfTwo(int input)
+{
+  int value = 1;
+  
+  while ( value < input ) {
+    value <<= 1;
+  }
+  return value;
+}
+
+
+/**
+   \brief checks if the compiled version and the local version of SDL_ttf match.
+   \returns true if match, false otherwise
+*/
 bool GLFont::checkVersion(void)
 {
@@ -475 +506 @@
 }
 
-
-
-/**
-   \brief Quick utility function for texture creation 
-   \param input an integer
-   \returns the next bigger 2^n-integer than input
-*/
-int GLFont::powerOfTwo(int input)
-{
-  int value = 1;
-  
-  while ( value < input ) {
-    value <<= 1;
-  }
-  return value;
-}
 
 

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

@@ -43 +43 @@
 {
  public:
-  GLFont(const char* fontFile, unsigned int fontSize = FONT_DEFAULT_SIZE);
+  GLFont(const char* fontFile);
   virtual ~GLFont();
 
@@ -59 +59 @@
   void createTexture(void);
   
-  void renderText(void);
-  void renderText(const char* text, int x, int y);
-
   virtual void draw(void);
 
  private:
   // information about the Font
-  TTF_Font* font;
-  char* fontFile;
-  char* text;
-  unsigned int fontSize;
-  SDL_Color color;
+  TTF_Font* font;                  //!< The font we use for this.
+  char* fontFile;                  //!< The fontfile from whitch the font was loaded.
+  char* text;                      //!< The text to display
+  unsigned int fontSize;           //!< The size of the font in pixels
+  SDL_Color color;                 //!< The color of the font.
 
   // placement in openGL
-  GLuint texture;
-  SDL_Rect textPosSize;               //!< A SDL-Rectangle representing the position and size of the Text on the screen.
-  int positionX;
-  int positionY;
-  int width;
-  int height;
-  int renderStyle;
-  SDL_Surface* surface;
-  GLfloat* texcoord;
+  GLuint texture;                  //!< A GL-texture to hold the text
+  SDL_Rect textPosSize;            //!< An SDL-Rectangle representing the position and size of the Text on the screen.
+  int renderStyle;                 //!< The Renderstyle
+  GLfloat* texcoord;               //!< Texture-coordinates \todo fix this to have a struct
 
   bool init(const char* fontFile, unsigned int fontSize = FONT_DEFAULT_SIZE);

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

@@ -203 +203 @@
       testFont = new FontSet();
       testFont->buildFont("../data/pictures/font.tga");
-      tmpFont = new GLFont("../data/fonts/refluxed.ttf", 50);
+      tmpFont = new GLFont("../data/fonts/refluxed.ttf");
       this->glmis->step();