diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-10 15:54:57 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-10 15:54:57 -0300 |
| commit | 1aaf507ffb9b96627219d1e6f4ca1f22565e06b8 (patch) | |
| tree | 3d0e7f836918f8c54f6576cc5f2d20d3ec52d33c /servers/physics/space_sw.h | |
| parent | 729ab84a49fb69aed25e6986828f727ad8b18691 (diff) | |
| download | redot-engine-1aaf507ffb9b96627219d1e6f4ca1f22565e06b8.tar.gz | |
change intersect_ray function to discriminate pickable objects, fixes #3203
Diffstat (limited to 'servers/physics/space_sw.h')
| -rw-r--r-- | servers/physics/space_sw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics/space_sw.h b/servers/physics/space_sw.h index 9c73565381..6300c206d8 100644 --- a/servers/physics/space_sw.h +++ b/servers/physics/space_sw.h @@ -46,7 +46,7 @@ public: SpaceSW *space; - virtual bool intersect_ray(const Vector3& p_from, const Vector3& p_to,RayResult &r_result,const Set<RID>& p_exclude=Set<RID>(),uint32_t p_layer_mask=0xFFFFFFFF,uint32_t p_object_type_mask=TYPE_MASK_COLLISION); + virtual bool intersect_ray(const Vector3& p_from, const Vector3& p_to,RayResult &r_result,const Set<RID>& p_exclude=Set<RID>(),uint32_t p_layer_mask=0xFFFFFFFF,uint32_t p_object_type_mask=TYPE_MASK_COLLISION,bool p_pick_ray=false); virtual int intersect_shape(const RID& p_shape, const Transform& p_xform,float p_margin,ShapeResult *r_results,int p_result_max,const Set<RID>& p_exclude=Set<RID>(),uint32_t p_layer_mask=0xFFFFFFFF,uint32_t p_object_type_mask=TYPE_MASK_COLLISION); virtual bool cast_motion(const RID& p_shape, const Transform& p_xform,const Vector3& p_motion,float p_margin,float &p_closest_safe,float &p_closest_unsafe, const Set<RID>& p_exclude=Set<RID>(),uint32_t p_layer_mask=0xFFFFFFFF,uint32_t p_object_type_mask=TYPE_MASK_COLLISION,ShapeRestInfo *r_info=NULL); virtual bool collide_shape(RID p_shape, const Transform& p_shape_xform,float p_margin,Vector3 *r_results,int p_result_max,int &r_result_count, const Set<RID>& p_exclude=Set<RID>(),uint32_t p_layer_mask=0xFFFFFFFF,uint32_t p_object_type_mask=TYPE_MASK_COLLISION); |