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

Timestamp:

May 19, 2006, 11:38:34 PM (18 years ago)

Author:

bensch

Message:

Using MultiLine-Text in the Shell. This is much faster, and Nicer

File:

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

trunk/src/lib/shell/shell.cc

@@ -21 +21 @@
 #include "shell_input.h"
 
-
-#include "text.h"
+#include "multi_line_text.h"
+
 #include "graphics_engine.h"
 #include "material.h"
 #include "event_handler.h"
-#include "debug.h"
-#include "class_list.h"
-
-#include "key_names.h"
-#include <stdarg.h>
-#include <stdio.h>
 
 namespace OrxShell
@@ -137 +131 @@
     std::list<std::string>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer().end();
     bool top = false;
-    for (std::list<Text*>::iterator text = this->bufferText.begin(); text != this->bufferText.end(); ++text)
+    for (std::list<MultiLineText*>::iterator text = this->bufferText.begin(); text != this->bufferText.end(); ++text)
     {
       (*text)->setVisibility(true);
@@ -164 +158 @@
     this->setRelCoorSoft2D(0, -(int)this->shellHeight, 5);
 
-    for (std::list<Text*>::iterator text = this->bufferText.begin(); text != this->bufferText.end(); ++text)
+    for (std::list<MultiLineText*>::iterator text = this->bufferText.begin(); text != this->bufferText.end(); ++text)
       (*text)->setVisibility(false);
     this->bufferOffset = 0;
@@ -257 +251 @@
      * output is routed from Some other Thread or by Changing any Values.
      */
-    std::list<Text*> bufferTextCopy = this->bufferText;
-    for (std::list<Text*>::iterator text = bufferTextCopy.begin(); text != bufferTextCopy.end(); ++text, ++i)
+    std::list<MultiLineText*> bufferTextCopy = this->bufferText;
+    for (std::list<MultiLineText*>::iterator text = bufferTextCopy.begin(); text != bufferTextCopy.end(); ++text, ++i)
     {
       this->resetText(*text, i);
@@ -296 +290 @@
       for (unsigned int i = oldSize; i <= bufferDisplaySize; i++)
       {
-        this->bufferText.push_back(new Text);
+        this->bufferText.push_back(new MultiLineText);
+        this->bufferText.back()->setLineWidth(this->getSizeX2D() * GraphicsEngine::getInstance()->getResolutionX());
+        this->bufferText.back()->setLineSpacing(0);
       }
     }
@@ -308 +304 @@
   void Shell::flush()
   {
-    for (std::list<Text*>::iterator text = this->bufferText.begin(); text != this->bufferText.end(); ++text)
+    for (std::list<MultiLineText*>::iterator text = this->bufferText.begin(); text != this->bufferText.end(); ++text)
     {
       (*text)->setText("");  // remove all chars from the BufferTexts.
@@ -322 +318 @@
   void Shell::printToDisplayBuffer(const std::string& text)
   {
+    // Remove Last Entry and prepend it to the front.
     this->bufferText.push_front(this->bufferText.back());
     this->bufferText.pop_back();
 
-
-    unsigned int i = 0;
-    for (std::list<Text*>::iterator textIt = ++this->bufferText.begin(); textIt != this->bufferText.end(); ++textIt, i++)
-    {
-      (*textIt)->setRelCoorSoft2D(this->calculateLinePosition(i+1), 5);
-    }
-
-    this->bufferText.front()->setRelCoor2D(this->calculateLinePosition(0)- Vector2D(-1000,0));
-    this->bufferText.front()->setRelCoorSoft2D(this->calculateLinePosition(0),10);
+    // Set the new Text.
+    this->bufferText.front()->setText(text);
+
+    // The LineCount will be started here.
+    int linePos = -1;
+
+    // The First Line gets a special Animation
+    this->bufferText.front()->setRelCoor2D(this->calculateLinePosition(linePos)- Vector2D(-1000,0));
+
+    // Move all lines one Entry up.
+    for (std::list<MultiLineText*>::iterator textIt = this->bufferText.begin(); textIt != this->bufferText.end(); ++textIt)
+    {
+      linePos += (*textIt)->getLineCount();
+      (*textIt)->setRelCoorSoft2D(this->calculateLinePosition(linePos), 8);
+    }
+
 
     /*  FANCY EFFECTS :)
@@ -344 +348 @@
     */
 
-    this->bufferText.front()->setText(text);
   }
 
@@ -389 +392 @@
     {
       /// FIXME
-      PRINTF(1)("Should not heappen\n");
+      PRINTF(1)("Should not happen\n");
       it--;
     }
-    for (std::list<Text*>::iterator textIt = this->bufferText.begin(); textIt != this->bufferText.end(); ++textIt)
+    for (std::list<MultiLineText*>::iterator textIt = this->bufferText.begin(); textIt != this->bufferText.end(); ++textIt)
     {
       (*textIt)->setText((*it));
@@ -398 +401 @@
       {
         /// FIXME
-        PRINTF(1)("Should not heappen\n");
+        PRINTF(1)("Should not happen\n");
         break;
       }
@@ -478 +481 @@
   Vector2D Shell::calculateLinePosition(unsigned int lineNumber)
   {
-    return Vector2D(5, (this->textSize + this->lineSpacing)*(this->bufferDisplaySize - lineNumber - 2) + this->textSize);
+    Vector2D val(5, (int)(this->textSize + this->lineSpacing)*(int)((int)this->bufferDisplaySize - (int)lineNumber - (int)2) + (int)this->textSize);
+     val.debug();
+     return val;
   }