Changeset 5107 in orxonox.OLD

Timestamp:

Aug 23, 2005, 9:36:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: shell is now properly moving through the bufferlines

Location:

trunk/src

Files:

• lib/graphics/render2D/element_2d.cc (modified) (1 diff)
• util/shell.cc (modified) (5 diffs)
• util/shell.h (modified) (1 diff)

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -712 +712 @@
   {
     tIterator<Element2D>* iterator = this->children->getIterator();
-      //PNode* pn = this->children->enumerate ();
     Element2D* pn = iterator->nextElement();
     while( pn != NULL)

trunk/src/util/shell.cc

@@ -43 +43 @@
 
   this->shellHeight = 400;
+  this->bActive = false;
   this->buffer = new tList<char>;
 
@@ -107 +108 @@
 void Shell::activate()
 {
+  if (this->bActive == true)
+    PRINTF(3)("The shell is already active\n");
+  this->bActive = true;
+
   EventHandler::getInstance()->setState(ES_SHELL);
   this->setRelCoorSoft2D(0, 0, 1, 5);
@@ -113 +118 @@
 void Shell::deactivate()
 {
+  if (this->bActive == false)
+    PRINTF(3)("The shell is already inactive\n");
+  this->bActive = false;
+
   EventHandler::getInstance()->setState(ES_GAME);
   this->setRelCoorSoft2D(0, -400, 1, 5);
@@ -158 +167 @@
     this->bufferText[i] = TextEngine::getInstance()->createText("fonts/Aniron_Bold.ttf", this->textSize, TEXT_DYNAMIC, 255, 0, 0);
     this->bufferText[i]->setAlignment(TEXT_ALIGN_LEFT);
-    this->bufferText[i]->setRelCoor2D(5, (this->textSize + this->lineSpacing)*i);
+    this->bufferText[i]->setRelCoor2D(5, (this->textSize + this->lineSpacing)*(bufferDisplaySize - i -1));
     this->bufferText[i]->setText(NULL);
     this->bufferText[i]->setParent2D(this);
@@ -240 +249 @@
    }
 
-   if (likely(bufferText != NULL))
+   if (this->bActive && likely(bufferText != NULL))
    {
-     Text* moveText = this->bufferText[this->bufferDisplaySize-1];
-     for (int i = this->bufferDisplaySize-1; i > 0; i--)
+     Text* lastText = this->bufferText[this->bufferDisplaySize-1];
+     Vector firstCoord = this->bufferText[0]->getRelCoor2D();
+
+     Text* swapText;
+     Text* moveText = this->bufferText[0];
+     this->bufferText[0]->setRelCoor2D(this->bufferText[1]->getRelCoor2D());
+     for (unsigned int i = 1; i < this->bufferDisplaySize; i++)
      {
-       this->bufferText[i] = this->bufferText[i-1];
+       if ( i < this->bufferDisplaySize-1)
+         this->bufferText[i]->setRelCoor2D(this->bufferText[i+1]->getRelCoor2D());
+       swapText = this->bufferText[i];
+       this->bufferText[i] = moveText;
+       moveText = swapText;
      }
-     this->bufferText[0] = moveText;
+     lastText->setRelCoor2D(firstCoord);
+     this->bufferText[0] = lastText;
+
+     this->bufferText[0]->setText(newLine);
    }
-   this->bufferText[0]->setText(newLine);
 }
 

trunk/src/util/shell.h

@@ -101 +101 @@
     unsigned int           lineSpacing;            //!< The Spacing between lines.
     unsigned int           shellHeight;            //!< The hight of the Shell in Pixels
+    bool                   bActive;                //!< if the shell is active;
 
     char                   bufferArray[10000];     //!< a BUFFER for fast writing