Changeset 5420 in orxonox.OLD for trunk/src/lib/shell/shell.cc

Timestamp:

Oct 22, 2005, 1:57:29 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Font is now Right, and the Rendering 'should be' faster.

File:

• trunk/src/lib/shell/shell.cc (modified) (7 diffs)

trunk/src/lib/shell/shell.cc

@@ -84 +84 @@
   this->textSize = 20;
   this->lineSpacing = 0;
-  this->bActive = false;
+  this->bActive = true;
   this->fontFile = new char[strlen(SHELL_DEFAULT_FONT)+1];
   strcpy(this->fontFile, SHELL_DEFAULT_FONT);
@@ -94 +94 @@
   this->setBackgroundColor(SHELL_DEFAULT_BACKGROUND_COLOR);
 
+  this->deactivate();
   // register the shell at the ShellBuffer
   ShellBuffer::getInstance()->registerShell(this);
@@ -135 +136 @@
   {
     this->bufferText[i]->setText(bufferIT->getCurrent(), true);
+    this->bufferText[i]->setVisibility(true);
     bufferIT->prevStep();
   }
@@ -159 +161 @@
     this->bufferText[i]->setText(bufferIT->getCurrent(), false);
     bufferIT->prevStep();
+    this->bufferText[i]->setVisibility(false);
   }
   delete bufferIT;
@@ -254 +257 @@
     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(5, (this->textSize + this->lineSpacing)*(this->bufferDisplaySize));
   }
 
@@ -271 +274 @@
   }
   this->shellHeight = (this->textSize + this->lineSpacing) * (bufferDisplaySize+1);
-
 }
 
@@ -501 +503 @@
 Vector Shell::calculateLinePosition(unsigned int lineNumber)
 {
-  return Vector(5, (this->textSize + this->lineSpacing)*(this->bufferDisplaySize - lineNumber -1) + this->textSize, 0);
+  return Vector(5, (this->textSize + this->lineSpacing)*(this->bufferDisplaySize - lineNumber - 2) + this->textSize, 0);
 }