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

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/shell

Files:

• shell.cc (modified) (9 diffs)
• shell.h (modified) (1 diff)

branches/2d-recalc/src/lib/shell/shell.cc

@@ -81 +81 @@
   this->backgroundMaterial = new Material;
   // Element2D and generals
-  this->setAbsCoor2D(3, -400);
-  this->textSize = 20;
-  this->lineSpacing = 0;
+  this->textSize = .001;
+  this->lineSpacing = .001;
   this->bActive = false;
   this->fontFile = new char[strlen(SHELL_DEFAULT_FONT)+1];
@@ -93 +92 @@
   this->setTextColor(SHELL_DEFAULT_TEXT_COLOR);
   this->setBackgroundColor(SHELL_DEFAULT_BACKGROUND_COLOR);
-
+  this->setRelCoor2D(0,-this->shellHeight, 0);
   // register the shell at the ShellBuffer
   ShellBuffer::getInstance()->registerShell(this);
@@ -128 +127 @@
 
   EventHandler::getInstance()->setState(ES_SHELL);
-  this->setRelCoorSoft2D(0, 0, 1, 5);
+  this->setRelCoorSoft2D(0, 0, 0, 5);
 
   tIterator<char>* bufferIT = ShellBuffer::getInstance()->getBuffer()->getIterator();
@@ -250 +249 @@
   if (this->shellInput != NULL)
   {
-    this->shellInput->setSize(this->textSize);
+    this->shellInput->setSizeY2D(this->textSize);
     this->shellInput->setColor(this->textColor[0], this->textColor[1], this->textColor[2]);
     this->shellInput->setBlending(this->textColor[3]);
-    this->shellInput->setRelCoor2D(5, (this->textSize + this->lineSpacing)*this->bufferDisplaySize + this->textSize);
+    this->shellInput->setRelCoor2D(.005, (this->textSize + this->lineSpacing)*this->bufferDisplaySize + this->textSize);
   }
 
@@ -262 +261 @@
       if (this->bufferText[i] != NULL)
       {
-        this->bufferText[i]->setSize(this->textSize);
+        this->bufferText[i]->setSizeY2D(this->textSize);
         this->bufferText[i]->setColor(this->textColor[0], this->textColor[1], this->textColor[2]);
         this->bufferText[i]->setBlending(this->textColor[3]);
@@ -269 +268 @@
     }
   }
-  this->shellHeight = (this->textSize + this->lineSpacing) * (bufferDisplaySize+1);
-
+  this->shellHeight = (float)(this->textSize + this->lineSpacing) * (bufferDisplaySize+1.0);
 }
 
@@ -365 +363 @@
   */
     lastText->setRelDir2D(-90);
-    lastText->setRelDirSoft2D(0, 10);
-    lastText->setRelCoor2D(this->calculateLinePosition(0)- Vector(-1000,0,0));
+    lastText->setRelDirSoft2D(0, 1);
+    lastText->setRelCoor2D(this->calculateLinePosition(0)- Vector(-1,0,0));
     lastText->setRelCoorSoft2D(this->calculateLinePosition(0),10);
 
@@ -478 +476 @@
 
   glTexCoord2f(1, 0);
-  glVertex2f(GraphicsEngine::getInstance()->getResolutionX() - this->getAbsCoor2D().x, this->getAbsCoor2D().y  );
+  glVertex2f(1 - this->getAbsCoor2D().x, this->getAbsCoor2D().y  );
 
   glTexCoord2f(0, 1);
@@ -484 +482 @@
 
   glTexCoord2f(1, 1);
-  glVertex2f(GraphicsEngine::getInstance()->getResolutionX() - this->getAbsCoor2D().x, this->getAbsCoor2D().y + this->shellHeight);
+  glVertex2f(1 - this->getAbsCoor2D().x, this->getAbsCoor2D().y + this->shellHeight);
 
   glEnd();

branches/2d-recalc/src/lib/shell/shell.h

@@ -92 +92 @@
     // GENERAL
     bool                     bActive;                //!< If the shell is active.
-    unsigned int             shellHeight;            //!< The hight of the Shell in Pixels.
-    unsigned int             lineSpacing;            //!< The Spacing between lines.
-    unsigned int             textSize;               //!< The size of the text.
+    float                    shellHeight;            //!< The hight of the Shell in Pixels.
+    float                    lineSpacing;            //!< The Spacing between lines.
+    float                    textSize;               //!< The size of the text.
     float                    textColor[4];           //!< The text's color [r,g,b,a].
     char*                    fontFile;               //!< The file containing the font.