Added preparation for GPU hardware accelerated solvers for BulletSoftBody (OpenCL and DirectCompute backends will follow)
Added assert to check for positive masses in btCompoundShape::calculatePrincipalAxisTransform, see Issue 399 Fixes for LLVM/GCC compilation issue in btSequentialImpulseConstraintSolver (Untested) fix for Linux 64bit compilation Issue 409
This commit is contained in:
@@ -5,6 +5,7 @@ INCLUDE_DIRECTORIES(
|
||||
|
||||
ADD_LIBRARY(BulletMultiThreaded
|
||||
PlatformDefinitions.h
|
||||
PpuAddressSpace.h
|
||||
SpuFakeDma.cpp
|
||||
SpuFakeDma.h
|
||||
SpuDoubleBuffer.h
|
||||
|
||||
@@ -1,3 +1,19 @@
|
||||
/*
|
||||
Bullet Continuous Collision Detection and Physics Library
|
||||
Copyright (c) 2003-2010 Erwin Coumans http://bulletphysics.org
|
||||
|
||||
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,
|
||||
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.
|
||||
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __PPU_ADDRESS_SPACE_H
|
||||
#define __PPU_ADDRESS_SPACE_H
|
||||
|
||||
@@ -9,13 +25,13 @@
|
||||
#endif //_WIN32
|
||||
|
||||
|
||||
#if defined(_WIN64) || defined(__LP64__) || defined(__x86_64__)
|
||||
typedef unsigned __int64 ppu_address_t;
|
||||
#if defined(_WIN64)
|
||||
typedef unsigned __int64 ppu_address_t;
|
||||
#elif defined(__LP64__) || defined(__x86_64__)
|
||||
typedef uint64_t ppu_address_t;
|
||||
#else
|
||||
typedef uint32_t ppu_address_t;
|
||||
#endif //defined(_WIN64)
|
||||
|
||||
typedef uint32_t ppu_address_t;
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif //__PPU_ADDRESS_SPACE_H
|
||||
|
||||
|
||||
@@ -1216,7 +1216,7 @@ void processCollisionTask(void* userPtr, void* lsMemPtr)
|
||||
#endif
|
||||
)
|
||||
{
|
||||
#define USE_PE_BOX_BOX 1
|
||||
//#define USE_PE_BOX_BOX 1
|
||||
#ifdef USE_PE_BOX_BOX
|
||||
{
|
||||
|
||||
|
||||
Reference in New Issue
Block a user