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

Merge pull request #2587 from eska014/fix-area2d-mask-matching

Browse Source 
Fix Area/Area2D mask matching
This commit is contained in:
Juan Linietsky 2015-10-17 09:47:27 -03:00
commit a871fc9112
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/physics/space_sw.cpp
View File

@ -34,10 +34,10 @@
_FORCE_INLINE_ static bool _match_object_type_query(CollisionObjectSW *p_object, uint32_t p_layer_mask, uint32_t p_type_mask) { _FORCE_INLINE_ static bool _match_object_type_query(CollisionObjectSW *p_object, uint32_t p_layer_mask, uint32_t p_type_mask) {
if ((p_object->get_layer_mask()&p_layer_mask)==0) if (p_object->get_type()==CollisionObjectSW::TYPE_AREA)
return false; return p_type_mask&PhysicsDirectSpaceState::TYPE_MASK_AREA;
if (p_object->get_type()==CollisionObjectSW::TYPE_AREA && !(p_type_mask&PhysicsDirectSpaceState::TYPE_MASK_AREA)) if ((p_object->get_layer_mask()&p_layer_mask)==0)
return false; return false;
BodySW *body = static_cast<BodySW*>(p_object); BodySW *body = static_cast<BodySW*>(p_object);

4
servers/physics_2d/space_2d_sw.cpp
View File

@ -36,8 +36,8 @@ _FORCE_INLINE_ static bool _match_object_type_query(CollisionObject2DSW *p_objec
if ((p_object->get_layer_mask()&p_layer_mask)==0) if ((p_object->get_layer_mask()&p_layer_mask)==0)
return false; return false;
if (p_object->get_type()==CollisionObject2DSW::TYPE_AREA && !(p_type_mask&Physics2DDirectSpaceState::TYPE_MASK_AREA)) if (p_object->get_type()==CollisionObject2DSW::TYPE_AREA)
return false; return p_type_mask&Physics2DDirectSpaceState::TYPE_MASK_AREA;
Body2DSW *body = static_cast<Body2DSW*>(p_object); Body2DSW *body = static_cast<Body2DSW*>(p_object);