diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-03 16:47:21 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-03 16:47:21 -0300 |
| commit | af068439829a3fec3a76c4c5d4dd2dba71ab6c5f (patch) | |
| tree | a50bea4ceb2ef7e70e86303148830377e19028ce /servers/physics_server.h | |
| parent | 5f2aac4bbe14d1256feebd4bb12d8b61e5b55f3d (diff) | |
| download | redot-engine-af068439829a3fec3a76c4c5d4dd2dba71ab6c5f.tar.gz | |
-new collision layer & mask system for 2D, for more flexible collision masking
Diffstat (limited to 'servers/physics_server.h')
| -rw-r--r-- | servers/physics_server.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics_server.h b/servers/physics_server.h index 97a1d34e7b..ffb462af22 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -131,8 +131,8 @@ class PhysicsDirectSpaceState : public Object { OBJ_TYPE( PhysicsDirectSpaceState, Object ); -// Variant _intersect_ray(const Vector3& p_from, const Vector3& p_to,const Vector<RID>& p_exclude=Vector<RID>(),uint32_t p_user_mask=0); -// Variant _intersect_shape(const RID& p_shape, const Transform& p_xform,int p_result_max=64,const Vector<RID>& p_exclude=Vector<RID>(),uint32_t p_user_mask=0); +// Variant _intersect_ray(const Vector3& p_from, const Vector3& p_to,const Vector<RID>& p_exclude=Vector<RID>(),uint32_t p_collision_mask=0); +// Variant _intersect_shape(const RID& p_shape, const Transform& p_xform,int p_result_max=64,const Vector<RID>& p_exclude=Vector<RID>(),uint32_t p_collision_mask=0); public: enum ObjectTypeMask { |