Changeset 7429 in orxonox.OLD for trunk/src

Timestamp:

Apr 29, 2006, 1:21:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Font Renders nicer now

Location:

trunk/src/lib

Files:

• graphics/text_engine/font.cc (modified) (3 diffs)
• graphics/text_engine/text.cc (modified) (1 diff)
• lang/base_object.cc (modified) (1 diff)
• lang/class_list.cc (modified) (1 diff)
• lang/class_list.h (modified) (1 diff)

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

@@ -380 +380 @@
                      &miY, &maY,
                      &adv);
+    printf("%c:: %d %d %d %d %d\n", rg->character, miX, maX, miY, maY, adv);
     rg->minX = (float)miX / (float)this->renderSize;
     rg->maxX = (float)maX / (float)this->renderSize;
@@ -471 +472 @@
         tmpRect.y = tmp;
 
-        tmpGlyph->texCoord[0] = (float)(tmpRect.x)/(float)tmpSurf->w;
-        tmpGlyph->texCoord[1] = (float)(tmpRect.x + tmpGlyph->width*(float)this->renderSize)/(float)tmpSurf->w;
+        tmpGlyph->texCoord[0] = (float)((float)tmpRect.x + tmpGlyph->minX*(float)this->renderSize)/(float)tmpSurf->w;
+        tmpGlyph->texCoord[1] = (float)((float)tmpRect.x + tmpGlyph->maxX*(float)this->renderSize)/(float)tmpSurf->w;
         tmpGlyph->texCoord[2] = (float)(tmpRect.y)/(float)tmpSurf->w;
-        tmpGlyph->texCoord[3] = (float)(tmpRect.y+this->getMaxHeight())/(float)tmpSurf->w;
+        tmpGlyph->texCoord[3] = (float)((float)tmpRect.y+(float)this->getMaxHeight())/(float)tmpSurf->w;
         SDL_FreeSurface(glyphSurf);
-        tmpRect.x += (int)(tmpGlyph->advance * this->renderSize)+1;
+        tmpRect.x += glyphSurf->w+1; //(int)(tmpGlyph->advance * this->renderSize);
 
         /*
@@ -492 +493 @@
   }
   // outputting the GLYPH-table
-  //   char outName[1024];
-  //   sprintf( outName, "%s-glyphs.bmp", this->getName());
-  //   SDL_SaveBMP(tmpSurf, outName);
+     char outName[1024];
+     sprintf( outName, "%s-glyphs.bmp", this->getName());
+     SDL_SaveBMP(tmpSurf, outName);
 
   if (this->setSurface(tmpSurf))

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

@@ -164 +164 @@
       {
         glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
-        glVertex2d(posX+tmpGlyph->width*this->getSizeY2D(), 0);
+        glVertex2d(posX+tmpGlyph->advance*this->getSizeY2D(), 0);
 
         glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[3]);
-        glVertex2d(posX+tmpGlyph->width*this->getSizeY2D(), this->getSizeY2D());
+        glVertex2d(posX+tmpGlyph->advance*this->getSizeY2D(), this->getSizeY2D());
 
         glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[3]);
-        glVertex2d(posX, this->getSizeY2D());
+        glVertex2d(posX+tmpGlyph->minX*this->getSizeY2D(), this->getSizeY2D());
 
         glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[2]);
-        glVertex2d(posX, 0);
+        glVertex2d(posX+tmpGlyph->minX*this->getSizeY2D(), 0);
 
         posX += tmpGlyph->advance * this->getSizeY2D();

trunk/src/lib/lang/base_object.cc

@@ -41 +41 @@
   this->xmlElem = NULL;
 
-//  ClassList::addToClassList(this, this->classID, "BaseObject");
+  //ClassList::addToClassList(this, this->classID, "BaseObject");
 }
 

trunk/src/lib/lang/class_list.cc

@@ -21 +21 @@
 #include "compiler.h"
 #include "debug.h"
-#include <string.h>
 #include <cmath>
-#include <algorithm>
+
 using namespace std;
 

trunk/src/lib/lang/class_list.h

@@ -11 +11 @@
 #include <list>
 #include <string>
-#ifndef NULL
-#define NULL     0    //!< NULL
-#endif
 
 // FORWARD DECLARATION