tobast/mpri-graphics-project
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Error after rebase

Browse source
This commit is contained in:
Rémi Oudin 2018-02-13 22:56:44 +01:00
parent 041a1236c0
commit 6823552ee7
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Ball.cpp
View file

@ -92,7 +92,6 @@ void Ball::update_pos(double dt) {
double old_t = T;
double max_t;
_compute_parameters();
>>>>>>> Utility function
max_t = (T - old_t)/2.0 + old_t;
if (((A + B * max_t - (G_CTE / 2) * max_t * max_t + min_height) < radius)) {