Changeset 10906 for code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc

Timestamp:

Nov 30, 2015, 9:34:54 PM (8 years ago)

Author:

gania

Message:

tried to fix fighting whn fps is low

File:

• code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) (6 diffs)

code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc

@@ -53 +53 @@
         this->squaredaccuracy_ = 2500;
         this->bFirstTick_ = true;
-
+        this->bStartedDodging_ = false;
+        this->timeDodged_ = 0;
         RegisterObject(ActionpointController);
 
@@ -78 +79 @@
             this->timeout_ -= dt;
         }
+        if (this->bStartedDodging_)
+        {
+            this->timeDodged_ += dt;
+            if (this->timeDodged_ > 2.0f)
+            {
+                this->bStartedDodging_ = false;
+                this->timeDodged_ = 0;
+            }
+        }
+        maneuverCounter_ += dt;
+        if (maneuverCounter_ > 6.0f)
+            maneuverCounter_ = 0;
         if (timeout_ <= 0)
             this->bFiredRocket_ = false;
@@ -110 +123 @@
             this->bFirstTick_ = false;
         }
-
+        if (this->hasTarget())
+        {
+            this->maneuver();
+            if (static_cast<int>(this->maneuverCounter_*100) % 3 == 0)
+                this->bShooting_ = this->canFire();
+        }
         SUPER(ActionpointController, tick, dt);
     }
@@ -123 +141 @@
         this->deltaHp = orxonox_cast<Pawn*> (this->getControllableEntity())->getHealth() - this->previousHp;
         this->previousHp = orxonox_cast<Pawn*> (this->getControllableEntity())->getHealth();
+
         // if (this->actionCounter_ % 2 == 0)
         //No action -> pop one from stack
@@ -236 +255 @@
             }
         }
-        if (this->hasTarget())
-        {
-            this->maneuver();
-            this->bShooting_ = this->canFire();
+
             // Vector3 healthPosition = bestHealthPickup((this->target_->getWorldPosition() - this->getControllableEntity()->getWorldPosition()).length());
             // if ((this->getControllableEntity()->getWorldPosition() - healthPosition).length() < this->tolerance_)
@@ -252 +268 @@
             // //----fire if you can----
             // this->bShooting_ = this->canFire();  
-        }
+         
         this->actionCounter_ += this->actionCounter_ < 100000 ? 1 : -this->actionCounter_ ;