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

Timestamp:

Jan 31, 2015, 6:03:17 PM (10 years ago)

Author:

landauf

Message:

merged branch presentationFS14 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/ArtificialController.cc (modified) (1 diff)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/ControllerDirector.cc (copied) (copied from code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc)
• src/orxonox/controllers/ControllerDirector.h (copied) (copied from code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.h)
• src/orxonox/controllers/NewHumanController.cc (modified) (2 diffs)
• src/orxonox/controllers/ScriptController.cc (copied) (copied from code/branches/presentationFS14/src/orxonox/controllers/ScriptController.cc)
• src/orxonox/controllers/ScriptController.h (copied) (copied from code/branches/presentationFS14/src/orxonox/controllers/ScriptController.h)
• src/orxonox/controllers/testscript.lua (copied) (copied from code/branches/presentationFS14/src/orxonox/controllers/testscript.lua)

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

@@ -94 +94 @@
         static const float hardcoded_projectile_speed = 1250;
 
-        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getPosition(), hardcoded_projectile_speed, this->target_->getPosition(), this->target_->getVelocity());
+        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

@@ -10 +10 @@
   DroneController.cc
   FormationController.cc
+  ControllerDirector.cc
 )

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

@@ -220 +220 @@
                 if (!controlPaused_ )
                 {
-                    if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
+                    if (this->getControllableEntity() && ((this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || (this->getControllableEntity()->isExactlyA(ClassByString("ModularSpaceShip")))) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
                         this->showOverlays();
                     else if (this->getControllableEntity() &&  this->getControllableEntity()->isExactlyA(ClassByString("FpsPlayer")))
@@ -498 +498 @@
         this->controlMode_ = 0;
         this->centerCursor();
-        if (this->getControllableEntity() && (this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
+        if (this->getControllableEntity() && ((this->getControllableEntity()->isExactlyA(ClassByString("SpaceShip")) || (this->getControllableEntity()->isExactlyA(ClassByString("ModularSpaceShip")))) || this->getControllableEntity()->isExactlyA(ClassByString("Rocket"))))
         {
             this->showOverlays_ = true;