Changeset 10826 for code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc

Timestamp:

Nov 22, 2015, 5:06:38 PM (8 years ago)

Author:

gania

Message:

some comments added

File:

• code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) (7 diffs)

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

@@ -46 +46 @@
 
     RegisterClass( CommonController );
-    float SPEED = 0.9f/0.02f;
-    float ROTATEFACTOR = 1.0f/0.02f;
+    const float SPEED = 0.9f/0.02f;
+    const float ROTATEFACTOR = 1.0f/0.02f;
 
     CommonController::CommonController( Context* context ): Controller( context )
@@ -53 +53 @@
         this->bSetupWorked = false;
 
-        this->executingManeuver_ = false;
+       
         this->executingMoveToPoint_ = false;
         this->action_ = Action::FLY;
         this->stopLookingAtTarget();
-        this->maneuverType_ = ManeuverType::NONE;
+       
         RegisterObject( CommonController );
     }
@@ -64 +64 @@
     CommonController::~CommonController() 
     {
-        orxout(internal_error) << "I died, my Rank is " << rank_ << endl;
+        //orxout(internal_error) << "I died, my Rank is " << rank_ << endl;
     }
 
@@ -77 +77 @@
         const std::string valUpper = getUppercase( val );
         FormationMode::Value value;
-        if ( valUpper == "VEE" )
-            value = FormationMode::VEE;
-        else if ( valUpper == "WALL" )
+        
+        if ( valUpper == "WALL" )
             value = FormationMode::WALL;
         else if ( valUpper == "FINGER4" )
@@ -94 +93 @@
         switch ( this->formationMode_ )
         {
-            case FormationMode::VEE:
-            {
-                return "VEE";
-                break;
-            }
             case FormationMode::WALL:
             {
@@ -246 +240 @@
             }
         }
-        if ( this->getControllableEntity()  && !this->target_ )
-        {
-
-            this->maneuverType_ = ManeuverType::NONE;
-        }
+        
         //orxout ( internal_error ) << "ManeuverType = " << this->maneuverType_ << endl;
     }
@@ -606 +596 @@
 
     }
+    float CommonController::distance (ControllableEntity* entity1, ControllableEntity* entity2)
+    {
+        if (!entity1 || !entity2)
+            return std::numeric_limits<float>::infinity();
+        return ( entity1->getPosition() - entity2->getPosition() ).length();
+    }
+    bool CommonController::sameTeam (ControllableEntity* entity1, ControllableEntity* entity2)
+    {
+        if (!entity1 || !entity2)
+            return false;
+        return entity1->getTeam() == entity2->getTeam();
+    }
     void CommonController::doFire() 
     {