Changeset 5402 in orxonox.OLD

Timestamp:

Oct 19, 2005, 12:10:26 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: promised checking should be working now.

Location:

trunk/src/lib/graphics/render2D

Files:

• element_2d.cc (modified) (7 diffs)
• element_2d.h (modified) (1 diff)

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

@@ -45 +45 @@
  * itself. Otherwise it would result in an endless Loop.
  */
-Element2D::Element2D (Element2D* parent)
+Element2D::Element2D (Element2D* parent, E2D_LAYER layer)
 {
   this->init();
-
+  this->layer = layer;
   // check Parenting, and if ok parent the stuff
   if (this->parent != NULL)
@@ -129 +129 @@
 void Element2D::loadParams(const TiXmlElement* root)
 {
+  // ELEMENT2D-native settings.
   LoadParam<Element2D>(root, "alignment", this, &Element2D::setAlignment)
       .describe("loads the alignment: (either: center, left, right or screen-center)");
@@ -142 +143 @@
 
 
-  // PNode-style:
+// PNode-style:
   LoadParam<Element2D>(root, "rel-coor", this, &Element2D::setRelCoor2D)
       .describe("Sets The relative position of the Node to its parent.");
@@ -198 +199 @@
 void Element2D::setLayer(E2D_LAYER layer)
 {
-
-
-
-
+  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()));
+    layer = this->parent->getLayer();
+  }
   this->layer = layer;
 }
@@ -463 +466 @@
   child->parent = this;
   if (likely(this != NULL))
+  {
     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));
+      child->setLayer(this->layer);
+    }
+  }
   child->parentCoorChanged();
 }
@@ -772 +783 @@
             Element2D::parentingModeToChar2D(parentMode),
             Element2D::layer2DToChar(this->layer));
+
   if (depth >= 2 || depth == 0)
   {
@@ -941 +953 @@
  * @param absCoordinate the cordinate of the Parent (normally Vector(0,0,0))
  */
-NullElement2D::NullElement2D () : Element2D(NULL)
+NullElement2D::NullElement2D () : Element2D(NULL, E2D_LAYER_TOP)
 {
   this->setClassID(CL_NULL_ELEMENT_2D, "NullElement2D");

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

@@ -67 +67 @@
   public:
     Element2D();
-    Element2D(Element2D* parent);
+    Element2D(Element2D* parent, E2D_LAYER layer = E2D_DEFAULT_LAYER);
     virtual ~Element2D();