Changeset 3770 in orxonox.OLD

Timestamp:

Apr 10, 2005, 11:52:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: textEngine rendering again

Location:

orxonox/branches/textEngine/src

Files:

• lib/graphics/font/text_engine.cc (modified) (7 diffs)
• lib/graphics/font/text_engine.h (modified) (1 diff)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/graphics/graphics_engine.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

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

@@ -45 +45 @@
   // initialize this Text
   this->bindNode = NULL;
+  this->font = font;
   this->text = NULL;
   this->texture = 0;
-  this->setType(TEXT_DYNAMIC);
+  this->setType(type);
   this->setPosition(0, 0);
 
@@ -146 +147 @@
   glGetIntegerv(GL_VIEWPORT, viewPort);
 
-  printf("rendering some Text\n");
-  //enter2DMode();
+  GraphicsEngine::enter2DMode();
 
 
@@ -192 +192 @@
       glEnd();
     }
-  else //(if type & TEXT_DYNAMIC)
+  else //(if type == TEXT_DYNAMIC)
     {
       Glyph** glyphArray = this->font->getGlyphArray();
@@ -199 +199 @@
       glTranslatef(pos.x, pos.y, 0);
 
-      printf("%d, %d\n", this->font->getFastTextureID(), glyphArray[65]->displayList);
+      //      printf("%d, %d\n", this->font->getFastTextureID(), glyphArray[65]->displayList);
       char* tmpText = this->text;
       while (*tmpText != '\0')
@@ -211 +211 @@
         }
     }
-  //leave2DMode();
+  GraphicsEngine::leave2DMode();
 }
 
@@ -400 +400 @@
   return rg;
 }
-
-/**
-   \brief entering 2D Mode
-   
-   this is a GL-Projection-mode, that is orthogonal, for placing the font in fron of everything else
-*/
-void Font::enter2DMode(void)
-{
-  SDL_Surface *screen = SDL_GetVideoSurface();
-  
-  /* Note, there may be other things you need to change,
-     depending on how you have your OpenGL state set up.
-  */
-  glPushAttrib(GL_ENABLE_BIT);
-  glDisable(GL_DEPTH_TEST);
-  glDisable(GL_CULL_FACE);
-  glDisable(GL_LIGHTING);  // will be set back when leaving 2D-mode
-  glEnable(GL_TEXTURE_2D);
-
-  /* This allows alpha blending of 2D textures with the scene */
-  glEnable(GL_BLEND);
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-  
-  glViewport(0, 0, screen->w, screen->h);
-  
-  glMatrixMode(GL_PROJECTION);
-  glPushMatrix();
-  glLoadIdentity();
-  
-  glOrtho(0.0, (GLdouble)screen->w, (GLdouble)screen->h, 0.0, 0.0, 1.0);
-  
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  glLoadIdentity();
-  
-  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-}
-
-/**
-   \brief leaves the 2DMode again also \see Font::enter2DMode(void)
-*/
-void Font::leave2DMode(void)
-{
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-
-        glPopAttrib();
-}
-
 
 GLuint Font::createFastTexture(void)
@@ -874 +822 @@
 
   newText = new Text(tmpFont, TEXT_DYNAMIC);
+  textList->add(newText);
+
+  return newText;
 }
 

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

@@ -170 +170 @@
   Glyph* getGlyphMetrics(Uint16 character);
 
-  void enter2DMode(void);
-  void leave2DMode(void);
-
-
   GLuint createFastTexture();
 

orxonox/branches/textEngine/src/lib/graphics/graphics_engine.cc

@@ -167 +167 @@
 
 
+/**
+   \brief entering 2D Mode
+   
+   this is a GL-Projection-mode, that is orthogonal, for placing the font in fron of everything else
+*/
+void GraphicsEngine::enter2DMode(void)
+{
+  SDL_Surface *screen = SDL_GetVideoSurface();
+  
+  /* Note, there may be other things you need to change,
+     depending on how you have your OpenGL state set up.
+  */
+  glPushAttrib(GL_ENABLE_BIT);
+  glDisable(GL_DEPTH_TEST);
+  glDisable(GL_CULL_FACE);
+  glDisable(GL_LIGHTING);  // will be set back when leaving 2D-mode
+  glEnable(GL_TEXTURE_2D);
+
+  /* This allows alpha blending of 2D textures with the scene */
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  
+  glViewport(0, 0, screen->w, screen->h);
+  
+  glMatrixMode(GL_PROJECTION);
+  glPushMatrix();
+  glLoadIdentity();
+  
+  glOrtho(0.0, (GLdouble)screen->w, (GLdouble)screen->h, 0.0, 0.0, 1.0);
+  
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  glLoadIdentity();
+  
+  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+}
+
+/**
+   \brief leaves the 2DMode again also \see Font::enter2DMode(void)
+*/
+void GraphicsEngine::leave2DMode(void)
+{
+  glMatrixMode(GL_MODELVIEW);
+  glPopMatrix();
+  
+  glMatrixMode(GL_PROJECTION);
+  glPopMatrix();
+  
+  glPopAttrib();
+}
 
 

orxonox/branches/textEngine/src/lib/graphics/graphics_engine.h

@@ -37 +37 @@
   static bool texturesEnabled;
 
+  static void enter2DMode(void);
+  static void leave2DMode(void);
+
  private:
   GraphicsEngine();

orxonox/branches/textEngine/src/story_entities/world.cc

@@ -350 +350 @@
             this->glmis->step();
             this->testText = TextEngine::getInstance()->createText("fonts/earth.ttf");
+            testText->setText("test");
+            testText->setBindNode(tn);
 
             break;