Changeset 9629 for code/branches/core6/src/modules/objects/triggers

Timestamp:

Aug 9, 2013, 9:26:46 PM (11 years ago)

Author:

landauf

Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

Location:

code/branches/core6/src/modules/objects/triggers

Files:

• CheckPoint.cc (modified) (1 diff)
• CheckPoint.h (modified) (1 diff)
• DistanceMultiTrigger.cc (modified) (1 diff)
• DistanceMultiTrigger.h (modified) (1 diff)
• DistanceTrigger.cc (modified) (1 diff)
• DistanceTrigger.h (modified) (1 diff)
• DistanceTriggerBeacon.cc (modified) (1 diff)
• DistanceTriggerBeacon.h (modified) (1 diff)
• EventMultiTrigger.cc (modified) (1 diff)
• EventMultiTrigger.h (modified) (1 diff)
• EventTrigger.cc (modified) (1 diff)
• EventTrigger.h (modified) (1 diff)
• MultiTrigger.cc (modified) (2 diffs)
• MultiTrigger.h (modified) (1 diff)
• MultiTriggerContainer.cc (modified) (2 diffs)
• MultiTriggerContainer.h (modified) (1 diff)
• Trigger.cc (modified) (1 diff)
• Trigger.h (modified) (1 diff)
• TriggerBase.cc (modified) (1 diff)
• TriggerBase.h (modified) (1 diff)

code/branches/core6/src/modules/objects/triggers/CheckPoint.cc

@@ -44 +44 @@
     CreateFactory(CheckPoint);
 
-    CheckPoint::CheckPoint(BaseObject* creator)
-        : DistanceTrigger(creator)
-        , RadarViewable(creator, static_cast<WorldEntity*>(this))
+    CheckPoint::CheckPoint(Context* context)
+        : DistanceTrigger(context)
+        , RadarViewable(this, static_cast<WorldEntity*>(this))
     {
         RegisterObject(CheckPoint);

code/branches/core6/src/modules/objects/triggers/CheckPoint.h

@@ -55 +55 @@
     {
     public:
-        CheckPoint(BaseObject* creator);
+        CheckPoint(Context* context);
         virtual ~CheckPoint();
 

code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.cc

@@ -53 +53 @@
         Default Constructor. Registers the object and initializes default values.
     */
-    DistanceMultiTrigger::DistanceMultiTrigger(BaseObject* creator) : MultiTrigger(creator)
+    DistanceMultiTrigger::DistanceMultiTrigger(Context* context) : MultiTrigger(context)
     {
         RegisterObject(DistanceMultiTrigger);

code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.h

@@ -95 +95 @@
 
         public:
-            DistanceMultiTrigger(BaseObject* creator); // Default Constructor. Registers the object and initializes default values.
+            DistanceMultiTrigger(Context* context); // Default Constructor. Registers the object and initializes default values.
             virtual ~DistanceMultiTrigger(); // Destructor.
 

code/branches/core6/src/modules/objects/triggers/DistanceTrigger.cc

@@ -57 +57 @@
         The creator of this trigger.
     */
-    DistanceTrigger::DistanceTrigger(BaseObject* creator) : Trigger(creator)
+    DistanceTrigger::DistanceTrigger(Context* context) : Trigger(context)
     {
         RegisterObject(DistanceTrigger);

code/branches/core6/src/modules/objects/triggers/DistanceTrigger.h

@@ -97 +97 @@
     {
         public:
-            DistanceTrigger(BaseObject* creator); // Constructor. Registers and initializes the object.
+            DistanceTrigger(Context* context); // Constructor. Registers and initializes the object.
             virtual ~DistanceTrigger();
 

code/branches/core6/src/modules/objects/triggers/DistanceTriggerBeacon.cc

@@ -48 +48 @@
         The creator of this object.
     */
-    DistanceTriggerBeacon::DistanceTriggerBeacon(BaseObject* creator) : StaticEntity(creator)
+    DistanceTriggerBeacon::DistanceTriggerBeacon(Context* context) : StaticEntity(context)
     {
         RegisterObject(DistanceTriggerBeacon);

code/branches/core6/src/modules/objects/triggers/DistanceTriggerBeacon.h

@@ -57 +57 @@
 
         public:
-            DistanceTriggerBeacon(BaseObject* creator); //!< Constructor.
+            DistanceTriggerBeacon(Context* context); //!< Constructor.
             virtual ~DistanceTriggerBeacon() {} //!< Destructor.
 

code/branches/core6/src/modules/objects/triggers/EventMultiTrigger.cc

@@ -49 +49 @@
         Constructor. Registers the object.
     */
-    EventMultiTrigger::EventMultiTrigger(BaseObject* creator) : MultiTrigger(creator)
+    EventMultiTrigger::EventMultiTrigger(Context* context) : MultiTrigger(context)
     {
         RegisterObject(EventMultiTrigger);

code/branches/core6/src/modules/objects/triggers/EventMultiTrigger.h

@@ -73 +73 @@
 
         public:
-            EventMultiTrigger(BaseObject* creator); //!< Constructor. Registers the object.
+            EventMultiTrigger(Context* context); //!< Constructor. Registers the object.
             virtual ~EventMultiTrigger(); //!< Destructor.
 

code/branches/core6/src/modules/objects/triggers/EventTrigger.cc

@@ -48 +48 @@
         The creator of the EventTrigger.
     */
-    EventTrigger::EventTrigger(BaseObject* creator) : Trigger(creator)
+    EventTrigger::EventTrigger(Context* context) : Trigger(context)
     {
         RegisterObject(EventTrigger);

code/branches/core6/src/modules/objects/triggers/EventTrigger.h

@@ -70 +70 @@
     {
         public:
-            EventTrigger(BaseObject* creator); // Constructor. Registers and initializes the object.
+            EventTrigger(Context* context); // Constructor. Registers and initializes the object.
             virtual ~EventTrigger();
 

code/branches/core6/src/modules/objects/triggers/MultiTrigger.cc

@@ -51 +51 @@
         The creator.
     */
-    MultiTrigger::MultiTrigger(BaseObject* creator) : TriggerBase(creator)
+    MultiTrigger::MultiTrigger(Context* context) : TriggerBase(context)
     {
         RegisterObject(MultiTrigger);
@@ -451 +451 @@
         }
 
-        MultiTriggerContainer* container = new MultiTriggerContainer(this, this, originator);
+        MultiTriggerContainer* container = new MultiTriggerContainer(this->getContext(), this, originator);
         this->fireEvent(status, container);
         orxout(verbose, context::triggers) << "MultiTrigger '" <<  this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << endl;

code/branches/core6/src/modules/objects/triggers/MultiTrigger.h

@@ -99 +99 @@
     {
         public:
-            MultiTrigger(BaseObject* creator); //!< Constructor. Registers the objects and initializes default values.
+            MultiTrigger(Context* context); //!< Constructor. Registers the objects and initializes default values.
             virtual ~MultiTrigger(); //!< Destructor.
 

code/branches/core6/src/modules/objects/triggers/MultiTriggerContainer.cc

@@ -50 +50 @@
         The creator.
     */
-    MultiTriggerContainer::MultiTriggerContainer(BaseObject* creator) : BaseObject(creator), originator_(NULL), data_(NULL)
+    MultiTriggerContainer::MultiTriggerContainer(Context* context) : BaseObject(context), originator_(NULL), data_(NULL)
     {
         RegisterObject(MultiTriggerContainer);
@@ -65 +65 @@
         A pointer to the data that should be sent with the container.
     */
-    MultiTriggerContainer::MultiTriggerContainer(BaseObject* creator, MultiTrigger* originator, BaseObject* data) : BaseObject(creator), originator_(originator), data_(data)
+    MultiTriggerContainer::MultiTriggerContainer(Context* context, MultiTrigger* originator, BaseObject* data) : BaseObject(context), originator_(originator), data_(data)
     {
         RegisterObject(MultiTriggerContainer);

code/branches/core6/src/modules/objects/triggers/MultiTriggerContainer.h

@@ -58 +58 @@
 
         public:
-            MultiTriggerContainer(BaseObject* creator); //!< Default constructor. Registers the object and creates an empty container.
-            MultiTriggerContainer(BaseObject* creator, MultiTrigger* originator, BaseObject* data); //!< Constructor. Registers the object and sets the input values.
+            MultiTriggerContainer(Context* context); //!< Default constructor. Registers the object and creates an empty container.
+            MultiTriggerContainer(Context* context, MultiTrigger* originator, BaseObject* data); //!< Constructor. Registers the object and sets the input values.
             virtual ~MultiTriggerContainer(); //!< Destructor.
 

code/branches/core6/src/modules/objects/triggers/Trigger.cc

@@ -55 +55 @@
         The creator of the Trigger.
     */
-    Trigger::Trigger(BaseObject* creator) : TriggerBase(creator)
+    Trigger::Trigger(Context* context) : TriggerBase(context)
     {
         RegisterObject(Trigger);

code/branches/core6/src/modules/objects/triggers/Trigger.h

@@ -80 +80 @@
     {
         public:
-            Trigger(BaseObject* creator); // Constructor. Registers and initializes the object.
+            Trigger(Context* context); // Constructor. Registers and initializes the object.
             virtual ~Trigger();
 

code/branches/core6/src/modules/objects/triggers/TriggerBase.cc

@@ -52 +52 @@
         Constructor. Registers the object and initializes some values.
     */
-    TriggerBase::TriggerBase(BaseObject* creator) : StaticEntity(creator)
+    TriggerBase::TriggerBase(Context* context) : StaticEntity(context)
     {
         RegisterObject(TriggerBase);

code/branches/core6/src/modules/objects/triggers/TriggerBase.h

@@ -74 +74 @@
     {
         public:
-            TriggerBase(BaseObject* creator);
+            TriggerBase(Context* context);
             virtual ~TriggerBase();