Changeset 4840 in orxonox.OLD for orxonox/trunk/src/lib/graphics

Timestamp:

Jul 12, 2005, 3:32:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more definitions for element2D

Location:

orxonox/trunk/src/lib/graphics/render2D

Files:

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

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

@@ -17 +17 @@
 
 #include "element_2d.h"
+#include "render_2d.h"
 
 using namespace std;
@@ -29 +30 @@
    this->setClassID(CL_ELEMENT_2D, "Element2D");
 
+   Render2D::getInstance()->registerElement2D(this);
 }
 
@@ -37 +39 @@
 {
   // delete what has to be deleted here
+  Render2D::getInstance()->unregisterElement2D(this);
 }

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

@@ -18 +18 @@
   E2D_BOTTOM,                          //!< Will be rendered on the bottom Layer
   E2D_BELOW_ALL                        //!< Will be rendered below the 3D-scene. @todo make this work.
-}E2DDepth;
+} E2DLayer;
 
 //! A class for ...
@@ -28 +28 @@
 
 
+  void setPosition(int xCoord, int yCoord);
+  void setLayer(E2DLayer layer);
+
+
+  virtual void draw() const = NULL;
+
  private:
-   bool               bDraw;
+   bool               visible;
    int                position2D[2];    //!< X-coord, Y-Coord
-   E2DDepth           depth;
+   E2DLayer           layer;
 
 };

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

@@ -18 +18 @@
 #include "render_2d.h"
 
+#include "graphics_engine.h"
+#include "class_list.h"
+#include "list.h"
+#include "element_2d.h"
+
 using namespace std;
 
@@ -30 +35 @@
    this->setName("Render2D");
 
+   this->element2DList = new tList<Element2D>();
 }
 
@@ -38 +44 @@
 
 /**
-   @brief standard deconstructor
+ * standard deconstructor
  */
 Render2D::~Render2D ()
 {
+  delete this->element2DList;
+
   Render2D::singletonRef = NULL;
 }
+
+
+/**
+ * registers a 2D-element to the 2D-Renderer
+ * @param element2D the element to registers
+ */
+void Render2D::registerElement2D(Element2D* element2D)
+{
+  this->element2DList->add(element2D);
+}
+
+/**
+ * unregisters a 2D-element from the 2D-Renderer
+ * @param element2D The element to unregister
+ */
+void Render2D::unregisterElement2D(Element2D* element2D)
+{
+  this->element2DList->remove(element2D);
+}

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

@@ -10 +10 @@
 
 // FORWARD DEFINITION
+template <class T> class tList;
+class Element2D;
 
 //! A default singleton class.
@@ -15 +17 @@
 
  public:
-  virtual ~Render2D(void);
+  virtual ~Render2D();
   /** @returns a Pointer to the only object of this Class */
-  inline static Render2D* getInstance(void) { if (!singletonRef) singletonRef = new Render2D();  return singletonRef; };
+  inline static Render2D* getInstance() { if (!singletonRef) singletonRef = new Render2D();  return singletonRef; };
+
+
+  void draw() const;
+
+  void registerElement2D(Element2D* element2D);
+  void unregisterElement2D(Element2D* element2D);
 
  private:
-  Render2D(void);
-  static Render2D* singletonRef;
+  Render2D();
+  static Render2D*               singletonRef;           //!< Reference to this class.
+
+  tList<Element2D>*              element2DList;          //!< List of all valid 2D-elements.
 };