Changeset 4848 in orxonox.OLD

Timestamp:

Jul 13, 2005, 6:36:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more 2D-definitions, better draw function

Location:

orxonox/trunk/src/lib/graphics/render2D

Files:

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

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

@@ -18 +18 @@
   E2D_MEDIUM,                          //!< Will be rendered on the medium Layer.
   E2D_BOTTOM,                          //!< Will be rendered on the bottom Layer
-  E2D_BELOW_ALL                        //!< Will be rendered below the 3D-scene. @todo make this work.
+  E2D_BELOW_ALL,                       //!< Will be rendered below the 3D-scene. @todo make this work.
+
+  E2D_LAYER_COUNT                      //!< The count of Layers.
 } E2DLayer;
 
@@ -24 +26 @@
 typedef enum
 {
-  ELEM2D_ALIGN_NONE,
-  ELEM2D_ALIGN_LEFT,
-  ELEM2D_ALIGN_RIGHT,
-  ELEM2D_ALIGN_CENTER,
-  ELEM2D_ALIGN_SCREEN_CENTER
-} ELEM2D_ALIGNMENT;
+  E2D_ALIGN_NONE,
+  E2D_ALIGN_LEFT,
+  E2D_ALIGN_RIGHT,
+  E2D_ALIGN_CENTER,
+  E2D_ALIGN_SCREEN_CENTER
+} E2D_ALIGNMENT;
 
 //! A Struct defining the Position of an Element in 2D-space
@@ -70 +72 @@
    E2DLayer                layer;
 
-   ELEM2D_ALIGNMENT        alignment;        //!< How the Element is aligned around its Position
+   E2D_ALIGNMENT           alignment;        //!< How the Element is aligned around its Position
    const PNode*            bindNode;         //!< a node over which to display this 2D-element
 };

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

@@ -35 +35 @@
    this->setName("Render2D");
 
-   this->element2DList = new tList<Element2D>();
+   this->element2DList = new tList<Element2D>;
 }
 
@@ -57 +57 @@
  * 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)
@@ -66 +68 @@
  * 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)
@@ -75 +79 @@
 void Render2D::draw() const
 {
+  GraphicsEngine::enter2DMode();
+
   tIterator<Element2D>* iterator = this->element2DList->getIterator();
   Element2D* elem = iterator->nextElement();
@@ -84 +90 @@
   }
   delete iterator;
+
+  GraphicsEngine::leave2DMode();
 }

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

@@ -2 +2 @@
  * @file render_2d.h
  * @brief Definition of the 2D-rendering engine singleton Class
+ * @todo implement Layer-rendering
 */
 
@@ -8 +9 @@
 
 #include "base_object.h"
-
+#include "element_2d.h"
 // FORWARD DEFINITION
 template <class T> class tList;
-class Element2D;
 
 //! A default singleton class.
@@ -29 +29 @@
  private:
   Render2D();
-  static Render2D*               singletonRef;           //!< Reference to this class.
+  static Render2D*              singletonRef;           //!< Reference to this class.
 
-  tList<Element2D>*              element2DList;          //!< List of all valid 2D-elements.
+  tList<Element2D>*             element2DList;          //!< List of all valid 2D-elements.
 };