Changeset 5367 in orxonox.OLD for trunk/src/lib/graphics/text_engine/font.cc

Timestamp:

Oct 12, 2005, 11:07:22 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: font do no more handle any displayLists of Glyphs

File:

• trunk/src/lib/graphics/text_engine/font.cc (modified) (7 diffs)

trunk/src/lib/graphics/text_engine/font.cc

@@ -106 +106 @@
       if (this->glyphArray[i] != NULL)
       {
-        if (this->glyphArray[i]->displayList != 0)
-          glDeleteLists(this->glyphArray[i]->displayList, 1);
         delete this->glyphArray[i];
       }
@@ -204 +202 @@
   {
     float cx,cy;
-    Glyph* glyph;
+    Glyph* tmpGlyph;
     this->glyphArray = new Glyph*[FONT_HIGHEST_KNOWN_CHAR];
     for (int i = 0; i < FONT_HIGHEST_KNOWN_CHAR; i++)
     {
-      glyph = this->glyphArray[i] = new Glyph;
-      glyph->displayList = glGenLists(1);
-      if (!glIsList(glyph->displayList))
-      {
-        PRINTF(2)("Error creating glList for Font character %c\n", i);
-        this->glyphArray[i] = NULL;
-        delete glyph;
-        continue;
-      }
+      tmpGlyph = this->glyphArray[i] = new Glyph;
       cx=(float)(i%16)/16.0f;                  // X Position Of Current Character
       cy=(float)(i/16)/16.0f;                  // Y Position Of Current Character
-      glNewList(glyph->displayList, GL_COMPILE); // Start Building A List
-      glBegin(GL_QUADS);                           // Use A Quad For Each Character
-      glTexCoord2f(cx, cy+0.001f);            // Texture Coord (Bottom Left)
-      glVertex2d(0,-16);                            // Vertex Coord (Bottom Left)
-      glTexCoord2f(cx+0.0625f, cy+0.001f);    // Texture Coord (Bottom Right)
-      glVertex2i(16,-16);                           // Vertex Coord (Bottom Right)
-      glTexCoord2f(cx+0.0625f, cy+0.0625f);     // Texture Coord (Top Right)
-      glVertex2i(16,0);                            // Vertex Coord (Top Right)
-      glTexCoord2f(cx, cy+0.0625f);             // Texture Coord (Top Left)
-      glVertex2i(0,0);                             // Vertex Coord (Top Left)
-      glEnd();                                     // Done Building Our Quad (Character)
-//       glTranslated(12,0,0);                        // Move To The Right Of The Character
-      glEndList();                                 // Done Building The Display List
-      this->glyphArray[i]->width = 12;
+
+      tmpGlyph->texCoord[0] = cx;
+      tmpGlyph->texCoord[1] = cx+0.0625f;
+      tmpGlyph->texCoord[2] = cy+0.001f;
+      tmpGlyph->texCoord[3] = cy+0.0625f;
+      tmpGlyph->width = 16;
+      tmpGlyph->bearingX = 16;
+      tmpGlyph->bearingY = 16;
+      tmpGlyph->height = 16;
     }
   }
@@ -292 +277 @@
                                                0xFF000000
 #else
-                                                   0xFF000000,
+                                               0xFF000000,
                                                0x00FF0000,
                                                0x0000FF00,
@@ -322 +307 @@
         SDL_BlitSurface(glyphSurf, NULL, tmpSurf, &tmpRect);
         SDL_FreeSurface(glyphSurf);
-              // Outputting Glyphs to BMP-files.
-/*
-        char outname[512];
-        if (i < 10)
-        sprintf( outname, "%s-glyph-00%d.bmp", this->getName(), i );
-        else if (i <100)
-        sprintf( outname, "%s-glyph-0%d.bmp", this->getName(), i );
-        else
-        sprintf( outname, "%s-glyph-%d.bmp", this->getName(), i );
-        SDL_SaveBMP(tmpSurf, outname);*/
-
       }
     }
@@ -409 +383 @@
 {
   Glyph* rg = new Glyph;
-  rg->displayList = 0;
   rg->character = character;
   if (likely (this->font!= NULL))
@@ -485 +458 @@
       if (tmpRect.y + maxLineHeight > tmpSurf->h)
       {
-        PRINTF(1)("Protection, so font cannot write over the boundraries error (this should not heappen\n");
+        PRINTF(1)("Protection, so font cannot write over the boundraries (!!this should not heappen!!)\n");
         break;
       }
@@ -499 +472 @@
 
         SDL_BlitSurface(glyphSurf, NULL, tmpSurf, &tmpRect);
-        TexCoord tmpTexCoord;
-        tmpTexCoord.minU = (float)tmpRect.x/(float)tmpSurf->w;
-        tmpTexCoord.maxU = (float)(tmpRect.x + tmpGlyph->advance)/(float)tmpSurf->w;
-        tmpTexCoord.minV = (float)(tmpRect.y)/(float)tmpSurf->w;
-        tmpTexCoord.maxV = (float)(tmpRect.y+tmpGlyph->height)/(float)tmpSurf->w;
-        tmpGlyph->displayList = glGenLists(1);
-
-        glNewList(tmpGlyph->displayList, GL_COMPILE);
-        glBegin(GL_QUADS);
-        glTexCoord2f(tmpTexCoord.minU, tmpTexCoord.minV);
-        glVertex2d(0, - tmpGlyph->bearingY);
-        glTexCoord2f(tmpTexCoord.minU, tmpTexCoord.maxV);
-        glVertex2d(0, tmpGlyph->height - tmpGlyph->bearingY);
-        glTexCoord2f(tmpTexCoord.maxU, tmpTexCoord.maxV);
-        glVertex2d(tmpGlyph->width, tmpGlyph->height - tmpGlyph->bearingY);
-        glTexCoord2f(tmpTexCoord.maxU, tmpTexCoord.minV);
-        glVertex2d(tmpGlyph->width, - tmpGlyph->bearingY);
-        glEnd();
-        glEndList();
+        tmpGlyph->texCoord[0] = (float)tmpRect.x/(float)tmpSurf->w;
+        tmpGlyph->texCoord[1] = (float)(tmpRect.x + tmpGlyph->advance)/(float)tmpSurf->w;
+        tmpGlyph->texCoord[2] = (float)(tmpRect.y)/(float)tmpSurf->w;
+        tmpGlyph->texCoord[3] = (float)(tmpRect.y+tmpGlyph->height)/(float)tmpSurf->w;
         SDL_FreeSurface(glyphSurf);