Changeset 3692 in orxonox.OLD

Timestamp:

Mar 31, 2005, 2:41:20 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: some minor changes

Location:

orxonox/branches/textEngine/src/lib/graphics/font

Files:

• glfont.cc (modified) (6 diffs)
• glfont.h (modified) (2 diffs)

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

@@ -54 +54 @@
 
 
-#define DEFAULT_PTSIZE  18
+#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
 
@@ -65 +68 @@
 
 }
+
+
 GLFont::GLFont(const char* fontFile)
 {
@@ -76 +81 @@
 }
 
+/**
+   \function to enable TTF_Fonts
+*/
 void GLFont::enableFonts(void)
 {
@@ -91 +99 @@
       
 }
+
+/**
+   \brief function to disable TTF_fonts
+*/
 void GLFont::disableFonts(void)
 {
@@ -168 +180 @@
 }
 
-void GLFont::setSize(void)
-{
-
-}
+void GLFont::setSize(unsigned int fontSize)
+{
+  this->fontSize = fontSize;
+}
+
+void GLFont::setColor(Uint8 r, Uint8 g, Uint8 b)
+{
+  this->color.r = r;
+  this->color.g = g;
+  this->color.b = b;
+}
+
+
+
+void GLFont::createTexture(void)
+{
+  GLfloat texcoord[4];
+  SDL_Surface* tmpSurf = TTF_RenderText_Blended(this->font, this->text, this->color);
+  texture = loadTexture(tmpSurf, texcoord);
+
+}
+
 
 /**
@@ -242 +272 @@
 
 }
+
+
 void GLFont::renderText(const char* text, int x, int y)
 {

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

@@ -47 +47 @@
 
   void setStyle(char* renderStyle);
-  void setSize(void);
+  void setSize(unsigned int fontSize);
+  void setColor(Uint8 r, Uint8 g, Uint8 b);
   void setPosition(int x, int y);
+
+  void createTexture(void);
   
   void renderText(void);
@@ -59 +62 @@
   char* text;
   unsigned int fontSize;
+  SDL_Color color;
 
   // placement in openGL