Merge remote-tracking branch 'upstream/master'

1 files changed, 10 insertions, 0 deletions

diff --git a/scene/resources/shape.h b/scene/resources/shape.h
index 3cc806c7a3..1992ce51c3 100644
--- a/scene/resources/shape.h
+++ b/scene/resources/shape.h
@@ -30,6 +30,7 @@
 #define SHAPE_H
 
 #include "resource.h"
+class Mesh;
 
 class Shape : public Resource {
 
@@ -38,13 +39,22 @@ class Shape : public Resource {
 	RES_BASE_EXTENSION("shp");
 	RID shape;
 
+	Ref<Mesh> debug_mesh_cache;
+
 protected:
 
 	_FORCE_INLINE_ RID get_shape() const { return shape; }
 	Shape(RID p_shape);
+
+	virtual Vector<Vector3> _gen_debug_mesh_lines()=0;// { return Vector<Vector3>(); }
 public:
 
 	virtual RID get_rid() const { return shape; }
+
+	Ref<Mesh> get_debug_mesh();
+
+	void add_vertices_to_array(DVector<Vector3> &array, const Transform& p_xform);
+
 	Shape();
 	~Shape();
 };