change lcpp Lua preprocessor, to keep #defines and comments, remove empty lines
remove duplicate data in b3Contact4 (now in btContact4Data shared between CPU/C++ and OpenCL) OpenCL kernels use #include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h" Increase number of batches back to 250 (from 50), need to fix this hard coded number (see https://github.com/erwincoumans/bullet3/issues/12) Work towards GJK/EPA, in addition to SAT/clipping (early on)
This commit is contained in:
@@ -116,7 +116,8 @@ if not _OPTIONS["ios"] then
|
||||
include "../Demos3/GpuGuiInitialize"
|
||||
|
||||
include "../test/OpenCL/BasicInitialize"
|
||||
-- include "../test/OpenCL/BroadphaseCollision"
|
||||
include "../test/OpenCL/KernelLaunch"--
|
||||
include "../test/OpenCL/BroadphaseCollision"
|
||||
-- include "../test/OpenCL/NarrowphaseCollision"
|
||||
include "../test/OpenCL/ParallelPrimitives"
|
||||
include "../test/OpenCL/RadixSortBenchmark"
|
||||
@@ -149,6 +150,7 @@ if not _OPTIONS["ios"] then
|
||||
end
|
||||
|
||||
|
||||
|
||||
if _OPTIONS["bullet2gpu"] then
|
||||
include "../src/LinearMath"
|
||||
include "../src/BulletCollision"
|
||||
|
||||
Reference in New Issue
Block a user