diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-08-24 00:25:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-24 00:25:31 +0100 |
commit | a326354ea6fccf76665a4212bf14daeba0f52ec8 (patch) | |
tree | 18cd2deb0c30b38d8ca7c5305735d2323259e020 /include/YAGE/Physics/particlebody.hpp | |
parent | 0a49874288f92c120d7e165550eb6dbbe1ef7307 (diff) | |
parent | 5403490b941f7c031bf1aafdb91b1098f69edbf2 (diff) | |
download | YAGE-a326354ea6fccf76665a4212bf14daeba0f52ec8.tar.gz YAGE-a326354ea6fccf76665a4212bf14daeba0f52ec8.zip |
Merge pull request #3 from ymherklotz/developv0.1.0
Merge develop to master
Diffstat (limited to 'include/YAGE/Physics/particlebody.hpp')
-rw-r--r-- | include/YAGE/Physics/particlebody.hpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/include/YAGE/Physics/particlebody.hpp b/include/YAGE/Physics/particlebody.hpp index ff8b3b85..a3091773 100644 --- a/include/YAGE/Physics/particlebody.hpp +++ b/include/YAGE/Physics/particlebody.hpp @@ -6,26 +6,27 @@ * ---------------------------------------------------------------------------- */ -#ifndef YAGE_PARTICLE_BODY_HPP -#define YAGE_PARTICLE_BODY_HPP +#ifndef YAGE_PHYSICS_PARTICLE_BODY_HPP +#define YAGE_PHYSICS_PARTICLE_BODY_HPP #include "Math/matrix.hpp" +#include "Physics/body.hpp" -#include "body.hpp" +namespace yage +{ -namespace yage { - -class ParticleBody : public Body { +class ParticleBody : public Body +{ public: - ParticleBody(const Vector2d& position = Vector2d(0, 0), double mass = 1, - const Vector2d& velocity = Vector2d(0, 0), + ParticleBody(const Vector2d &position = Vector2d(0, 0), double mass = 1, + const Vector2d &velocity = Vector2d(0, 0), bool gravity = true); // apply a force to the rigid body - virtual void applyForce(const Vector2d& force); - virtual void update(); + void applyForce(const Vector2d &force) override; + void update() override; }; -} // yage +} // yage #endif |