1
0
mirror of https://github.com/godotengine/godot.git synced 2025-12-03 16:55:53 +00:00

vhacd: Reapply downstream changes to namespace conflicting bullet code

Also adding a patch to easily identify and reapply them.
This commit is contained in:
Rémi Verschelde
2019-04-11 17:48:49 +02:00
parent 531b158897
commit 668439d16a
10 changed files with 292 additions and 0 deletions

View File

@@ -49,6 +49,10 @@ typedef unsigned long long int32_t uint64_t;
#include <stdio.h>
#endif
// -- GODOT start --
namespace VHACD {
// -- GODOT end --
// Convex hull implementation based on Preparata and Hong
// Ole Kniemeyer, MAXON Computer GmbH
class btConvexHullInternal {
@@ -2477,3 +2481,7 @@ btScalar btConvexHullComputer::compute(const void* coords, bool doubleCoords, in
return shift;
}
// -- GODOT start --
}; // namespace VHACD
// -- GODOT end --