Changeset 4838 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jul 12, 2005, 12:09:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Element2D added → will be moved to lib/graphics afterwards
ProtoClass update
EventListeners do not have to be unsubscribed externally, but still one listener won't unsubscribe

Location:

orxonox/trunk/src/lib

Files:

• event/event_handler.cc (modified) (1 diff)
• graphics/graphics_engine.cc (modified) (1 diff)
• graphics/render2D (added)
• graphics/render2D/element_2D.cc (copied) (copied from orxonox/trunk/src/proto/proto_class.cc) (4 diffs)
• graphics/render2D/element_2D.h (copied) (copied from orxonox/trunk/src/proto/proto_class.h) (2 diffs)
• graphics/render2D/render_2d.cc (copied) (copied from orxonox/trunk/src/proto/proto_singleton.cc) (2 diffs)
• graphics/render2D/render_2d.h (copied) (copied from orxonox/trunk/src/proto/proto_singleton.h) (2 diffs)

orxonox/trunk/src/lib/event/event_handler.cc

@@ -72 +72 @@
       if( this->listeners[i][j] != NULL)
       {
-        PRINTF(2)("Someone forgot to unsubscribe an EventListener!\n");
+        PRINTF(2)("forgot to unsubscribe an EventListener %s!\n");//, this->listeners[i][j]->getName());
       }
     }

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -58 +58 @@
 {
   // delete what has to be deleted here
-  EventHandler::getInstance()->unsubscribe(this);
 }
 

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

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
+#include "element_2D.h"
 
 using namespace std;
@@ -22 +22 @@
 
 /**
-   \brief standard constructor
-   \todo this constructor is not jet implemented - do it
+ * standard constructor
+ * @todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass ()
+Element2D::Element2D ()
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
+   this->setClassID(CL_ELEMENT_2D, "Element2D");
 
    /* If you make a new class, what is most probably the case when you write this file
@@ -43 +43 @@
 
 /**
-   \brief standard deconstructor
-
+ * standard deconstructor
 */
-ProtoClass::~ProtoClass ()
+Element2D::~Element2D ()
 {
   // delete what has to be deleted here

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

@@ -1 @@
-/*! 
-    \file proto_class.h
-    \brief Definition of ...
-
+/*!
+ * @file element_2D.h
+ * @brief Definition of the 2D elements rendered on top through the GraphicsEngine
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _ELEMENT_2D_H
+#define _ELEMENT_2D_H
 
 #include "base_object.h"
 
-// FORWARD DEFINITION
-
-
+// FORWARD DECLARATION
 
 //! A class for ...
-class ProtoClass : public BaseObject {
+class Element2D : public BaseObject {
 
  public:
-  ProtoClass();
-  virtual ~ProtoClass();
+  Element2D();
+  virtual ~Element2D();
 
 
@@ -26 +23 @@
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _ELEMENT_2D_H */

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

@@ -22 +22 @@
 
 /**
-   \brief standard constructor
-*/
+ * standard constructor
+ */
 ProtoSingleton::ProtoSingleton ()
 {
@@ -42 +42 @@
 
 /**
-   \brief the singleton reference to this class
-*/
+ *  the singleton reference to this class
+ */
 ProtoSingleton* ProtoSingleton::singletonRef = NULL;
 
 /**
-   \brief standard deconstructor
-
-*/
+   @brief standard deconstructor
+ */
 ProtoSingleton::~ProtoSingleton ()
 {
   ProtoSingleton::singletonRef = NULL;
-
 }

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

@@ -1 @@
-/*! 
-    \file proto_singleton.h
-    \brief Definition of the ... singleton Class
-    
+/*!
+ * @file proto_singleton.h
+ * @brief Definition of the ... singleton Class
 */
 
@@ -17 +16 @@
  public:
   virtual ~ProtoSingleton(void);
-  /** \returns a Pointer to the only object of this Class */
+  /** @returns a Pointer to the only object of this Class */
   inline static ProtoSingleton* getInstance(void) { if (!singletonRef) singletonRef = new ProtoSingleton();  return singletonRef; };