Changeset 8589 for code/branches/presentation/src/orxonox/worldentities/MobileEntity.cc

Timestamp:

May 26, 2011, 12:58:09 AM (13 years ago)

Author:

dafrick

Message:

Merging bigships branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/MobileEntity.cc (modified) (1 diff)

code/branches/presentation/src/orxonox/worldentities/MobileEntity.cc

@@ -143 +143 @@
     {
         if (this->isDynamic())
+        {
             this->physicalBody_->applyCentralForce(btVector3(acceleration.x * this->getMass(), acceleration.y * this->getMass(), acceleration.z * this->getMass()));
-
+        }
+
+        // If not bullet-managed (deprecated? SpaceShip doesn't use this anymore for movement)
         this->linearAcceleration_ = acceleration;
+    }
+
+    void MobileEntity::addAcceleration(const Vector3 &acceleration, const Vector3 &relativePosition)
+    {
+        if(this->isDynamic())
+        {
+            this->physicalBody_->applyForce(this->getMass() * btVector3(acceleration.x, acceleration.y, acceleration.z), btVector3(relativePosition.x, relativePosition.y, relativePosition.z));
+        }
     }