Changeset 5120 in orxonox.OLD for trunk/src/lib

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/lib

Files:

• collision_detection/bounding_volume.cc (modified) (2 diffs)
• collision_detection/obb.cc (modified) (1 diff)
• util/list.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;