Changeset 9006 for code/branches

Timestamp:

Dec 20, 2011, 12:03:21 AM (13 years ago)

Author:

jo

Message:

Repairing setbotlevel command. Start of a presentation level.

Location:

code/branches/presentation2011

Files:

• data/levels/asteroidField.oxw (modified) (1 diff)
• data/levels/presentationHS11.oxw (added)
• src/orxonox/controllers/ArtificialController.cc (modified) (3 diffs)
• src/orxonox/controllers/ArtificialController.h (modified) (3 diffs)
• src/orxonox/controllers/FormationController.cc (modified) (1 diff)

code/branches/presentation2011/data/levels/asteroidField.oxw

@@ -3 +3 @@
  description = "Test of the asteroidField generator."
   screenshot = "asteroidFieldTest.png"
- tags = ""
+ tags = "test, showcase"
 />
 

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

@@ -29 +29 @@
 #include "ArtificialController.h"
 #include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommand.h"
 #include "worldentities/pawns/Pawn.h"
 #include "worldentities/pawns/SpaceShip.h"
@@ -41 +42 @@
 namespace orxonox
 {
+    SetConsoleCommand("ArtificialController", "setbotlevel",      &ArtificialController::setAllBotLevel);
 
     ArtificialController::ArtificialController(BaseObject* creator) : FormationController(creator)
@@ -113 +115 @@
     }
 
-//****************************************************************************************** NEW
     /**
         @brief DoFire is called when a bot should shoot and decides which weapon is used and whether the bot shoots at all.

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

@@ -33 +33 @@
 #include "controllers/FormationController.h"
 
+
 namespace orxonox
 {
@@ -44 +45 @@
 
             virtual void changedControllableEntity();
-//************************************************************************* NEW 
+
             virtual void doFire();
             void setBotLevel(float level=1.0f);
@@ -69 +70 @@
             bool isCloseAtTarget(float distance) const;
             bool isLookingAtTarget(float angle) const;
-//************************************************************************* NEW 
+
             float botlevel_; //<! Makes the level of a bot configurable.
             enum Mode {DEFAULT, ROCKET, DEFENCE, MOVING};//TODO; implement DEFENCE, MOVING modes

code/branches/presentation2011/src/orxonox/controllers/FormationController.cc

@@ -86 +86 @@
         this->bShooting_ = false;
         this->bHasTargetPosition_ = false;
-        this->bHasTargetOrientation_=false;
+        this->bHasTargetOrientation_=false;
         this->speedCounter_ = 0.2f;
         this->targetPosition_ = Vector3::ZERO;