Changeset 3458 in orxonox.OLD for orxonox/trunk/src/sfont

Timestamp:

Mar 5, 2005, 11:49:35 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: some minor changes in the framework, and the font is 25% on the go.

Location:

orxonox/trunk/src/sfont

Files:

• fontset.h (modified) (2 diffs)
• glfont.cc (moved) (moved from orxonox/trunk/src/sfont/glfont.c) (6 diffs)
• glfont.h (added)

orxonox/trunk/src/sfont/fontset.h

@@ -9 +9 @@
   loaded by orxonox Texture-class
 */
+
+#ifndef _FONTSET_H
+#define _FONTSET_H
 
 class Texture;
@@ -45 +48 @@
 
 };
+
+
+#endif /* _FONTSET_H */

orxonox/trunk/src/sfont/glfont.cc

@@ -44 +44 @@
 */
 
-/* $Id: glfont.c,v 1.6 2004/01/04 17:41:55 slouken Exp $ */
-
-/* A simple program to test the text rendering feature of the TTF library */
+#include "glfont.h"
+
+
 
 #include <stdlib.h>
@@ -56 +56 @@
 
 #include "../glincl.h"
+#include "../debug.h"
+
 
 #define DEFAULT_PTSIZE  18
@@ -61 +63 @@
 #define NUM_COLORS      256
 
-static char *Usage =
-"Usage: %s [-utf8|-unicode] [-b] [-i] [-u] [-fgcol r,g,b] [-bgcol r,g,b] \
-<font>.ttf [ptsize] [text]\n";
-
+
+
+GLFont::GLFont()
+{
+  this->init("");
+
+}
+GLFont::GLFont(const char* fontFile)
+{
+  this->init(fontFile);
+}
+GLFont::~GLFont()
+{
+  
+}
+
+bool GLFont::init(const char* fontFile)
+{
+  // setting default values.
+  renderStyle = TTF_STYLE_NORMAL;
+
+
+  // Initializing lib-TTF if necesary.
+  if (TTF_WasInit() && TTF_Init() < 0 ) 
+    {
+      PRINTF(1)("Couldn't initialize TTF: %s\n", SDL_GetError());
+      return false;
+    }
+}
+
+bool GLFont::ttfInitialized = false;
+
+bool GLFont::setFont(const char* fonFile)
+{
+
+}
+void GLFont::setText(const char* text)
+{
+
+}
+
+void GLFont::setStyle(char* style)
+{
+  renderStyle = TTF_STYLE_NORMAL;
+  
+  for (int i = 0; i < strlen(style); i++)
+    if (strncmp(style+i, "b", 1) == 0) 
+      this->renderStyle |= TTF_STYLE_BOLD;
+    else if (strncmp(style+i, "i", 1) == 0)
+      this->renderStyle |= TTF_STYLE_ITALIC;
+    else if (strncmp(style+i, "u", 1) == 0) 
+      this->renderStyle |= TTF_STYLE_UNDERLINE;
+
+  // TTF_SetFontStyle(font, renderstyle);
+
+}
+void GLFont::setSize(void)
+{
+
+}
+void GLFont::setPosition(int x, int y)
+{
+
+}
+
+void GLFont::renderText(void)
+{
+
+}
+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();
+}
+
+
+bool GLFont::loadTexture()
+{
+  int w, h;
+  SDL_Surface *image;
+  SDL_Rect area;
+  Uint32 saved_flags;
+  Uint8  saved_alpha;
+  
+  /* Use the surface width and height expanded to powers of 2 */
+  w = powerOfTwo(surface->w);
+  h = powerOfTwo(surface->h);
+  texcoord[0] = 0.0f;                   /* Min X */
+  texcoord[1] = 0.0f;                   /* Min Y */
+  texcoord[2] = (GLfloat)surface->w / w;        /* Max X */
+  texcoord[3] = (GLfloat)surface->h / h;        /* Max Y */
+  
+  image = SDL_CreateRGBSurface(
+                               SDL_SWSURFACE,
+                               w, h,
+                               32,
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
+                               0x000000FF, 
+                               0x0000FF00, 
+                               0x00FF0000, 
+                               0xFF000000
+#else
+                               0xFF000000,
+                               0x00FF0000, 
+                               0x0000FF00, 
+                               0x000000FF
+#endif
+                               );
+  if ( image == NULL ) {
+    return 0;
+  }
+  
+  /* Save the alpha blending attributes */
+  saved_flags = surface->flags&(SDL_SRCALPHA|SDL_RLEACCELOK);
+  saved_alpha = surface->format->alpha;
+  if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) {
+    SDL_SetAlpha(surface, 0, 0);
+  }
+  
+  /* Copy the surface into the GL texture image */
+  area.x = 0;
+  area.y = 0;
+  area.w = surface->w;
+  area.h = surface->h;
+  SDL_BlitSurface(surface, &area, image, &area);
+  
+  /* Restore the alpha blending attributes */
+  if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) {
+    SDL_SetAlpha(surface, saved_flags, saved_alpha);
+  }
+  
+  /* Create an OpenGL texture for the image */
+  glGenTextures(1, &texture);
+  glBindTexture(GL_TEXTURE_2D, texture);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  glTexImage2D(GL_TEXTURE_2D,
+               0,
+               GL_RGBA,
+               w, h,
+               0,
+               GL_RGBA,
+               GL_UNSIGNED_BYTE,
+               image->pixels);
+  SDL_FreeSurface(image); /* No longer needed */
+  
+  //  return texture;
+}
+
+/* Quick utility function for texture creation */
+int GLFont::powerOfTwo(int input)
+{
+  int value = 1;
+  
+  while ( value < input ) {
+    value <<= 1;
+  }
+  return value;
+}
+
+
+/*
+private:
+char* fontFile;
+char* text;
+int positionX;
+int positionY;
+*/
+
+
+
+
+char Usage[100] = "orxonox test" ;
 void SDL_GL_Enter2DMode()
 {
-        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);
 }
 
 void SDL_GL_Leave2DMode()
 {
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-
-        glPopAttrib();
 }
 
@@ -110 +287 @@
 static int power_of_two(int input)
 {
-        int value = 1;
-
-        while ( value < input ) {
-                value <<= 1;
-        }
-        return value;
-}
+}
+
+
 
 GLuint SDL_GL_LoadTexture(SDL_Surface *surface, GLfloat *texcoord)
 {
-        GLuint texture;
-        int w, h;
-        SDL_Surface *image;
-        SDL_Rect area;
-        Uint32 saved_flags;
-        Uint8  saved_alpha;
-
-        /* Use the surface width and height expanded to powers of 2 */
-        w = power_of_two(surface->w);
-        h = power_of_two(surface->h);
-        texcoord[0] = 0.0f;                     /* Min X */
-        texcoord[1] = 0.0f;                     /* Min Y */
-        texcoord[2] = (GLfloat)surface->w / w;  /* Max X */
-        texcoord[3] = (GLfloat)surface->h / h;  /* Max Y */
-
-        image = SDL_CreateRGBSurface(
-                        SDL_SWSURFACE,
-                        w, h,
-                        32,
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
-                        0x000000FF, 
-                        0x0000FF00, 
-                        0x00FF0000, 
-                        0xFF000000
-#else
-                        0xFF000000,
-                        0x00FF0000, 
-                        0x0000FF00, 
-                        0x000000FF
-#endif
-                       );
-        if ( image == NULL ) {
-                return 0;
-        }
-
-        /* Save the alpha blending attributes */
-        saved_flags = surface->flags&(SDL_SRCALPHA|SDL_RLEACCELOK);
-        saved_alpha = surface->format->alpha;
-        if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) {
-                SDL_SetAlpha(surface, 0, 0);
-        }
-
-        /* Copy the surface into the GL texture image */
-        area.x = 0;
-        area.y = 0;
-        area.w = surface->w;
-        area.h = surface->h;
-        SDL_BlitSurface(surface, &area, image, &area);
-
-        /* Restore the alpha blending attributes */
-        if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) {
-                SDL_SetAlpha(surface, saved_flags, saved_alpha);
-        }
-
-        /* Create an OpenGL texture for the image */
-        glGenTextures(1, &texture);
-        glBindTexture(GL_TEXTURE_2D, texture);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexImage2D(GL_TEXTURE_2D,
-                     0,
-                     GL_RGBA,
-                     w, h,
-                     0,
-                     GL_RGBA,
-                     GL_UNSIGNED_BYTE,
-                     image->pixels);
-        SDL_FreeSurface(image); /* No longer needed */
-
-        return texture;
+
 }
 
@@ -223 +327 @@
         dump = 0;
         /* Look for special rendering types */
-        renderstyle = TTF_STYLE_NORMAL;
         rendertype = RENDER_LATIN1;
         /* Default is black and white */
@@ -311 +414 @@
                 return(2);
         }
-        TTF_SetFontStyle(font, renderstyle);
 
         if( dump ) {