Changeset 10651 for code

Timestamp:

Oct 13, 2015, 6:11:01 PM (9 years ago)

Author:

gania

Message:

Old AIController default behaviour is commented out

Location:

code/branches/AI_HS15/src/orxonox/controllers

Files:

• AIController.cc (modified) (5 diffs)
• ArtificialController.h (modified) (1 diff)

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

@@ -44 +44 @@
     {
         RegisterObject(AIController);
-
         this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&AIController::action, this)));
     }
@@ -147 +146 @@
     void AIController::tick(float dt)
     {
+
         if (!this->isActive())
             return;
@@ -256 +256 @@
 //**********************************************NEW
     void AIController::defaultBehaviour(float maxrand)
-    {       float random;
+    {      
+             if (!this->target_)
+                this->searchNewTarget();
+             if (!(this->passive_) && (this->target_ && !this->bShooting_))
+                    this->bShooting_ = true;
+            /*
+            float random;
             // search enemy
             random = rnd(maxrand);
@@ -313 +319 @@
             if (random < botlevel_*50 )
                 this->boostControl();
-
+            */
+
+            
             // update Checkpoints
             /*random = rnd(maxrand);
@@ -321 +329 @@
             if (this->waypoints_.size() == 0 )
                 this->manageWaypoints();
+
+            
     }
 

code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.h

@@ -74 +74 @@
 
             float botlevel_; //<! Makes the level of a bot configurable.
+            //botLevel_ is never used in XML (so far), is it redundant?
             enum Mode {DEFAULT, ROCKET, DEFENCE, MOVING};//TODO; implement DEFENCE, MOVING modes
             Mode mode_; //TODO: replace single value with stack-like implementation: std::vector<Mode> mode_;