Changeset 7035 for code/branches/presentation3

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:

• ArtificialController.cc (modified) (1 diff)
• DroneController.cc (modified) (3 diffs)

code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc

@@ -30 +30 @@
 
 #include <vector>
+#include "limits.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"

code/branches/presentation3/src/orxonox/controllers/DroneController.cc

@@ -76 +76 @@
         float maxrand = 100.0f / ACTION_INTERVAL;
 
-        const Vector3& ownerPosition = getOwner()->getWorldPosition();
-        const Vector3& dronePosition = getDrone()->getWorldPosition();
+        // const Vector3& ownerPosition = getOwner()->getWorldPosition();
+        // const Vector3& dronePosition = getDrone()->getWorldPosition();
 
-        const Vector3& locOwnerDir = getDrone()->getOrientation().UnitInverse()*(ownerPosition-dronePosition); //Vector from Drone To Owner out of drones local coordinate system
+        // const Vector3& locOwnerDir = getDrone()->getOrientation().UnitInverse()*(ownerPosition-dronePosition); //Vector from Drone To Owner out of drones local coordinate system
 
         random = rnd(maxrand);
@@ -105 +105 @@
     void DroneController::tick(float dt)
     {
-        
-
-        Drone *myDrone = static_cast<Drone*>(this->getControllableEntity());
+        // Drone *myDrone = static_cast<Drone*>(this->getControllableEntity());
         float maxDistanceSquared = this->getDrone()->getMaxDistanceToOwner()*this->getDrone()->getMaxDistanceToOwner();
         float minDistanceSquared = this->getDrone()->getMinDistanceToOwner()*this->getDrone()->getMinDistanceToOwner();
@@ -126 +124 @@
             else if((int)randomSelection==5) drone_->rotateRoll(random);
         }
+        
         SUPER(AIController, tick, dt);