diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-11 09:01:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 09:01:15 +0200 |
| commit | f705fc5a989534e7b3f34a2c8f4a7f0f5912b6ad (patch) | |
| tree | e95b8b8ca2f034f87bf95ba9a6e43566f5c94f8f /thirdparty | |
| parent | 0e7f116b5236d248b8e0088705f3d83d8c845b45 (diff) | |
| parent | 6c90aaf5c741fd7d9ff7b47e5bb4ed7d45623c2e (diff) | |
Merge pull request #27916 from WindyDarian/vhacd_namespace_placing
Fixes for vhacd module
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/vhacd/src/btConvexHullComputer.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/thirdparty/vhacd/src/btConvexHullComputer.cpp b/thirdparty/vhacd/src/btConvexHullComputer.cpp index 5ff3ab917e..15956fc0c4 100644 --- a/thirdparty/vhacd/src/btConvexHullComputer.cpp +++ b/thirdparty/vhacd/src/btConvexHullComputer.cpp @@ -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 { |