Changeset 8360 in orxonox.OLD

Timestamp:

Jun 14, 2006, 9:46:00 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: more performant Element2D'drawer

Location:

trunk/src/lib/graphics/render2D

Files:

• element_2d.cc (modified) (3 diffs)
• element_2d.h (modified) (3 diffs)

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

@@ -34 +34 @@
 
 #include "shell_command.h"
-SHELL_COMMAND(debug, Element2D, debug2DSC);
+SHELL_COMMAND(debug, Element2D, debug2D);
 
 
@@ -1072 +1072 @@
 /**
  * @brief draws all the Elements from this element2D downwards
- * @param layer the maximal Layer to draw. @see E2D_LAYER
+ * @param from the minimal Layer to draw. @see E2D_LAYER
+ * @param to the maximal Layer to draw. @see E2D_LAYER
+ *
  */
 void Element2D::draw2D(E2D_LAYER from, E2D_LAYER to) const
 {
   if (this->isVisible())
+  {
     this->draw();
-  if (this->children.size() > 0)
+    this->drawChildren(from, to);
+  }
+  else if ((parentMode & E2D_HIDE_CHILDREN_IF_HIDDEN) == 0)
+    this->drawChildren(from, to);
+}
+
+/**
+ * @brief Draws the Children of the Element2D node.
+ * @param param the minimal Layer to draw. @see E2D_LAYER
+ * @param to the maximal Layer to draw. @see E2D_LAYER
+ */
+void Element2D::drawChildren(E2D_LAYER from, E2D_LAYER to) const
+{
+  if (likely(this->children.size() > 0))
   {
     std::list<Element2D*>::const_iterator child;
@@ -1086 +1102 @@
   }
 }
+
 
 /**

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

@@ -69 +69 @@
   // VISIBILITY/ACTIVITY
   E2D_HIDE_CHILDREN_IF_HIDDEN        = 0x1000,    //!< Prohibits the Children from being drawn if this node isn't visible. (used for Draw))
-  E2D_HIDE_IF_PARENT_HIDDEN          = 0x2000,    //!< Prohibits the node from being drawn if the Parent is invisible.
+  //E2D_HIDE_IF_PARENT_HIDDEN          = 0x2000,    //!< Prohibits the node from being drawn if the Parent is invisible.
   E2D_UPDATE_CHILDREN_IF_INACTIVE    = 0x4000,    //!< Updates the Children of this Node even if the Parent is Inactive (note if this's parent is inactive children won't be updated.)
   E2D_STATIC_NODE                    = 0x8000,    //!< Used for nodes that do not have any moving children, and that do not move.
@@ -139 +139 @@
     void tick2D(float dt);
     void draw2D(E2D_LAYER from, E2D_LAYER to) const;
+    void drawChildren(E2D_LAYER from, E2D_LAYER to) const;
 
     // LIKE PNODE
@@ -216 +217 @@
 
     void debug2D (unsigned int depth = 1, unsigned int level = 0) const;
-    void debug2DSC (unsigned int depth = 1, unsigned int level = 0) { this->debug2D(depth, level); }; // Wrapping Function for ShellCommand.
     void debugDraw2D(unsigned int depth = 1, float size = 1.0, Vector color = Vector(1,0,0), unsigned int level = 0) const;