matteo/skizzle
matteo
/
skizzle
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of https://github.com/matteodelabre/projet-cmi

This commit is contained in:
Rémi Cérès 2016-03-10 21:49:33 +01:00
parent 01bcf9ed66 642ecb88ba
commit 11ecc85ea2
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ CC=g++
CFLAGS=-Wall -std=c++11 CFLAGS=-Wall -std=c++11
TARGET=ptf TARGET=ptf
$(TARGET): build/main.o build/object.o build/physics_object.o build/block.o build/ball.o build/engine.o $(TARGET): build/main.o build/object.o build/physics_object.o build/block.o build/ball.o build/engine.o
$(CC) $(CFLAGS) -o build/$(TARGET) \ $(CC) $(CFLAGS) -o build/$(TARGET) \
build/main.o build/object.o build/physics_object.o build/block.o \ build/main.o build/object.o build/physics_object.o build/block.o \
build/ball.o build/engine.o \ build/ball.o build/engine.o \

2
engine.cpp
View File

@ -86,4 +86,6 @@ void Engine::draw() {
display_queue.top()->draw(window); display_queue.top()->draw(window);
display_queue.pop(); display_queue.pop();
} }
window.display();
} }

6
physics_object.cpp
View File

@ -1,9 +1,9 @@
#include "physics_object.hpp" #include "physics_object.hpp"
void PhysicsObject::update(State state) { void PhysicsObject::update(State state) {
sf::Vector2f forces = getForces(state); sf::Vector2f acceleration = getForces(state) / mass;
velocity += acceleration * state.delta;
// TODO: intégrer le vecteur force dans la vitesse puis la position position += velocity * state.delta;
} }
sf::Vector2f PhysicsObject::getVelocity() { sf::Vector2f PhysicsObject::getVelocity() {