Changeset 6856 for code/trunk
- Timestamp:
- May 4, 2010, 10:16:10 PM (15 years ago)
- Location:
- code/trunk/src/modules/objects
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/modules/objects/eventsystem/EventListener.cc
r6800 r6856 62 62 } 63 63 64 COUT(4) << "EventListener : Processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << std::endl;64 COUT(4) << "EventListener, processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << std::endl; 65 65 66 66 this->bActive_ = true; 67 //TODO: Why not this->fireEvent(event)? 67 68 this->fireEvent(event.activate_, event.originator_, event.name_); 68 69 this->bActive_ = false; -
code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc
r6800 r6856 27 27 */ 28 28 29 /** 30 @file MultiTriggerContainer.cc 31 @brief Implementation of the MultiTriggerContainer class. 32 */ 33 29 34 #include "MultiTriggerContainer.h" 30 35 … … 33 38 namespace orxonox 34 39 { 35 36 CreateFactory(MultiTriggerContainer);37 40 41 /** 42 @brief 43 Default constructor. Registers the object and creates an empty container. 44 @param creator 45 The creator. 46 */ 38 47 MultiTriggerContainer::MultiTriggerContainer(BaseObject* creator) : BaseObject(creator), originator_(NULL), data_(NULL) 39 48 { 40 49 RegisterObject(MultiTriggerContainer); 41 42 50 } 43 51 52 /** 53 @brief 54 Constructor. Registers the object and sets the input values. 55 @param creator 56 The creator. 57 @param originator 58 A pointer to the originator of the Event, i.e. the MultiTrigger that fired the Event. (or is about to) 59 @param data 60 A pointer to the data that should be sent with the container. 61 */ 44 62 MultiTriggerContainer::MultiTriggerContainer(BaseObject* creator, MultiTrigger* originator, BaseObject* data) : BaseObject(creator), originator_(originator), data_(data) 45 63 { 46 64 RegisterObject(MultiTriggerContainer); 47 48 65 } 49 66 67 /** 68 @brief 69 Destructor. 70 */ 50 71 MultiTriggerContainer::~MultiTriggerContainer() 51 72 { -
code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h
r6800 r6856 21 21 * 22 22 * Author: 23 * ...23 * Damian 'Mozork' Frick 24 24 * Co-authors: 25 25 * ... 26 26 * 27 */ 28 29 /** 30 @file MultiTriggerContainer.h 31 @brief Definition of the MultiTriggerContainer class. 27 32 */ 28 33 … … 37 42 { 38 43 44 /** 45 @brief 46 This class is used by the MultiTrigger class to transport additional data via Events. 47 @author 48 Damian 'Mozork' Frick 49 */ 39 50 class _ObjectsExport MultiTriggerContainer : public BaseObject 40 51 { 52 41 53 public: 42 43 MultiTriggerContainer(BaseObject* creator); 44 MultiTriggerContainer(BaseObject* creator, MultiTrigger* originator, BaseObject* data); 45 ~MultiTriggerContainer(); 46 54 MultiTriggerContainer(BaseObject* creator); //!< Default constructor. Registers the object and creates an empty container. 55 MultiTriggerContainer(BaseObject* creator, MultiTrigger* originator, BaseObject* data); //!< Constructor. Registers the object and sets the input values. 56 ~MultiTriggerContainer(); //!< Destructor. 57 58 /** 59 @brief Get the originator of the Event. (The MultiTrigger that fired the Event) 60 @return Returns a pointer to the originator. 61 */ 47 62 inline MultiTrigger* getOriginator(void) 48 63 { return this->originator_; } 64 /** 65 @brief Get the data of this container. 66 @return Returns a pointer ot the data. 67 */ 49 68 inline BaseObject* getData(void) 50 69 { return this->data_; } 51 70 52 71 private: 53 MultiTrigger* originator_; 54 BaseObject* data_; 72 MultiTrigger* originator_; //!< The originator. 73 BaseObject* data_; //!< The data. 55 74 }; 56 75
Note: See TracChangeset
for help on using the changeset viewer.