Merge pull request godotengine#15 from JiepengTan/spx4.2.2

Collider add spx debug mode(draw debug shape)

core/extension/spx_sprite.cpp

@@ -116,14 +116,11 @@ void SpxSprite::_draw() {
 	if (!Spx::debug_mode) {
 		return;
 	}
-	if (trigger2d != nullptr && trigger2d->get_shape() != nullptr) {
-		Ref<Shape2D> trigger_shape = trigger2d->get_shape();
-		trigger_shape->draw(get_canvas_item(), Color(1, 0, 0, 0.2));
+	if(trigger2d != nullptr) {
+		trigger2d->set_spx_debug_color(Color(1, 0, 0, 0.2));
 	}
-
-	if (collider2d != nullptr && collider2d->get_shape() != nullptr) {
-		Ref<Shape2D> collider_shape = collider2d->get_shape();
-		collider_shape->draw(get_canvas_item(), Color(0, 0, 1, 0.2));
+	if(collider2d != nullptr) {
+		collider2d->set_spx_debug_color(Color(0, 0, 1, 0.2));
 	}
 }
 

scene/2d/collision_shape_2d.cpp

@@ -31,6 +31,7 @@
 #include "collision_shape_2d.h"
 
 #include "collision_object_2d.h"
+#include "core/extension/spx.h"
 #include "scene/2d/area_2d.h"
 #include "scene/resources/concave_polygon_shape_2d.h"
 #include "scene/resources/convex_polygon_shape_2d.h"
@@ -90,7 +91,11 @@ void CollisionShape2D::_notification(int p_what) {
 		case NOTIFICATION_DRAW: {
 			ERR_FAIL_COND(!is_inside_tree());
 
-			if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) {
+			if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint() && !Spx::debug_mode) {
+				break;
+			}
+
+			if(Spx::debug_mode && !is_enable_spx_debug) {
 				break;
 			}
 

scene/2d/collision_shape_2d.h

@@ -46,6 +46,7 @@ class CollisionShape2D : public Node2D {
 	bool one_way_collision = false;
 	real_t one_way_collision_margin = 1.0;
 	Color debug_color;
+	bool is_enable_spx_debug;
 
 	void _shape_changed();
 	void _update_in_shape_owner(bool p_xform_only = false);
@@ -82,6 +83,10 @@ class CollisionShape2D : public Node2D {
 
 	PackedStringArray get_configuration_warnings() const override;
 
+	void set_spx_debug_color(const Color &p_color) {
+		is_enable_spx_debug = true;
+		debug_color = p_color;
+	}
 	CollisionShape2D();
 };