Changeset 5397 in orxonox.OLD for trunk/src/lib/graphics/render2D/element_2d.h

Timestamp:

Oct 18, 2005, 5:33:11 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Elemet2D-drawing better
prevent segfault in setParent with NULL as new Parent in Element2D and PNode

File:

• trunk/src/lib/graphics/render2D/element_2d.h (modified) (2 diffs)

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

@@ -21 +21 @@
 typedef enum
 {
-  E2D_BELOW_ALL                 =     1,        //!< Will be rendered below the 3D-scene. @todo make this work.
-  E2D_BOTTOM                    =     2,        //!< Will be rendered on the bottom Layer
-  E2D_MEDIUM                    =     4,        //!< Will be rendered on the medium Layer.
-  E2D_TOP                       =     8,        //!< Will be rendered on top of everything else
-
-  E2D_LAYER_COUNT               =     4         //!< The count of Layers.
+  E2D_BELOW_ALL,       //!< Will be rendered below the 3D-scene. @todo make this work.
+  E2D_BOTTOM,          //!< Will be rendered on the bottom Layer
+  E2D_MEDIUM,          //!< Will be rendered on the medium Layer.
+  E2D_TOP,             //!< Will be rendered on top of everything else
+
+  E2D_LAYER_COUNT,     //!< The count of Layers.
+
+  E2D_LAYER_ALL,
 } E2D_LAYER;
 #define E2D_DEFAULT_LAYER       E2D_TOP
-#define E2D_ALL_LAYERS          E2D_TOP | E2D_MEDIUM | E2D_BOTTOM | E2D_BELOW_ALL
 
 typedef enum
@@ -153 +154 @@
     void setParent2D (const char* parentName);
     /** @returns the parent of this Element2D */
-    inline Element2D* getParent () const { return this->parent; };
+    inline Element2D* getParent2D () const { return this->parent; };
     /** @returns the List of Children of this Element2D */
     inline const tList<Element2D>* getChildren2D() const { return this->children; };