Changeset 8978 for code/branches

Timestamp:

Dec 14, 2011, 2:15:45 PM (13 years ago)

Author:

willis

Message:

renamed Masterable to FormationController, some minor changes

Location:

code/branches/formation/src/orxonox/controllers

Files:

• AIController.cc (modified) (1 diff)
• ArtificialController.cc (modified) (1 diff)
• ArtificialController.h (modified) (1 diff)
• CMakeLists.txt (modified) (1 diff)
• FormationController.cc (added)
• FormationController.h (added)
• HumanController.cc (modified) (2 diffs)
• HumanController.h (modified) (3 diffs)

code/branches/formation/src/orxonox/controllers/AIController.cc

@@ -118 +118 @@
         if (this->state_ == SLAVE && this->mode_==ATTACK)
         {
-            if (!this->target_)
-            {
-               this->searchNewTarget();
-            }
+            // search enemy
+            random = rnd(maxrand);
+            if (random < 75 && (!this->target_))
+                this->searchNewTarget();
 
             // next enemy

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

@@ -35 +35 @@
 {
 
-    ArtificialController::ArtificialController(BaseObject* creator) : Masterable(creator)
+    ArtificialController::ArtificialController(BaseObject* creator) : FormationController(creator)
     {
           

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "controllers/Masterable.h"
+#include "controllers/FormationController.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ArtificialController : public Masterable
+    class _OrxonoxExport ArtificialController : public FormationController
     {
         public:

code/branches/formation/src/orxonox/controllers/CMakeLists.txt

@@ -9 +9 @@
   WaypointPatrolController.cc
   DroneController.cc
-  Masterable.cc
+  FormationController.cc
 )

code/branches/formation/src/orxonox/controllers/HumanController.cc

@@ -71 +71 @@
     /*static*/ const float HumanController::BOOSTING_TIME = 0.1f;
 
-    HumanController::HumanController(BaseObject* creator) : Masterable(creator)
+    HumanController::HumanController(BaseObject* creator) : FormationController(creator)
     {
         RegisterObject(HumanController);
@@ -176 +176 @@
         {
             HumanController::localController_s->controllableEntity_->fire(firemode);
-            //if human fires, set slaves free. See Masterable::forceFreeSlaves()
+            //if human fires, set slaves free. See FormationController::forceFreeSlaves()
             if (HumanController::localController_s->state_==MASTER && HumanController::localController_s->mode_==NORMAL)
             {

code/branches/formation/src/orxonox/controllers/HumanController.h

@@ -34 +34 @@
 #include "tools/Timer.h"
 #include "tools/interfaces/Tickable.h"
-#include "Masterable.h"
+#include "FormationController.h"
 
 // tolua_begin
@@ -41 +41 @@
     class _OrxonoxExport HumanController
 // tolua_end
-        : public Masterable, public Tickable
+        : public FormationController, public Tickable
     { // tolua_export
         public:
@@ -113 +113 @@
             Timer boostingTimeout_; // A timer to check whether the player is no longer boosting.
             static const float BOOSTING_TIME; // The time after it is checked, whether the player is no longer boosting.
-            Masterable* tempMaster;
+            FormationController* tempMaster;
 
     }; // tolua_export