Changeset 11932 for code/branches/ScriptableController_FS18/src/orxonox

Timestamp:

May 3, 2018, 3:16:09 PM (6 years ago)

Author:

adamc

Message:

Fixed killing and moving of entities & commit issue

Location:

code/branches/ScriptableController_FS18/src/orxonox

Files:

• scriptablecontroller/scriptable_controller_api.cc (modified) (1 diff)
• worldentities/pawns/AAAAutonomousDrone.cc (modified) (1 diff)

code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc

@@ -408 +408 @@
             controllable_entity = orxonox_cast<ControllableEntity*>(entity);
 
-            orxout(user_warning) << "Accessed " << id << std::endl;
-
             controllable_entity->moveFrontBack(x);
             controllable_entity->moveRightLeft(y);

code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns/AAAAutonomousDrone.cc

@@ -121 +121 @@
         SUPER(AAAAutonomousDrone, tick, dt);
 
+
         this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxiliaryThrust_);
         this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() * getMass() * this->auxiliaryThrust_);
+
+
         if (this->localLinearAcceleration_.z() > 0)
             this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->auxiliaryThrust_);
         else
             this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->primaryThrust_);
+
         this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
         this->localLinearAcceleration_.setValue(0, 0, 0);