Changeset 7097 for code/branches/presentation3

Timestamp:

Jun 3, 2010, 12:39:55 AM (14 years ago)

Author:

landauf

Message:

trying to activate formationflight also for xml enemies

Location:

code/branches/presentation3/src/orxonox/controllers

Files:

• ArtificialController.cc (modified) (8 diffs)
• ArtificialController.h (modified) (1 diff)

code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc

@@ -95 +95 @@
 
         XMLPortParam(ArtificialController, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
-        XMLPortParam(ArtificialController, "formationFlight", setFormationFlight, getFormationFlight, xmlelement, mode).defaultValues(true);
+        XMLPortParam(ArtificialController, "formationFlight", setFormationFlight, getFormationFlight, xmlelement, mode).defaultValues(false);
         XMLPortParam(ArtificialController, "formationSize", setFormationSize, getFormationSize, xmlelement, mode).defaultValues(STANDARD_MAX_FORMATION_SIZE);
+        XMLPortParam(ArtificialController, "passive", setPassive, getPassive, xmlelement, mode).defaultValues(false);
     }
 
@@ -109 +110 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-            if (!it->getController())
-                continue;
-
-            ArtificialController *aiController = orxonox_cast<ArtificialController*>(it->getController());
+            Controller* controller = 0;
+            
+            if (it->getController())
+                controller = it->getController();
+            else if (it->getXMLController())
+                controller = it->getXMLController();
+                
+            if (!controller)
+                continue;
+
+            ArtificialController *aiController = orxonox_cast<ArtificialController*>(controller);
 
             if(aiController)
@@ -134 +142 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-            if (!it->getController())
-                continue;
-
-            ArtificialController *aiController = orxonox_cast<ArtificialController*>(it->getController());
+            Controller* controller = 0;
+            
+            if (it->getController())
+                controller = it->getController();
+            else if (it->getXMLController())
+                controller = it->getXMLController();
+                
+            if (!controller)
+                continue;
+
+            ArtificialController *aiController = orxonox_cast<ArtificialController*>(controller);
 
             if(aiController && aiController->state_ == MASTER)
@@ -161 +176 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-            if (!it->getController())
-                continue;
-
-            currentHumanController = orxonox_cast<NewHumanController*>(it->getController());
+            Controller* controller = 0;
+            
+            if (it->getController())
+                controller = it->getController();
+            else if (it->getXMLController())
+                controller = it->getXMLController();
+                
+            if (!controller)
+                continue;
+
+            currentHumanController = orxonox_cast<NewHumanController*>(controller);
 
             if(currentHumanController) humanPawn = *it;
 
-            ArtificialController *aiController = orxonox_cast<ArtificialController*>(it->getController());
+            ArtificialController *aiController = orxonox_cast<ArtificialController*>(controller);
 
             if(aiController && aiController->state_ == MASTER)
@@ -202 +224 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-            if (!it->getController())
-                continue;
-
-            ArtificialController *aiController = orxonox_cast<ArtificialController*>(it->getController());
+            Controller* controller = 0;
+            
+            if (it->getController())
+                controller = it->getController();
+            else if (it->getXMLController())
+                controller = it->getXMLController();
+                
+            if (!controller)
+                continue;
+
+            ArtificialController *aiController = orxonox_cast<ArtificialController*>(controller);
 
             if(aiController)
@@ -223 +252 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-            if (!it->getController())
-                continue;
-
-            ArtificialController *aiController = orxonox_cast<ArtificialController*>(it->getController());
+            Controller* controller = 0;
+            
+            if (it->getController())
+                controller = it->getController();
+            else if (it->getXMLController())
+                controller = it->getXMLController();
+                
+            if (!controller)
+                continue;
+
+            ArtificialController *aiController = orxonox_cast<ArtificialController*>(controller);
 
             if(aiController)
@@ -356 +392 @@
 
             //has it an ArtificialController?
-            if (!it->getController())
+            Controller* controller = 0;
+            
+            if (it->getController())
+                controller = it->getController();
+            else if (it->getXMLController())
+                controller = it->getXMLController();
+                
+            if (!controller)
                 continue;
 
@@ -365 +408 @@
             teamSize++;
 
-            ArtificialController *newMaster = orxonox_cast<ArtificialController*>(it->getController());
+            ArtificialController *newMaster = orxonox_cast<ArtificialController*>(controller);
 
             //is it a master?

code/branches/presentation3/src/orxonox/controllers/ArtificialController.h

@@ -64 +64 @@
             inline int getFormationSize() const
                 { return this->maxFormationSize_; }
+                
+            inline void setPassive(bool passive)
+                { this->passive_ = passive; }
+            inline bool getPassive() const
+                { return this->passive_; }
 
             virtual void changedControllableEntity();