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

Correction d'un bug calcul de collision

This commit is contained in:
Mattéo Delabre 2016-04-10 23:51:23 +02:00
parent 3b8fc8f0b7
commit 5ff5e38928
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.cpp
View File

@ -4,13 +4,10 @@
#include "game.hpp"
#include <iostream>
#include <memory>
#include <fstream>
#include <fenv.h>
int main() {
Manager manager;
std::shared_ptr<Menu> menu = std::shared_ptr<Menu>(new Menu(manager));
feenableexcept(FE_ALL_EXCEPT & ~FE_INEXACT);
try {
manager.setState(menu);

3
src/object.cpp
View File

@ -228,7 +228,7 @@ void Object::solveCollision(Level& level, Object::Ptr obj, const sf::Vector2f& n
// si les directions sont divergentes, pas besoin
// de résoudre la collision
if (dot_normal > 0) {
if (dot_normal >= 0) {
return;
}
@ -252,7 +252,6 @@ void Object::solveCollision(Level& level, Object::Ptr obj, const sf::Vector2f& n
// on calcule le vecteur tangent qui porte la force de frottement.
// les coefficients de friction utilisés sont les moyennes de ceux des deux objets
rel_velo = obj->getVelocity() - getVelocity();
dot_normal = rel_velo.x * normal.x + rel_velo.y * normal.y;
sf::Vector2f tangent = rel_velo - dot_normal * normal;
float tangent_length = std::sqrt(tangent.x * tangent.x + tangent.y * tangent.y);