Changeset 5404 in orxonox.OLD

Timestamp:

Oct 19, 2005, 1:16:20 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: removed old unused functionality, and added some comments

Location:

trunk/src/lib

Files:

• graphics/render2D/element_2d.cc (modified) (1 diff)
• graphics/render2D/element_2d.h (modified) (3 diffs)
• graphics/render2D/render_2d.cc (modified) (1 diff)
• graphics/render2D/render_2d.h (modified) (1 diff)
• gui/gl_gui/glgui_button.cc (modified) (1 diff)
• gui/gl_gui/glgui_widget.cc (modified) (1 diff)

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

@@ -840 +840 @@
 /**
  * draws all the Elements from this element2D downwards
- * @param layer the maximal Layer to draw.
- */
-void Element2D::draw2D(E2D_LAYER layer) const
+ * @param layer the maximal Layer to draw. @see E2D_LAYER
+ */
+void Element2D::draw2D(short layer) const
 {
   if (this->visible)

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

@@ -25 +25 @@
 
   E2D_LAYER_COUNT               =     4,         //!< The count of Layers.
-
-  E2D_LAYER_EXTERN              =    -1,         //!< In a Layers handeled externally.
-
-  E2D_LAYER_ALL                 =     5,
 } E2D_LAYER;
 #define E2D_DEFAULT_LAYER       E2D_LAYER_MEDIUM
+#define E2D_LAYER_ALL           4
 
 typedef enum
@@ -62 +59 @@
 };
 
-//! A class for ...
+//! A class for 2D-elements
+/**
+ * this class mainly tries to imitate PNode in its functionality, but on a 2D-level
+ * it extends PNode in the Sense of the tick-ability/draw-alility layering (and size)
+ *
+ * Layering: Layers are sorted into the Tree. e.g:
+ * the roor is in the lowest Layer, the leaves in the highest (of each branche)
+ * the first child of each node is in the lowest layer of all children, the last in the highest
+ * -> the tree is sorted on insertion of a new Child: @see Element2D::addChild2D()
+ */
 class Element2D : virtual public BaseObject {
 
@@ -110 +116 @@
     virtual void draw() const = 0;
     void tick2D(float dt);
-    void draw2D(E2D_LAYER layer) const;
+    void draw2D(short layer) const;
 
     // LIKE PNODE

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

@@ -64 +64 @@
  * @param layer the Layer to draw (if E2D_LAYER_ALL then all layers will be drawn)
  */
-void Render2D::draw(E2D_LAYER layer) const
+void Render2D::draw(short layer) const
 {
   GraphicsEngine::enter2DMode();

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

@@ -23 +23 @@
 
     void tick(float dt);
-    void draw(E2D_LAYER layer) const;
+    void draw(short layer) const;
 
   private:

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

@@ -52 +52 @@
   this->label = new Text();
   this->label->setParent2D(this);
-  this->label->setLayer(E2D_LAYER_EXTERN);
 }
 

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

@@ -51 +51 @@
   this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
   this->setParent2D((Element2D*)NULL);
-  this->setLayer(E2D_LAYER_EXTERN);
 
   this->backMat = NULL;