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
build3/bin2cpp.bat
View File

@@ -2,6 +2,6 @@
rem @echo off
premake4 --file=bin2cpp.lua --binfile="../btgui/FontFiles/OpenSans.ttf" --cppfile="../btgui/OpenGLWindow/OpenSans.cpp" --stringname="OpenSansData" bin2cpp
premake4 --file=bin2cpp.lua --binfile="../btgui/OpenGLWindow/OpenSans.ttf" --cppfile="../btgui/OpenGLWindow/OpenSans.cpp" --stringname="OpenSansData" bin2cpp
pause

2
build3/bin2cpp.lua
View File

@@ -9,7 +9,7 @@ function convertFile(filenameIn, filenameOut, stringname)
local bytes = f:read(block)
if not bytes then break end
for b in string.gfind(bytes, ".") do
fw:write(string.format("char(%u),", string.byte(b)))
fw:write(string.format("%u,", string.byte(b)))
end
--io.write(string.rep(" ", block - string.len(bytes) + 1))
--io.write(string.gsub(bytes, "%c", "."), "\n")

30
build3/findOpenGLGlewGlut.lua
View File

@@ -43,26 +43,6 @@
configuration{}
end
function initGlut()
configuration {}
if os.is("Windows") then
configuration {"Windows"}
includedirs {
projectRootDir .. "btgui/OpenGLWindow/Glut"
}
libdirs { projectRootDir .. "btgui/OpenGLWindow/Glut"}
configuration {"Windows", "x32"}
links {"glut32"}
configuration {"Windows", "x64"}
links {"glut64"}
end
configuration {"MacOSX"}
links { "Glut.framework" }
configuration {"Linux"}
links {"glut"}
configuration{}
end
function initGlew()
configuration {}
@@ -70,9 +50,9 @@
configuration {"Windows"}
defines { "GLEW_STATIC"}
includedirs {
projectRootDir .. "btgui/OpenGLWindow/GlewWindows"
projectRootDir .. "examples/ThirdPartyLibs/Glew"
}
files { projectRootDir .. "btgui/OpenGLWindow/GlewWindows/glew.c"}
files { projectRootDir .. "examples/ThirdPartyLibs/Glew/glew.c"}
end
if os.is("Linux") then
configuration{"Linux"}
@@ -83,9 +63,9 @@
print("Using static glew and dynamic loading of glx functions")
defines { "GLEW_STATIC","GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1"}
includedirs {
projectRootDir .. "btgui/OpenGLWindow/GlewWindows"
projectRootDir .. "examples/ThirdPartyLibs/Glew"
}
files { projectRootDir .. "btgui/OpenGLWindow/GlewWindows/glew.c"}
files { projectRootDir .. "examples/ThirdPartyLibs/Glew/glew.c"}
links {"dl"}
end
@@ -100,7 +80,7 @@
else
print("No X11/X.h found, using dynamic loading of X11")
includedirs {
projectRootDir .. "btgui/OpenGLWindow/optionalX11"
projectRootDir .. "examples/ThirdPartyLibs/optionalX11"
}
defines {"DYNAMIC_LOAD_X11_FUNCTIONS"}
links {"dl","pthread"}

98
build3/premake4.lua
View File

@@ -114,83 +114,35 @@
language "C++"
include "../examples/ExampleBrowser"
include "../examples/OpenGLWindow"
include "../examples/ThirdPartyLibs/Gwen"
include "../examples/HelloWorld"
include "../examples/BasicDemo"
if not _OPTIONS["without-gtest"] then
include "../test/gtest-1.7.0"
-- include "../test/hello_gtest"
include "../test/collision"
include "../test/TestBullet3OpenCL"
end
if findOpenGL3() then
include "../Demos3/AllBullet2Demos"
include "../Demos3/GpuDemos"
include"../Demos3/BasicDemoConsole"
include"../Demos3/BasicDemoCustomOpenGL2"
-- include "../Demos3/CpuDemos"
-- include "../Demos3/Wavefront"
-- include "../btgui/MultiThreading"
include "../btgui/OpenGLWindow"
include "../btgui/Bullet3AppSupport"
-- include "../Demos3/ImplicitCloth"
include "../Demos3/SimpleOpenGL3"
include "../btgui/urdf"
include "../btgui/lua-5.2.3"
include "../test/lua"
include "../btgui/Gwen"
include "../btgui/GwenOpenGLTest"
end
-- include "../demo/gpudemo"
if _OPTIONS["midi"] then
include "../btgui/MidiTest"
end
-- include "../opencl/vector_add_simplified"
-- include "../opencl/vector_add"
-- include "../test/clew"
-- include "../Demos3/GpuGuiInitialize"
-- include "../test/OpenCL/BasicInitialize"
include "../test/OpenCL/KernelLaunch"--
-- include "../test/OpenCL/BroadphaseCollision"
-- include "../test/OpenCL/NarrowphaseCollision"
include "../test/OpenCL/ParallelPrimitives"
include "../test/OpenCL/RadixSortBenchmark"
include "../src/BulletSoftBody"
include "../src/BulletDynamics"
include "../src/BulletCollision"
include "../src/LinearMath"
include "../src/Bullet3Dynamics"
include "../src/Bullet3Common"
include "../src/Bullet3Geometry"
include "../src/Bullet3Collision"
include "../src/Bullet3Serialize/Bullet2FileLoader"
include "../src/Bullet3OpenCL"
-- include "../demo/gpu_initialize"
-- include "../opencl/lds_bank_conflict"
-- include "../opencl/reduce"
-- include "../btgui/OpenGLWindow"
-- include "../demo/ObjLoader"
-- include "../test/b3DynamicBvhBroadphase"
if _OPTIONS["enet"] then
include "../btgui/enet"
include "../test/enet/server"
include "../test/enet/client"
end
if _OPTIONS["bullet2demos"] then
include "../Extras"
if findOpenGL() then
include "../Demos"
end
end
include "../src/BulletSoftBody"
include "../src/BulletDynamics"
include "../src/BulletCollision"
include "../src/LinearMath"
include "../src/Bullet3Common"
include "../src/Bullet3Geometry"
include "../src/Bullet3Collision"
include "../src/Bullet3Dynamics"
include "../src/Bullet3OpenCL"
include "../src/Bullet3Serialize/Bullet2FileLoader"