Changeset 5400 in orxonox.OLD for trunk/src

Timestamp:

Oct 18, 2005, 9:32:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: a new Function to List.
This gives the ability to remove entities from the end of the List.
This is good, if you have an entity just added, and then deleted right afterwards

Location:

trunk/src/lib

Files:

• graphics/render2D/render_2d.cc (modified) (1 diff)
• util/list.h (modified) (2 diffs)

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

@@ -101 +101 @@
   {
     if (element2D->getLayer() != E2D_LAYER_EXTERN)
-      this->element2DList[element2D->getLayer()]->remove(element2D);
+      this->element2DList[element2D->getLayer()]->removeFromLast(element2D);
     if (to != E2D_LAYER_EXTERN)
       this->element2DList[to]->add(element2D);

trunk/src/lib/util/list.h

@@ -38 +38 @@
     void addAtBeginning(T* entity); //!< @todo This should be made with an ENUM
     void remove(const T* entity);
+    void removeFromLast(const T* entity);
     void removeLast();
     void flush();
@@ -159 +160 @@
     }
     this->currentEl = this->currentEl->next;
+  }
+}
+
+/**
+ * remove an entity from the list
+ * @param entity: the entity to be removed
+ *
+ * this algorithm starts at the end of the List, working its way to the front
+ * for finding the right entity.
+ */
+template<class T>
+    inline void tList<T>::removeFromLast(const T* entity)
+{
+  this->currentEl = this->last;
+  while( this->currentEl != NULL)
+  {
+    if( unlikely(this->currentEl->curr == entity))
+    {
+      // erstes element?
+      if( unlikely(this->currentEl->prev == NULL)) this->first = this->currentEl->next;
+      else this->currentEl->prev->next = this->currentEl->next;
+
+      // letztes element?
+      if( unlikely(this->currentEl->next == NULL)) this->last = this->currentEl->prev;
+      else this->currentEl->next->prev = this->currentEl->prev;
+
+      delete this->currentEl;
+      this->size--;
+      return;
+    }
+    this->currentEl = this->currentEl->prev;
   }
 }