Changeset 5418 in orxonox.OLD for trunk/src

Timestamp:

Oct 21, 2005, 1:13:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Text offers its Size to Element2D

Location:

trunk/src/lib

Files:

• graphics/render2D/element_2d.cc (modified) (1 diff)
• graphics/text_engine/font.cc (modified) (1 diff)
• graphics/text_engine/text.cc (modified) (3 diffs)
• graphics/text_engine/text.h (modified) (1 diff)
• gui/gl_gui/glgui_pushbutton.cc (modified) (1 diff)

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -939 +939 @@
   glRotatef(this->getAbsDir2D(), 0,0,1);
   glBegin(GL_LINE_LOOP);
-  glVertex2f(-this->getSizeX2D(), -this->getSizeY2D());
-  glVertex2f(-this->getSizeX2D(), +this->getSizeY2D());
+  glVertex2f(0, 0);
+  glVertex2f(0, +this->getSizeY2D());
   glVertex2f(+this->getSizeX2D(), +this->getSizeY2D());
-  glVertex2f(+this->getSizeX2D(), -this->getSizeY2D());
+  glVertex2f(+this->getSizeX2D(), 0);
   glEnd();
 

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

@@ -215 +215 @@
       tmpGlyph->texCoord[3] = cy+0.0625f;
       tmpGlyph->width = 1;
+      tmpGlyph->advance = 1;
       tmpGlyph->bearingX = 1;
       tmpGlyph->bearingY = 1;

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

@@ -39 +39 @@
     this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
   this->setType(type);
-  this->size = textSize;
+  this->setSizeY2D(this->size = textSize);
 }
 
@@ -147 +147 @@
 
   // setting up the Text-Width if DYNAMIC
-  if (this->type & TEXT_RENDER_DYNAMIC && this->getAlignment() != TEXT_ALIGN_LEFT && this->font != NULL)
-  {
-    Glyph** glyphArray = this->font->getGlyphArray();
+//  if (this->type & TEXT_RENDER_DYNAMIC && this->getAlignment() != TEXT_ALIGN_LEFT && this->font != NULL)
+  const Font* calcSizeFont = this->font;
+  if (calcSizeFont != NULL || (calcSizeFont = Font::getDefaultFont()) != NULL)
+  {
+    Glyph** glyphArray = calcSizeFont->getGlyphArray();
 
     float width = 0;
@@ -159 +161 @@
       while (*tmpText != '\0')
       {
-        if(glyphArray[*tmpText])
+        if(glyphArray[*tmpText] != NULL)
         {
-          width += glyphArray[*tmpText]->width;
+          width += glyphArray[*tmpText]->advance;
         }
         tmpText++;
       }
-      this->width = width;
+      this->setSizeX2D(this->width = width *this->getSizeY2D());
     }
   }

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

@@ -69 +69 @@
     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; };
+    void setSize(float size) { this->setSizeY2D(this->size = size); };
     /** @returns the Size of the Text */
 //    void getSize(float &x, float& y) const { return this->size; };

trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc

@@ -54 +54 @@
 {
   this->label->draw();
-  printf("test");
+//  printf("test");
 }