Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7035 for code/branches


Ignore:
Timestamp:
May 31, 2010, 7:43:51 AM (14 years ago)
Author:
dafrick
Message:

Added include in ArtificialController to make it work under linux. Commented some unused variables in DroneController.

Location:
code/branches/presentation3/src/orxonox/controllers
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc

    r7034 r7035  
    3030
    3131#include <vector>
     32#include "limits.h"
    3233#include "core/CoreIncludes.h"
    3334#include "core/XMLPort.h"
  • code/branches/presentation3/src/orxonox/controllers/DroneController.cc

    r7034 r7035  
    7676        float maxrand = 100.0f / ACTION_INTERVAL;
    7777
    78         const Vector3& ownerPosition = getOwner()->getWorldPosition();
    79         const Vector3& dronePosition = getDrone()->getWorldPosition();
     78        // const Vector3& ownerPosition = getOwner()->getWorldPosition();
     79        // const Vector3& dronePosition = getDrone()->getWorldPosition();
    8080
    81         const Vector3& locOwnerDir = getDrone()->getOrientation().UnitInverse()*(ownerPosition-dronePosition); //Vector from Drone To Owner out of drones local coordinate system
     81        // const Vector3& locOwnerDir = getDrone()->getOrientation().UnitInverse()*(ownerPosition-dronePosition); //Vector from Drone To Owner out of drones local coordinate system
    8282
    8383        random = rnd(maxrand);
     
    105105    void DroneController::tick(float dt)
    106106    {
    107        
    108 
    109         Drone *myDrone = static_cast<Drone*>(this->getControllableEntity());
     107        // Drone *myDrone = static_cast<Drone*>(this->getControllableEntity());
    110108        float maxDistanceSquared = this->getDrone()->getMaxDistanceToOwner()*this->getDrone()->getMaxDistanceToOwner();
    111109        float minDistanceSquared = this->getDrone()->getMinDistanceToOwner()*this->getDrone()->getMinDistanceToOwner();
     
    126124            else if((int)randomSelection==5) drone_->rotateRoll(random);
    127125        }
     126       
    128127        SUPER(AIController, tick, dt);
    129128
Note: See TracChangeset for help on using the changeset viewer.