aboutsummaryrefslogtreecommitdiffstats
path: root/src/rigidbody.cpp
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-05-19 20:08:23 +0100
committerYann Herklotz <ymherklotz@gmail.com>2017-05-19 20:08:23 +0100
commit3308d13ad04fac43e7a111b299ff9444aea4ab9f (patch)
tree54a91113f75e506318101acf3151d3b11d309e96 /src/rigidbody.cpp
parente15b2c6dd405d008d9e892608c209fd980bcd8ff (diff)
downloadYAGE-3308d13ad04fac43e7a111b299ff9444aea4ab9f.tar.gz
YAGE-3308d13ad04fac43e7a111b299ff9444aea4ab9f.zip
Adding math to yage
Diffstat (limited to 'src/rigidbody.cpp')
-rw-r--r--src/rigidbody.cpp34
1 files changed, 5 insertions, 29 deletions
diff --git a/src/rigidbody.cpp b/src/rigidbody.cpp
index d8b963de..f92500b8 100644
--- a/src/rigidbody.cpp
+++ b/src/rigidbody.cpp
@@ -3,35 +3,11 @@
namespace yage
{
-RigidBody::RigidBody(const glm::vec2 &center_of_mass, double mass, const glm::vec2 &force, const glm::vec2 &velocity, bool gravity) :
- Body(center_of_mass, mass, force, velocity, gravity)
+RigidBody::RigidBody(const glm::vec2 &position,
+ double mass,
+ const glm::vec2 &velocity,
+ bool gravity) :
+ ParticleBody(position, mass, velocity, gravity)
{}
-void RigidBody::applyForce(const glm::vec2 &force)
-{
- force_+=force;
-}
-
-void RigidBody::update()
-{
- // set the time_step for 60fps
- double time_step=1.0/60.0;
-
- // set the last acceleration
- glm::vec2 last_acceleration=acceleration_;
-
- // update the position of the body
- center_of_mass_.x+=velocity_.x*time_step+(0.5*last_acceleration.x*time_step*time_step);
- center_of_mass_.y+=velocity_.y*time_step+(0.5*last_acceleration.y*time_step*time_step);
-
- // update the acceleration
- acceleration_=glm::vec2(force_.x/mass_, force_.y/mass_);
- glm::vec2 avg_acceleration=glm::vec2((acceleration_.x+last_acceleration.x)/2,
- (acceleration_.y+last_acceleration.y)/2);
-
- // update the velocity of the body
- velocity_.x+=avg_acceleration.x*time_step;
- velocity_.y+=avg_acceleration.y*time_step;
-}
-
} // yage