Changeset 8720 for code/branches/ai/src/orxonox/controllers

Timestamp:

Jun 30, 2011, 8:30:13 PM (13 years ago)

Author:

jo

Message:

Just a backup, before starting to update the ai branch.

Location:

code/branches/ai/src/orxonox/controllers

Files:

• AIController.cc (modified) (2 diffs)
• ArtificialController.cc (modified) (5 diffs)
• ArtificialController.h (modified) (2 diffs)

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

@@ -208 +208 @@
         if (!this->isActive())
             return;
-
+        //Vector-implementation: if(target_.size() == 0) target[0] = DEFAULT;
         if(this->mode_ == DEFAULT)
-        {
+        {//Vector-implementation: mode_.back() == DEFAULT;
             if (this->state_ == MASTER)
             {
@@ -271 +271 @@
         }//END_OF DEFAULT MODE
         else if (this->mode_ == ROCKET)//Rockets do not belong to a group of bots -> bot states are not relevant.
-        {   
+        {   //Vector-implementation: mode_.back() == ROCKET;
             ControllableEntity *controllable = this->getControllableEntity(); 
             if(controllable)

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

@@ -91 +91 @@
         this->numberOfWeapons = 0;
         this->botlevel_ = 1.0f;
-        this->mode_ = DEFAULT;
+        this->mode_ = DEFAULT;////Vector-implementation: mode_.push_back(DEFAULT);
         this->timeout_=0;
     }
@@ -98 +98 @@
     {
         if (this->isInitialized())
-        {
+        {//Vector-implementation: mode_.erase(mode_.begin(),mode_.end());
             this->removeFromFormation();
 
@@ -1046 +1046 @@
             {//ROCKET: mid range weapon
                 //TODO: Which weapon is the rocket? How many rockets are available?
-                this->mode_ = ROCKET;
+                this->mode_ = ROCKET;//Vector-implementation: mode_.push_back(ROCKET);
                 this->getControllableEntity()->fire(3);//launch rocket
                 if(this->getControllableEntity()&&this->target_)//after fire(3) getControllableEntity() refers to the rocket!
@@ -1081 +1081 @@
                     else if(wpn=="LaserMunition")//other munitiontypes are not defined yet :-(
                         weapons[0]=0;
-                    else if(wpn=="LENSFLARE")//TODO: insert right munition name
+                    else if(wpn=="FusionMunition")
                         weapons[1]=1;
-                    else if(wpn=="SIMPLEROCKET")//TODO: insert right munition name
+                    else if(wpn=="TargetSeeking Rockets")
                         weapons[2]=2;
                     else if(wpn=="ROCKET")//TODO: insert right munition name
@@ -1133 +1133 @@
     void ArtificialController::setPreviousMode()
     {
-        this->mode_ = DEFAULT;
+        this->mode_ = DEFAULT; //Vector-implementation: mode_.pop_back();
     }
     

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

@@ -146 +146 @@
             bool bShooting_;
             
-            int numberOfWeapons;//< Used for weapon init function. Displayes number of weapons available for a bot.
+            int numberOfWeapons; //< Used for weapon init function. Displayes number of weapons available for a bot.
             int weapons[WeaponSystem::MAX_WEAPON_MODES];
             int projectiles[WeaponSystem::MAX_WEAPON_MODES];
@@ -153 +153 @@
 
             enum Mode {DEFAULT, ROCKET, DEFENCE, MOVING};//TODO; implement DEFENCE, MOVING modes
-            Mode mode_;
+            Mode mode_; //TODO: replace single value with stack-like implementation: std::vector<Mode> mode_;
             void setPreviousMode();