seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #20381 from AndreaCatania/phymat_2

Browse Source 
Improved Physics material
This commit is contained in:
Juan Linietsky
2018-08-07 15:31:26 -03:00
committed by GitHub
parent e0456f7976 5e65e28eed
commit 14fd797c53
22 changed files with 80 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
servers/physics_2d_server.h
View File

@ -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,