Changeset 10840

Timestamp:

Nov 23, 2015, 4:56:50 PM (9 years ago)

Author:

gania

Message:

action PROTECT works. Look FUCK

Location:

code/branches/campaignHS15

Files:

• data/levels/AITest.oxw (modified) (4 diffs)
• src/orxonox/controllers/CommonController.cc (modified) (4 diffs)
• src/orxonox/controllers/CommonController.h (modified) (2 diffs)
• src/orxonox/controllers/DivisionController.cc (modified) (1 diff)
• src/orxonox/controllers/SectionController.cc (modified) (1 diff)

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

@@ -66 +66 @@
       </templates>
       <controller>
-        <WingmanController >
+        <WingmanController team=0>
         </WingmanController>
       </controller>
@@ -75 +75 @@
       </templates>
       <controller>
-        <WingmanController >
+        <WingmanController team=0>
         </WingmanController>
       </controller>
@@ -84 +84 @@
       </templates>
       <controller>
-        <SectionController >
+        <SectionController team=0>
         </SectionController>
       </controller>
@@ -93 +93 @@
       </templates>
       <controller>
-        <SectionController>
+        <SectionController team=0>
         </SectionController>
       </controller>

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

@@ -80 +80 @@
     void CommonController::setProtectXML( std::string val )
     {
-        for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
-        {
-            if ((*itP)->getName() == val)
-            {
-                this->setProtect (static_cast<ControllableEntity*>(*itP));
-            }
-        }
-    }
+        this->protectName_ = val;
+        
+    }
+    void CommonController::tick(float dt)
+    {
+
+    }
+
     std::string CommonController::getProtectXML ()
     {
@@ -202 +202 @@
         else if (action == Action::PROTECT)
         {
+            if (target)
+                this->setProtect (target);
         }
     }
@@ -211 +213 @@
             this->setTargetPosition (target);
         }
-        else if (action == Action::PROTECT)
-        {
-
-        }
+        
     }
     void CommonController::setAction (Action::Value action, const Vector3& target,  const Quaternion& orient )
@@ -224 +223 @@
             this->setTargetOrientation (orient);
         }
-        else if (action == Action::PROTECT)
-        {
-            
-        }
+       
     }
     void CommonController::setClosestTarget()

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

@@ -77 +77 @@
             CommonController(Context* context);
             virtual ~CommonController();
+
+            virtual void tick(float dt); 
 
             //----[XML data]----
@@ -194 +196 @@
                 FormationMode::Value formationMode_;
                 Rank::Value rank_;
+                std::string protectName_;
                 Action::Value action_;
             //----[/"Private" variables]----               

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

@@ -133 +133 @@
         else if (this->action_ == Action::PROTECT)
         {
-            if (this->getProtect())
-            {
-                orxout(internal_error) << "PROTECT FOUND" << endl;
-            }
+            if (!this->getProtect())
+            {
+                for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
+                {
+                    if ((*itP)->getName() == this->protectName_)
+                    {
+                        this->setProtect (static_cast<ControllableEntity*>(*itP));
+                    }
+                }
+            }
+            else
+            {
+               /* if (this->myWingman_)
+                    this->myWingman_->setAction (Action::PROTECT, this->getProtect());
+                if (this->myFollower_)
+                    this->myFollower_->setAction (Action::PROTECT, this->getProtect());
+                */
+                Vector3* targetRelativePosition;
+                    
+                targetRelativePosition = new Vector3 (0, 0, 500);  
+     
+                Vector3 targetAbsolutePosition = ((this->getProtect()->getWorldPosition()) + 
+                    (this->getProtect()->getWorldOrientation()* (*targetRelativePosition)));
+                this->setTargetPosition(targetAbsolutePosition);
+                
+                this->setTargetPositionOfWingman();
+                this->setTargetPositionOfFollower();
+            }            
+
         }
 

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

@@ -145 +145 @@
         else if (this->action_ == Action::PROTECT)
         {
+           /* if (this->myWingman_)
+                this->myWingman_->setAction (Action::PROTECT, this->getProtect());
+*/
+            this->setTargetPositionOfWingman();
 
         }