Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/erwincoumans/bullet3_experiments

Browse Source
This commit is contained in:
erwin coumans
2013-04-19 18:30:24 -07:00
parent d086090c77 fd1b00965a
commit dd315d164d
20 changed files with 3228 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
demo/gpudemo/GpuDemo.h
View File

@@ -38,9 +38,9 @@ public:
:useOpenCL(true),
preferredOpenCLPlatformIndex(-1),
preferredOpenCLDeviceIndex(-1),
arraySizeX(30),
arraySizeX(10),
arraySizeY(30),
arraySizeZ(30),
arraySizeZ(10),
m_useConcaveMesh(false),
gapX(14.3),
gapY(14.0),

11
demo/gpudemo/premake4.lua
View File

@@ -25,7 +25,10 @@ function createProject(vendor)
}
links {
"gwen"
"gwen",
"Bullet3Common",
"Bullet3Geometry",
"Bullet3Dynamics"
}
files {
@@ -41,12 +44,6 @@ function createProject(vendor)
"../ObjLoader/list.cpp",
"../ObjLoader/list.h",
"../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/Bullet3Common/b3AlignedAllocator.h",
"../../src/Bullet3Common/b3Quickprof.cpp",
"../../src/Bullet3Common/b3Quickprof.h",
"../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
"../../src/Bullet3Geometry/b3ConvexHullComputer.h",
"../../btgui/OpenGLWindow/GLInstancingRenderer.cpp",
"../../btgui/OpenGLWindow/GLInstancingRenderer.h",