Changeset 5397 in orxonox.OLD for trunk/src/lib/graphics/render2D/render_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/render_2d.h (modified) (1 diff)

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

@@ -15 +15 @@
 //! A default singleton class.
 class Render2D : public BaseObject {
+  friend class Element2D;
 
- public:
-  virtual ~Render2D();
-  /** @returns a Pointer to the only object of this Class */
-  inline static Render2D* getInstance() { if (!singletonRef) singletonRef = new Render2D();  return singletonRef; };
+  public:
+    virtual ~Render2D();
+    /** @returns a Pointer to the only object of this Class */
+    inline static Render2D* getInstance() { if (!singletonRef) singletonRef = new Render2D();  return singletonRef; };
 
-  void tick(float dt);
-  void draw(unsigned int layer) const;
+    void tick(float dt);
+    void draw(unsigned int layer) const;
 
-  void registerElement2D(Element2D* element2D);
-  void unregisterElement2D(Element2D* element2D);
-  void moveToLayer(Element2D* element2D, E2D_LAYER to);
 
- private:
-  Render2D();
-  static Render2D*              singletonRef;                    //!< Reference to this class.
+  private:
+    void registerElement2D(Element2D* element2D);
+    void unregisterElement2D(Element2D* element2D);
+    void moveToLayer(Element2D* element2D, E2D_LAYER to);
+
+
+    Render2D();
+    static Render2D*              singletonRef;                    //!< Reference to this class.
 
 //  tList<Element2D>*             element2DList;                   //!< List of all valid 2D-elements.
-  tList<Element2D>*             element2DList[E2D_LAYER_COUNT];  //!< List of all valid 2D-elements in the different Layers.
+    tList<Element2D>*             element2DList[E2D_LAYER_COUNT];  //!< List of all valid 2D-elements in the different Layers.
 };