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

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

Files:

• graphics_engine.cc (modified) (5 diffs)
• render2D/element_2d.cc (modified) (1 diff)
• render2D/element_2d.h (modified) (1 diff)
• text_engine/text.cc (modified) (5 diffs)
• text_engine/text.h (modified) (3 diffs)

branches/2d-recalc/src/lib/graphics/graphics_engine.cc

@@ -301 +301 @@
     glMatrixMode(GL_PROJECTION_MATRIX);
     glLoadIdentity();
-    glViewport(0,0,width,height);                                                   // Reset The Current Viewport
+    glViewport(0,0,width,height);    // Reset The Current Viewport
 }
 
@@ -421 +421 @@
   glLoadIdentity();
 
-  glOrtho(0.0, (GLdouble)screen->w, (GLdouble)screen->h, 0.0, 0.0, 1.0);
+  glOrtho(0.0, 1, 1, 0.0, 0.0, 1.0);
 
   glMatrixMode(GL_MODELVIEW);
@@ -565 +565 @@
     this->geTextCFPS->setName("curFPS");
     this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
-    this->geTextCFPS->setAbsCoor2D(5, 15);
+    this->geTextCFPS->setAbsCoor2Dpx(5, 15);
   }
   if (this->geTextMaxFPS == NULL)
@@ -572 +572 @@
     this->geTextMaxFPS->setName("MaxFPS");
     this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
-    this->geTextMaxFPS->setAbsCoor2D(5, 40);
+    this->geTextMaxFPS->setAbsCoor2Dpx(5, 40);
   }
   if (this->geTextMinFPS == NULL)
@@ -579 +579 @@
     this->geTextMinFPS->setName("MinFPS");
     this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
-    this->geTextMinFPS->setAbsCoor2D(5, 65);
+    this->geTextMinFPS->setAbsCoor2Dpx(5, 65);
   }
 }

branches/2d-recalc/src/lib/graphics/render2D/element_2d.cc

@@ -221 +221 @@
   else if (!strcmp(layer, "below-all"))
     this->setLayer(E2D_BELOW_ALL);
+}
+
+
+void Element2D::setSize2Dpx(int x, int y)
+{
+  this->setSize2D((float)(x)/(float)GraphicsEngine::getInstance()->getResolutionX(), (float)(y)/(float)GraphicsEngine::getInstance()->getResolutionY());
+}
+
+
+void Element2D::setSizeX2Dpx(int x)
+{
+  this->setSizeX2D((float)x/(float)GraphicsEngine::getInstance()->getResolutionX());
+}
+
+
+void Element2D::setSizeY2Dpx(int y)
+{
+  this->setSizeY2D((float)y/(float)GraphicsEngine::getInstance()->getResolutionY());
+}
+
+int Element2D::getSizeX2Dpx() const
+{
+  return (int)((float)this->getSizeX2D()*GraphicsEngine::getInstance()->getResolutionX());
+}
+
+int Element2D::getSizeY2Dpx() const
+{
+  return (int)((float)this->getSizeY2D()*GraphicsEngine::getInstance()->getResolutionY());
 }
 

branches/2d-recalc/src/lib/graphics/render2D/element_2d.h

@@ -100 +100 @@
 
     inline void setSize2D(float x, float y) { this->sizeX = x, this->sizeY = y; };
+    void setSize2Dpx(int x, int y);
     inline void setSizeX2D(float x) { this->sizeX = x; };
+    void setSizeX2Dpx(int x);
     inline void setSizeY2D(float y) { this->sizeY = y; };
+    void setSizeY2Dpx(int y);
     inline float getSizeX2D() const { return this->sizeX; };
+    int getSizeX2Dpx() const;
     inline float getSizeY2D() const { return this->sizeY; };
+    int getSizeY2Dpx() const;
 
     // LIKE PNODE

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