Changeset 9681

Timestamp:

Sep 30, 2013, 1:18:18 PM (11 years ago)

Author:

smerkli

Message:

Quick fix to make things work in the tutorial. Will be reverted to
a cleaner way soon.

Location:

code/branches/tutorial4/src/orxonox

Files:

• controllers/AutonomousDroneController.cc (modified) (2 diffs)
• worldentities/AutonomousDrone.cc (modified) (1 diff)

code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.cc

@@ -48 +48 @@
         // 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*>(context);
-        assert(drone != NULL);
-        this->setControllableEntity(drone);
+        /* NOTE from Sandro: This is currently broken */
+        //AutonomousDrone* drone = dynamic_cast<AutonomousDrone*>(context);
+        //assert(drone != NULL);
+        //this->setControllableEntity(drone);
     }
 
@@ -70 +71 @@
     void AutonomousDroneController::tick(float dt)
     {
-        AutonomousDrone *myDrone = static_cast<AutonomousDrone*>(this->getControllableEntity());
+        /* NOTE: Ugly hack by Sandro to make the tutorial work for the moment.
+         * This will be reverted once the framework update is complete
+         */
+        //AutonomousDrone *myDrone = static_cast<AutonomousDrone*>(this->getControllableEntity());
+        ObjectList<AutonomousDrone>::iterator it = ObjectList<AutonomousDrone>::begin();
+
         //TODO: Place your code here:
         // Steering commands

code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.cc

@@ -58 +58 @@
         this->setCollisionType(WorldEntity::Dynamic);
 
-        this->myController_ = new AutonomousDroneController(this); // Creates a new controller and passes our this pointer to it as creator.
+        //this->myController_ = new AutonomousDroneController(this); // Creates a new controller and passes our this pointer to it as creator.
     }