Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9681


Ignore:
Timestamp:
Sep 30, 2013, 1:18:18 PM (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/tutorial4/src/orxonox/controllers/AutonomousDroneController.cc

    r9679 r9681  
    4848        // This checks that our context really is a drone
    4949        // and saves the pointer to the drone for the controlling commands
    50         AutonomousDrone* drone = dynamic_cast<AutonomousDrone*>(context);
    51         assert(drone != NULL);
    52         this->setControllableEntity(drone);
     50        /* NOTE from Sandro: This is currently broken */
     51        //AutonomousDrone* drone = dynamic_cast<AutonomousDrone*>(context);
     52        //assert(drone != NULL);
     53        //this->setControllableEntity(drone);
    5354    }
    5455
     
    7071    void AutonomousDroneController::tick(float dt)
    7172    {
    72         AutonomousDrone *myDrone = static_cast<AutonomousDrone*>(this->getControllableEntity());
     73        /* NOTE: Ugly hack by Sandro to make the tutorial work for the moment.
     74         * This will be reverted once the framework update is complete
     75         */
     76        //AutonomousDrone *myDrone = static_cast<AutonomousDrone*>(this->getControllableEntity());
     77        ObjectList<AutonomousDrone>::iterator it = ObjectList<AutonomousDrone>::begin();
     78
    7379        //TODO: Place your code here:
    7480        // Steering commands
  • code/branches/tutorial4/src/orxonox/worldentities/AutonomousDrone.cc

    r9679 r9681  
    5858        this->setCollisionType(WorldEntity::Dynamic);
    5959
    60         this->myController_ = new AutonomousDroneController(this); // Creates a new controller and passes our this pointer to it as creator.
     60        //this->myController_ = new AutonomousDroneController(this); // Creates a new controller and passes our this pointer to it as creator.
    6161    }
    6262
Note: See TracChangeset for help on using the changeset viewer.