Changeset 5118 in orxonox.OLD for trunk

Timestamp:

Aug 24, 2005, 2:45:46 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: semi-active buffers

Location:

trunk/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (2 diffs)
• lib/util/list.h (modified) (4 diffs)
• util/shell.cc (modified) (6 diffs)
• util/shell.h (modified) (3 diffs)

trunk/src/lib/coord/p_node.cc

@@ -598 +598 @@
       PRINTF(4)("NullParent::update - (%f, %f, %f)\n", this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
       if (this->bRelCoorChanged)
+      {
+        this->prevRelCoordinate = this->relCoordinate;
         this->absCoordinate = this->relCoordinate;
+      }
       if (this->bRelDirChanged)
+      {
+        this->prevRelDirection = this->relDirection;
         this->absDirection = this->getAbsDir () * this->relDirection;
+      }
     }
 

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

@@ -618 +618 @@
 
 
-    if( this->parentMode & PNODE_LOCAL_ROTATE && this->bRelDirChanged)
+    if( this->parentMode & E2D_PARENT_LOCAL_ROTATE && this->bRelDirChanged)
     {
       /* update the current absDirection - remember * means rotation around sth.*/
@@ -677 +677 @@
     PRINTF(5)("Element2D::update - (%f, %f, %f)\n", this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
     if (this->bRelCoorChanged)
+    {
+      this->prevRelCoordinate = this->relCoordinate;
       this->absCoordinate = this->relCoordinate;
+    }
     if (this->bRelDirChanged)
+    {
+      this->prevRelDirection = this->relDirection;
       this->absDirection = this->getAbsDir2D() * this->relDirection;
+    }
   }
 

trunk/src/lib/util/list.h

@@ -333 +333 @@
 
     T* firstElement();
+    T* lastElement();
     T* nextElement();
+    T* prevElement();
     T* seekElement(T* element);
     T* iteratorElement(const tIterator<T>* iterator);
@@ -375 +377 @@
     inline tIterator<T>::~tIterator ()
 {
-  this->currentEl = NULL;
 }
 
@@ -382 +383 @@
 {
   this->currentEl = this->list->first;
-  if (this->currentEl == NULL)
-    return NULL;
-  else
+  if (this->currentEl != NULL)
     return this->currentEl->curr;
+  else
+    return NULL;
+}
+
+template<class T>
+    inline T* tIterator<T>::lastElement ()
+{
+  this->currentEl = this->list->last;
+  if (this->currentEl != NULL)
+    return this->currentEl->curr;
+  else
+    return NULL;
 }
 
@@ -405 +416 @@
     return NULL;
 }
+
+/**
+ *  use it to iterate backwards through the list
+ * @returns next list element
+ */
+template<class T>
+    inline T* tIterator<T>::prevElement ()
+{
+  if( this->currentEl == NULL)
+    return NULL;
+
+  this->currentEl = this->currentEl->prev;
+  if (this->currentEl != NULL)
+    return this->currentEl->curr;
+  else
+    return NULL;
+}
+
 
 /**

trunk/src/util/shell.cc

@@ -45 +45 @@
   this->bActive = false;
   this->buffer = new tList<char>;
+  this->bufferIterator = this->buffer->getIterator();
 
   this->textSize = 15;
@@ -53 +54 @@
   this->setBufferSize(100);
   this->bufferDisplaySize = 10;
-  this->setBufferDisplaySize(10);
   this->setAbsCoor2D(3, -400);
   this->delayed = 0;
@@ -90 +90 @@
 
   // delete all the Chars in the Buffers
-  tIterator<char>* charIterator = this->buffer->getIterator();
-  char* charElem = charIterator->firstElement();
+  char* charElem = this->bufferIterator->firstElement();
   while (charElem != NULL)
   {
     delete charElem;
-    charElem = charIterator->nextElement();
-  }
-  delete charIterator;
+    charElem = this->bufferIterator->nextElement();
+  }
+  delete this->bufferIterator;
 
 //  if (this->completionList != NULL)
@@ -114 +113 @@
   EventHandler::getInstance()->setState(ES_SHELL);
   this->setRelCoorSoft2D(0, 0, 1, 5);
+
+  this->bufferIterator->lastElement();
+  for (int i = 0; i < this->bufferDisplaySize; i++)
+    this->bufferText[i]->setText(this->bufferIterator->prevElement());
 }
 
@@ -124 +127 @@
   EventHandler::getInstance()->setState(ES_GAME);
   this->setRelCoorSoft2D(0, -400, 1, 5);
+
 }
 
@@ -249 +253 @@
    }
 
-   if (this->bActive && likely(bufferText != NULL))
+   if (this->bActive)
    {
-     Text* lastText = this->bufferText[this->bufferDisplaySize-1];
-     Vector firstCoord = this->bufferText[0]->getRelCoorSoft2D();
-
-     Text* swapText;
-     Text* moveText = this->bufferText[0];
-     this->bufferText[0]->setRelCoorSoft2D(this->bufferText[1]->getRelCoorSoft2D(), 5);
-     for (unsigned int i = 1; i < this->bufferDisplaySize; i++)
-     {
-       if ( i < this->bufferDisplaySize-1)
-         this->bufferText[i]->setRelCoorSoft2D(this->bufferText[i+1]->getRelCoorSoft2D(),5);
-       swapText = this->bufferText[i];
-       this->bufferText[i] = moveText;
-       moveText = swapText;
-     }
-     lastText->setRelCoor2D(firstCoord);
-     this->bufferText[0] = lastText;
-
-     this->bufferText[0]->setText(newLine);
+     this->printToDisplayBuffer(newLine);
    }
+}
+
+/**
+ * prints out some text to the input-buffers
+ * @param text the text to output.
+ */
+void Shell::printToDisplayBuffer(const char* text)
+{
+  if(likely(bufferText != NULL))
+  {
+    Text* lastText = this->bufferText[this->bufferDisplaySize-1];
+    Vector firstCoord = this->bufferText[0]->getRelCoorSoft2D();
+
+    Text* swapText;
+    Text* moveText = this->bufferText[0];
+    this->bufferText[0]->setRelCoorSoft2D(this->bufferText[1]->getRelCoorSoft2D(), 5);
+    for (unsigned int i = 1; i < this->bufferDisplaySize; i++)
+    {
+      if ( i < this->bufferDisplaySize-1)
+        this->bufferText[i]->setRelCoorSoft2D(this->bufferText[i+1]->getRelCoorSoft2D(),5);
+      swapText = this->bufferText[i];
+      this  ->bufferText[i] = moveText;
+      moveText = swapText;
+    }
+    lastText->setRelCoor2D(firstCoord);
+    this->bufferText[0] = lastText;
+
+    this->bufferText[0]->setText(text);
+  }
 }
 

trunk/src/util/shell.h

@@ -15 +15 @@
 class Text;
 template<class T> class tList;
+template<class T> class tIterator;
 
 //! A class that is able to redirect all output to a openGL-Shell, and that one can use to input some commands
@@ -48 +49 @@
     static bool addBufferLineStatic(const char* line, ...);
     void addBufferLine(const char* line, va_list arg);
+    void printToDisplayBuffer(const char* text);
     void moveBuffer(int lineCount);
     const char* getBufferLine(unsigned int lineNumber);
@@ -96 +98 @@
 
     tList<char>*           buffer;                 //!< A list of stored char-arrays(strings) to store the history
+    tIterator<char>*       bufferIterator;         //!< An iterator for the Shells main buffer.
 
     Text**                 bufferText;             //!< A list of stored bufferTexts for the display of the buffer