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

add BspDemo.bsp data file

Browse Source 
add sphere2.urdf
move btSpatialAlgebra into LinearMath
remove some warnings, introduce BT_ZERO, BT_ONE, BT_HALF as defines for 0.f/0., 1.f/1., 0.5f/0.5 respectively
This commit is contained in:
erwincoumans
2015-04-16 10:17:35 -07:00
parent a1bf9c5556
commit 794c8ec064
19 changed files with 448 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/OpenCL/AllBullet3Kernels/testExecuteBullet3NarrowphaseKernels.cpp
View File

@@ -12,7 +12,7 @@
#include "Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.h"
#ifdef B3_USE_ZLIB
#include "../btgui/minizip/unzip.h"
#include "minizip/unzip.h"
#endif
#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"

5
test/TestBullet3OpenCL/premake4.lua
View File

@@ -20,6 +20,7 @@ function createProject(vendor)
{
".","../gtest-1.7.0/include",
"../../src",
"../../examples/ThirdPartyLibs", --for unzip
}
links {"gtest",
@@ -34,8 +35,8 @@ function createProject(vendor)
--you can comment out the following few lines, then you need to unzip the untest_data.zip manually
defines {"B3_USE_ZLIB"}
files {
"../../btgui/minizip/*.c",
"../../btgui/zlib/*.c",
"../../examples/ThirdPartyLibs/minizip/*.c",
"../../examples/ThirdPartyLibs/zlib/*.c",
}
files {

6
test/collision/premake4.lua
View File

@@ -15,6 +15,12 @@
}
if os.is("Windows") then
--see http://stackoverflow.com/questions/12558327/google-test-in-visual-studio-2012
defines {"_VARIADIC_MAX=10"}
end
links {"LinearMath", "gtest"}
files {

8
test/gtest-1.7.0/premake4.lua
View File

@@ -5,9 +5,11 @@
files{"src/gtest-all.cc"}
--defines {"GTEST_HAS_PTHREAD=1"}
--see http://stackoverflow.com/questions/12558327/google-test-in-visual-studio-2012
defines {"_VARIADIC_MAX=10"}
if os.is("Windows") then
--see http://stackoverflow.com/questions/12558327/google-test-in-visual-studio-2012
defines {"_VARIADIC_MAX=10"}
end
--targetdir "../../lib"

5
test/hello_gtest/premake4.lua
View File

@@ -12,6 +12,11 @@
".","../gtest-1.7.0/include"
}
if os.is("Windows") then
--see http://stackoverflow.com/questions/12558327/google-test-in-visual-studio-2012
defines {"_VARIADIC_MAX=10"}
end
-- linkLib "gtest"
links "gtest"