From e80becdaee5dae3380cf30fea3aaff509025810c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Oudin?= Date: Mon, 12 Feb 2018 11:38:46 +0100 Subject: [PATCH] A ball has a min heihgt (for deformation) --- Ball.cpp | 3 ++- Ball.hpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Ball.cpp b/Ball.cpp index 300b2cd..aa623ce 100644 --- a/Ball.cpp +++ b/Ball.cpp @@ -2,10 +2,11 @@ #include #include -Ball::Ball(Point& _center, double _v_x, double _p, double _q) : +Ball::Ball(Point& _center, double _min_height, double _v_x, double _p, double _q) : Center(_center), surface(_center, _p, _q), init_h(_center.z), + min_height(_min_height), bounce_number(0.0), crt_time(0), A(_center.z), diff --git a/Ball.hpp b/Ball.hpp index f1df10e..0ab1a86 100644 --- a/Ball.hpp +++ b/Ball.hpp @@ -20,6 +20,7 @@ class Ball { Point Center; Spheroid surface; double init_h; + double min_height; size_t bounce_number; double crt_time; double A, B, U, T; // Coefficients for the physical model. @@ -31,7 +32,7 @@ class Ball { void _compute_U_n(); void _compute_T_n(); public: - Ball(Point& _center, double _v_x, double p, double q); + Ball(Point& _center, double _min_height, double _v_x, double p, double q); void update_pos(double dt); Point getCenter() const {return Center;} double accessT() const { return T;}