Changeset 10909 for code/branches/campaignHS15

Timestamp:

Dec 1, 2015, 10:03:10 AM (9 years ago)

Author:

gania

Message:

decided to get rid of action timer and call action in tick instead: action is being called once in 2 sec in a tick, 2 sec were split in 4 * 0.25 sec, with 0.25 sec gap for each member of division to call its action, resulted in significant speed up.

Location:

code/branches/campaignHS15

Files:

• data/levels/AITest.oxw (modified) (2 diffs)
• src/orxonox/controllers/ActionpointController.cc (modified) (6 diffs)
• src/orxonox/controllers/ActionpointController.h (modified) (1 diff)
• src/orxonox/controllers/DivisionController.cc (modified) (2 diffs)
• src/orxonox/controllers/SectionController.cc (modified) (2 diffs)
• src/orxonox/controllers/WingmanController.cc (modified) (3 diffs)
• src/orxonox/controllers/WingmanController.h (modified) (1 diff)

code/branches/campaignHS15/data/levels/AITest.oxw

@@ -157 +157 @@
 <!-- HERE STARTS DEMO FOR FIGHTING -->
     
-<!-- 
+
     <SpaceShip position="-4000, 1500, -1000" lookat="0,0,0" team=0 name="d1sd1">
       <templates>
@@ -297 +297 @@
         </WingmanController>
       </controller>
-    </SpaceShip> -->
+    </SpaceShip>
     <SpaceShip position="1000, -2400, 1000" lookat="0,0,0" team=1 name="d2s1w2">
       <templates>

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

@@ -91 +91 @@
         if (maneuverCounter_ > 6.0f)
             maneuverCounter_ = 0;
+        this->timeOffset_ += dt;
+        if (this->timeOffset_ >= 2.0f)
+            this->timeOffset_ = 0.0f;
         if (timeout_ <= 0)
             this->bFiredRocket_ = false;
@@ -102 +105 @@
             this->lookAtTarget(dt);
         }
+
+
         if (this->bShooting_)
         {
@@ -117 +122 @@
         if (this->bFirstTick_)
         {    
+            this->timeOffset_ = 0.0f;
+            this->bActionCalled_ = false;
             setSpawners();
             // orxout(internal_error) << "health spawners size = " << this->healthSpawners_.size() <<
@@ -123 +130 @@
             this->bFirstTick_ = false;
         }
-        if (this->hasTarget())
-        {
+
+        //maneuver every 0.25 sec -> 
+        float currentPeriodTime = this->timeOffset_ - static_cast<int>(this->timeOffset_);
+        if (this->hasTarget() && ((currentPeriodTime >= 0.25f && currentPeriodTime <= 0.5f) || (currentPeriodTime >= 0.75 && currentPeriodTime <= 0.999f)) && !this->bManeuverCalled_)
+        {
+            this->bManeuverCalled_ = true;
             this->maneuver();
-            if (static_cast<int>(this->maneuverCounter_*100) % 3 == 0)
-                this->bShooting_ = this->canFire();
-        }
+            this->bShooting_ = this->canFire();
+        }
+        if ((currentPeriodTime >= 0.0f && currentPeriodTime <= 0.25f) || (currentPeriodTime >= 0.5f && currentPeriodTime <= 0.75f))
+            this->bManeuverCalled_ = false;
         SUPER(ActionpointController, tick, dt);
     }
@@ -137 +149 @@
         if (!this->getControllableEntity() || !orxonox_cast<Pawn*> (this->getControllableEntity()))
             return;
-            this->startAttackingEnemiesThatAreClose();
+        this->startAttackingEnemiesThatAreClose();
 
         this->deltaHp = orxonox_cast<Pawn*> (this->getControllableEntity())->getHealth() - this->previousHp;
@@ -546 +558 @@
             return;
         }  
-        if (this->actionCounter_ % 3 == 0)
-            this->setTargetOrientation(this->getProtect()->getWorldOrientation());
+        this->setTargetOrientation(this->getProtect()->getWorldOrientation());
     }
     void ActionpointController::nextActionpoint()

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

@@ -236 +236 @@
                 std::multimap <int, std::pair<PickupSpawner*, bool> > speedSpawners_; 
 
+                float timeOffset_;
+                bool bActionCalled_;
+                bool bManeuverCalled_;
+
         private:
             

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

@@ -43 +43 @@
         this->myFollower_ = 0;
         this->myWingman_ = 0;
-        this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&DivisionController::action, this)));
+        //this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&DivisionController::action, this)));
     }
 
@@ -68 +68 @@
             return;   
         SUPER(DivisionController, tick, dt);
+        if (this->timeOffset_ >= 0.0f && this->timeOffset_ <= 0.5f && !this->bActionCalled_)
+        {
+            this->action();
+            this->bActionCalled_ = true;
+        }
+        if (this->timeOffset_ > 1.0f)
+        {
+            this->bActionCalled_ = false;
+        }
+
+        
     }
     void DivisionController::action()

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

@@ -44 +44 @@
         this->setFormationMode(FormationMode::FINGER4);
 
-        this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&SectionController::action, this)));
+        //this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&SectionController::action, this)));
         this->myWingman_ = 0;
         this->myDivisionLeader_ = 0;
@@ -74 +74 @@
    
         SUPER(SectionController, tick, dt);
+        if (this->timeOffset_ >= 0.5f && this->timeOffset_ <= 1.0f && !this->bActionCalled_)
+        {
+            this->action();
+            this->bActionCalled_ = true;
+        }
+        if (this->timeOffset_ > 1.5f)
+        {
+            this->bActionCalled_ = false;
+        }
     }
 

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

@@ -39 +39 @@
     {
         RegisterObject(WingmanController);
-        this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&WingmanController::action, this)));
+        //this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&WingmanController::action, this)));
         this->myLeader_ = 0;
         this->bFirstAction_ = true;
@@ -68 +68 @@
         
         SUPER(WingmanController, tick, dt);
+        if (this->timeOffset_ >= this->actionTime_ && this->timeOffset_ <= this->actionTime_ + 0.5f && !this->bActionCalled_)
+        {
+            this->action();
+            this->bActionCalled_ = true;
+        }
+        if (this->timeOffset_ <= 0.5f)
+        {
+            this->bActionCalled_ = false;
+        }
     }
     
@@ -229 +238 @@
             if (closestLeader->setWingman(orxonox_cast<ActionpointController*>(this)))
             {
+                if (closestLeader->getIdentifier()->getName() == "SectionController")
+                {
+                    this->actionTime_ = 1.0f;
+                }
+                else
+                {
+                    this->actionTime_ = 1.5f;
+                }
                 return closestLeader;
             }

code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h

@@ -70 +70 @@
                 Timer actionTimer_; //<! Regularly calls action().
                 bool bFirstAction_;
-
+                float actionTime_;
     };
 }