Merge branch 'master' of https://github.com/matteodelabre/projet-cmi
This commit is contained in:
commit
11ecc85ea2
|
@ -86,4 +86,6 @@ void Engine::draw() {
|
|||
display_queue.top()->draw(window);
|
||||
display_queue.pop();
|
||||
}
|
||||
|
||||
window.display();
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#include "physics_object.hpp"
|
||||
|
||||
void PhysicsObject::update(State state) {
|
||||
sf::Vector2f forces = getForces(state);
|
||||
|
||||
// TODO: intégrer le vecteur force dans la vitesse puis la position
|
||||
sf::Vector2f acceleration = getForces(state) / mass;
|
||||
velocity += acceleration * state.delta;
|
||||
position += velocity * state.delta;
|
||||
}
|
||||
|
||||
sf::Vector2f PhysicsObject::getVelocity() {
|
||||
|
|
Loading…
Reference in New Issue