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

Merge pull request #20101 from panzergame/shape_margin

Browse Source 
Expose bullet shape margin to UI.
This commit is contained in:
Rémi Verschelde
2018-08-21 16:17:11 +02:00
committed by GitHub
parent 238b70e2db e5bfa98d0f
commit 912131fe03
9 changed files with 98 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
servers/physics/physics_server_sw.cpp
View File

@ -124,6 +124,13 @@ Variant PhysicsServerSW::shape_get_data(RID p_shape) const {
return shape->get_data();
};
void PhysicsServerSW::shape_set_margin(RID p_shape, real_t p_margin) {
}
real_t PhysicsServerSW::shape_get_margin(RID p_shape) const {
return 0.0;
}
real_t PhysicsServerSW::shape_get_custom_solver_bias(RID p_shape) const {
const ShapeSW *shape = shape_owner.get(p_shape);
@ -292,6 +299,7 @@ void PhysicsServerSW::area_set_shape(RID p_area, int p_shape_idx, RID p_shape) {
area->set_shape(p_shape_idx, shape);
}
void PhysicsServerSW::area_set_shape_transform(RID p_area, int p_shape_idx, const Transform &p_transform) {
AreaSW *area = area_owner.get(p_area);

4
servers/physics/physics_server_sw.h
View File

@ -85,6 +85,10 @@ public:
virtual ShapeType shape_get_type(RID p_shape) const;
virtual Variant shape_get_data(RID p_shape) const;
virtual void shape_set_margin(RID p_shape, real_t p_margin);
virtual real_t shape_get_margin(RID p_shape) const;
virtual real_t shape_get_custom_solver_bias(RID p_shape) const;
/* SPACE API */

4
servers/physics_server.h
View File

@ -243,6 +243,10 @@ public:
virtual ShapeType shape_get_type(RID p_shape) const = 0;
virtual Variant shape_get_data(RID p_shape) const = 0;
virtual void shape_set_margin(RID p_shape, real_t p_margin) = 0;
virtual real_t shape_get_margin(RID p_shape) const = 0;
virtual real_t shape_get_custom_solver_bias(RID p_shape) const = 0;
/* SPACE API */