diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-08-07 15:31:26 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 15:31:26 -0300 |
| commit | 14fd797c536a675c94c36a2b2b924ce0295f5d64 (patch) | |
| tree | 9ac70ce41c656f726402187f0fd90e578036c3af /servers/physics_2d_server.h | |
| parent | e0456f7976832b9f17958e1e8e7c18379b19e382 (diff) | |
| parent | 5e65e28eed1398cceb4b77cb99ba6578115953db (diff) | |
Merge pull request #20381 from AndreaCatania/phymat_2
Improved Physics material
Diffstat (limited to 'servers/physics_2d_server.h')
| -rw-r--r-- | servers/physics_2d_server.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/servers/physics_2d_server.h b/servers/physics_2d_server.h index 796eec1e8e..f42d9868f0 100644 --- a/servers/physics_2d_server.h +++ b/servers/physics_2d_server.h @@ -423,19 +423,6 @@ public: virtual void body_set_param(RID p_body, BodyParameter p_param, float p_value) = 0; virtual float body_get_param(RID p_body, BodyParameter p_param) const = 0; - enum CombineMode { - COMBINE_MODE_MAX, - COMBINE_MODE_MIN, - COMBINE_MODE_MULTIPLY, - COMBINE_MODE_AVERAGE, - - COMBINE_MODE_INHERIT /// Inherit from other body or use COMBINE_MODE_MAX (Restitution) COMBINE_MODE_MULTIPLY (Friction) - }; - - /// p_param accept only Bounce and Friction - virtual void body_set_combine_mode(RID p_body, BodyParameter p_param, CombineMode p_mode) = 0; - virtual CombineMode body_get_combine_mode(RID p_body, BodyParameter p_param) const = 0; - //state enum BodyState { BODY_STATE_TRANSFORM, |