Changeset 5120 in orxonox.OLD

Timestamp:

Aug 25, 2005, 12:08:04 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better calculation of the Line-Positions in the Shell

Location:

trunk/src

Files:

• lib/collision_detection/bounding_volume.cc (modified) (2 diffs)
• lib/collision_detection/obb.cc (modified) (1 diff)
• lib/util/list.h (modified) (1 diff)
• util/shell.cc (modified) (3 diffs)
• util/shell.h (modified) (1 diff)

trunk/src/lib/collision_detection/bounding_volume.cc

@@ -30 +30 @@
    this->center = new Vector();
    this->bOrigVertices = true;
+   this->vertices = NULL;
 }
 
@@ -43 +44 @@
 
   if( this->vertices && !this->bOrigVertices)
-  {
-    delete this->vertices;
-    this->vertices = NULL;
-  }
+    delete[] this->vertices;
 }

trunk/src/lib/collision_detection/obb.cc

@@ -32 +32 @@
    this->halfLength = new float[3];
    this->bCollided = false;
-   this->vertices = NULL;
 }
 

trunk/src/lib/util/list.h

@@ -465 +465 @@
  * grabs the iterator entity from another iterator
  * @param iterator the iterator to grab the local currentEl from
- * @returns the grabbed element (current).
+ * @returns the grabbed element (current). NULL if not found, or not defined
+ *
+ * Both iterators must be from the same List!
  */
 template<class T>
     T* tIterator<T>::iteratorElement(const tIterator<T>* iterator)
 {
-  if (iterator != NULL)
+  if (iterator != NULL && iterator->list == this->list)
   {
     this->currentEl = iterator->currentEl;

trunk/src/util/shell.cc

@@ -185 +185 @@
     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)*(bufferDisplaySize - i -1));
+    this->bufferText[i]->setRelCoor2D(calculateLinePosition(i));
     this->bufferText[i]->setText(NULL);
     this->bufferText[i]->setParent2D(this);
@@ -282 +282 @@
   {
     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);
+    this->bufferText[0]->setRelCoorSoft2D(this->calculateLinePosition(1),10);
     for (unsigned int i = 1; i < this->bufferDisplaySize; i++)
     {
       if ( i < this->bufferDisplaySize-1)
-        this->bufferText[i]->setRelCoorSoft2D(this->bufferText[i+1]->getRelCoorSoft2D(),5);
+        this->bufferText[i]->setRelCoorSoft2D(this->calculateLinePosition(i+1),5);
       swapText = this->bufferText[i];
       this  ->bufferText[i] = moveText;
       moveText = swapText;
     }
-    lastText->setRelCoor2D(firstCoord);
+    lastText->setRelCoor2D(this->calculateLinePosition(0));
     this->bufferText[0] = lastText;
 
@@ -739 +738 @@
 }
 
+
+///////////////////////
+// HELPER FUNCTIONS  //
+///////////////////////
+Vector Shell::calculateLinePosition(unsigned int lineNumber)
+{
+  return Vector(5, (this->textSize + this->lineSpacing)*(this->bufferDisplaySize - lineNumber -1), 0);
+}
+
+
+
 /**
  * displays some nice output from the Shell

trunk/src/util/shell.h

@@ -83 +83 @@
     const tList<const char>* Shell::createCompleteList(const tList<BaseObject>* inputList, const char* classNameBegin);
 
+    // helpers //
+    Vector calculateLinePosition(unsigned int lineNumber);
+
 
   private: