Changeset 10763

Timestamp:

Nov 3, 2015, 5:06:05 PM (9 years ago)

Author:

gania

Message:

fixed a bug

Location:

code/branches/AI_HS15/src/orxonox/controllers

Files:

• CommonController.cc (modified) (5 diffs)
• CommonController.h (modified) (1 diff)
• DivisionController.cc (modified) (3 diffs)
• FleetController.cc (modified) (2 diffs)

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

@@ -190 +190 @@
     void CommonController::moveToPosition(const Vector3& target)
     {
+        float factor = 1;
         if (!this->getControllableEntity())
             return;
         if (this->rank_ == Rank::DIVISIONLEADER)
-            SPEED *= 0.8;
+            factor = 0.8;
         if (this->rank_ == Rank::SECTIONLEADER)
-            SPEED *= 0.9;
+            factor = 0.9;
         
         //100 is (so far) the smallest tolerance (empirically found) that can be reached, 
@@ -233 +234 @@
                 }
             }
-            this->getControllableEntity()->moveFrontBack(1.2f*SPEED);
+                    orxout (internal_error) << "MOVING" <<endl ;
+
+            this->getControllableEntity()->moveFrontBack(1.2f*SPEED*factor);
         }
         else
@@ -257 +260 @@
     {
         //check pointers
-        if (!this->getControllableEntity() || !this->target_ || !this->target_->getControllableEntity())
+        if (!this->getControllableEntity() || !this->target_)
             return false;
-        
+
         //check if this points in the direction of target_
 
         Vector3 myPosition = this->getControllableEntity()->getWorldPosition();
-        Vector3 targetPosition = this->target_->getControllableEntity()->getWorldPosition();
+        Vector3 targetPosition = this->target_->getWorldPosition();
         Vector3 differenceVector = targetPosition - myPosition;
-        float scalarProduct = differenceVector * WorldEntity::FRONT;
+        float scalarProduct = differenceVector.dotProduct(WorldEntity::FRONT);
         Vector3 projection = scalarProduct * WorldEntity::FRONT;
         if ((differenceVector - projection).length() > 50)
@@ -282 +285 @@
                 allyPosition = it->getControllableEntity()->getWorldPosition();
                 allyDifference = allyPosition - myPosition;
-                allyScalarProduct = allyDifference * WorldEntity::FRONT;
+                allyScalarProduct = allyDifference.dotProduct(WorldEntity::FRONT);
                 allyProjection = allyScalarProduct * WorldEntity::FRONT;
                 if (allyScalarProduct < 0 || allyScalarProduct > scalarProduct)
@@ -291 +294 @@
         }
 
+        Pawn* pawn = orxonox_cast<Pawn*>(this->getControllableEntity());
+        if (pawn)
+            pawn->setAimPosition(WorldEntity::FRONT);
+    
         return true;
 

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

@@ -109 +109 @@
 
             void setTarget(ControllableEntity* target);
-
+            
             void setTargetOrientation(const Quaternion& orient);
             void setTargetOrientation(ControllableEntity* target);

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

@@ -40 +40 @@
         
         this->setFormationMode(FormationMode::DIAMOND);
-
+        this->target_ = 0;
         this->myFollower_ = 0;
         this->myWingman_ = 0;
@@ -46 +46 @@
         this->rank_ = Rank::DIVISIONLEADER;
 
-        Vector3* pos = new Vector3(-4000,-1000,-2000);
-        this->setTargetPosition(*pos);
 
     }
@@ -76 +74 @@
     void DivisionController::action()
     {
+/*
+        Vector3* pos = new Vector3(4000,1000,2000);
+        this->setTargetPosition(*pos);*/
+
         setTargetPositionOfFollower();
         setTargetPositionOfWingman();

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

@@ -58 +58 @@
         this->divisions_.clear();
         
-        /*for (ObjectList<DivisionController>::iterator it = ObjectList<DivisionController>::begin(); it; ++it)
+        for (ObjectList<DivisionController>::iterator it = ObjectList<DivisionController>::begin(); it; ++it)
         {
             if ((this->getControllableEntity()->getTeam() == (it)->getControllableEntity()->getTeam()))
@@ -65 +65 @@
             } 
         }
+        /*for(std::vector<WeakPtr<DivisionController> >::iterator it2 = divisions_.begin(); it2 != divisions_.end(); ++it2) 
+        {
+            (*it2)->setTargetPosition(this->getControllableEntity()->getWorldPosition());   
+        }*/ 
         for (ObjectList<Controller>::iterator it = ObjectList<Controller>::begin(); it; ++it)
         {
-            if ((this->getControllableEntity()->getTeam() != (it)->getControllableEntity()->getTeam()) && (it)->getControllableEntity()->getTeam() != 0)
+            if ((this->getControllableEntity()->getTeam() != (it)->getControllableEntity()->getTeam()) && (it)->getControllableEntity()->getTeam() == 0)
             {
                 for(std::vector<WeakPtr<DivisionController> >::iterator it2 = divisions_.begin(); it2 != divisions_.end(); ++it2) {
                     (*it2)->setTarget(it->getControllableEntity());   
+                    (*it2)->setTargetPosition(it->getControllableEntity()->getWorldPosition());
                 }               
                 break;
             } 
-        }*/
+        }
 
     }