Changeset 9629 for code/branches/core6/src/modules/docking

Timestamp:

Aug 9, 2013, 9:26:46 PM (12 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/docking

Files:

• Dock.cc (modified) (1 diff)
• Dock.h (modified) (1 diff)
• DockToShip.cc (modified) (1 diff)
• DockToShip.h (modified) (1 diff)
• DockingAnimation.cc (modified) (1 diff)
• DockingAnimation.h (modified) (1 diff)
• DockingController.cc (modified) (1 diff)
• DockingController.h (modified) (1 diff)
• DockingEffect.cc (modified) (1 diff)
• DockingEffect.h (modified) (1 diff)
• DockingTarget.cc (modified) (1 diff)
• DockingTarget.h (modified) (1 diff)
• MoveToDockingTarget.cc (modified) (2 diffs)
• MoveToDockingTarget.h (modified) (1 diff)

code/branches/core6/src/modules/docking/Dock.cc

@@ -53 +53 @@
     registerStaticNetworkFunction(Dock::showDockingDialog);
 
-    Dock::Dock(BaseObject* creator) : StaticEntity(creator)
+    Dock::Dock(Context* context) : StaticEntity(context)
     {
         RegisterObject(Dock);

code/branches/core6/src/modules/docking/Dock.h

@@ -57 +57 @@
     { // tolua_export
         public:
-            Dock(BaseObject* creator);
+            Dock(Context* context);
             virtual ~Dock();
 

code/branches/core6/src/modules/docking/DockToShip.cc

@@ -40 +40 @@
     CreateFactory(DockToShip);
 
-    DockToShip::DockToShip(BaseObject* creator) : DockingEffect(creator)
+    DockToShip::DockToShip(Context* context) : DockingEffect(context)
     {
         RegisterObject(DockToShip);

code/branches/core6/src/modules/docking/DockToShip.h

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

code/branches/core6/src/modules/docking/DockingAnimation.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    DockingAnimation::DockingAnimation(BaseObject* creator) : BaseObject(creator)
+    DockingAnimation::DockingAnimation(Context* context) : BaseObject(context)
     {
         RegisterObject(DockingAnimation);

code/branches/core6/src/modules/docking/DockingAnimation.h

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

code/branches/core6/src/modules/docking/DockingController.cc

@@ -40 +40 @@
     CreateFactory(DockingController);
 
-    DockingController::DockingController(BaseObject* creator) : ArtificialController(creator)
+    DockingController::DockingController(Context* context) : ArtificialController(context)
     {
         RegisterObject(DockingController);

code/branches/core6/src/modules/docking/DockingController.h

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

code/branches/core6/src/modules/docking/DockingEffect.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    DockingEffect::DockingEffect(BaseObject* creator) : BaseObject(creator)
+    DockingEffect::DockingEffect(Context* context) : BaseObject(context)
     {
         RegisterObject(DockingEffect);

code/branches/core6/src/modules/docking/DockingEffect.h

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

code/branches/core6/src/modules/docking/DockingTarget.cc

@@ -41 +41 @@
     CreateFactory(DockingTarget);
 
-    DockingTarget::DockingTarget(BaseObject* creator) : StaticEntity(creator)
+    DockingTarget::DockingTarget(Context* context) : StaticEntity(context)
     {
         RegisterObject(DockingTarget);

code/branches/core6/src/modules/docking/DockingTarget.h

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

code/branches/core6/src/modules/docking/MoveToDockingTarget.cc

@@ -42 +42 @@
     CreateFactory(MoveToDockingTarget);
 
-    MoveToDockingTarget::MoveToDockingTarget(BaseObject *creator) : DockingAnimation(creator)
+    MoveToDockingTarget::MoveToDockingTarget(Context* context) : DockingAnimation(context)
     {
         RegisterObject(MoveToDockingTarget);
@@ -55 +55 @@
         assert(this->parent_);
 
-        DockingController *dockingController = new DockingController(this);
+        DockingController *dockingController = new DockingController(this->getContext());
         dockingController->setDock(this->parent_);
         dockingController->setPlayer(player);

code/branches/core6/src/modules/docking/MoveToDockingTarget.h

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