1 files changed, 17 insertions, 2 deletions

diff --git a/servers/physics/space_sw.h b/servers/physics/space_sw.h
index cec1053400..a97647dcfc 100644
--- a/servers/physics/space_sw.h
+++ b/servers/physics/space_sw.h
@@ -46,8 +46,11 @@ public:
 

 	SpaceSW *space;

 

-	bool intersect_ray(const Vector3& p_from, const Vector3& p_to,RayResult &r_result,const Set<RID>& p_exclude=Set<RID>(),uint32_t p_user_mask=0);

-	int intersect_shape(const RID& p_shape, const Transform& p_xform,ShapeResult *r_results,int p_result_max,const Set<RID>& p_exclude=Set<RID>(),uint32_t p_user_mask=0);

+	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 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);

+	virtual bool rest_info(RID p_shape, const Transform& p_shape_xform,float p_margin,ShapeRestInfo *r_info, const Set<RID>& p_exclude=Set<RID>(),uint32_t p_layer_mask=0xFFFFFFFF,uint32_t p_object_type_mask=TYPE_MASK_COLLISION);

 

 	PhysicsDirectSpaceStateSW();

 };

@@ -94,6 +97,10 @@ class SpaceSW {
 

 	bool locked;

 

+	int island_count;

+	int active_objects;

+	int collision_pairs;

+

 friend class PhysicsDirectSpaceStateSW;

 

 public:

@@ -147,6 +154,14 @@ public:
 	void set_param(PhysicsServer::SpaceParameter p_param, real_t p_value);

 	real_t get_param(PhysicsServer::SpaceParameter p_param) const;

 

+	void set_island_count(int p_island_count) { island_count=p_island_count; }

+	int get_island_count() const { return island_count; }

+

+	void set_active_objects(int p_active_objects) { active_objects=p_active_objects; }

+	int get_active_objects() const { return active_objects; }

+

+	int get_collision_pairs() const { return collision_pairs; }

+

 	PhysicsDirectSpaceStateSW *get_direct_state();

 

 	SpaceSW();