Changeset 10834 for code/branches/campaignHS15/src/orxonox

Timestamp:

Nov 23, 2015, 1:24:51 PM (10 years ago)

Author:

maxima

Message:

AI_HS15 merged into campaignHS15

Location:

code/branches/campaignHS15

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/CommonController.cc (copied) (copied from code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc)
• src/orxonox/controllers/CommonController.h (copied) (copied from code/branches/AI_HS15/src/orxonox/controllers/CommonController.h)
• src/orxonox/controllers/DivisionController.cc (copied) (copied from code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc)
• src/orxonox/controllers/DivisionController.h (copied) (copied from code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h)
• src/orxonox/controllers/FormationController.cc (modified) (2 diffs)
• src/orxonox/controllers/LeaderController.cc (copied) (copied from code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc)
• src/orxonox/controllers/LeaderController.h (copied) (copied from code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h)
• src/orxonox/controllers/SectionController.cc (copied) (copied from code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc)
• src/orxonox/controllers/SectionController.h (copied) (copied from code/branches/AI_HS15/src/orxonox/controllers/SectionController.h)
• src/orxonox/controllers/WingmanController.cc (copied) (copied from code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc)
• src/orxonox/controllers/WingmanController.h (copied) (copied from code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (3 diffs)

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

@@ -11 +11 @@
   FormationController.cc
   ControllerDirector.cc
+  DivisionController.cc
+  LeaderController.cc
+  WingmanController.cc
+  SectionController.cc
+  CommonController.cc
 )

code/branches/campaignHS15/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);
@@ -1069 +1069 @@
             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/branches/campaignHS15/src/orxonox/worldentities/pawns/Pawn.cc

@@ -299 +299 @@
     }
 
-
     void Pawn::kill()
     {
@@ -319 +318 @@
         }
     }
-
 
     void Pawn::death()
@@ -472 +470 @@
     }
 
+    /**
+    @brief
+        Check whether the Pawn has a @ref Orxonox::WeaponSystem and fire it with the specified firemode if it has one.
+    */
     void Pawn::fired(unsigned int firemode)
     {