godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix vhacd namespace placing in thirdparty/vhacd/src/btConvexHullComputer.cpp

This commit is contained in:
Windy Darian 2019-04-10 23:45:26 -04:00
parent 5823b5d77d
commit f05af9d492
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
thirdparty/vhacd/src/btConvexHullComputer.cpp vendored
View File

@ -3,8 +3,8 @@ Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net
This software is provided 'as-is', without any express or implied warranty.
In no event will the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
@ -21,11 +21,6 @@ subject to the following restrictions:
#ifdef __GNUC__
#include <stdint.h>
//GODOT ADDITION
namespace VHACD {
//
#elif defined(_MSC_VER)
typedef __int32 int32_t;
typedef __int64 int64_t;
@ -54,6 +49,10 @@ typedef unsigned long long int32_t uint64_t;
#include <stdio.h>
#endif
//GODOT ADDITION
namespace VHACD {
//
// Convex hull implementation based on Preparata and Hong
// Ole Kniemeyer, MAXON Computer GmbH
class btConvexHullInternal {