Changeset 5403 in orxonox.OLD

Timestamp:

Oct 19, 2005, 1:00:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk:
implemented List-addAtIteratorPosition, to add any entity in the Sorted list at a designated position (for include-sorting)
include-sort the list of added Element2D's after their layer-depth

Location:

trunk/src/lib

Files:

• graphics/render2D/element_2d.cc (modified) (6 diffs)
• graphics/render2D/element_2d.h (modified) (1 diff)
• util/list.h (modified) (6 diffs)

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

@@ -201 +201 @@
   if (this->parent != NULL && this->parent->getLayer() > layer)
   {
-    PRINTF(2)("Unable to set this Element2D to layer %s, because it's parent is of higher layer %s\n",
-    Element2D::layer2DToChar(layer), Element2D::layer2DToChar(this->parent->getLayer()));
+    PRINTF(2)("Unable to set %s to layer %s, because it's parent(%s) is of higher layer %s\n",
+              this->getName(),
+              Element2D::layer2DToChar(layer),
+              this->parent->getName(),
+              Element2D::layer2DToChar(this->parent->getLayer()));
     layer = this->parent->getLayer();
   }
@@ -455 +458 @@
  * use this to add a child to this node.
  */
-void Element2D::addChild2D (Element2D* child, int parentingMode)
+void Element2D::addChild2D (Element2D* child)
 {
   if( likely(child->parent != NULL))
@@ -462 +465 @@
     child->parent->children->remove(child);
   }
-  if (parentingMode != E2D_PARENT_NONE)
-    child->parentMode = parentingMode;
   child->parent = this;
   if (likely(this != NULL))
   {
-    this->children->add(child);
+    // ELEMENT SORTING TO LAYERS  //
+    unsigned int childCount = this->children->getSize();
+    tIterator<Element2D>* iterator = this->children->getIterator();
+    Element2D* elem = iterator->firstElement();
+    while (elem != NULL)
+    {
+      if (elem->layer < child->layer)
+      {
+        this->children->addAtIteratorPosition(child, iterator);
+        break;
+      }
+      elem = iterator->nextElement();
+    }
+    delete iterator;
+    if (childCount == this->children->getSize())
+      this->children->add(child);
+    ////////////////////////////////
     if (unlikely(this->layer > child->getLayer()))
     {
-      PRINTF(2)("Layer '%s' of Child %s lower than parents layer '%s'. updating\n",
-      Element2D::layer2DToChar(child->getLayer()), Element2D::layer2DToChar(this->layer));
+      PRINTF(2)("Layer '%s' of Child(%s) lower than parents(%s) layer '%s'. updating...\n",
+      Element2D::layer2DToChar(child->getLayer()),child->getName(), this->getName(), Element2D::layer2DToChar(this->layer));
       child->setLayer(this->layer);
     }
@@ -498 +515 @@
 {
   if (child != NULL)
-  {
     child->remove2D();
-//    this->children->remove(child);
-//    child->parent = NULL;
-  }
 }
 
@@ -517 +530 @@
   while( pn != NULL)
   {
-    NullElement2D::getInstance()->addChild2D(pn, pn->getParentMode2D());
+    NullElement2D::getInstance()->addChild2D(pn);
     pn = iterator->nextElement();
   }
@@ -953 +966 @@
  * @param absCoordinate the cordinate of the Parent (normally Vector(0,0,0))
  */
-NullElement2D::NullElement2D () : Element2D(NULL, E2D_LAYER_TOP)
+NullElement2D::NullElement2D () : Element2D(NULL, E2D_LAYER_BELOW_ALL)
 {
   this->setClassID(CL_NULL_ELEMENT_2D, "NullElement2D");

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

@@ -152 +152 @@
 
 
-    void addChild2D (Element2D* child, int parentingMode = E2D_PARENT_NONE);
+    void addChild2D (Element2D* child);
     void addChild2D (const char* childName);
     void removeChild2D (Element2D* child);

trunk/src/lib/util/list.h

@@ -37 +37 @@
     void add(T* entity);
     void addAtBeginning(T* entity); //!< @todo This should be made with an ENUM
+    void addAtIteratorPosition(T* entity, tIterator<T>* itereator);
     void remove(const T* entity);
     void removeFromLast(const T* entity);
@@ -122 +123 @@
 {
   if( unlikely(entity == NULL)) return;
+
   listElement<T>* el = new listElement<T>;
   el->next = this->first;
@@ -134 +136 @@
 }
 
+/**
+ * add an entity at an iterators position
+ * @param entity the entity to add
+ * @param iterator the iterator get the Positional from
+ *
+ * this works best with an iterator walking with
+ * firstElement() ; nextStep();
+ * or
+ * lastElement(); prevStep();
+ */
+template<class T>
+    inline void tList<T>::addAtIteratorPosition(T* entity, tIterator<T>* iterator)
+{
+  // rule out unusable
+  if (unlikely(entity == NULL))
+    return;
+  // on any error (or next == NULL) add using default add-function
+  if (unlikely(iterator == NULL || iterator->getList() == NULL) ||
+      iterator->tmpEl == NULL || iterator->tmpEl->next == NULL)
+    return this->add(entity);
+  // on prev == NULL add with addAtBeginning-function
+  if (unlikely(iterator->tmpEl->prev == NULL))
+    return addAtBeginning(entity);
+  else
+  {
+    listElement<T>* el = new listElement<T>;
+    el->next = iterator->tmpEl->next;
+    el->curr = entity;
+    el->prev = iterator->tmpEl->prev;
+
+    el->next->prev = el;
+    el->prev->next = el;
+  }
+}
 
 /**
@@ -370 +406 @@
 template<class T> class tIterator
 {
+  friend class tList<T>;
   public:
     tIterator(const tList<T>* list);
@@ -380 +417 @@
     T* seekElement(const T* element);
     T* iteratorElement(const tIterator<T>* iterator);
-    bool compareListPointer(const tList<T>* list);
-
+    bool compareListPointer(const tList<T>* list) const;
+    inline const tList<T>* getList() const { return this->list; };
     /** another way to iterate through the list
      * !! THIS IS NOT MEANT FOR DELETION
@@ -554 +591 @@
 
 template<class T>
-    bool tIterator<T>::compareListPointer(const tList<T>* list)
+    bool tIterator<T>::compareListPointer(const tList<T>* list) const
 {
   return (this->list == list)?true:false;