Bundled VHACD library for convex decomposition.

Modified both MeshInstance tools as well as importer to use it instead of QuickHull.

4 files changed, 160 insertions, 0 deletions

diff --git a/modules/vhacd/SCsub b/modules/vhacd/SCsub
new file mode 100644
index 0000000000..e89a64a68e
--- /dev/null
+++ b/modules/vhacd/SCsub
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+
+Import('env')
+Import('env_modules')
+
+env_vhacd = env_modules.Clone()
+
+# Thirdparty source files
+
+thirdparty_dir = "#thirdparty/vhacd/"
+
+thirdparty_sources = [
+"src/vhacdManifoldMesh.cpp",
+"src/FloatMath.cpp",
+"src/vhacdMesh.cpp",
+"src/vhacdICHull.cpp",
+"src/vhacdVolume.cpp",
+"src/VHACD-ASYNC.cpp",
+"src/btAlignedAllocator.cpp",
+"src/vhacdRaycastMesh.cpp",
+"src/VHACD.cpp",
+"src/btConvexHullComputer.cpp"
+]
+
+thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+env_vhacd.Append(CPPPATH=[thirdparty_dir+"/inc"])
+env_vhacd.Append(CPPFLAGS=["-DGODOT_ENET"])
+
+env_thirdparty = env_vhacd.Clone()
+env_thirdparty.disable_warnings()
+env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
+
+env_vhacd.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/vhacd/config.py b/modules/vhacd/config.py
new file mode 100644
index 0000000000..9ced70d2fb
--- /dev/null
+++ b/modules/vhacd/config.py
@@ -0,0 +1,6 @@
+def can_build(env, platform):
+    return True
+
+def configure(env):
+    pass
+
diff --git a/modules/vhacd/register_types.cpp b/modules/vhacd/register_types.cpp
new file mode 100644
index 0000000000..076a1738ab
--- /dev/null
+++ b/modules/vhacd/register_types.cpp
@@ -0,0 +1,88 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md)    */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "register_types.h"
+#include "scene/resources/mesh.h"
+#include "thirdparty/vhacd/public/VHACD.h"
+
+static Vector<Vector<Face3> > convex_decompose(const Vector<Face3> &p_faces) {
+
+	Vector<float> vertices;
+	vertices.resize(p_faces.size() * 9);
+	Vector<uint32_t> indices;
+	indices.resize(p_faces.size() * 3);
+
+	for (int i = 0; i < p_faces.size(); i++) {
+		for (int j = 0; j < 3; j++) {
+			vertices.write[i * 9 + j * 3 + 0] = p_faces[i].vertex[j].x;
+			vertices.write[i * 9 + j * 3 + 1] = p_faces[i].vertex[j].y;
+			vertices.write[i * 9 + j * 3 + 2] = p_faces[i].vertex[j].z;
+			indices.write[i * 3 + j] = i * 3 + j;
+		}
+	}
+
+	VHACD::IVHACD *decomposer = VHACD::CreateVHACD();
+	VHACD::IVHACD::Parameters params;
+	decomposer->Compute(vertices.ptr(), vertices.size() / 3, indices.ptr(), indices.size() / 3, params);
+
+	int hull_count = decomposer->GetNConvexHulls();
+
+	Vector<Vector<Face3> > ret;
+
+	for (int i = 0; i < hull_count; i++) {
+		Vector<Face3> triangles;
+		VHACD::IVHACD::ConvexHull hull;
+		decomposer->GetConvexHull(i, hull);
+		triangles.resize(hull.m_nTriangles);
+		for (uint32_t j = 0; j < hull.m_nTriangles; j++) {
+			Face3 f;
+			for (int k = 0; k < 3; k++) {
+				for (int l = 0; l < 3; l++) {
+					f.vertex[k][l] = hull.m_points[hull.m_triangles[j * 3 + k] * 3 + l];
+				}
+			}
+			triangles.write[j] = f;
+		}
+		ret.push_back(triangles);
+	}
+
+	decomposer->Clean();
+	decomposer->Release();
+
+	return ret;
+}
+
+void register_vhacd_types() {
+	Mesh::convex_composition_function = convex_decompose;
+}
+
+void unregister_vhacd_types() {
+	Mesh::convex_composition_function = NULL;
+}
diff --git a/modules/vhacd/register_types.h b/modules/vhacd/register_types.h
new file mode 100644
index 0000000000..cb948faf44
--- /dev/null
+++ b/modules/vhacd/register_types.h
@@ -0,0 +1,32 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md)    */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+void register_vhacd_types();
+void unregister_vhacd_types();