Changeset 2954 for code/branches/gametypes

Timestamp:

May 4, 2009, 5:28:59 PM (16 years ago)

Author:

Aurelian

Message:

ForceField not working jet, but no errors…

Location:

code/branches/gametypes/src/orxonox/objects/worldentities

Files:

• CMakeLists.txt (modified) (1 diff)
• ForceField.cc (added)
• ForceField.h (added)
• MobileEntity.cc (modified) (1 diff)
• MobileEntity.h (modified) (1 diff)

code/branches/gametypes/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -23 +23 @@
   PongBall.cc
   PongBat.cc
+  ForceField.cc
 )
 

code/branches/gametypes/src/orxonox/objects/worldentities/MobileEntity.cc

@@ -166 +166 @@
     }
 
+    void MobileEntity::applyCentralForce(const Vector3& force)
+    {
+        if (this->isDynamic())
+            this->physicalBody_->applyCentralForce(btVector3(force.x * this->getMass(), force.y * this->getMass(), force.z * this->getMass()));
+    }
+
     bool MobileEntity::isCollisionTypeLegal(WorldEntity::CollisionType type) const
     {

code/branches/gametypes/src/orxonox/objects/worldentities/MobileEntity.h

@@ -75 +75 @@
                 { return this->angularAcceleration_; }
 
+            void applyCentralForce(const Vector3& force);
+            inline void applyCentralForce(float x, float y, float z)
+                { this->applyCentralForce(Vector3(x, y, z)); }
+
             inline void setRotationRate(Degree rate)
                 { this->setAngularVelocity(this->getAngularVelocity().normalisedCopy() * rate.valueRadians()); }