4 files changed, 119 insertions, 6 deletions

diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp
index 85018f38d7..67639858ce 100644
--- a/scene/resources/mesh.cpp
+++ b/scene/resources/mesh.cpp
@@ -37,6 +37,8 @@
 
 #include <stdlib.h>
 
+Mesh::ConvexDecompositionFunc Mesh::convex_composition_function = NULL;
+
 Ref<TriangleMesh> Mesh::generate_triangle_mesh() const {
 
 	if (triangle_mesh.is_valid())
@@ -543,6 +545,49 @@ void Mesh::clear_cache() const {
 	debug_lines.clear();
 }
 
+Vector<Ref<Shape> > Mesh::convex_decompose() const {
+
+	ERR_FAIL_COND_V(!convex_composition_function, Vector<Ref<Shape> >());
+
+	PoolVector<Face3> faces = get_faces();
+	Vector<Face3> f3;
+	f3.resize(faces.size());
+	PoolVector<Face3>::Read f = faces.read();
+	for (int i = 0; i < f3.size(); i++) {
+		f3.write[i] = f[i];
+	}
+
+	Vector<Vector<Face3> > decomposed = convex_composition_function(f3);
+
+	Vector<Ref<Shape> > ret;
+
+	for (int i = 0; i < decomposed.size(); i++) {
+		Set<Vector3> points;
+		for (int j = 0; j < decomposed[i].size(); j++) {
+			points.insert(decomposed[i][j].vertex[0]);
+			points.insert(decomposed[i][j].vertex[1]);
+			points.insert(decomposed[i][j].vertex[2]);
+		}
+
+		PoolVector<Vector3> convex_points;
+		convex_points.resize(points.size());
+		{
+			PoolVector<Vector3>::Write w = convex_points.write();
+			int idx = 0;
+			for (Set<Vector3>::Element *E = points.front(); E; E = E->next()) {
+				w[idx++] = E->get();
+			}
+		}
+
+		Ref<ConvexPolygonShape> shape;
+		shape.instance();
+		shape->set_points(convex_points);
+		ret.push_back(shape);
+	}
+
+	return ret;
+}
+
 Mesh::Mesh() {
 }
 
diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h
index dabfc6ea60..1457d283bd 100644
--- a/scene/resources/mesh.h
+++ b/scene/resources/mesh.h
@@ -31,6 +31,7 @@
 #ifndef MESH_H
 #define MESH_H
 
+#include "core/math/face3.h"
 #include "core/math/triangle_mesh.h"
 #include "core/resource.h"
 #include "scene/resources/material.h"
@@ -147,6 +148,12 @@ public:
 	Size2 get_lightmap_size_hint() const;
 	void clear_cache() const;
 
+	typedef Vector<Vector<Face3> > (*ConvexDecompositionFunc)(const Vector<Face3> &);
+
+	static ConvexDecompositionFunc convex_composition_function;
+
+	Vector<Ref<Shape> > convex_decompose() const;
+
 	Mesh();
 };
 
diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp
index 2e54424c90..e9f90fc85f 100644
--- a/scene/resources/resource_format_text.cpp
+++ b/scene/resources/resource_format_text.cpp
@@ -445,6 +445,11 @@ Error ResourceInteractiveLoaderText::poll() {
 		} else {
 
 			resource_cache.push_back(res);
+#ifdef TOOLS_ENABLED
+			//remember ID for saving
+			res->set_id_for_path(local_path,index);
+#endif
+
 		}
 
 		ExtResource er;
@@ -1355,7 +1360,7 @@ String ResourceFormatSaverTextInstance::_write_resource(const RES &res) {
 
 	if (external_resources.has(res)) {
 
-		return "ExtResource( " + itos(external_resources[res] + 1) + " )";
+		return "ExtResource( " + itos(external_resources[res]) + " )";
 	} else {
 
 		if (internal_resources.has(res)) {
@@ -1539,18 +1544,65 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path, const RES &p_r
 		f->store_line("]\n"); //one empty line
 	}
 
-	Vector<RES> sorted_er;
-	sorted_er.resize(external_resources.size());
+	{
+
+
+
+	}
+
+#ifdef TOOLS_ENABLED
+	//keep order from cached ids
+	Set<int> cached_ids_found;
+	for (Map<RES, int>::Element *E = external_resources.front(); E; E = E->next()) {
+		int cached_id = E->key()->get_id_for_path(local_path);
+		if (cached_id < 0 || cached_ids_found.has(cached_id)) {
+			E->get() = -1; //reset
+		} else {
+			E->get() = cached_id;
+			cached_ids_found.insert(cached_id);
+		}
+	}
+	//create IDs for non cached resources
+	for (Map<RES, int>::Element *E = external_resources.front(); E; E = E->next()) {
+		if (cached_ids_found.has(E->get())) { //already cached, go on
+			continue;
+		}
+
+		int attempt = 1; //start from one, more readable format
+		while(cached_ids_found.has(attempt)) {
+			attempt++;
+		}
+
+		cached_ids_found.insert(attempt);
+		E->get() = attempt;
+		//update also in resource
+		Ref<Resource> res = E->key();
+		res->set_id_for_path(local_path,attempt);
+	}
+#else
+	//make sure to start from one, as it makes format more readable
+	for (Map<RES, int>::Element *E = external_resources.front(); E; E = E->next()) {
+		E->get() = E->get() + 1;
+	}
+#endif
+
+	Vector<ResourceSort> sorted_er;
 
 	for (Map<RES, int>::Element *E = external_resources.front(); E; E = E->next()) {
 
-		sorted_er.write[E->get()] = E->key();
+		ResourceSort rs;
+		rs.resource = E->key();
+		rs.index = E->get();
+		sorted_er.push_back(rs);
 	}
 
+	sorted_er.sort();
+
+
 	for (int i = 0; i < sorted_er.size(); i++) {
-		String p = sorted_er[i]->get_path();
+		String p = sorted_er[i].resource->get_path();
 
-		f->store_string("[ext_resource path=\"" + p + "\" type=\"" + sorted_er[i]->get_save_class() + "\" id=" + itos(i + 1) + "]\n"); //bundled
+		f->store_string("[ext_resource path=\"" + p + "\" type=\"" + sorted_er[i].resource->get_save_class() + "\" id=" + itos(sorted_er[i].index) + "]\n"); //bundled
 	}
 
 	if (external_resources.size())
diff --git a/scene/resources/resource_format_text.h b/scene/resources/resource_format_text.h
index 8d78ab33b0..ab6f94986c 100644
--- a/scene/resources/resource_format_text.h
+++ b/scene/resources/resource_format_text.h
@@ -169,6 +169,15 @@ class ResourceFormatSaverTextInstance {
 	Map<RES, int> external_resources;
 	Map<RES, int> internal_resources;
 
+	struct ResourceSort {
+		RES resource;
+		int index;
+		bool operator<(const ResourceSort& p_right) const {
+			return index < p_right.index;
+		}
+
+	};
+
 	void _find_resources(const Variant &p_variant, bool p_main = false);
 
 	static String _write_resources(void *ud, const RES &p_resource);