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

fix demo/gpudemo build

Browse Source
This commit is contained in:
erwin coumans
2013-03-13 13:22:56 -07:00
parent 6d56a69344
commit d8a3732306
18 changed files with 130 additions and 1177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
demo/gpudemo/GpuDemo.cpp → demo/donttouch/GpuDemo.cpp
View File

0
demo/gpudemo/GpuDemo.h → demo/donttouch/GpuDemo.h
View File

13
demo/gpudemo/OpenGL3CoreRenderer.cpp → demo/donttouch/OpenGL3CoreRenderer.cpp
View File

@@ -1,12 +1,12 @@
#include "OpenGL3CoreRenderer.h"
#include "../../rendering/rendertest/GLInstancingRenderer.h"
#include "../../rendering/rendertest/ShapeData.h"
#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
#include "LinearMath/btQuickprof.h"
#include "OpenGLWindow/GLInstancingRenderer.h"
#include "OpenGLWindow/ShapeData.h"
//#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
//#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
#include "BulletCommon/btQuickprof.h"
#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
/*#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
#include "BulletCollision/CollisionShapes/btConvexPolyhedron.h"
#include "BulletCollision/CollisionShapes/btConvexHullShape.h"
#include "BulletCollision/CollisionShapes/btCollisionShape.h"
@@ -16,6 +16,7 @@
#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
#include "../../rendering/WavefrontObjLoader/objLoader.h"
*/
OpenGL3CoreRenderer::OpenGL3CoreRenderer()
{

0
demo/gpudemo/OpenGL3CoreRenderer.h → demo/donttouch/OpenGL3CoreRenderer.h
View File

132
demo/gpudemo/AMD/premake4.lua
View File

@@ -1,132 +0,0 @@
hasCL = findOpenCL_AMD()
if (hasCL) then
project "bullet2_gpu_demo_opengl3core"
initOpenCL_AMD()
language "C++"
kind "ConsoleApp"
targetdir "../../../../bin"
includedirs {
"..",
"../../../../bullet2",
"../../../../rendering/Gwen"
}
links {
"gwen"
}
initOpenGL()
initGlew()
files {
"../GpuDemo.cpp",
"../GpuDemo.h",
"../btGpuDynamicsWorld.cpp",
"../btGpuDynamicsWorld.h",
"../btCpuDynamicsWorld.cpp",
"../btCpuDynamicsWorld.h",
"../btGpuIntegrateTransforms.cpp",
"../btGpuIntegrateTransforms.h",
"../gwenUserInterface.cpp",
"../gwenUserInterface.h",
"../ParticleDemo.cpp",
"../ParticleDemo.h",
"../BroadphaseBenchmark.cpp",
"../BroadphaseBenchmark.h",
"../main_opengl3core.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.h",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.h",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.h",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.cpp",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.h",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.cpp",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.h",
"../../../../opencl/broadphase_benchmark/btFillCL.cpp",
"../../../../opencl/broadphase_benchmark/btFillCL.h",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.cpp",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.h",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.h",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.h",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.cpp",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.h",
"../../../../dynamics/basic_demo/Stubs/ChNarrowphase.cpp",
"../../../../dynamics/basic_demo/Stubs/Solver.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.h",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.cpp",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.h",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.cpp",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.h",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.cpp",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.h",
"../../../../opencl/basic_initialize/btOpenCLUtils.cpp",
"../../../../opencl/basic_initialize/btOpenCLUtils.h",
"../../../../opencl/basic_initialize/btOpenCLInclude.h",
"../../../DemosCommon/GL_ShapeDrawer.cpp",
"../../../DemosCommon/GL_ShapeDrawer.h",
"../../../DemosCommon/OpenGL3CoreRenderer.cpp",
"../../../DemosCommon/OpenGL3CoreRenderer.h",
"../../../../rendering/WavefrontObjLoader/string_extra.cpp",
"../../../../rendering/WavefrontObjLoader/string_extra.h",
"../../../../rendering/WavefrontObjLoader/objLoader.cpp",
"../../../../rendering/WavefrontObjLoader/objLoader.h",
"../../../../rendering/WavefrontObjLoader/obj_parser.cpp",
"../../../../rendering/WavefrontObjLoader/obj_parser.h",
"../../../../rendering/WavefrontObjLoader/list.cpp",
"../../../../rendering/WavefrontObjLoader/list.h",
"../../../../rendering/rendertest/GLInstancingRenderer.cpp",
"../../../../rendering/rendertest/GLInstancingRenderer.h",
"../../../../rendering/rendertest/GLPrimitiveRenderer.cpp",
"../../../../rendering/rendertest/GLPrimitiveRenderer.h",
"../../../../rendering/rendertest/LoadShader.cpp",
"../../../../rendering/rendertest/LoadShader.h",
"../../../../rendering/rendertest/TwFonts.cpp",
"../../../../rendering/rendertest/TwFonts.h",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.cpp",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.h",
}
if os.is("Windows") then
files {
"../../../../rendering/rendertest/Win32OpenGLWindow.cpp",
"../../../../rendering/rendertest/Win32OpenGLWindow.h",
"../../../../rendering/rendertest/Win32Window.cpp",
"../../../../rendering/rendertest/Win32Window.h",
}
end
if os.is("Linux") then
files{
"../../../../rendering/rendertest/X11OpenGLWindow.cpp",
"../../../../rendering/rendertest/X11OpenGLWindow.h",
}
end
end

266
demo/gpudemo/Apple/premake4.lua
View File

@@ -1,266 +0,0 @@
hasCL = findOpenCL_Apple()
if (hasCL) then
project "bullet2_gpu_demo_opengl2_Apple"
initOpenCL_Apple()
language "C++"
kind "ConsoleApp"
targetdir "../../../../bin"
includedirs {
"..",
"../../../../rendering/rendertest",
"../../../../bullet2",
"../../../../rendering/Gwen"
}
links {
"BulletSoftBody",
"BulletDynamics",
"BulletCollision",
"LinearMath"
}
initOpenGL()
initGlew()
files {
"../GpuDemo.cpp",
"../GpuDemo.h",
"../btGpuDynamicsWorld.cpp",
"../btGpuDynamicsWorld.h",
"../btCpuDynamicsWorld.cpp",
"../btCpuDynamicsWorld.h",
"../btGpuIntegrateTransforms.cpp",
"../btGpuIntegrateTransforms.h",
"../main_opengl2.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.h",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.h",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.h",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.cpp",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.h",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.cpp",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.h",
"../../../../opencl/broadphase_benchmark/btFillCL.cpp",
"../../../../opencl/broadphase_benchmark/btFillCL.h",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.cpp",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.h",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.h",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.h",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.cpp",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.h",
"../../../../dynamics/basic_demo/Stubs/ChNarrowphase.cpp",
"../../../../dynamics/basic_demo/Stubs/Solver.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.h",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.cpp",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.h",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.cpp",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.h",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.cpp",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.h",
"../../../../opencl/basic_initialize/btOpenCLUtils.cpp",
"../../../../opencl/basic_initialize/btOpenCLUtils.h",
"../../../../opencl/basic_initialize/btOpenCLInclude.h",
"../../../DemosCommon/GL_ShapeDrawer.cpp",
"../../../DemosCommon/GL_ShapeDrawer.h",
"../../../DemosCommon/OpenGL2Renderer.cpp",
"../../../DemosCommon/OpenGL2Renderer.h",
"../../../../rendering/WavefrontObjLoader/string_extra.cpp",
"../../../../rendering/WavefrontObjLoader/string_extra.h",
"../../../../rendering/WavefrontObjLoader/objLoader.cpp",
"../../../../rendering/WavefrontObjLoader/objLoader.h",
"../../../../rendering/WavefrontObjLoader/obj_parser.cpp",
"../../../../rendering/WavefrontObjLoader/obj_parser.h",
"../../../../rendering/WavefrontObjLoader/list.cpp",
"../../../../rendering/WavefrontObjLoader/list.h",
"../../../../rendering/rendertest/GLPrimitiveRenderer.cpp",
"../../../../rendering/rendertest/GLPrimitiveRenderer.h",
"../../../../rendering/rendertest/LoadShader.cpp",
"../../../../rendering/rendertest/LoadShader.h",
"../../../../rendering/rendertest/TwFonts.cpp",
"../../../../rendering/rendertest/TwFonts.h",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.cpp",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.h",
}
if os.is("windows") then
files
{
"../../../../rendering/rendertest/Win32OpenGLWindow.cpp",
"../../../../rendering/rendertest/Win32OpenGLWindow.h",
"../../../../rendering/rendertest/Win32Window.cpp",
"../../../../rendering/rendertest/Win32Window.h",
}
end
if os.is("macosx") then
files
{
"../../../../rendering/rendertest/MacOpenGLWindow.mm",
"../../../../rendering/rendertest/MacOpenGLWindow.h"
}
links {"Cocoa.framework"}
end
project "bullet2_gpu_demo_opengl3core_Apple"
initOpenCL_Apple()
language "C++"
kind "ConsoleApp"
targetdir "../../../../bin"
includedirs {
"..",
"../../../../rendering/rendertest",
"../../../../bullet2",
"../../../../rendering/Gwen"
}
links {
"BulletSoftBody",
"BulletDynamics",
"BulletCollision",
"LinearMath",
"gwen",
}
initOpenGL()
initGlew()
files {
"../GpuDemo.cpp",
"../GpuDemo.h",
"../btGpuDynamicsWorld.cpp",
"../btGpuDynamicsWorld.h",
"../btCpuDynamicsWorld.cpp",
"../btCpuDynamicsWorld.h",
"../btGpuIntegrateTransforms.cpp",
"../btGpuIntegrateTransforms.h",
"../GwenUserInterface.cpp",
"../GwenUserInterface.h",
"../ParticleDemo.cpp",
"../ParticleDemo.h",
"../BroadphaseBenchmark.cpp",
"../BroadphaseBenchmark.h",
"../main_opengl3core.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.h",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.h",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.h",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.cpp",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.h",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.cpp",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.h",
"../../../../opencl/broadphase_benchmark/btFillCL.cpp",
"../../../../opencl/broadphase_benchmark/btFillCL.h",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.cpp",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.h",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.h",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.h",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.cpp",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.h",
"../../../../dynamics/basic_demo/Stubs/ChNarrowphase.cpp",
"../../../../dynamics/basic_demo/Stubs/Solver.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.h",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.cpp",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.h",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.cpp",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.h",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.cpp",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.h",
"../../../../opencl/basic_initialize/btOpenCLUtils.cpp",
"../../../../opencl/basic_initialize/btOpenCLUtils.h",
"../../../../opencl/basic_initialize/btOpenCLInclude.h",
"../../../DemosCommon/GL_ShapeDrawer.cpp",
"../../../DemosCommon/GL_ShapeDrawer.h",
"../../../DemosCommon/OpenGL3CoreRenderer.cpp",
"../../../DemosCommon/OpenGL3CoreRenderer.h",
"../../../../rendering/WavefrontObjLoader/string_extra.cpp",
"../../../../rendering/WavefrontObjLoader/string_extra.h",
"../../../../rendering/WavefrontObjLoader/objLoader.cpp",
"../../../../rendering/WavefrontObjLoader/objLoader.h",
"../../../../rendering/WavefrontObjLoader/obj_parser.cpp",
"../../../../rendering/WavefrontObjLoader/obj_parser.h",
"../../../../rendering/WavefrontObjLoader/list.cpp",
"../../../../rendering/WavefrontObjLoader/list.h",
"../../../../rendering/rendertest/GLInstancingRenderer.cpp",
"../../../../rendering/rendertest/GLInstancingRenderer.h",
"../../../../rendering/rendertest/GLPrimitiveRenderer.cpp",
"../../../../rendering/rendertest/GLPrimitiveRenderer.h",
"../../../../rendering/rendertest/LoadShader.cpp",
"../../../../rendering/rendertest/LoadShader.h",
"../../../../rendering/rendertest/TwFonts.cpp",
"../../../../rendering/rendertest/TwFonts.h",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.cpp",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.h",
}
if os.is("windows") then
files
{
"../../../../rendering/rendertest/Win32OpenGLWindow.cpp",
"../../../../rendering/rendertest/Win32OpenGLWindow.h",
"../../../../rendering/rendertest/Win32Window.cpp",
"../../../../rendering/rendertest/Win32Window.h",
}
end
if os.is("macosx") then
files
{
"../../../../rendering/rendertest/MacOpenGLWindow.mm",
"../../../../rendering/rendertest/MacOpenGLWindow.h"
}
links {"Cocoa.framework"}
end
end

265
demo/gpudemo/Apple/premake4.lua.bak
View File

@@ -1,265 +0,0 @@
hasCL = findOpenCL_Apple()
if (hasCL) then
project "bullet2_gpu_demo_opengl2_Apple"
initOpenCL_Apple()
language "C++"
kind "ConsoleApp"
targetdir "../../../../bin"
includedirs {
"..",
"../../../../rendering/rendertest",
"../../../../bullet2",
"../../../../rendering/Gwen"
}
links {
"BulletSoftBody",
"BulletDynamics",
"BulletCollision",
"LinearMath"
}
initOpenGL()
initGlew()
files {
"../GpuDemo.cpp",
"../GpuDemo.h",
"../btGpuDynamicsWorld.cpp",
"../btGpuDynamicsWorld.h",
"../btCpuDynamicsWorld.cpp",
"../btCpuDynamicsWorld.h",
"../btGpuIntegrateTransforms.cpp",
"../btGpuIntegrateTransforms.h",
"../main_opengl2.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.h",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.h",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.h",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.cpp",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.h",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.cpp",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.h",
"../../../../opencl/broadphase_benchmark/btFillCL.cpp",
"../../../../opencl/broadphase_benchmark/btFillCL.h",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.cpp",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.h",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.h",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.h",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.cpp",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.h",
"../../../../dynamics/basic_demo/Stubs/ChNarrowphase.cpp",
"../../../../dynamics/basic_demo/Stubs/Solver.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.h",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.cpp",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.h",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.cpp",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.h",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.cpp",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.h",
"../../../../opencl/basic_initialize/btOpenCLUtils.cpp",
"../../../../opencl/basic_initialize/btOpenCLUtils.h",
"../../../../opencl/basic_initialize/btOpenCLInclude.h",
"../../../DemosCommon/GL_ShapeDrawer.cpp",
"../../../DemosCommon/GL_ShapeDrawer.h",
"../../../DemosCommon/OpenGL2Renderer.cpp",
"../../../DemosCommon/OpenGL2Renderer.h",
"../../../../rendering/WavefrontObjLoader/string_extra.cpp",
"../../../../rendering/WavefrontObjLoader/string_extra.h",
"../../../../rendering/WavefrontObjLoader/objLoader.cpp",
"../../../../rendering/WavefrontObjLoader/objLoader.h",
"../../../../rendering/WavefrontObjLoader/obj_parser.cpp",
"../../../../rendering/WavefrontObjLoader/obj_parser.h",
"../../../../rendering/WavefrontObjLoader/list.cpp",
"../../../../rendering/WavefrontObjLoader/list.h",
"../../../../rendering/rendertest/GLPrimitiveRenderer.cpp",
"../../../../rendering/rendertest/GLPrimitiveRenderer.h",
"../../../../rendering/rendertest/LoadShader.cpp",
"../../../../rendering/rendertest/LoadShader.h",
"../../../../rendering/rendertest/TwFonts.cpp",
"../../../../rendering/rendertest/TwFonts.h",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.cpp",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.h",
}
if os.is("windows") then
files
{
"../../../../rendering/rendertest/Win32OpenGLWindow.cpp",
"../../../../rendering/rendertest/Win32OpenGLWindow.h",
"../../../../rendering/rendertest/Win32Window.cpp",
"../../../../rendering/rendertest/Win32Window.h",
}
end
if os.is("macosx") then
files
{
"../../../../rendering/rendertest/MacOpenGLWindow.mm",
"../../../../rendering/rendertest/MacOpenGLWindow.h"
}
links {"Cocoa.framework"}
end
project "bullet2_gpu_demo_opengl3core_Apple"
initOpenCL_Apple()
language "C++"
kind "ConsoleApp"
targetdir "../../../../bin"
includedirs {
"..",
"../../../../rendering/rendertest",
"../../../../bullet2",
"../../../../rendering/Gwen"
}
links {
"BulletSoftBody",
"BulletDynamics",
"BulletCollision",
"LinearMath",
"gwen",
}
initOpenGL()
initGlew()
files {
"../GpuDemo.cpp",
"../GpuDemo.h",
"../btGpuDynamicsWorld.cpp",
"../btGpuDynamicsWorld.h",
"../btCpuDynamicsWorld.cpp",
"../btCpuDynamicsWorld.h",
"../btGpuIntegrateTransforms.cpp",
"../btGpuIntegrateTransforms.h",
"../GwenUserInterface.cpp",
"../GwenUserInterface.h",
"../ParticleDemo.cpp",
"../ParticleDemo.h",
"../main_opengl3core.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.h",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.h",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.h",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.cpp",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.h",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.cpp",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.h",
"../../../../opencl/broadphase_benchmark/btFillCL.cpp",
"../../../../opencl/broadphase_benchmark/btFillCL.h",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.cpp",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.h",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.h",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.h",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.cpp",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.h",
"../../../../dynamics/basic_demo/Stubs/ChNarrowphase.cpp",
"../../../../dynamics/basic_demo/Stubs/Solver.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.h",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.cpp",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.h",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.cpp",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.h",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.cpp",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.h",
"../../../../opencl/basic_initialize/btOpenCLUtils.cpp",
"../../../../opencl/basic_initialize/btOpenCLUtils.h",
"../../../../opencl/basic_initialize/btOpenCLInclude.h",
"../../../DemosCommon/GL_ShapeDrawer.cpp",
"../../../DemosCommon/GL_ShapeDrawer.h",
"../../../DemosCommon/OpenGL3CoreRenderer.cpp",
"../../../DemosCommon/OpenGL3CoreRenderer.h",
"../../../../rendering/WavefrontObjLoader/string_extra.cpp",
"../../../../rendering/WavefrontObjLoader/string_extra.h",
"../../../../rendering/WavefrontObjLoader/objLoader.cpp",
"../../../../rendering/WavefrontObjLoader/objLoader.h",
"../../../../rendering/WavefrontObjLoader/obj_parser.cpp",
"../../../../rendering/WavefrontObjLoader/obj_parser.h",
"../../../../rendering/WavefrontObjLoader/list.cpp",
"../../../../rendering/WavefrontObjLoader/list.h",
"../../../../rendering/rendertest/GLInstancingRenderer.cpp",
"../../../../rendering/rendertest/GLInstancingRenderer.h",
"../../../../rendering/rendertest/GLPrimitiveRenderer.cpp",
"../../../../rendering/rendertest/GLPrimitiveRenderer.h",
"../../../../rendering/rendertest/LoadShader.cpp",
"../../../../rendering/rendertest/LoadShader.h",
"../../../../rendering/rendertest/TwFonts.cpp",
"../../../../rendering/rendertest/TwFonts.h",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.cpp",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.h",
}
if os.is("windows") then
files
{
"../../../../rendering/rendertest/Win32OpenGLWindow.cpp",
"../../../../rendering/rendertest/Win32OpenGLWindow.h",
"../../../../rendering/rendertest/Win32Window.cpp",
"../../../../rendering/rendertest/Win32Window.h",
}
end
if os.is("macosx") then
files
{
"../../../../rendering/rendertest/MacOpenGLWindow.mm",
"../../../../rendering/rendertest/MacOpenGLWindow.h"
}
links {"Cocoa.framework"}
end
end

234
demo/gpudemo/NVIDIA/premake4.lua
View File

@@ -1,234 +0,0 @@
hasCL = findOpenCL_NVIDIA()
if (hasCL) then
project "bullet2_gpu_demo_opengl2_NVIDIA"
initOpenCL_NVIDIA()
language "C++"
kind "ConsoleApp"
targetdir "../../../../bin"
includedirs {
"..",
"../../../../bullet2",
"../../../../rendering/Gwen"
}
links {
"BulletSoftBody",
"BulletDynamics",
"BulletCollision",
"LinearMath"
}
initOpenGL()
initGlew()
files {
"../GpuDemo.cpp",
"../GpuDemo.h",
"../btGpuDynamicsWorld.cpp",
"../btGpuDynamicsWorld.h",
"../btCpuDynamicsWorld.cpp",
"../btCpuDynamicsWorld.h",
"../btGpuIntegrateTransforms.cpp",
"../btGpuIntegrateTransforms.h",
"../main_opengl2.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.h",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.h",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.h",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.cpp",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.h",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.cpp",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.h",
"../../../../opencl/broadphase_benchmark/btFillCL.cpp",
"../../../../opencl/broadphase_benchmark/btFillCL.h",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.cpp",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.h",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.h",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.h",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.cpp",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.h",
"../../../../dynamics/basic_demo/Stubs/ChNarrowphase.cpp",
"../../../../dynamics/basic_demo/Stubs/Solver.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.h",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.cpp",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.h",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.cpp",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.h",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.cpp",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.h",
"../../../../opencl/basic_initialize/btOpenCLUtils.cpp",
"../../../../opencl/basic_initialize/btOpenCLUtils.h",
"../../../../opencl/basic_initialize/btOpenCLInclude.h",
"../../../DemosCommon/GL_ShapeDrawer.cpp",
"../../../DemosCommon/GL_ShapeDrawer.h",
"../../../DemosCommon/OpenGL2Renderer.cpp",
"../../../DemosCommon/OpenGL2Renderer.h",
"../../../../rendering/WavefrontObjLoader/string_extra.cpp",
"../../../../rendering/WavefrontObjLoader/string_extra.h",
"../../../../rendering/WavefrontObjLoader/objLoader.cpp",
"../../../../rendering/WavefrontObjLoader/objLoader.h",
"../../../../rendering/WavefrontObjLoader/obj_parser.cpp",
"../../../../rendering/WavefrontObjLoader/obj_parser.h",
"../../../../rendering/WavefrontObjLoader/list.cpp",
"../../../../rendering/WavefrontObjLoader/list.h",
"../../../../rendering/rendertest/GLPrimitiveRenderer.cpp",
"../../../../rendering/rendertest/GLPrimitiveRenderer.h",
"../../../../rendering/rendertest/Win32OpenGLWindow.cpp",
"../../../../rendering/rendertest/Win32OpenGLWindow.h",
"../../../../rendering/rendertest/Win32Window.cpp",
"../../../../rendering/rendertest/Win32Window.h",
"../../../../rendering/rendertest/LoadShader.cpp",
"../../../../rendering/rendertest/LoadShader.h",
"../../../../rendering/rendertest/TwFonts.cpp",
"../../../../rendering/rendertest/TwFonts.h",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.cpp",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.h",
}
project "bullet2_gpu_demo_opengl3core_NVIDIA"
initOpenCL_NVIDIA()
language "C++"
kind "ConsoleApp"
targetdir "../../../../bin"
includedirs {
"..",
"../../../../bullet2",
"../../../../rendering/Gwen"
}
links {
"BulletSoftBody",
"BulletDynamics",
"BulletCollision",
"LinearMath",
"gwen",
}
initOpenGL()
initGlew()
files {
"../GpuDemo.cpp",
"../GpuDemo.h",
"../btGpuDynamicsWorld.cpp",
"../btGpuDynamicsWorld.h",
"../btCpuDynamicsWorld.cpp",
"../btCpuDynamicsWorld.h",
"../btGpuIntegrateTransforms.cpp",
"../btGpuIntegrateTransforms.h",
"../GwenUserInterface.cpp",
"../GwenUserInterface.h",
"../ParticleDemo.cpp",
"../ParticleDemo.h",
"../BroadphaseBenchmark.cpp",
"../BroadphaseBenchmark.h",
"../main_opengl3core.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.h",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.h",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.h",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.cpp",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.h",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.cpp",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.h",
"../../../../opencl/broadphase_benchmark/btFillCL.cpp",
"../../../../opencl/broadphase_benchmark/btFillCL.h",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.cpp",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.h",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.h",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.h",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.cpp",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.h",
"../../../../dynamics/basic_demo/Stubs/ChNarrowphase.cpp",
"../../../../dynamics/basic_demo/Stubs/Solver.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.h",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.cpp",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.h",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.cpp",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.h",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.cpp",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.h",
"../../../../opencl/basic_initialize/btOpenCLUtils.cpp",
"../../../../opencl/basic_initialize/btOpenCLUtils.h",
"../../../../opencl/basic_initialize/btOpenCLInclude.h",
"../../../DemosCommon/GL_ShapeDrawer.cpp",
"../../../DemosCommon/GL_ShapeDrawer.h",
"../../../DemosCommon/OpenGL3CoreRenderer.cpp",
"../../../DemosCommon/OpenGL3CoreRenderer.h",
"../../../../rendering/WavefrontObjLoader/string_extra.cpp",
"../../../../rendering/WavefrontObjLoader/string_extra.h",
"../../../../rendering/WavefrontObjLoader/objLoader.cpp",
"../../../../rendering/WavefrontObjLoader/objLoader.h",
"../../../../rendering/WavefrontObjLoader/obj_parser.cpp",
"../../../../rendering/WavefrontObjLoader/obj_parser.h",
"../../../../rendering/WavefrontObjLoader/list.cpp",
"../../../../rendering/WavefrontObjLoader/list.h",
"../../../../rendering/rendertest/GLInstancingRenderer.cpp",
"../../../../rendering/rendertest/GLInstancingRenderer.h",
"../../../../rendering/rendertest/GLPrimitiveRenderer.cpp",
"../../../../rendering/rendertest/GLPrimitiveRenderer.h",
"../../../../rendering/rendertest/Win32OpenGLWindow.cpp",
"../../../../rendering/rendertest/Win32OpenGLWindow.h",
"../../../../rendering/rendertest/Win32Window.cpp",
"../../../../rendering/rendertest/Win32Window.h",
"../../../../rendering/rendertest/LoadShader.cpp",
"../../../../rendering/rendertest/LoadShader.h",
"../../../../rendering/rendertest/TwFonts.cpp",
"../../../../rendering/rendertest/TwFonts.h",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.cpp",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.h",
}
end

233
demo/gpudemo/NVIDIA/premake4.lua.bak
View File

@@ -1,233 +0,0 @@
hasCL = findOpenCL_NVIDIA()
if (hasCL) then
project "bullet2_gpu_demo_opengl2_NVIDIA"
initOpenCL_NVIDIA()
language "C++"
kind "ConsoleApp"
targetdir "../../../../bin"
includedirs {
"..",
"../../../../bullet2",
"../../../../rendering/Gwen"
}
links {
"BulletSoftBody",
"BulletDynamics",
"BulletCollision",
"LinearMath"
}
initOpenGL()
initGlew()
files {
"../GpuDemo.cpp",
"../GpuDemo.h",
"../btGpuDynamicsWorld.cpp",
"../btGpuDynamicsWorld.h",
"../btCpuDynamicsWorld.cpp",
"../btCpuDynamicsWorld.h",
"../btGpuIntegrateTransforms.cpp",
"../btGpuIntegrateTransforms.h",
"../main_opengl2.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.h",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.h",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.h",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.cpp",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.h",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.cpp",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.h",
"../../../../opencl/broadphase_benchmark/btFillCL.cpp",
"../../../../opencl/broadphase_benchmark/btFillCL.h",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.cpp",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.h",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.h",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.h",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.cpp",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.h",
"../../../../dynamics/basic_demo/Stubs/ChNarrowphase.cpp",
"../../../../dynamics/basic_demo/Stubs/Solver.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.h",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.cpp",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.h",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.cpp",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.h",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.cpp",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.h",
"../../../../opencl/basic_initialize/btOpenCLUtils.cpp",
"../../../../opencl/basic_initialize/btOpenCLUtils.h",
"../../../../opencl/basic_initialize/btOpenCLInclude.h",
"../../../DemosCommon/GL_ShapeDrawer.cpp",
"../../../DemosCommon/GL_ShapeDrawer.h",
"../../../DemosCommon/OpenGL2Renderer.cpp",
"../../../DemosCommon/OpenGL2Renderer.h",
"../../../../rendering/WavefrontObjLoader/string_extra.cpp",
"../../../../rendering/WavefrontObjLoader/string_extra.h",
"../../../../rendering/WavefrontObjLoader/objLoader.cpp",
"../../../../rendering/WavefrontObjLoader/objLoader.h",
"../../../../rendering/WavefrontObjLoader/obj_parser.cpp",
"../../../../rendering/WavefrontObjLoader/obj_parser.h",
"../../../../rendering/WavefrontObjLoader/list.cpp",
"../../../../rendering/WavefrontObjLoader/list.h",
"../../../../rendering/rendertest/GLPrimitiveRenderer.cpp",
"../../../../rendering/rendertest/GLPrimitiveRenderer.h",
"../../../../rendering/rendertest/Win32OpenGLWindow.cpp",
"../../../../rendering/rendertest/Win32OpenGLWindow.h",
"../../../../rendering/rendertest/Win32Window.cpp",
"../../../../rendering/rendertest/Win32Window.h",
"../../../../rendering/rendertest/LoadShader.cpp",
"../../../../rendering/rendertest/LoadShader.h",
"../../../../rendering/rendertest/TwFonts.cpp",
"../../../../rendering/rendertest/TwFonts.h",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.cpp",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.h",
}
project "bullet2_gpu_demo_opengl3core_NVIDIA"
initOpenCL_NVIDIA()
language "C++"
kind "ConsoleApp"
targetdir "../../../../bin"
includedirs {
"..",
"../../../../bullet2",
"../../../../rendering/Gwen"
}
links {
"BulletSoftBody",
"BulletDynamics",
"BulletCollision",
"LinearMath",
"gwen",
}
initOpenGL()
initGlew()
files {
"../GpuDemo.cpp",
"../GpuDemo.h",
"../btGpuDynamicsWorld.cpp",
"../btGpuDynamicsWorld.h",
"../btCpuDynamicsWorld.cpp",
"../btCpuDynamicsWorld.h",
"../btGpuIntegrateTransforms.cpp",
"../btGpuIntegrateTransforms.h",
"../GwenUserInterface.cpp",
"../GwenUserInterface.h",
"../ParticleDemo.cpp",
"../ParticleDemo.h",
"../main_opengl3core.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.cpp",
"../../../../opencl/opengl_interop/btOpenCLGLInteropBuffer.h",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/CLPhysicsDemo.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btPgsJacobiSolver.h",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/btGpuSapBroadphase.h",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.cpp",
"../../../../opencl/gpu_rigidbody_pipeline2/ConvexHullContact.h",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.cpp",
"../../../../opencl/broadphase_benchmark/btPrefixScanCL.h",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.cpp",
"../../../../opencl/broadphase_benchmark/btRadixSort32CL.h",
"../../../../opencl/broadphase_benchmark/btFillCL.cpp",
"../../../../opencl/broadphase_benchmark/btFillCL.h",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.cpp",
"../../../../opencl/broadphase_benchmark/btBoundSearchCL.h",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btConvexUtility.h",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.cpp",
"../../../../opencl/gpu_rigidbody_pipeline/btGpuNarrowPhaseAndSolver.h",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.cpp",
"../../../../dynamics/basic_demo/ConvexHeightFieldShape.h",
"../../../../dynamics/basic_demo/Stubs/ChNarrowphase.cpp",
"../../../../dynamics/basic_demo/Stubs/Solver.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.cpp",
"../../../../opencl/broadphase_benchmark/findPairsOpenCL.h",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.cpp",
"../../../../opencl/broadphase_benchmark/btGridBroadphaseCL.h",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.cpp",
"../../../../opencl/3dGridBroadphase/Shared/bt3dGridBroadphaseOCL.h",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.cpp",
"../../../../opencl/3dGridBroadphase/Shared/btGpu3DGridBroadphase.h",
"../../../../opencl/basic_initialize/btOpenCLUtils.cpp",
"../../../../opencl/basic_initialize/btOpenCLUtils.h",
"../../../../opencl/basic_initialize/btOpenCLInclude.h",
"../../../DemosCommon/GL_ShapeDrawer.cpp",
"../../../DemosCommon/GL_ShapeDrawer.h",
"../../../DemosCommon/OpenGL3CoreRenderer.cpp",
"../../../DemosCommon/OpenGL3CoreRenderer.h",
"../../../../rendering/WavefrontObjLoader/string_extra.cpp",
"../../../../rendering/WavefrontObjLoader/string_extra.h",
"../../../../rendering/WavefrontObjLoader/objLoader.cpp",
"../../../../rendering/WavefrontObjLoader/objLoader.h",
"../../../../rendering/WavefrontObjLoader/obj_parser.cpp",
"../../../../rendering/WavefrontObjLoader/obj_parser.h",
"../../../../rendering/WavefrontObjLoader/list.cpp",
"../../../../rendering/WavefrontObjLoader/list.h",
"../../../../rendering/rendertest/GLInstancingRenderer.cpp",
"../../../../rendering/rendertest/GLInstancingRenderer.h",
"../../../../rendering/rendertest/GLPrimitiveRenderer.cpp",
"../../../../rendering/rendertest/GLPrimitiveRenderer.h",
"../../../../rendering/rendertest/Win32OpenGLWindow.cpp",
"../../../../rendering/rendertest/Win32OpenGLWindow.h",
"../../../../rendering/rendertest/Win32Window.cpp",
"../../../../rendering/rendertest/Win32Window.h",
"../../../../rendering/rendertest/LoadShader.cpp",
"../../../../rendering/rendertest/LoadShader.h",
"../../../../rendering/rendertest/TwFonts.cpp",
"../../../../rendering/rendertest/TwFonts.h",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../../rendering/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.cpp",
"../../../../rendering/OpenGLTrueTypeFont/fontstash.h",
}
end

4
demo/gpudemo/ParticleDemo.cpp
View File

@@ -8,7 +8,7 @@
static char* particleKernelsString =
#include "ParticleKernels.cl"
#define INTEROPKERNEL_SRC_PATH "../../demos/gpudemo/ParticleKernels.cl"
#define INTEROPKERNEL_SRC_PATH "demo/gpudemo/ParticleKernels.cl"
#include "BulletCommon/btVector3.h"
#include "OpenGLWindow/OpenGLInclude.h"
#include "OpenGLWindow/GLInstanceRendererInternalData.h"
@@ -207,7 +207,7 @@ void ParticleDemo::setupScene(const ConstructionInfo& ci)
int numParticles = NUM_PARTICLES_X*NUM_PARTICLES_Y*NUM_PARTICLES_Z;
btOverlappingPairCache* overlappingPairCache=0;
int maxObjects = NUM_PARTICLES_X*NUM_PARTICLES_Y*NUM_PARTICLES_Z+1024;
int maxPairsSmallProxy = 32;

53
demo/gpudemo/ParticleDemo.h
View File

@@ -1,13 +1,49 @@
#ifndef PARTICLE_DEMO_H
#define PARTICLE_DEMO_H
#include "GpuDemo.h"
//#include "GpuDemo.h"
struct GLInstancingRenderer;
class ParticleDemo;
class ParticleDemo : public GpuDemo
class ParticleDemo //: public GpuDemo
{
protected:
public:
typedef class ParticleDemo* (CreateFunc)();
struct ConstructionInfo
{
bool useOpenCL;
int preferredOpenCLPlatformIndex;
int preferredOpenCLDeviceIndex;
int arraySizeX;
int arraySizeY;
int arraySizeZ;
bool m_useConcaveMesh;
float gapX;
float gapY;
float gapZ;
GLInstancingRenderer* m_instancingRenderer;
ConstructionInfo()
:useOpenCL(false),//true),
preferredOpenCLPlatformIndex(-1),
preferredOpenCLDeviceIndex(-1),
arraySizeX(10),
arraySizeY(10 ),
arraySizeZ(10),
m_useConcaveMesh(false),
gapX(4.3),
gapY(4.0),
gapZ(4.3),
m_instancingRenderer(0)
{
}
};
protected:
struct ParticleInternalData* m_data;
GLInstancingRenderer* m_instancingRenderer;
@@ -31,16 +67,13 @@ public:
{
return "ParticleDemo";
}
static GpuDemo* CreateFunc()
static ParticleDemo* MyCreateFunc()
{
GpuDemo* demo = new ParticleDemo;
ParticleDemo* demo = new ParticleDemo;
return demo;
}
virtual const btDynamicsWorld* getDynamicsWorld() const
{
return 0;
}
virtual void renderScene();

51
demo/gpudemo/main_opengl3core.cpp
View File

@@ -1,5 +1,5 @@
#include "GpuDemo.h"
//#include "GpuDemo.h"
#ifdef _WIN32
#include <Windows.h> //for GetLocalTime/GetSystemTime
@@ -15,7 +15,7 @@
#include "OpenGLWindow/GLPrimitiveRenderer.h"
#include "OpenGLWindow/GLInstancingRenderer.h"
#include "OpenGL3CoreRenderer.h"
//#include "OpenGL3CoreRenderer.h"
#include "BulletCommon/btQuickprof.h"
//#include "btGpuDynamicsWorld.h"
#include <assert.h>
@@ -29,6 +29,7 @@
int g_OpenGLWidth=1024;
int g_OpenGLHeight = 768;
bool dump_timings = false;
extern char OpenSansData[];
static void MyResizeCallback( float width, float height)
{
@@ -55,11 +56,11 @@ enum
btAlignedObjectArray<const char*> demoNames;
int selectedDemo = 0;
GpuDemo::CreateFunc* allDemos[]=
ParticleDemo::CreateFunc* allDemos[]=
{
//BroadphaseBenchmark::CreateFunc,
//GpuBoxDemo::CreateFunc,
ParticleDemo::CreateFunc,
ParticleDemo::MyCreateFunc,
//SpheresDemo::CreateFunc,
//GpuCompoundDemo::CreateFunc,
//EmptyDemo::CreateFunc,
@@ -141,12 +142,12 @@ void MyKeyboardCallback(int key, int state)
extern bool enableExperimentalCpuConcaveCollision;
bool enableExperimentalCpuConcaveCollision=false;
int droidRegular, droidItalic, droidBold, droidJapanese, dejavu;
int droidRegular=0;//, droidItalic, droidBold, droidJapanese, dejavu;
sth_stash* stash=0;
@@ -156,7 +157,7 @@ sth_stash* initFont(GLPrimitiveRenderer* primRender)
struct sth_stash* stash = 0;
int datasize;
unsigned char* data;
float sx,sy,dx,dy,lh;
GLuint texture;
@@ -171,7 +172,8 @@ sth_stash* initFont(GLPrimitiveRenderer* primRender)
fprintf(stderr, "Could not create stash.\n");
return 0;
}
#ifdef LOAD_FONT_FROM_FILE
unsigned char* data=0;
const char* fontPaths[]={
"./",
"../../bin/",
@@ -250,6 +252,15 @@ sth_stash* initFont(GLPrimitiveRenderer* primRender)
assert(0);
return 0;
}
#else//LOAD_FONT_FROM_FILE
char* data2 = OpenSansData;
unsigned char* data = (unsigned char*) data2;
if (!(droidRegular = sth_add_font_from_memory(stash, data)))
{
printf("error!\n");
}
#endif//LOAD_FONT_FROM_FILE
err = glGetError();
assert(err==GL_NO_ERROR);
@@ -327,14 +338,15 @@ void DumpSimulationTime(FILE* f)
}
extern const char* g_deviceName;
///extern const char* g_deviceName;
const char* g_deviceName = "blaat";
int main(int argc, char* argv[])
{
printf("main start");
CommandLineArgs args(argc,argv);
GpuDemo::ConstructionInfo ci;
ParticleDemo::ConstructionInfo ci;
if (args.CheckCmdLineFlag("help"))
{
@@ -418,11 +430,11 @@ int main(int argc, char* argv[])
int numItems = sizeof(allDemos)/sizeof(GpuDemo::CreateFunc*);
int numItems = sizeof(allDemos)/sizeof(ParticleDemo::CreateFunc*);
demoNames.clear();
for (int i=0;i<numItems;i++)
{
GpuDemo* demo = allDemos[i]();
ParticleDemo* demo = allDemos[i]();
demoNames.push_back(demo->getName());
delete demo;
}
@@ -497,7 +509,7 @@ int main(int argc, char* argv[])
}
once=false;
OpenGL3CoreRenderer render;
// OpenGL3CoreRenderer render;
glClearColor(0,1,0,1);
glClear(GL_COLOR_BUFFER_BIT);
@@ -514,13 +526,18 @@ int main(int argc, char* argv[])
{
GpuDemo* demo = allDemos[selectedDemo]();
ParticleDemo* demo = allDemos[selectedDemo]();
// demo->myinit();
bool useGpu = false;
ci.m_instancingRenderer = render.getInstancingRenderer();
render.init();
int maxObjectCapacity=128*1024;
ci.m_instancingRenderer = new GLInstancingRenderer(maxObjectCapacity);//render.getInstancingRenderer();
ci.m_instancingRenderer->init();
ci.m_instancingRenderer->InitShaders();
// render.init();
demo->initPhysics(ci);
printf("-----------------------------------------------------\n");
@@ -565,7 +582,7 @@ int main(int argc, char* argv[])
CProfileManager::Reset();
CProfileManager::Increment_Frame_Counter();
render.reshape(g_OpenGLWidth,g_OpenGLHeight);
// render.reshape(g_OpenGLWidth,g_OpenGLHeight);
window->startRendering();

35
demo/gpudemo/premake4.lua
View File

@@ -34,7 +34,40 @@ function createProject(vendor)
"gwenUserInterface.h",
"ParticleDemo.cpp",
"ParticleDemo.h",
"../../src/BulletCommon/btAlignedAllocator.cpp",
"../../src/BulletCommon/btAlignedAllocator.h",
"../../src/BulletCommon/btQuickprof.cpp",
"../../src/BulletCommon/btQuickprof.h",
"../../src/BulletGeometry/btConvexHullComputer.cpp",
"../../src/BulletGeometry/btConvexHullComputer.h",
"../../btgui/OpenGLWindow/GLInstancingRenderer.cpp",
"../../btgui/OpenGLWindow/GLInstancingRenderer.h",
"../../btgui/OpenGLWindow/GLPrimitiveRenderer.cpp",
"../../btgui/OpenGLWindow/GLPrimitiveRenderer.h",
"../../btgui/OpenGLWindow/LoadShader.cpp",
"../../btgui/OpenGLWindow/LoadShader.h",
"../../btgui/OpenGLWindow/TwFonts.cpp",
"../../btgui/OpenGLWindow/TwFonts.h",
"../../btgui/OpenGLTrueTypeFont/fontstash.cpp",
"../../btgui/OpenGLTrueTypeFont/fontstash.h",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../btgui/FontFiles/OpenSans.cpp",
"../../opencl/basic_initialize/btOpenCLUtils.cpp",
"../../opencl/basic_initialize/btOpenCLUtils.h",
"../../opencl/gpu_broadphase/host/btGpuSapBroadphase.cpp",
"../../opencl/gpu_sat/host/btConvexUtility.cpp",
"../../opencl/gpu_sat/host/ConvexHullContact.cpp",
"../../opencl/gpu_sat/host/ConvexHullContact.h",
"../../opencl/parallel_primitives/host/btBoundSearchCL.cpp",
"../../opencl/parallel_primitives/host/btBoundSearchCL.h",
"../../opencl/parallel_primitives/host/btFillCL.cpp",
"../../opencl/parallel_primitives/host/btFillCL.h",
"../../opencl/parallel_primitives/host/btPrefixScanCL.cpp",
"../../opencl/parallel_primitives/host/btPrefixScanCL.h",
"../../opencl/parallel_primitives/host/btRadixSort32CL.cpp",
"../../opencl/parallel_primitives/host/btRadixSort32CL.h",
}
if os.is("Windows") then

2
opencl/gpu_broadphase/host/btGpuSapBroadphase.cpp
View File

@@ -3,7 +3,7 @@
#include "BulletCommon/btVector3.h"
#include "parallel_primitives/host/btLauncherCL.h"
#include "BulletCommon/btQuickprof.h"
#include "../basic_initialize/btOpenCLUtils.h"
#include "basic_initialize/btOpenCLUtils.h"
#include "../kernels/sapKernels.h"

2
opencl/gpu_sat/host/ConvexHullContact.cpp
View File

@@ -28,7 +28,7 @@ typedef btAlignedObjectArray<btVector3> btVertexArray;
#include "BulletCommon/btQuickprof.h"
#include <float.h> //for FLT_MAX
#include "../basic_initialize/btOpenCLUtils.h"
#include "basic_initialize/btOpenCLUtils.h"
#include "parallel_primitives/host/btLauncherCL.h"
//#include "AdlQuaternion.h"

10
opencl/gpu_sat/host/btConvexUtility.cpp
View File

@@ -15,12 +15,12 @@ subject to the following restrictions:
#include "btConvexUtility.h"
#include "LinearMath/btConvexHullComputer.h"
#include "LinearMath/btGrahamScan2dConvexHull.h"
#include "LinearMath/btQuaternion.h"
#include "LinearMath/btHashMap.h"
#include "BulletGeometry/btConvexHullComputer.h"
#include "BulletGeometry/btGrahamScan2dConvexHull.h"
#include "BulletCommon/btQuaternion.h"
#include "BulletCommon/btHashMap.h"
#include "../gpu_rigidbody_pipeline2/ConvexPolyhedronCL.h"
#include "btConvexPolyhedronCL.h"

3
opencl/gpu_sat/test/main.cpp
View File

@@ -86,8 +86,7 @@ inline void gpuConvexHullContactTest()
int main(int argc, char** argv)
{
int preferredDeviceIndex = -1;
int preferredPlatformIndex = -1;
int preferredDeviceIndex = -1; int preferredPlatformIndex = -1;
CommandLineArgs args(argc, argv);
args.GetCmdLineArgument("deviceId", preferredDeviceIndex);

4
src/BulletGeometry/btGrahamScan2dConvexHull.h
View File

@@ -18,8 +18,8 @@ subject to the following restrictions:
#define GRAHAM_SCAN_2D_CONVEX_HULL_H
#include "btVector3.h"
#include "btAlignedObjectArray.h"
#include "BulletCommon/btVector3.h"
#include "BulletCommon/btAlignedObjectArray.h"
struct GrahamVector3 : public btVector3
{