Changeset 3735 in orxonox.OLD for orxonox

Timestamp:

Apr 6, 2005, 5:36:38 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: minor

Location:

orxonox/branches/textEngine/src

Files:

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

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

@@ -145 +145 @@
 
   this->setText(FONT_DEFAULT_TEXT);
+  
+  this->setColor(0,255,0);
 
   this->createTexture();
@@ -449 +451 @@
    *  97-122: a-z
    */
+  SDL_Color tmpColor;
+  tmpColor.r = tmpColor.g = tmpColor.b = 0;
   SDL_Surface* tmpSurf =  SDL_CreateRGBSurface(
                                                SDL_SWSURFACE,
-                                               100, 100,
+                                               1000, 300,
                                                32,
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
@@ -466 +470 @@
                                                );
   SDL_Rect tmpRect;
-  tmpRect.x = 0; tmpRect.y = 0; tmpRect.w = 100; tmpRect.h = 100;
-  for ( int i = 65; i <= 90; i++ ) 
+
+  tmpRect.x = 0; tmpRect.y = 0; tmpRect.w = tmpSurf->w; tmpRect.h = tmpSurf->h;
+  SDL_SetClipRect(tmpSurf, &tmpRect);
+  for ( int i = 33; i <= 122; i++ ) 
     {
       SDL_Surface* glyph = NULL;
-      
-      glyph = TTF_RenderGlyph_Blended( this->font, i, this->currentText->color );
-      
+      SDL_Surface* glyph2 = NULL;
+      Glyph tmpGlyph;
+
+      tmpGlyph = getGlyphMetrics(i);
+      if (tmpRect.x+tmpGlyph.width > tmpSurf->w)
+        {
+          tmpRect.x = 0;
+          tmpRect.y = tmpRect.y+tmpGlyph.height+1;
+          printf("x:%d, y:%d\n", tmpRect.x, tmpRect.y);
+        }
+      if (tmpRect.y +tmpGlyph.height > tmpSurf->h)
+        {
+          PRINTF(1)("Protection, so font cannot write over the boundraries error\n");
+          break;
+        }
+
+
+      glyph = TTF_RenderGlyph_Shaded(this->font,
+                                     i,
+                                     this->currentText->color,
+                                     tmpColor);
+
       if( glyph ) {
         char outname[64];
@@ -482 +507 @@
           sprintf( outname, "glyph-%d.bmp", i );
 
+        SDL_SetColorKey (glyph, SDL_SRCCOLORKEY, 1);
+        if (glyph->flags & SDL_SRCALPHA)
+          printf("glyph-flags: %d\n", glyph->flags);
+
         SDL_BlitSurface(glyph, NULL, tmpSurf, &tmpRect);
-        SDL_SaveBMP( tmpSurf, outname );
+        SDL_SaveBMP(tmpSurf, outname);
+        tmpRect.x += tmpGlyph.width+1;
       }
     }

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

@@ -26 +26 @@
 
 
+
+//! A Struct to handel Texture Coordinates for quads
+struct TexCoord
+{
+  float minU;                      //!< The minimum U-Coordinate
+  float maxU;                      //!< The maximum U-Coordinate
+  float minV;                      //!< The minimum V-Coordinate
+  float maxV;                      //!< The maximum V-Coordinate
+};
+
 //! A struct for handling glyphs
 /**
@@ -32 +42 @@
 struct Glyph
 {
+  // Glyph-specific (size and so on)
   Uint16 character;              //!< The character
   int minX;                      //!< The minimum distance from the origin in X
@@ -42 +53 @@
   int bearingY;                  //!< How much is above the Origin
   int advance;                   //!< How big a Glyph would be in monospace-mode
-};
-
-//! A Struct to handel Texture Coordinates for quads
-struct TexCoord
-{
-  float minU;                      //!< The minimum U-Coordinate
-  float maxU;                      //!< The maximum U-Coordinate
-  float minV;                      //!< The minimum V-Coordinate
-  float maxV;                      //!< The maximum V-Coordinate
+  
+  // OpenGL-specific
+  TexCoord texCoord;             //!< A Texture Coordinate for this glyph
 };
 

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

@@ -406 +406 @@
   glNewList (objectList, GL_COMPILE);
  
-  trackManager->drawGraph(.01);
+  //  trackManager->drawGraph(.01);
   trackManager->debug(2);
   glEndList();