Changeset 5123 in orxonox.OLD

Timestamp:

Aug 25, 2005, 2:13:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: patches, to make TextEngine more intuitive

Location:

trunk/src

Files:

• lib/graphics/text_engine.cc (modified) (5 diffs)
• lib/graphics/text_engine.h (modified) (1 diff)
• util/shell.cc (modified) (1 diff)

trunk/src/lib/graphics/text_engine.cc

@@ -143 +143 @@
           tmpText++;
         }
-      this->posSize.w = width;
+      this->width = width;
     }
 }
@@ -168 +168 @@
     this->texture = loadTexture(tmpSurf, &this->texCoord);
 
-  this->posSize.w = tmpSurf->w;
-  this->posSize.h = tmpSurf->h;
+  this->width = tmpSurf->w;
+  this->height = tmpSurf->h;
   SDL_FreeSurface(tmpSurf);
 }
@@ -181 +181 @@
   // transform for alignment.
   if (this->getAlignment() == TEXT_ALIGN_RIGHT)
-    glTranslatef(-this->posSize.w, 0, 0);
+    glTranslatef(-this->width, 0, 0);
   else if (this->getAlignment() == TEXT_ALIGN_CENTER || this->getAlignment() == TEXT_ALIGN_SCREEN_CENTER)
-    glTranslatef(-this->posSize.w/2, 0, 0);
+    glTranslatef(-this->width/2, 0, 0);
 
   // drawing this Text.
@@ -223 +223 @@
 
       glTexCoord2f(this->texCoord.maxU, this->texCoord.minV);
-      glVertex2f(this->getAbsCoor2D().x + this->posSize.w, this->getAbsCoor2D().y  );
+      glVertex2f(this->getAbsCoor2D().x + this->width, this->getAbsCoor2D().y  );
 
       glTexCoord2f(this->texCoord.maxU, this->texCoord.maxV);
-      glVertex2f(this->getAbsCoor2D().x + this->posSize.w, getAbsCoor2D().y + this->posSize.h);
+      glVertex2f(this->getAbsCoor2D().x + this->width, getAbsCoor2D().y + this->height);
 
       glTexCoord2f(this->texCoord.minU, this->texCoord.maxV);
-      glVertex2f(getAbsCoor2D().x, getAbsCoor2D().y + this->posSize.h);
+      glVertex2f(getAbsCoor2D().x, getAbsCoor2D().y + this->height);
 
       glEnd();
@@ -249 +249 @@
   if (this->getBindNode())
     PRINT(0)("is bind to %s; ref=%p\n", this->getBindNode()->getName(), this->getBindNode());
-  PRINT(0)("Relative Position: (%d::%d)\n", this->posSize.x, this->posSize.y);
   PRINT(0)("Color: %0.2f %0.2f %0.2f\n", this->color.x, this->color.y, this->color.z);
 }

trunk/src/lib/graphics/text_engine.h

@@ -139 +139 @@
   GLuint            texture;        //!< A GL-texture to hold the text
   TexCoord          texCoord;       //!< Texture-coordinates @todo fix this to have a struct
-  SDL_Rect          posSize;        //!< An SDL-Rectangle representing the position and size of the Text on the screen.
+  float             height;
+  float             width;
 };
 

trunk/src/util/shell.cc

@@ -360 +360 @@
   delete this->inputLine;
   this->inputLine = addCharLine;
-  this->inputLineText->setText(inputLine);
+  this->inputLineText->setText(inputLine, true);
 }