Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Ability to visually debug geometry visually:

Browse source 
-Visible 2D and 3D Shapes, Polygons, Tile collisions, etc.
-Visible Navmesh and Navpoly
-Visible collision contacts for 2D and 3D as a red point
-Customizable colors in project settings
This commit is contained in:
Juan Linietsky 2015-09-20 13:03:46 -03:00
commit 83d9a692be
106 changed files with 2025 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

10
servers/physics/body_pair_sw.cpp
View file

@ -299,6 +299,16 @@ bool BodyPairSW::setup(float p_step) {
c.active=true;
#ifdef DEBUG_ENABLED
if (space->is_debugging_contacts()) {
space->add_debug_contact(global_A+offset_A);
space->add_debug_contact(global_B+offset_A);
}
#endif
int gather_A = A->can_report_contacts();
int gather_B = B->can_report_contacts();

24
servers/physics/physics_server_sw.cpp
View file

@ -201,6 +201,30 @@ PhysicsDirectSpaceState* PhysicsServerSW::space_get_direct_state(RID p_space) {
return space->get_direct_state();
}
void PhysicsServerSW::space_set_debug_contacts(RID p_space,int p_max_contacts) {
SpaceSW *space = space_owner.get(p_space);
ERR_FAIL_COND(!space);
space->set_debug_contacts(p_max_contacts);
}
Vector<Vector3> PhysicsServerSW::space_get_contacts(RID p_space) const {
SpaceSW *space = space_owner.get(p_space);
ERR_FAIL_COND_V(!space,Vector<Vector3>());
return space->get_debug_contacts();
}
int PhysicsServerSW::space_get_contact_count(RID p_space) const {
SpaceSW *space = space_owner.get(p_space);
ERR_FAIL_COND_V(!space,0);
return space->get_debug_contact_count();
}
RID PhysicsServerSW::area_create() {
AreaSW *area = memnew( AreaSW );

3
servers/physics/physics_server_sw.h
View file

@ -94,6 +94,9 @@ public:
// this function only works on fixed process, errors and returns null otherwise
virtual PhysicsDirectSpaceState* space_get_direct_state(RID p_space);
virtual void space_set_debug_contacts(RID p_space,int p_max_contacts);
virtual Vector<Vector3> space_get_contacts(RID p_space) const;
virtual int space_get_contact_count(RID p_space) const;
/* AREA API */

4
servers/physics/space_sw.cpp
View file

@ -640,7 +640,7 @@ void SpaceSW::call_queries() {
void SpaceSW::setup() {
contact_debug_count=0;
while(inertia_update_list.first()) {
inertia_update_list.first()->self()->update_inertias();
inertia_update_list.remove(inertia_update_list.first());
@ -651,6 +651,7 @@ void SpaceSW::setup() {
void SpaceSW::update() {
broadphase->update();
}
@ -712,6 +713,7 @@ SpaceSW::SpaceSW() {
collision_pairs=0;
active_objects=0;
island_count=0;
contact_debug_count=0;
locked=false;
contact_recycle_radius=0.01;

8
servers/physics/space_sw.h
View file

@ -103,6 +103,9 @@ class SpaceSW {
RID static_global_body;
Vector<Vector3> contact_debug;
int contact_debug_count;
friend class PhysicsDirectSpaceStateSW;
public:
@ -166,6 +169,11 @@ public:
PhysicsDirectSpaceStateSW *get_direct_state();
void set_debug_contacts(int p_amount) { contact_debug.resize(p_amount); }
_FORCE_INLINE_ bool is_debugging_contacts() const { return !contact_debug.empty(); }
_FORCE_INLINE_ void add_debug_contact(const Vector3& p_contact) { if (contact_debug_count<contact_debug.size()) contact_debug[contact_debug_count++]=p_contact; }
_FORCE_INLINE_ Vector<Vector3> get_debug_contacts() { return contact_debug; }
_FORCE_INLINE_ int get_debug_contact_count() { return contact_debug_count; }
void set_static_global_body(RID p_body) { static_global_body=p_body; }
RID get_static_global_body() { return static_global_body; }

7
servers/physics_2d/body_pair_2d_sw.cpp
View file

@ -379,7 +379,12 @@ bool BodyPair2DSW::setup(float p_step) {
}
c.active=true;
#ifdef DEBUG_ENABLED
if (space->is_debugging_contacts()) {
space->add_debug_contact(global_A+offset_A);
space->add_debug_contact(global_B+offset_A);
}
#endif
int gather_A = A->can_report_contacts();
int gather_B = B->can_report_contacts();

24
servers/physics_2d/physics_2d_server_sw.cpp
View file

@ -257,6 +257,30 @@ real_t Physics2DServerSW::space_get_param(RID p_space,SpaceParameter p_param) co
return space->get_param(p_param);
}
void Physics2DServerSW::space_set_debug_contacts(RID p_space,int p_max_contacts) {
Space2DSW *space = space_owner.get(p_space);
ERR_FAIL_COND(!space);
space->set_debug_contacts(p_max_contacts);
}
Vector<Vector2> Physics2DServerSW::space_get_contacts(RID p_space) const {
Space2DSW *space = space_owner.get(p_space);
ERR_FAIL_COND_V(!space,Vector<Vector2>());
return space->get_debug_contacts();
}
int Physics2DServerSW::space_get_contact_count(RID p_space) const {
Space2DSW *space = space_owner.get(p_space);
ERR_FAIL_COND_V(!space,0);
return space->get_debug_contact_count();
}
Physics2DDirectSpaceState* Physics2DServerSW::space_get_direct_state(RID p_space) {
Space2DSW *space = space_owner.get(p_space);

5
servers/physics_2d/physics_2d_server_sw.h
View file

@ -102,6 +102,11 @@ public:
virtual void space_set_param(RID p_space,SpaceParameter p_param, real_t p_value);
virtual real_t space_get_param(RID p_space,SpaceParameter p_param) const;
virtual void space_set_debug_contacts(RID p_space,int p_max_contacts);
virtual Vector<Vector2> space_get_contacts(RID p_space) const;
virtual int space_get_contact_count(RID p_space) const;
// this function only works on fixed process, errors and returns null otherwise
virtual Physics2DDirectSpaceState* space_get_direct_state(RID p_space);

16
servers/physics_2d/physics_2d_server_wrap_mt.h
View file

@ -94,6 +94,22 @@ public:
return physics_2d_server->space_get_direct_state(p_space);
}
FUNC2(space_set_debug_contacts,RID,int);
virtual Vector<Vector2> space_get_contacts(RID p_space) const {
ERR_FAIL_COND_V(main_thread!=Thread::get_caller_ID(),Vector<Vector2>());
return physics_2d_server->space_get_contacts(p_space);
}
virtual int space_get_contact_count(RID p_space) const {
ERR_FAIL_COND_V(main_thread!=Thread::get_caller_ID(),0);
return physics_2d_server->space_get_contact_count(p_space);
}
/* AREA API */

7
servers/physics_2d/space_2d_sw.cpp
View file

@ -1230,6 +1230,7 @@ void Space2DSW::call_queries() {
void Space2DSW::setup() {
contact_debug_count=0;
while(inertia_update_list.first()) {
inertia_update_list.first()->self()->update_inertias();
@ -1302,6 +1303,8 @@ Space2DSW::Space2DSW() {
active_objects=0;
island_count=0;
contact_debug_count=0;
locked=false;
contact_recycle_radius=0.01;
contact_max_separation=0.05;
@ -1320,6 +1323,10 @@ Space2DSW::Space2DSW() {
direct_access = memnew( Physics2DDirectSpaceStateSW );
direct_access->space=this;
}
Space2DSW::~Space2DSW() {

11
servers/physics_2d/space_2d_sw.h
View file

@ -103,6 +103,9 @@ class Space2DSW {
int _cull_aabb_for_body(Body2DSW *p_body,const Rect2& p_aabb);
Vector<Vector2> contact_debug;
int contact_debug_count;
friend class Physics2DDirectSpaceStateSW;
public:
@ -169,6 +172,14 @@ public:
bool test_body_motion(Body2DSW *p_body, const Vector2&p_motion, float p_margin, Physics2DServer::MotionResult *r_result);
void set_debug_contacts(int p_amount) { contact_debug.resize(p_amount); }
_FORCE_INLINE_ bool is_debugging_contacts() const { return !contact_debug.empty(); }
_FORCE_INLINE_ void add_debug_contact(const Vector2& p_contact) { if (contact_debug_count<contact_debug.size()) contact_debug[contact_debug_count++]=p_contact; }
_FORCE_INLINE_ Vector<Vector2> get_debug_contacts() { return contact_debug; }
_FORCE_INLINE_ int get_debug_contact_count() { return contact_debug_count; }
Physics2DDirectSpaceStateSW *get_direct_state();
Space2DSW();

3
servers/physics_2d_server.h
View file

@ -293,6 +293,9 @@ public:
// this function only works on fixed process, errors and returns null otherwise
virtual Physics2DDirectSpaceState* space_get_direct_state(RID p_space)=0;
virtual void space_set_debug_contacts(RID p_space,int p_max_contacts)=0;
virtual Vector<Vector2> space_get_contacts(RID p_space) const=0;
virtual int space_get_contact_count(RID p_space) const=0;
//missing space parameters

3
servers/physics_server.h
View file

@ -286,6 +286,9 @@ public:
// this function only works on fixed process, errors and returns null otherwise
virtual PhysicsDirectSpaceState* space_get_direct_state(RID p_space)=0;
virtual void space_set_debug_contacts(RID p_space,int p_max_contacts)=0;
virtual Vector<Vector3> space_get_contacts(RID p_space) const=0;
virtual int space_get_contact_count(RID p_space) const=0;
//missing space parameters

3
servers/visual/rasterizer_dummy.cpp
View file

@ -1948,6 +1948,9 @@ bool RasterizerDummy::has_feature(VS::Features p_feature) const {
}
void RasterizerDummy::restore_framebuffer() {
}
RasterizerDummy::RasterizerDummy() {

1
servers/visual/rasterizer_dummy.h
View file

@ -779,6 +779,7 @@ public:
virtual bool has_feature(VS::Features p_feature) const;
virtual void restore_framebuffer();
RasterizerDummy();
virtual ~RasterizerDummy();

8
servers/visual/visual_server_raster.cpp
View file

@ -454,6 +454,14 @@ AABB VisualServerRaster::mesh_get_custom_aabb(RID p_mesh) const {
return rasterizer->mesh_get_custom_aabb(p_mesh);
}
void VisualServerRaster::mesh_clear(RID p_mesh) {
ERR_FAIL_COND(!rasterizer->is_mesh(p_mesh));
while(rasterizer->mesh_get_surface_count(p_mesh)) {
rasterizer->mesh_remove_surface(p_mesh,0);
}
}
/* MULTIMESH */

1
servers/visual/visual_server_raster.h
View file

@ -765,6 +765,7 @@ public:
virtual void mesh_set_custom_aabb(RID p_mesh,const AABB& p_aabb);
virtual AABB mesh_get_custom_aabb(RID p_mesh) const;
virtual void mesh_clear(RID p_mesh);
/* MULTIMESH API */

1
servers/visual/visual_server_wrap_mt.h
View file

@ -199,6 +199,7 @@ public:
FUNC2(mesh_remove_surface,RID,int);
FUNC1RC(int,mesh_get_surface_count,RID);
FUNC1(mesh_clear,RID);
FUNC2(mesh_set_custom_aabb,RID,const AABB&);

2
servers/visual_server.h
View file

@ -353,6 +353,8 @@ public:
virtual void mesh_set_custom_aabb(RID p_mesh,const AABB& p_aabb)=0;
virtual AABB mesh_get_custom_aabb(RID p_mesh) const=0;
virtual void mesh_clear(RID p_mesh)=0;
/* MULTIMESH API */
virtual RID multimesh_create()=0;