Error after rebase
This commit is contained in:
parent
041a1236c0
commit
6823552ee7
1
Ball.cpp
1
Ball.cpp
|
@ -92,7 +92,6 @@ void Ball::update_pos(double dt) {
|
||||||
double old_t = T;
|
double old_t = T;
|
||||||
double max_t;
|
double max_t;
|
||||||
_compute_parameters();
|
_compute_parameters();
|
||||||
>>>>>>> Utility function
|
|
||||||
max_t = (T - old_t)/2.0 + old_t;
|
max_t = (T - old_t)/2.0 + old_t;
|
||||||
|
|
||||||
if (((A + B * max_t - (G_CTE / 2) * max_t * max_t + min_height) < radius)) {
|
if (((A + B * max_t - (G_CTE / 2) * max_t * max_t + min_height) < radius)) {
|
||||||
|
|
Loading…
Reference in a new issue