Changeset 5380 in orxonox.OLD for branches/2d-recalc/src/lib/graphics/text_engine

Timestamp:

Oct 15, 2005, 1:49:17 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some 2d-adaptions

Location:

branches/2d-recalc/src/lib/graphics/text_engine

Files:

• text.cc (modified) (5 diffs)
• text.h (modified) (3 diffs)

branches/2d-recalc/src/lib/graphics/text_engine/text.cc

@@ -29 +29 @@
 /**
  *  creates a new Text Element
+ * @param textSize the size of the font to be displayed.
  * @param fontFile the Font to render this text in
  * @param type The renderType to display this font in
@@ -39 +40 @@
     this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
   this->setType(type);
-  this->size = textSize;
+  this->setSizeY2Dpx(textSize);
 }
 
@@ -71 +72 @@
   this->blending = TEXT_DEFAULT_BLENDING;
   this->color = TEXT_DEFAULT_COLOR;
-  this->size = TEXT_DEFAULT_SIZE;
+  this->setSizeY2Dpx(TEXT_DEFAULT_SIZE);
   this->setType(TEXT_RENDER_DYNAMIC);
 
@@ -250 +251 @@
           glBegin(GL_QUADS);
           glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[2]);
-          glVertex2d(posX, - tmpGlyph->bearingY * this->size);
+          glVertex2d(posX, - tmpGlyph->bearingY * this->getSizeY2D());
           glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[3]);
-          glVertex2d(posX, (tmpGlyph->height - tmpGlyph->bearingY)*this->size);
+          glVertex2d(posX, (tmpGlyph->height - tmpGlyph->bearingY)*this->getSizeY2D());
           glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[3]);
-          glVertex2d(posX+tmpGlyph->width*this->size, (tmpGlyph->height - tmpGlyph->bearingY)*this->size);
+          glVertex2d(posX+tmpGlyph->width*this->getSizeY2D(), (tmpGlyph->height - tmpGlyph->bearingY)*this->getSizeY2D());
           glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
-          glVertex2d(posX+tmpGlyph->width*this->size, - tmpGlyph->bearingY*this->size);
+          glVertex2d(posX+tmpGlyph->width*this->getSizeY2D(), - tmpGlyph->bearingY*this->getSizeY2D());
           glEnd();
           glEndList();
-          posX += tmpGlyph->width*this->size;
+          posX += tmpGlyph->width*this->getSizeY2D();
         }
         tmpText++;
@@ -298 +299 @@
     PRINT(0)("=== TEXT: %s ===\n", this->externText);
 
-  if (this->getBindNode())
-    PRINT(0)("is bind to %s; ref=%p\n", this->getBindNode()->getName(), this->getBindNode());
   PRINT(0)("Color: %0.2f %0.2f %0.2f\n", this->color.x, this->color.y, this->color.z);
 }

branches/2d-recalc/src/lib/graphics/text_engine/text.h

@@ -55 +55 @@
   public:
     Text(const char* fontFile, unsigned int fontSize = TEXT_DEFAULT_SIZE, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
+    Text(const char* fontFile, float fontSize);
     ~Text();
     void init();
@@ -69 +70 @@
     void setColor(float r, float g, float b) { this->color = Vector(r, g, b); };
     /** sets the Size of the Font */
-    void setSize(float size) { this->size = size; };
-    /** @returns the Size of the Text */
-//    void getSize(float &x, float& y) const { return this->size; };
+    inline void setTextSize(unsigned int size) { this->setSizeY2Dpx(size); };
 
     void setType(TEXT_RENDER_TYPE type);
@@ -92 +91 @@
     Vector            color;          //!< The color of the font.
     float             blending;       //!< The blending intensity.
-    float             size;           //!< The size of the Font.
 
   // placement in openGL