Changeset 10877 for code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc

Timestamp:

Nov 27, 2015, 4:42:14 PM (9 years ago)

Author:

gania

Message:

CommonController now has static methods only. Replace with a namespace?

File:

• code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) (5 diffs)

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

@@ -126 +126 @@
         Vector3 diffUnit = diffVector/diffLength;
 
-        bool bTargetIsLookingAtThis = this->isLooking ( this->target_, getControllableEntity(), math::pi/10.0f );
+        bool bTargetIsLookingAtThis = CommonController::isLooking ( this->target_, getControllableEntity(), math::pi/10.0f );
         
         //too far? well, come closer then
@@ -167 +167 @@
     {
         float factorX = 0, factorY = 0, factorZ = 0;
-        float rand = randomInRange (0, 1);
+        float rand = CommonController::randomInRange (0, 1);
     
         if (rand <= 0.5)
@@ -173 +173 @@
         else
         { factorX = -1; }
-        rand = randomInRange (0, 1);
+        rand = CommonController::randomInRange (0, 1);
         if (rand <= 0.5)
         { factorY = 1; }
         else
         { factorY = -1; }
-        rand = randomInRange (0, 1);
+        rand = CommonController::randomInRange (0, 1);
         if (rand <= 0.5)
         { factorZ = 1; }
@@ -186 +186 @@
         Vector3 target = ( diffUnit )* 8000.0f;
         Vector3* randVector = new Vector3( 
-            factorX * randomInRange( 10000, 40000 ), 
-            factorY * randomInRange( 10000, 40000 ), 
-            factorZ * randomInRange( 10000, 40000 ) 
+            factorX * CommonController::randomInRange( 10000, 40000 ), 
+            factorY * CommonController::randomInRange( 10000, 40000 ), 
+            factorZ * CommonController::randomInRange( 10000, 40000 ) 
         );
         Vector3 projection = randVector->dotProduct( diffUnit )* diffUnit;
@@ -245 +245 @@
         if ( !this->getControllableEntity()  || !this->target_ )
             return false;
-        return this->isLooking(this->getControllableEntity(), this->getTarget(), angle);
+        return CommonController::isLooking(this->getControllableEntity(), this->getTarget(), angle);
     }
         void FightingController::setClosestTarget()