Changeset 221 for code/branches/objecthierarchie/src/ObjectList.cc

Timestamp:

Nov 20, 2007, 2:57:59 AM (17 years ago)

Author:

landauf

Message:

• made ObjectList double-linked to allow forward- and backward-iterating. its now a LI(F/L)O list.

• added an iterator to iterate through object-lists. you can iterate forwards and backwards.

iterating forwards is easy: you get "0 1 2 … last"
iterating backwards is a bit tricky: you still get "0" first, but then "last … 2 1".
thats caused by the structure of the for-loop: you get the first element before the iterator knows if you'll increase or decrease it

File:

• code/branches/objecthierarchie/src/ObjectList.cc (modified) (3 diffs)

code/branches/objecthierarchie/src/ObjectList.cc

@@ -9 +9 @@
     {
         this->first_ = 0;
+        this->last_ = 0;
     }
 
@@ -24 +25 @@
     void ObjectList::add(OrxonoxClass* object)
     {
-        ObjectListElement* temp = this->first_;
-        this->first_ = new ObjectListElement(object);
-        this->first_->next_ = temp;
+        if (!this->last_)
+        {
+            this->last_ = new ObjectListElement(object);
+            this->first_ = this->last_;
+        }
+        else
+        {
+            ObjectListElement* temp = this->last_;
+            this->last_ = new ObjectListElement(object);
+            this->last_->prev_ = temp;
+            temp->next_ = this->last_;
+        }
     }
 
-    void ObjectList::remove(OrxonoxClass* object)
+    void ObjectList::remove(OrxonoxClass* object, bool bIterateForwards)
     {
-        if (!object)
+        if (!object || !this->first_ || !this->last_)
             return;
 
-        if (this->first_->object_ == object)
+        if (this->first_ == this->last_)
         {
-            ObjectListElement* temp = this->first_->next_;
-            delete this->first_;
-            this->first_ = temp;
+            if (this->first_->object_ == object)
+            {
+                delete this->first_;
+                this->first_ = 0;
+                this->last_ = 0;
+            }
 
             return;
         }
 
-        ObjectListElement* temp = this->first_;
-        while (temp->next_)
+        if (bIterateForwards)
         {
-            if (temp->next_->object_ == object)
+            if (this->first_->object_ == object)
             {
-                ObjectListElement* temp2 = temp->next_->next_;
-                delete temp->next_;
-                temp->next_ = temp2;
+                ObjectListElement* temp = this->first_->next_;
+                delete this->first_;
+                this->first_ = temp;
 
                 return;
             }
 
-            temp = temp->next_;
+            ObjectListElement* temp = this->first_;
+            while (temp->next_)
+            {
+                if (temp->next_->object_ == object)
+                {
+                    ObjectListElement* temp2 = temp->next_->next_;
+                    delete temp->next_;
+                    temp->next_ = temp2;
+                    temp2->prev_ = temp;
+
+                    return;
+                }
+
+                temp = temp->next_;
+            }
+        }
+        else
+        {
+            if (this->last_->object_ == object)
+            {
+                ObjectListElement* temp = this->last_->prev_;
+                delete this->last_;
+                this->last_ = temp;
+
+                return;
+            }
+
+            ObjectListElement* temp = this->last_;
+            while (temp->prev_)
+            {
+                if (temp->prev_->object_ == object)
+                {
+                    ObjectListElement* temp2 = temp->prev_->prev_;
+                    delete temp->prev_;
+                    temp->prev_ = temp2;
+                    temp2->next_ = temp;
+
+                    return;
+                }
+
+                temp = temp->prev_;
+            }
         }
     }
@@ -67 +120 @@
         this->object_ = object;
         this->next_ = 0;
+        this->prev_ = 0;
     }