diff options
| author | Andrea Catania <info@andreacatania.com> | 2018-07-23 16:37:07 +0200 |
|---|---|---|
| committer | Andrea Catania <info@andreacatania.com> | 2018-08-07 19:38:04 +0200 |
| commit | 5e65e28eed1398cceb4b77cb99ba6578115953db (patch) | |
| tree | 2b4ae296db3d7763f2cf071dc87340ae56585d48 /servers/physics_2d/body_2d_sw.h | |
| parent | 1ad20dc2f13001d95e91cb2089571028f44db11a (diff) | |
Removed physics material combination mode. Added rough and absorbent parameter to material. Fixed 'change' signal connection
Diffstat (limited to 'servers/physics_2d/body_2d_sw.h')
| -rw-r--r-- | servers/physics_2d/body_2d_sw.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/servers/physics_2d/body_2d_sw.h b/servers/physics_2d/body_2d_sw.h index 301bd6b299..782adf3416 100644 --- a/servers/physics_2d/body_2d_sw.h +++ b/servers/physics_2d/body_2d_sw.h @@ -54,8 +54,6 @@ class Body2DSW : public CollisionObject2DSW { real_t mass; real_t bounce; real_t friction; - Physics2DServer::CombineMode bounce_combine_mode; - Physics2DServer::CombineMode friction_combine_mode; real_t _inv_mass; real_t _inv_inertia; @@ -258,12 +256,6 @@ public: _FORCE_INLINE_ real_t get_linear_damp() const { return linear_damp; } _FORCE_INLINE_ real_t get_angular_damp() const { return angular_damp; } - void set_combine_mode(Physics2DServer::BodyParameter p_param, Physics2DServer::CombineMode p_mode); - Physics2DServer::CombineMode get_combine_mode(Physics2DServer::BodyParameter p_param) const; - - _FORCE_INLINE_ Physics2DServer::CombineMode get_bounce_combine_mode() const { return bounce_combine_mode; } - _FORCE_INLINE_ Physics2DServer::CombineMode get_friction_combine_mode() const { return friction_combine_mode; } - void integrate_forces(real_t p_step); void integrate_velocities(real_t p_step); |