Changeset 10915 for code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc

Timestamp:

Dec 2, 2015, 10:31:23 AM (9 years ago)

Author:

gania

Message:

little fix

File:

• code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) (2 diffs)

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

@@ -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;
-        }
+        if (!this->myLeader_)
+        {
+            if (this->actionTime_ == 2.0f)
+            {
+                if (this->timeOffset_ >= 0.0f && this->timeOffset_ <= 0.8f && !this->bActionCalled_)
+                {
+                    this->action();
+                    this->bActionCalled_ = true;
+                }
+                if (this->timeOffset_ > 1.6f)
+                {
+                    this->bActionCalled_ = false;
+                }
+            }
+            else
+            {
+                if (this->timeOffset_ > 0.8f && this->timeOffset_ <= 1.6f && !this->bActionCalled_)
+                {
+                    this->action();
+                    this->bActionCalled_ = true;
+                }
+                if (this->timeOffset_ > 2.0f)
+                {
+                    this->bActionCalled_ = false;
+                }
+            }
+        }
+        else
+        {
+            if (this->timeOffset_ >= this->actionTime_ && this->timeOffset_ <= this->actionTime_ + 0.4f && !this->bActionCalled_)
+            {
+                this->action();
+                this->bActionCalled_ = true;
+            }
+            if (this->timeOffset_ <= 0.5f)
+            {
+                this->bActionCalled_ = false;
+            }
+        }
+       
+
     }
     
@@ -240 +272 @@
                 if (closestLeader->getIdentifier()->getName() == "SectionController")
                 {
-                    this->actionTime_ = 1.0f;
+                    this->actionTime_ = 1.6f;
                 }
                 else
                 {
-                    this->actionTime_ = 1.5f;
+                    this->actionTime_ = 2.0f;
                 }
                 return closestLeader;