Changeset 10861 for code/branches/campaignHS15/src/orxonox

Timestamp:

Nov 25, 2015, 8:46:09 PM (9 years ago)

Author:

gania

Message:

finished everything, demos are commented out in AITest.oxw

Location:

code/branches/campaignHS15/src/orxonox/controllers

Files:

• CommonController.cc (modified) (6 diffs)
• CommonController.h (modified) (1 diff)
• DivisionController.cc (modified) (2 diffs)
• SectionController.cc (modified) (1 diff)

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

@@ -74 +74 @@
         this->parsedActionpoints_.clear();
         RegisterObject( CommonController );
-
+        this->bTakenOver_ = false;
     }
     CommonController::~CommonController() 
     {
+        parsedActionpoints_.clear();
+        actionpoints_.clear();
     }
     void CommonController::tick(float dt)
@@ -97 +99 @@
             std::reverse(parsedActionpoints_.begin(), parsedActionpoints_.end());
             std::reverse(actionpoints_.begin(), actionpoints_.end());
+            if (this->parsedActionpoints_.empty())
+            {
+                this->action_ = Action::FIGHTALL;
+            }
         }
         if (this->bFirstTick_)
@@ -822 +828 @@
                     {
                         std::string protectName = this->loopActionpoints_.back().name;
-
-                        for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
-                        {
-                            if (CommonController::getName(*itP) == protectName)
+                        if (protectName == "reservedKeyword:human")
+                        {
+                            for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
                             {
-                                this->setProtect (static_cast<ControllableEntity*>(*itP));
+                                if (orxonox_cast<ControllableEntity*>(*itP) && ((*itP)->getController()) && orxonox_cast <NewHumanController*> ((*itP)->getController()))
+                                {
+                                    this->setProtect (static_cast<ControllableEntity*>(*itP));
+                                }
                             }
+                        }
+                        else
+                        {
+                            for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
+                            {
+                                if (CommonController::getName(*itP) == protectName)
+                                {
+                                    this->setProtect (static_cast<ControllableEntity*>(*itP));
+                                }
+                            }                            
                         }
                         if (!this->getProtect())
@@ -915 +933 @@
                     case Action::PROTECT:
                     {
+                        
                         std::string protectName = this->parsedActionpoints_.back().name;
-
-                        for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
-                        {
-                            if (CommonController::getName(*itP) == protectName)
+                        if (protectName == "reservedKeyword:human")
+                        {
+                            for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
                             {
-                                this->setProtect (static_cast<ControllableEntity*>(*itP));
+                                if (orxonox_cast<ControllableEntity*>(*itP) && ((*itP)->getController()) && orxonox_cast <NewHumanController*> ((*itP)->getController()))
+                                {
+                                    this->setProtect (static_cast<ControllableEntity*>(*itP));
+                                }
                             }
+                        }
+                        else
+                        {
+                            for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
+                            {
+                                if (CommonController::getName(*itP) == protectName)
+                                {
+                                    this->setProtect (static_cast<ControllableEntity*>(*itP));
+                                }
+                            }                            
                         }
                         if (!this->getProtect())
@@ -1028 +1059 @@
         if (!this || !this->getControllableEntity())
             return;
-        orxout (internal_error) << "Size of actions is " << this->parsedActionpoints_.size() << endl;
+        // orxout (internal_error) << "Size of actions is " << this->parsedActionpoints_.size() << endl;
         this->startAttackingEnemiesThatAreClose();
         //No action -> pop one from stack
-        if (this->action_ == Action::NONE)
-        {
+        if (this->action_ == Action::NONE || this->bTakenOver_)
+        {
+            if (this->parsedActionpoints_.empty() && this->loopActionpoints_.empty())
+            {
+                Point p = { Action::FIGHTALL, "", Vector3::ZERO, false };
+                this->parsedActionpoints_.push_back (p);
+            }
             this->executeActionpoint();
+            this->bTakenOver_ = false;
         }
         //Action fightall -> fight till nobody alive
@@ -1134 +1171 @@
       this->parsedActionpoints_ = vector;
       this->loopActionpoints_ = loop;
-      this->bLoop_ = b;
-      this->setAction (Action::NONE);
-      // this->setTarget(0);
-      // this->setTargetPosition (this->getControllableEntity()->getWorldPosition());
-      orxout(internal_error) << "Top action is " << this->parsedActionpoints_.back().action << endl;
+      this->bLoop_ = this->bLoop_;
+      this->bTakenOver_ = true;
+      // orxout(internal_error) << "Top action is " << this->parsedActionpoints_.back().action << endl;
     }
     void CommonController::boostControl()

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

@@ -229 +229 @@
                 bool bInLoop_;
                 bool bLoop_;   
-                bool bEndLoop_;                
+                bool bEndLoop_;  
+                bool bTakenOver_;              
             //----[/"Private" variables]----    
            

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

@@ -83 +83 @@
     {   
         if (!this->isActive())
-            return;
+            return;   
         SUPER(DivisionController, tick, dt);
     }
@@ -90 +90 @@
         if (!this || !this->getControllableEntity())
             return;
+        
         CommonController::action();
+        if (!this || !this->getControllableEntity())
+            return;
+        if (!(this->parsedActionpoints_.empty() && this->loopActionpoints_.empty()))
+        {
+            if (this->myFollower_)
+            {
+                this->myFollower_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+            }
+            else if (this->myWingman_)
+            {
+                this->myWingman_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+            }    
+        }
         
     }

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

@@ -98 +98 @@
         if (!myDivisionLeader_)
         {
+            
             CommonController::action();
+            if (!this || !this->getControllableEntity())
+                return;
+            if (!(this->parsedActionpoints_.empty() && this->loopActionpoints_.empty()))
+            {
+                if (this->myWingman_)
+                {
+                    this->myWingman_->takeActionpoints(this->parsedActionpoints_, this->loopActionpoints_, this->bLoop_);
+                }    
+            }
         }
         else if (myDivisionLeader_)