Changeset 3747 in orxonox.OLD

Timestamp:

Apr 7, 2005, 4:21:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/braches/textEngine: now shows single char

Location:

orxonox/branches/textEngine/src/lib/graphics/font

Files:

• glfont.cc (modified) (11 diffs)
• glfont.h (modified) (3 diffs)

orxonox/branches/textEngine/src/lib/graphics/font/glfont.cc

@@ -112 +112 @@
   this->fontFile = NULL;
   this->glyphArray = NULL;
+  this->fastTextureID = 0;
 
   this->currentText = new Text;
@@ -120 +121 @@
   
   this->setSize(fontSize);
+  this->setType(TEXT_DYNAMIC);
   
   this->currentText->renderStyle = TTF_STYLE_NORMAL;
@@ -134 +136 @@
   this->createTexture();
 
-  this->createFastTexture();
+  this->fastTextureID = this->createFastTexture();
 }
 
@@ -169 +171 @@
 }
 
+/**
+   \brief sets the Type of this Text
+   \param type the type to set.
+*/
+void GLFont::setType(int type)
+{
+  this->currentText->type = type;
+}
+
 
 /**
@@ -244 +255 @@
 void GLFont::draw(void)
 {
+  // storing all the Transformation Matrices.
   GLdouble modMat[16];
   GLint viewPort[4];
@@ -251 +263 @@
   this->enter2DMode();
 
-
+  // setting the Position of this Text.
   Vector pos;
   if (this->currentText->bindNode)
@@ -271 +283 @@
       pos.z = 0;
     }
-  glBindTexture(GL_TEXTURE_2D, this->currentText->texture);
-  glEnable(GL_TEXTURE_2D);
-  glBegin(GL_QUADS);
-  
-  glTexCoord2f(this->currentText->texCoord.minU, this->currentText->texCoord.minV);
-  glVertex2i(pos.x,   pos.y  );
-
-  glTexCoord2f(this->currentText->texCoord.maxU, this->currentText->texCoord.minV);
-  glVertex2i(pos.x + this->currentText->textPosSize.w, pos.y  );
-
-  glTexCoord2f(this->currentText->texCoord.maxU, this->currentText->texCoord.maxV);
-  glVertex2i(pos.x + this->currentText->textPosSize.w, pos.y + this->currentText->textPosSize.h);
-
-  glTexCoord2f(this->currentText->texCoord.minU, this->currentText->texCoord.maxV);
-  glVertex2i(pos.x, pos.y + this->currentText->textPosSize.h);
-
-  glEnd();
-
+
+  // drawing this Text.
+  if(currentText->type == TEXT_STATIC)
+    {
+      glBindTexture(GL_TEXTURE_2D, this->currentText->texture);
+      glEnable(GL_TEXTURE_2D);
+      glBegin(GL_QUADS);
+      
+      glTexCoord2f(this->currentText->texCoord.minU, this->currentText->texCoord.minV);
+      glVertex2i(pos.x,   pos.y  );
+      
+      glTexCoord2f(this->currentText->texCoord.maxU, this->currentText->texCoord.minV);
+      glVertex2i(pos.x + this->currentText->textPosSize.w, pos.y  );
+      
+      glTexCoord2f(this->currentText->texCoord.maxU, this->currentText->texCoord.maxV);
+      glVertex2i(pos.x + this->currentText->textPosSize.w, pos.y + this->currentText->textPosSize.h);
+      
+      glTexCoord2f(this->currentText->texCoord.minU, this->currentText->texCoord.maxV);
+      glVertex2i(pos.x, pos.y + this->currentText->textPosSize.h);
+      
+      glEnd();
+    }
+  else //(if currentText->type & TEXT_DYNAMIC)
+    {
+      glBindTexture(GL_TEXTURE_2D, this->fastTextureID);
+      //      glEnable(GL_TEXTURE_2D);
+      glTranslatef(pos.x, pos.y, 0);
+
+      printf("%d, %d\n", this->fastTextureID, glyphArray[65]->displayList);
+      glCallList(glyphArray[65]->displayList);
+    }
   this->leave2DMode();
 }
@@ -443 +468 @@
 
   // setting default values. (maybe not needed afterwards)
-  //  SDL_Color tmpColor;  tmpColor.r = tmpColor.g = tmpColor.b = 0;
+  SDL_Color tmpColor;  tmpColor.r = tmpColor.g = tmpColor.b = 0;
   // Surface definition.
   SDL_Rect tmpRect; // this represents a Rectangle for blitting.
@@ -490 +515 @@
             }
           // reading in the new Glyph
-          glyphSurf = TTF_RenderGlyph_Blended(this->font,
+          glyphSurf = TTF_RenderGlyph_Shaded(this->font,
                                               i,
-                                              this->currentText->color);
-          //                                     tmpColor);
+                                              this->currentText->color,
+          tmpColor);
           if( glyphSurf ) 
             {
@@ -503 +528 @@
               tmpTexCoord.maxV = (float)(tmpRect.y+tmpGlyph->height)/(float)tmpSurf->w;
               tmpGlyph->displayList = glGenLists(1);
+
               glNewList(tmpGlyph->displayList, GL_COMPILE);
               glBegin(GL_QUADS);
@@ -508 +534 @@
               glVertex2d(0, 0);
               glTexCoord2f(tmpTexCoord.minU, tmpTexCoord.maxV);
-              glVertex2d(0, 1);
+              glVertex2d(0, tmpRect.y);
               glTexCoord2f(tmpTexCoord.maxU, tmpTexCoord.maxV);
-              glVertex2d(1, 1);
+              glVertex2d(tmpRect.x, tmpRect.y);
               glTexCoord2f(tmpTexCoord.maxU, tmpTexCoord.minV);
-              glVertex2d(1, 0);
+              glVertex2d(tmpRect.x, 0);
               glEnd();
               glEndList();

orxonox/branches/textEngine/src/lib/graphics/font/glfont.h

@@ -26 +26 @@
 
 #define FONT_HIGHEST_KNOWN_CHAR 128                  //!< The highest character known to the textEngine.
+
+#define TEXT_STATIC             0                    //!< Static Text
+#define TEXT_DYNAMIC            1                    //!< Dynamic Text
+/**
+ * STATIC means: a font, that is only one GL-face.
+ ** it is very fast, and can be used for all text
+ ** that does not have to be changed anymore, or if
+ ** the the text should look very nice
+ * DYNAMIC means: a very fast font, that will is build
+ ** from multiple quads.
+ ** Use this type, if you want to create fast changing
+ ** text like a counter.
+ */
 
 
@@ -78 +91 @@
   // text
   void setBindNode(PNode* bindNode);
+  void setType(int type);
   void setText(const char* text);
   void setStyle(char* renderStyle);
@@ -95 +109 @@
   
   Glyph** glyphArray;               //!< An Array of all the Glyphs stored in the Array of Glyphs.
+  GLuint fastTextureID;             //!< The fast textureID.
 
   //! Represents one textElement.
   struct Text
   {
+    int type;                   //!< The type of this Font.
     char* text;                      //!< The text to display
     SDL_Color color;                 //!< The color of the font.