feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -15,9 +15,7 @@ subject to the following restrictions:
|
|||
|
||||
#include "btAlignedAllocator.h"
|
||||
|
||||
// -- GODOT start --
|
||||
namespace VHACD {
|
||||
// -- GODOT end --
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(disable:4311 4302)
|
||||
|
|
@ -72,12 +70,10 @@ static inline void* btAlignedAllocDefault(size_t size, int32_t alignment)
|
|||
|
||||
real = (char*)sAllocFunc(size + sizeof(void*) + (alignment - 1));
|
||||
if (real) {
|
||||
// -- GODOT start --
|
||||
// Synced with Bullet 2.88 to fix GH-27926
|
||||
//offset = (alignment - (unsigned long)(real + sizeof(void*))) & (alignment - 1);
|
||||
//ret = (void*)((real + sizeof(void*)) + offset);
|
||||
ret = btAlignPointer(real + sizeof(void *), alignment);
|
||||
// -- GODOT end --
|
||||
*((void**)(ret)-1) = (void*)(real);
|
||||
}
|
||||
else {
|
||||
|
|
@ -185,8 +181,6 @@ void btAlignedFreeInternal(void* ptr)
|
|||
sAlignedFreeFunc(ptr);
|
||||
}
|
||||
|
||||
// -- GODOT start --
|
||||
}; // namespace VHACD
|
||||
// -- GODOT end --
|
||||
|
||||
#endif //BT_DEBUG_MEMORY_ALLOCATIONS
|
||||
|
|
|
|||
|
|
@ -49,9 +49,7 @@ 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
|
||||
|
|
@ -2482,6 +2480,4 @@ btScalar btConvexHullComputer::compute(const void* coords, bool doubleCoords, in
|
|||
return shift;
|
||||
}
|
||||
|
||||
// -- GODOT start --
|
||||
}; // namespace VHACD
|
||||
// -- GODOT end --
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue