Changeset 5401 in orxonox.OLD for trunk/src

Timestamp:

Oct 18, 2005, 11:57:44 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new Layering system works, now i have to do the check on reparenting, so no lower layers are children of high-layer-parents

Location:

trunk/src

Files:

• lib/graphics/render2D/element_2d.cc (modified) (8 diffs)
• lib/graphics/render2D/element_2d.h (modified) (4 diffs)
• lib/graphics/render2D/render_2d.cc (modified) (4 diffs)
• lib/graphics/render2D/render_2d.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_handler.cc (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)

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

@@ -35 +35 @@
 {
   this->init();
-  Render2D::getInstance()->registerElement2D(this);
   this->setParent2D(NullElement2D::getInstance());
 }
@@ -49 +48 @@
 {
   this->init();
-  Render2D::getInstance()->registerElement2D(this);
 
   // check Parenting, and if ok parent the stuff
@@ -69 +67 @@
  * 2. instance->remove2D(); delete instance;
  *   -> result:
- *    moves its children to the NullParent
+ *    moves its children to the NullElement2D
  *    then deletes the Element.
  */
 Element2D::~Element2D ()
 {
-  // delete what has to be deleted here
-  Render2D::getInstance()->unregisterElement2D(this);
-
   // remove the Node, delete it's children.
   tIterator<Element2D>* iterator = this->children->getIterator();
@@ -203 +198 @@
 void Element2D::setLayer(E2D_LAYER layer)
 {
-  Render2D::getInstance()->moveToLayer(this, layer);
+
+
+
+
   this->layer = layer;
 }
@@ -209 +207 @@
 /**
  * sets the layer onto which this 2D-element is projected to.
- * @param layer the layer @see loadParams
+ * @param layer the layer @see loadParams @see Element2D::charToLayer2D(const char* layer)
  */
 void Element2D::setLayer(const char* layer)
 {
-  if (!strcmp(layer, "top"))
-    this->setLayer(E2D_LAYER_TOP);
-  else if (!strcmp(layer, "medium"))
-    this->setLayer(E2D_LAYER_MEDIUM);
-  else if (!strcmp(layer, "bottom"))
-    this->setLayer(E2D_LAYER_BOTTOM);
-  else if (!strcmp(layer, "below-all"))
-    this->setLayer(E2D_LAYER_BELOW_ALL);
+  this->setLayer(Element2D::charToLayer2D(layer));
 }
 
@@ -771 +762 @@
   else
     PRINT(0)(" -");
-  PRINT(0)("Element2D(%s::%s) - absCoord: (%0.2f, %0.2f), relCoord(%0.2f, %0.2f), direction(%0.2f) - %s\n",
-  this->getClassName(),
-  this->getName(),
-  this->absCoordinate.x,
-  this->absCoordinate.y,
-  this->relCoordinate.x,
-  this->relCoordinate.y,
-  this->getAbsDir2D(),
-  Element2D::parentingModeToChar2D(parentMode));
+  PRINT(0)("Element2D(%s::%s) - absCoord: (%0.2f, %0.2f), relCoord(%0.2f, %0.2f), direction(%0.2f) - %s, layer:%s\n",
+            this->getClassName(),
+            this->getName(),
+            this->absCoordinate.x,
+            this->absCoordinate.y,
+            this->relCoordinate.x,
+            this->relCoordinate.y,
+            this->getAbsDir2D(),
+            Element2D::parentingModeToChar2D(parentMode),
+            Element2D::layer2DToChar(this->layer));
   if (depth >= 2 || depth == 0)
   {
@@ -799 +791 @@
  * ticks the 2d-Element
  * @param dt the time elapsed since the last tick
- */
-void Element2D::tick(float dt)
-{
-
+ *
+ * the element only gets tickt, if it is active.
+ * Be aware, that this walks through the entire Element2D-tree,
+ * searching for Elements to be ticked.
+ */
+void Element2D::tick2D(float dt)
+{
+  if (this->active)
+    this->tick(dt);
+  if (this->children->getSize() > 0)
+  {
+    tIterator<Element2D>* tickIT = children->getIterator();
+    Element2D* tickElem = tickIT->firstElement();
+    while (tickElem != NULL)
+    {
+      tickElem->tick2D(dt);
+      tickElem = tickIT->nextElement();
+    }
+    delete tickIT;
+  }
+}
+
+/**
+ * draws all the Elements from this element2D downwards
+ * @param layer the maximal Layer to draw.
+ */
+void Element2D::draw2D(E2D_LAYER layer) const
+{
+  if (this->visible)
+    this->draw();
+  if (this->children->getSize() >0)
+  {
+    tIterator<Element2D>* drawIT = children->getIterator();
+    Element2D* drawElem = drawIT->firstElement();
+    while (drawElem != NULL)
+    {
+      if (likely(layer >= this->layer))
+        drawElem->draw2D(layer);
+      drawElem = drawIT->nextElement();
+    }
+    delete drawIT;
+  }
 }
 
@@ -853 +883 @@
 }
 
+/**
+ * converts a layer into its corresponding string
+ * @param layer the layer to get the name-String of.
+ * @returns the Name of the Layer (on error the default-layer-string is returned)
+ */
+const char* Element2D::layer2DToChar(E2D_LAYER layer)
+{
+  switch(layer)
+  {
+    case E2D_LAYER_TOP:
+      return "top";
+      break;
+    case E2D_LAYER_MEDIUM:
+      return "medium";
+      break;
+    case E2D_LAYER_BOTTOM:
+      return "bottom";
+      break;
+    case E2D_LAYER_BELOW_ALL:
+      return "below-all";
+      break;
+    default:
+      return layer2DToChar(E2D_DEFAULT_LAYER);
+      break;
+  }
+}
+
+/**
+ * converts a String holding a actual Layer
+ * @param layer the String to convert into a Layer2D
+ * @returns the E2D_LAYER on success, E2D_DEFAULT_LAYER on error.
+ */
+E2D_LAYER Element2D::charToLayer2D(const char* layer)
+{
+  if (!strcmp(layer, "top"))
+    return (E2D_LAYER_TOP);
+  else  if (!strcmp(layer, "medium"))
+    return (E2D_LAYER_MEDIUM);
+  else  if (!strcmp(layer, "bottom"))
+    return (E2D_LAYER_BOTTOM);
+  else  if (!strcmp(layer, "below-all"))
+    return (E2D_LAYER_BELOW_ALL);
+  else
+    return (E2D_DEFAULT_LAYER);
+}
+
 
 

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

@@ -2 +2 @@
  * @file element_2d.h
  * Definition of the 2D elements rendered on top through the GraphicsEngine
- *
- * @todo reimplement it, so it looks just like PNode.
-*/
+ */
 
 #ifndef _ELEMENT_2D_H
@@ -107 +105 @@
     inline float getSizeX2D() const { return this->sizeX; };
     inline float getSizeY2D() const { return this->sizeY; };
+
+  public:
+    virtual void tick(float dt) {};
+    virtual void draw() const = 0;
+    void tick2D(float dt);
+    void draw2D(E2D_LAYER layer) const;
 
     // LIKE PNODE
@@ -178 +182 @@
     static E2D_PARENT_MODE charToParentingMode2D(const char* parentingMode);
 
+    static const char* layer2DToChar(E2D_LAYER layer);
+    static E2D_LAYER charToLayer2D(const char* layer);
+
   private:
     /** tells the child that the parent's Coordinate has changed */
@@ -186 +193 @@
     inline Vector getLastAbsCoor() { return this->lastAbsCoordinate; }
 
-  public:
-    virtual void tick(float dt);
-    virtual void draw() const = 0;
+
 
   private:

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

@@ -34 +34 @@
    this->setClassID(CL_RENDER_2D, "Render2D");
    this->setName("Render2D");
-
-   for (int i = 0; i < E2D_LAYER_COUNT; i++)
-     this->element2DList[i] = new tList<Element2D>;
 }
 
@@ -51 +48 @@
   delete NullElement2D::getInstance();
 
-  for (int i = 0; i < E2D_LAYER_COUNT; i++)
-    delete this->element2DList[i];
-
   Render2D::singletonRef = NULL;
 }
-
-
-/**
- * registers a 2D-element to the 2D-Renderer
- * @param element2D the element to registers
- *
- * do not use this function by yourself, because this is used by Element2D's constructor
- */
-void Render2D::registerElement2D(Element2D* element2D)
-{
-  if (likely(element2D != NULL) && element2D->getLayer() < E2D_LAYER_COUNT && element2D->getLayer() != E2D_LAYER_EXTERN)
-    this->element2DList[element2D->getLayer()]->add(element2D);
-  // DEBUG printf("::::%p, %d %d \n", element2D, element2D->getLayer(), this->element2DList[element2D->getLayer()]->getSize());
-}
-
-
-/**
- * unregisters a 2D-element from the 2D-Renderer
- * @param element2D The element to unregister
- *
- * do not use this function by yourself, because this is used by Element2D's destructor
- */
-void Render2D::unregisterElement2D(Element2D* element2D)
-{
-  if (likely(element2D != NULL) && element2D->getLayer() < E2D_LAYER_COUNT && element2D->getLayer() != E2D_LAYER_EXTERN)
-    this->element2DList[element2D->getLayer()]->remove(element2D);
-    // DEBUG  printf(":::%s layer: %d, %d\n", element2D->getClassName(), element2D->getLayer(), this->element2DList[element2D->getLayer()]->getSize());
-}
-
-
-/**
- * moves an 2D-Element to another Layer
- * @param element2D the Element to move
- * @param to which layer to move it to.
- */
-void Render2D::moveToLayer(Element2D* element2D, E2D_LAYER to)
-{
-  if (element2D == NULL)
-    return;
-
-  if (E2D_LAYER_COUNT  < to)
-    to = E2D_DEFAULT_LAYER;
-  if (likely(element2D->getLayer() != to))
-  {
-    if (element2D->getLayer() != E2D_LAYER_EXTERN)
-      this->element2DList[element2D->getLayer()]->removeFromLast(element2D);
-    if (to != E2D_LAYER_EXTERN)
-      this->element2DList[to]->add(element2D);
-  }
-}
-
 
 /**
@@ -114 +57 @@
 void Render2D::tick(float dt)
 {
-  for (int i = 0; i < E2D_LAYER_COUNT; i++)
-  {
-    tIterator<Element2D>* iterator = this->element2DList[i]->getIterator();
-    Element2D* elem = iterator->firstElement();
-    while (elem != NULL)
-    {
-      if (elem->isActive())
-        elem->tick(dt);
-      elem = iterator->nextElement();
-    }
-    delete iterator;
-  }
+  NullElement2D::getInstance()->tick2D(dt);
 }
 
@@ -135 +67 @@
 {
   GraphicsEngine::enter2DMode();
-
-  if (layer != E2D_LAYER_ALL)
-  {
-    if (likely(layer != E2D_LAYER_EXTERN && this->element2DList[layer]->getSize() > 0))
-    {
-      tIterator<Element2D>* iterator = this->element2DList[layer]->getIterator();
-      Element2D* elem = iterator->firstElement();
-      while (elem != NULL)
-      {
-        if (elem->isVisible())
-          elem->draw();
-        elem = iterator->nextElement();
-      }
-      delete iterator;
-    }
-  }
-  else  // if (layer != E2D_LAYER_ALL)
-  {
-    for (int i = 0; i < E2D_LAYER_COUNT; i++)
-    {
-      if (this->element2DList[i]->getSize() > 0)
-      {
-        tIterator<Element2D>* iterator = this->element2DList[i]->getIterator();
-        Element2D* elem = iterator->firstElement();
-        while (elem != NULL)
-        {
-          if (elem->isVisible())
-            elem->draw();
-          elem = iterator->nextElement();
-        }
-        delete iterator;
-      }
-    }
-  }
+  NullElement2D::getInstance()->draw2D(E2D_LAYER_ALL);
   GraphicsEngine::leave2DMode();
 }

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

@@ -25 +25 @@
     void draw(E2D_LAYER layer) const;
 
-
   private:
-    void registerElement2D(Element2D* element2D);
-    void unregisterElement2D(Element2D* element2D);
-    void moveToLayer(Element2D* element2D, E2D_LAYER to);
-
-
     Render2D();
     static Render2D*              singletonRef;                    //!< Reference to this class.
 
-//  tList<Element2D>*             element2DList;                   //!< List of all valid 2D-elements.
-    tList<Element2D>*             element2DList[E2D_LAYER_COUNT];  //!< List of all valid 2D-elements in the different Layers.
-};
+ };
 
 #endif /* _RENDER_2D_H */

trunk/src/lib/gui/gl_gui/glgui_handler.cc

@@ -14 +14 @@
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
 
 #include "glgui_handler.h"

trunk/src/story_entities/world.cc

@@ -99 +99 @@
   this->path = NULL;
   this->constuctorInit(name, -1);
-  //NullParent* np = NullParent::getInstance();
 }
 
@@ -1027 +1026 @@
                   Vector* relCoor, Quaternion* relDir)
 {
-  NullParent::getInstance();
   if( parentNode != NULL)
     {