[Orxonox-commit 5013] r9679 - in code/branches/tutorial4/src/orxonox: controllers worldentities

[jo at orxonox.net]

Author: jo
Date: 2013-09-30 09:54:58 +0200 (Mon, 30 Sep 2013)
New Revision: 9679

Modified:
   code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.cc
   code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.h
   code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.cc
   code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.h
Log:
Updates due to core6 changes.

Modified: code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.cc
===================================================================
--- code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.cc	2013-09-30 07:47:19 UTC (rev 9678)
+++ code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.cc	2013-09-30 07:54:58 UTC (rev 9679)
@@ -37,17 +37,17 @@
     /**
     @brief
         Constructor.
-    @param creator
-        The creator of this object.
+    @param context
+        The context of this object.
     */
-    AutonomousDroneController::AutonomousDroneController(BaseObject* creator) : Controller(creator)
+    AutonomousDroneController::AutonomousDroneController(Context* context) : Controller(context)
     {
         //TODO: Place your code here:
         // Make sure to register the object and create the factory.
 
-        // This checks that our creator really is a drone
+        // This checks that our context really is a drone
         // and saves the pointer to the drone for the controlling commands
-        AutonomousDrone* drone = dynamic_cast<AutonomousDrone*>(creator);
+        AutonomousDrone* drone = dynamic_cast<AutonomousDrone*>(context);
         assert(drone != NULL);
         this->setControllableEntity(drone);
     }

Modified: code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.h
===================================================================
--- code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.h	2013-09-30 07:47:19 UTC (rev 9678)
+++ code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.h	2013-09-30 07:54:58 UTC (rev 9679)
@@ -45,7 +45,7 @@
     class _OrxonoxExport AutonomousDroneController : public Controller, public Tickable
     {
         public:
-            AutonomousDroneController(BaseObject* creator);
+            AutonomousDroneController(Context* context);
             virtual ~AutonomousDroneController();
 
             virtual void tick(float dt); //!< The controlling happens here. This method defines what the controller has to do each tick.
@@ -56,4 +56,4 @@
     };
 }
 
-#endif /* _AutonomousDroneController_H__ */
\ No newline at end of file
+#endif /* _AutonomousDroneController_H__ */

Modified: code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.cc
===================================================================
--- code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.cc	2013-09-30 07:47:19 UTC (rev 9678)
+++ code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.cc	2013-09-30 07:54:58 UTC (rev 9679)
@@ -42,7 +42,7 @@
     @param creator
         The creator of this object.
     */
-    AutonomousDrone::AutonomousDrone(BaseObject* creator) : ControllableEntity(creator)
+    AutonomousDrone::AutonomousDrone(Context* context) : ControllableEntity(context)
     {
         //TODO: Put your code in here:
         // Register the drone class to the core.

Modified: code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.h
===================================================================
--- code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.h	2013-09-30 07:47:19 UTC (rev 9678)
+++ code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.h	2013-09-30 07:54:58 UTC (rev 9679)
@@ -48,7 +48,7 @@
     class _OrxonoxExport AutonomousDrone : public ControllableEntity
     {
         public:
-            AutonomousDrone(BaseObject* creator);
+            AutonomousDrone(Context* context);
             virtual ~AutonomousDrone();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating an AutonomousDrone through XML.