Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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:
1 added
2 edited
4 copied

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/lib/event/event_handler.cc

    r4836 r4838  
    7272      if( this->listeners[i][j] != NULL)
    7373      {
    74         PRINTF(2)("Someone forgot to unsubscribe an EventListener!\n");
     74        PRINTF(2)("forgot to unsubscribe an EventListener %s!\n");//, this->listeners[i][j]->getName());
    7575      }
    7676    }
  • orxonox/trunk/src/lib/graphics/graphics_engine.cc

    r4836 r4838  
    5858{
    5959  // delete what has to be deleted here
    60   EventHandler::getInstance()->unsubscribe(this);
    6160}
    6261
  • orxonox/trunk/src/lib/graphics/render2D/element_2D.cc

    r4837 r4838  
    1010
    1111   ### File Specific:
    12    main-programmer: ...
     12   main-programmer: Benjamin Grauer
    1313   co-programmer: ...
    1414*/
     
    1616//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
    1717
    18 #include "proto_class.h"
     18#include "element_2D.h"
    1919
    2020using namespace std;
     
    2222
    2323/**
    24    \brief standard constructor
    25    \todo this constructor is not jet implemented - do it
     24 * standard constructor
     25 * @todo this constructor is not jet implemented - do it
    2626*/
    27 ProtoClass::ProtoClass ()
     27Element2D::Element2D ()
    2828{
    29    this->setClassID(CL_PROTO_ID, "ProtoClass");
     29   this->setClassID(CL_ELEMENT_2D, "Element2D");
    3030
    3131   /* If you make a new class, what is most probably the case when you write this file
     
    4343
    4444/**
    45    \brief standard deconstructor
    46 
     45 * standard deconstructor
    4746*/
    48 ProtoClass::~ProtoClass ()
     47Element2D::~Element2D ()
    4948{
    5049  // delete what has to be deleted here
  • orxonox/trunk/src/lib/graphics/render2D/element_2D.h

    r4837 r4838  
    1 /*!
    2     \file proto_class.h
    3     \brief Definition of ...
    4 
     1/*!
     2 * @file element_2D.h
     3 * @brief Definition of the 2D elements rendered on top through the GraphicsEngine
    54*/
    65
    7 #ifndef _PROTO_CLASS_H
    8 #define _PROTO_CLASS_H
     6#ifndef _ELEMENT_2D_H
     7#define _ELEMENT_2D_H
    98
    109#include "base_object.h"
    1110
    12 // FORWARD DEFINITION
    13 
    14 
     11// FORWARD DECLARATION
    1512
    1613//! A class for ...
    17 class ProtoClass : public BaseObject {
     14class Element2D : public BaseObject {
    1815
    1916 public:
    20   ProtoClass();
    21   virtual ~ProtoClass();
     17  Element2D();
     18  virtual ~Element2D();
    2219
    2320
     
    2623};
    2724
    28 #endif /* _PROTO_CLASS_H */
     25#endif /* _ELEMENT_2D_H */
  • orxonox/trunk/src/lib/graphics/render2D/render_2d.cc

    r4837 r4838  
    2222
    2323/**
    24    \brief standard constructor
    25 */
     24 * standard constructor
     25 */
    2626ProtoSingleton::ProtoSingleton ()
    2727{
     
    4242
    4343/**
    44    \brief the singleton reference to this class
    45 */
     44 * the singleton reference to this class
     45 */
    4646ProtoSingleton* ProtoSingleton::singletonRef = NULL;
    4747
    4848/**
    49    \brief standard deconstructor
    50 
    51 */
     49   @brief standard deconstructor
     50 */
    5251ProtoSingleton::~ProtoSingleton ()
    5352{
    5453  ProtoSingleton::singletonRef = NULL;
    55 
    5654}
  • orxonox/trunk/src/lib/graphics/render2D/render_2d.h

    r4837 r4838  
    1 /*!
    2     \file proto_singleton.h
    3     \brief Definition of the ... singleton Class
    4    
     1/*!
     2 * @file proto_singleton.h
     3 * @brief Definition of the ... singleton Class
    54*/
    65
     
    1716 public:
    1817  virtual ~ProtoSingleton(void);
    19   /** \returns a Pointer to the only object of this Class */
     18  /** @returns a Pointer to the only object of this Class */
    2019  inline static ProtoSingleton* getInstance(void) { if (!singletonRef) singletonRef = new ProtoSingleton();  return singletonRef; };
    2120
Note: See TracChangeset for help on using the changeset viewer.