godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

-new collision layer & mask system for 2D, for more flexible collision masking

Browse Source
This commit is contained in:
Juan Linietsky
2015-05-03 16:47:21 -03:00
parent 5f2aac4bbe
commit af06843982
18 changed files with 147 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/physics_server.cpp
View File

@@ -221,7 +221,7 @@ PhysicsShapeQueryParameters::PhysicsShapeQueryParameters() {
/////////////////////////////////////
/*
Variant PhysicsDirectSpaceState::_intersect_shape(const RID& p_shape, const Transform& p_xform,int p_result_max,const Vector<RID>& p_exclude,uint32_t p_user_mask) {
Variant PhysicsDirectSpaceState::_intersect_shape(const RID& p_shape, const Transform& p_xform,int p_result_max,const Vector<RID>& p_exclude,uint32_t p_collision_mask) {