Changeset 10882 for code/branches/campaignHS15

Timestamp:

Nov 28, 2015, 10:16:31 AM (9 years ago)

Author:

gania

Message:

fixed a bug in DivisionController, made action transitions smoother

Location:

code/branches/campaignHS15

Files:

• data/levels/AITest.oxw (modified) (4 diffs)
• src/orxonox/controllers/ActionpointController.cc (modified) (11 diffs)
• src/orxonox/controllers/DivisionController.cc (modified) (2 diffs)
• src/orxonox/controllers/FlyingController.cc (modified) (1 diff)

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

@@ -35 +35 @@
     
 <!-- HERE STARTS DEMO FOR THE "WAYPOINTS" -->
-     <!--  
+      
     <Model mesh="cube.mesh" scale=8 position="  0,2000,-600" />
     <Model mesh="cube.mesh" scale=8 position="  0,2000,-800" />
@@ -57 +57 @@
       </controller>
     </SpaceShip> 
-    -->
+   
 <!-- HERE ENDS DEMO FOR THE "WAYPOINTS" -->
 
 <!-- HERE STARTS DEMO FOR THE ACTIONPOINTS. 
 P.S. Never set protectMe in the first actionpoint: if human didn't spawn, that actionpoint will be skipped -->
-     <!--   
+       <!-- 
     <Model mesh="cube.mesh" scale=8 position="0,0,0" />
 
@@ -210 +210 @@
 <!-- HERE ENDS DEMO FOR FIGHTING -->
 <!-- HERE STARTS DEMO FOR FORMATIONS -->
-    
+    <!-- 
     <Model mesh="cube.mesh" scale=8 position="   0,2000,    0" />
     <Model mesh="cube.mesh" scale=8 position="   0,2000,-2000" />
@@ -259 +259 @@
       </controller>
     </SpaceShip> 
-   
+    -->
 <!-- HERE ENDS DEMO FOR FORMATIONS -->
     <!-- 

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

@@ -364 +364 @@
             (this->getProtect()->getWorldOrientation()* (targetRelativePosition)));
         this->setTargetPosition(targetAbsolutePosition);
-        this->actionCounter_ += this->actionCounter_ < 100000 ? 1 : -this->actionCounter_ ;
-        if (this->actionConter_ % 3 == 0)
+        if (this->actionCounter_ % 3 == 0)
             this->setTargetOrientation(this->getProtect()->getWorldOrientation());
     }
@@ -387 +386 @@
         }
         this->setAction(Action::NONE);
+        this->bHasTargetPosition_ = false;
     }
     void ActionpointController::moveBackToTop()
@@ -419 +419 @@
             return;
         // orxout (internal_error) << "Size of actions is " << this->parsedActionpoints_.size() << endl;
-        this->startAttackingEnemiesThatAreClose();
+        if (this->actionCounter_ % 5 == 0)
+            this->startAttackingEnemiesThatAreClose();
         //No action -> pop one from stack
         if (this->action_ == Action::NONE || this->bTakenOver_)
@@ -427 +428 @@
                 Point p = { Action::FIGHTALL, "", Vector3::ZERO, false };
                 this->parsedActionpoints_.push_back (p);
+
             }
             this->executeActionpoint();
             this->bTakenOver_ = false;
+            this->action();
         }
         //Action fightall -> fight till nobody alive
@@ -445 +448 @@
                 {
                     this->nextActionpoint();
-                    return;
+
+                    if (!(this->parsedActionpoints_.empty() && this->loopActionpoints_.empty()))
+                    {
+                        this->action();
+                    }
+                    
                 }
             }
@@ -468 +476 @@
                 {
                     this->nextActionpoint();
-                    return;
+                    this->action();
                 }
             }
@@ -488 +496 @@
                     {
                         this->nextActionpoint();
-                        return;
+                        this->action();
                     }
                 }
@@ -498 +506 @@
             {
                 this->nextActionpoint();   
-                return;
+                this->action();
             }
         }
@@ -505 +513 @@
             if (!this->getProtect())
             {
-                this->nextActionpoint(); 
-                return;
+                this->nextActionpoint();
+                this->action(); 
             }
             this->stayNearProtect();
@@ -515 +523 @@
             {
                 this->nextActionpoint();
-                return;
+                this->action();
             }
         }
@@ -525 +533 @@
             this->bShooting_ = this->canFire();                
         }
+        this->actionCounter_ += this->actionCounter_ < 100000 ? 1 : -this->actionCounter_ ;
+
     }
     void ActionpointController::takeActionpoints (std::vector<Point > vector, std::vector<Point > loop, bool b)

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

@@ -117 +117 @@
         {
             this->myFollower_ = newFollower;
+            if (this->hasWingman())
+            {
+                this->myWingman_->takeActionpoints (std::vector<Point>(), std::vector<Point>(), false);
+            }
             return true;
         }
@@ -135 +139 @@
         if (this->myFollower_)
             return true;
-        else
-            return false;
+        
+        return false;
     }
 }

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

@@ -39 +39 @@
         this->rotationProgress_ = 0;
         this->spread_ = 200;
-        this->tolerance_ = 80;
+        this->tolerance_ = 60;
         RegisterObject( FlyingController );
     }