Changeset 11052 for code/trunk/src/orxonox/controllers

Timestamp:

Jan 9, 2016, 6:26:20 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationHS15 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/ActionpointController.cc (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.cc)
• src/orxonox/controllers/ActionpointController.h (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.h)
• src/orxonox/controllers/ArtificialController.cc (modified) (1 diff)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/CommonController.cc (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc)
• src/orxonox/controllers/CommonController.h (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/CommonController.h)
• src/orxonox/controllers/DivisionController.cc (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/DivisionController.cc)
• src/orxonox/controllers/DivisionController.h (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h)
• src/orxonox/controllers/FightingController.cc (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc)
• src/orxonox/controllers/FightingController.h (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/FightingController.h)
• src/orxonox/controllers/FlyingController.cc (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/FlyingController.cc)
• src/orxonox/controllers/FlyingController.h (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/FlyingController.h)
• src/orxonox/controllers/FormationController.cc (modified) (4 diffs)
• src/orxonox/controllers/HumanController.cc (modified) (1 diff)
• src/orxonox/controllers/MasterController.cc (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/MasterController.cc)
• src/orxonox/controllers/MasterController.h (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/MasterController.h)
• src/orxonox/controllers/SectionController.cc (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc)
• src/orxonox/controllers/SectionController.h (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/SectionController.h)
• src/orxonox/controllers/WingmanController.cc (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc)
• src/orxonox/controllers/WingmanController.h (copied) (copied from code/branches/presentationHS15/src/orxonox/controllers/WingmanController.h)

code/trunk/src/orxonox/controllers/ArtificialController.cc

@@ -94 +94 @@
             return;
 
-        static const float hardcoded_projectile_speed = 750;
-
-        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), hardcoded_projectile_speed, this->target_->getWorldPosition(), this->target_->getVelocity());
+        static const float HARDCODED_PROJECTILE_SPEED = 750;
+
+        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), HARDCODED_PROJECTILE_SPEED, this->target_->getWorldPosition(), this->target_->getVelocity());
         this->bHasTargetPosition_ = (this->targetPosition_ != Vector3::ZERO);
 

code/trunk/src/orxonox/controllers/CMakeLists.txt

@@ -11 +11 @@
   FormationController.cc
   ControllerDirector.cc
+  DivisionController.cc
+  WingmanController.cc
+  SectionController.cc
+  CommonController.cc
+  ActionpointController.cc
+  FlyingController.cc
+  FightingController.cc
+  MasterController.cc
 )

code/trunk/src/orxonox/controllers/FormationController.cc

@@ -277 +277 @@
         }
 
-        Vector2 coord = get2DViewcoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
+        Vector2 coord = get2DViewCoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
         float distance = (target - this->getControllableEntity()->getPosition()).length();
         float rotateX = clamp(coord.x * 10, -1.0f, 1.0f);
@@ -970 +970 @@
         if (controller)
         {
+            if (controller->getIdentifier()->getName() == "MasterController")
+                return true;
             FormationController* ac = orxonox_cast<FormationController*>(controller);
             if (ac)
@@ -981 +983 @@
         if (controller)
         {
+            if (controller->getIdentifier()->getName() == "MasterController")
+                return true;
             FormationController* ac = orxonox_cast<FormationController*>(controller);
             if (ac)
@@ -1069 +1073 @@
             return;
 
-        Vector2 coord = get2DViewcoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
+        Vector2 coord = get2DViewCoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
         float distance = (target - this->getControllableEntity()->getPosition()).length();
 

code/trunk/src/orxonox/controllers/HumanController.cc

@@ -199 +199 @@
     @brief
         Starts the boosting mode.
-        Resets the boosting timeout and ells the ControllableEntity to boost (or not boost anymore).
+        Resets the boosting timeout and tells the ControllableEntity to boost (or not boost anymore).
     */
     void HumanController::startBoosting(void)