Changeset 10805 for code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc

Timestamp:

Nov 15, 2015, 4:47:35 PM (8 years ago)

Author:

gania

Message:

Finished groundwork: AI fights enemies like I want it to. TODO implement all the functionality of old AI, like Waypoints, XMLPort

File:

• code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) (2 diffs)

code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc

@@ -87 +87 @@
             for(std::vector<WeakPtr<DivisionController> >::iterator it = divisions_.begin(); it != divisions_.end(); ++it) 
             {
-                if (static_cast<ControllableEntity*>(*itP) != (*it)->getControllableEntity() && !(*it)->hasTarget())
+                if (static_cast<ControllableEntity*>(*itP) != (*it)->getControllableEntity() && !(*it)->hasTarget()
+                    && ((*itP)->getWorldPosition() - (*it)->getControllableEntity()->getWorldPosition()).length() < 10000)
                 {
-                    (*it)->setTarget(*itP);
+                    (*it)->setAction(Action::FIGHT, *itP);
                 }
                 
@@ -95 +96 @@
            
         }
-
+        /*for(std::vector<WeakPtr<DivisionController> >::iterator it = divisions_.begin(); it != divisions_.end(); ++it) 
+        {
+            Vector3* target = new Vector3 (0, 0, 2000);
+            (*it)->setAction (Action::FLY, *target);           
+        }   
+*/
     }
     void FleetController::tick(float dt)