godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Refactor layer_mask to collision_layer

Browse Source
This commit is contained in:
Poommetee Ketson
2017-06-13 22:45:01 +07:00
parent a8e845a474
commit 6c44fff508
30 changed files with 220 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
servers/physics_2d/physics_2d_server_sw.cpp
View File

@@ -476,12 +476,12 @@ void Physics2DServerSW::area_set_collision_mask(RID p_area, uint32_t p_mask) {
area->set_collision_mask(p_mask);
}
void Physics2DServerSW::area_set_layer_mask(RID p_area, uint32_t p_mask) {
void Physics2DServerSW::area_set_collision_layer(RID p_area, uint32_t p_layer) {
Area2DSW *area = area_owner.get(p_area);
ERR_FAIL_COND(!area);
area->set_layer_mask(p_mask);
area->set_collision_layer(p_layer);
}
void Physics2DServerSW::area_set_monitor_callback(RID p_area, Object *p_receiver, const StringName &p_method) {
@@ -691,19 +691,19 @@ uint32_t Physics2DServerSW::body_get_object_instance_ID(RID p_body) const {
return body->get_instance_id();
};
void Physics2DServerSW::body_set_layer_mask(RID p_body, uint32_t p_flags) {
void Physics2DServerSW::body_set_collision_layer(RID p_body, uint32_t p_flags) {
Body2DSW *body = body_owner.get(p_body);
ERR_FAIL_COND(!body);
body->set_layer_mask(p_flags);
body->set_collision_layer(p_flags);
};
uint32_t Physics2DServerSW::body_get_layer_mask(RID p_body) const {
uint32_t Physics2DServerSW::body_get_collision_layer(RID p_body) const {
Body2DSW *body = body_owner.get(p_body);
ERR_FAIL_COND_V(!body, 0);
return body->get_layer_mask();
return body->get_collision_layer();
};
void Physics2DServerSW::body_set_collision_mask(RID p_body, uint32_t p_flags) {