Changeset 11175 for code/branches/sagerjFS16/src/orxonox/controllers

Timestamp:

Apr 28, 2016, 3:09:26 PM (9 years ago)

Author:

sagerj

Message:

overwritten many fire functions now only need to implement timer/charges

Location:

code/branches/sagerjFS16/src/orxonox/controllers

Files:

• AIController.cc (modified) (3 diffs)
• ArtificialController.cc (modified) (3 diffs)
• ArtificialController.h (modified) (1 diff)
• DroneController.cc (modified) (1 diff)
• FightingController.cc (modified) (1 diff)
• WaypointPatrolController.cc (modified) (1 diff)

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

@@ -197 +197 @@
                     if (this->bHasTargetPosition_)
                         this->moveToTargetPosition();
-                    this->doFire();
+                    this->doPush();
                 }
 
@@ -227 +227 @@
                     this->moveToTargetPosition();
 
-                    this->doFire();
+                    this->doPush();
             }
         }
@@ -241 +241 @@
                     if((timeout_< 0)||(!target_))//Check if the timeout is over or target died.
                     {
-                       controllable->fire(0);//kill the rocket
+                       controllable->push(0);//kill the rocket
                        this->setPreviousMode();//get out of rocket mode
                     }

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

@@ -132 +132 @@
         @brief DoFire is called when a bot should shoot and decides which weapon is used and whether the bot shoots at all.
     */
-    void ArtificialController::doFire()
+    void ArtificialController::doPush()
     {
         if(!this->bSetupWorked)//setup: find out which weapons are active ! hard coded: laser is "0", lens flare is "1", ...
@@ -144 +144 @@
             if (this->isCloseAtTarget(130) && (firemode = getFiremode("LightningGun")) > -1 )
             {//LENSFLARE: short range weapon
-                this->getControllableEntity()->fire(firemode); //ai uses lens flare if they're close enough to the target
+                this->getControllableEntity()->push(firemode); //ai uses lens flare if they're close enough to the target
             }
             else if( this->isCloseAtTarget(400) && (random < this->botlevel_) && (firemode = getFiremode("RocketFire")) > -1 )
             {//ROCKET: mid range weapon
                 this->mode_ = ROCKET; //Vector-implementation: mode_.push_back(ROCKET);
-                this->getControllableEntity()->fire(firemode); //launch rocket
+                this->getControllableEntity()->push(firemode); //launch rocket
                 if(this->getControllableEntity() && this->target_) //after fire(3) is called, getControllableEntity() refers to the rocket!
                 {
@@ -161 +161 @@
             }
             else if ((firemode = getFiremode("HsW01")) > -1 ) //LASER: default weapon
-                this->getControllableEntity()->fire(firemode);
+                this->getControllableEntity()->push(firemode);
         }
     }

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

@@ -48 +48 @@
             virtual void changedControllableEntity() override;
 
-            virtual void doFire();
+            virtual void doPush();
             void setBotLevel(float level=1.0f);
             inline float getBotLevel() const

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

@@ -130 +130 @@
                        this->aimAtTarget();
                        if(!this->friendlyFire())
-                           this->getDrone()->fire(0);
+                           this->getDrone()->push(0);
                     }
                }

code/branches/sagerjFS16/src/orxonox/controllers/FightingController.cc

@@ -318 +318 @@
         }
               
-        this->getControllableEntity()->fire(firemode);
+        this->getControllableEntity()->push(firemode);
         
     }

code/branches/sagerjFS16/src/orxonox/controllers/WaypointPatrolController.cc

@@ -69 +69 @@
 
             if (this->getControllableEntity() && this->isCloseAtTarget(this->attackradius_) && this->isLookingAtTarget(math::pi / 20.0f))
-                this->getControllableEntity()->fire(0);
+                this->getControllableEntity()->push(0);
         }
         else