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

bt->b3

Browse Source
This commit is contained in:
erwin coumans
2013-04-17 17:52:51 -07:00
parent 3cb80ad1a3
commit 626f0cf1e3
92 changed files with 158 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
btgui/GwenOpenGLTest/premake4.lua
View File

@@ -37,11 +37,11 @@
"../OpenGLTrueTypeFont/fontstash.h", "../OpenGLTrueTypeFont/fontstash.h",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp", "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h", "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../src/BulletGeometry/b3ConvexHullComputer.cpp", "../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
"../../src/BulletGeometry/b3ConvexHullComputer.h", "../../src/Bullet3Geometry/b3ConvexHullComputer.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp", "../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3Quickprof.cpp", "../../src/Bullet3Common/b3Quickprof.cpp",
"../../src/BulletCommon/b3Quickprof.h", "../../src/Bullet3Common/b3Quickprof.h",
"**.cpp", "**.cpp",
"**.h", "**.h",
} }

6
btgui/OpenGLTrueTypeFont/main.cpp
View File

@@ -32,9 +32,9 @@ subject to the following restrictions:
#include "opengl_fontstashcallbacks.h" #include "opengl_fontstashcallbacks.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "BulletCommon/b3CommandLineArgs.h" #include "Bullet3Common/b3CommandLineArgs.h"
#include "../OpenGLWindow/LoadShader.h" #include "../OpenGLWindow/LoadShader.h"
extern char OpenSansData[]; extern char OpenSansData[];
bool printStats = false; bool printStats = false;

6
btgui/OpenGLTrueTypeFont/premake4.lua
View File

@@ -23,9 +23,9 @@
"../FontFiles/OpenSans.cpp", "../FontFiles/OpenSans.cpp",
"../OpenGLWindow/LoadShader.cpp", "../OpenGLWindow/LoadShader.cpp",
"../OpenGLWindow/LoadShader.h", "../OpenGLWindow/LoadShader.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp", "../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3Quickprof.cpp", "../../src/Bullet3Common/b3Quickprof.cpp",
"../../src/BulletCommon/b3Quickprof.h" , "../../src/Bullet3Common/b3Quickprof.h" ,
"fontstash.cpp", "fontstash.cpp",
"fontstash.h", "fontstash.h",
"opengl_fontstashcallbacks.cpp", "opengl_fontstashcallbacks.cpp",

2
btgui/OpenGLWindow/GLInstanceGraphicsShape.h
View File

@@ -1,7 +1,7 @@
#ifndef GL_INSTANCE_GRAPHICS_SHAPE_H #ifndef GL_INSTANCE_GRAPHICS_SHAPE_H
#define GL_INSTANCE_GRAPHICS_SHAPE_H #define GL_INSTANCE_GRAPHICS_SHAPE_H
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
struct GLInstanceVertex struct GLInstanceVertex
{ {

2
btgui/OpenGLWindow/GLInstanceRendererInternalData.h
View File

@@ -2,7 +2,7 @@
#define GL_INSTANCE_RENDERER_INTERNAL_DATA_H #define GL_INSTANCE_RENDERER_INTERNAL_DATA_H
#include "OpenGLInclude.h" #include "OpenGLInclude.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
struct GLInstanceRendererInternalData struct GLInstanceRendererInternalData
{ {

8
btgui/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -22,10 +22,10 @@ subject to the following restrictions:
//#include "DemoSettings.h" //#include "DemoSettings.h"
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "BulletCommon/b3Matrix3x3.h" #include "Bullet3Common/b3Matrix3x3.h"
#include "LoadShader.h" #include "LoadShader.h"

2
btgui/OpenGLWindow/GLInstancingRenderer.h
View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#ifndef GL_INSTANCING_RENDERER_H #ifndef GL_INSTANCING_RENDERER_H
#define GL_INSTANCING_RENDERER_H #define GL_INSTANCING_RENDERER_H
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
void btDefaultMouseButtonCallback( int button, int state, float x, float y); void btDefaultMouseButtonCallback( int button, int state, float x, float y);
void btDefaultMouseMoveCallback( float x, float y); void btDefaultMouseMoveCallback( float x, float y);

2
btgui/OpenGLWindow/Win32OpenGLWindow.cpp
View File

@@ -18,7 +18,7 @@ subject to the following restrictions:
#include "OpenGLInclude.h" #include "OpenGLInclude.h"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "Win32InternalWindowData.h" #include "Win32InternalWindowData.h"
#include <stdio.h> #include <stdio.h>

2
btgui/OpenGLWindow/Win32Window.cpp
View File

@@ -17,7 +17,7 @@ subject to the following restrictions:
#include "Win32Window.h" #include "Win32Window.h"
#include "OpenGLInclude.h" #include "OpenGLInclude.h"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include <wchar.h> #include <wchar.h>
static InternalData2* sData = 0; static InternalData2* sData = 0;

2
btgui/OpenGLWindow/gwenWindow.cpp
View File

@@ -19,7 +19,7 @@
#include "Gwen/Controls/TabControl.h" #include "Gwen/Controls/TabControl.h"
#include "Gwen/Controls/ListBox.h" #include "Gwen/Controls/ListBox.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "GwenOpenGL3CoreRenderer.h" #include "GwenOpenGL3CoreRenderer.h"
#include "GLPrimitiveRenderer.h" #include "GLPrimitiveRenderer.h"

6
btgui/OpenGLWindow/main.cpp
View File

@@ -37,10 +37,10 @@ extern char OpenSansData[];
#include "renderscene.h" #include "renderscene.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "BulletCommon/b3CommandLineArgs.h" #include "Bullet3Common/b3CommandLineArgs.h"
#include "../OpenGLTrueTypeFont/fontstash.h" #include "../OpenGLTrueTypeFont/fontstash.h"
#include "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h" #include "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"

10
btgui/OpenGLWindow/premake4.lua
View File

@@ -41,11 +41,11 @@
"../OpenGLTrueTypeFont/fontstash.h", "../OpenGLTrueTypeFont/fontstash.h",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp", "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h", "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../src/BulletGeometry/b3ConvexHullComputer.cpp", "../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
"../../src/BulletGeometry/b3ConvexHullComputer.h", "../../src/Bullet3Geometry/b3ConvexHullComputer.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp", "../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3Quickprof.cpp", "../../src/Bullet3Common/b3Quickprof.cpp",
"../../src/BulletCommon/b3Quickprof.h" "../../src/Bullet3Common/b3Quickprof.h"
} }
if os.is("Windows") then if os.is("Windows") then

4
btgui/OpenGLWindow/renderscene.cpp
View File

@@ -16,8 +16,8 @@ bool keepStaticObjects = false;
#include "GLInstancingRenderer.h" #include "GLInstancingRenderer.h"
//#include "LinearMath/b3Quickprof.h" //#include "LinearMath/b3Quickprof.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "BulletCommon/b3Matrix3x3.h" #include "Bullet3Common/b3Matrix3x3.h"
//#include "../opencl/gpu_rigidbody_pipeline/b3ConvexUtility.h" //#include "../opencl/gpu_rigidbody_pipeline/b3ConvexUtility.h"
#include "ShapeData.h" #include "ShapeData.h"
///work-in-progress ///work-in-progress

2
demo/donttouch/GpuDemo.h
View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#define GPU_DEMO_H #define GPU_DEMO_H
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
class btBroadphaseInterface; class btBroadphaseInterface;

2
demo/donttouch/OpenGL3CoreRenderer.cpp
View File

@@ -4,7 +4,7 @@
#include "OpenGLWindow/ShapeData.h" #include "OpenGLWindow/ShapeData.h"
//#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" //#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
//#include "BulletCollision/CollisionDispatch/btCollisionObject.h" //#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
/*#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" /*#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
#include "BulletCollision/CollisionShapes/btConvexPolyhedron.h" #include "BulletCollision/CollisionShapes/btConvexPolyhedron.h"

2
demo/donttouch/btGpuDynamicsWorld.h
View File

@@ -7,7 +7,7 @@ class btCollisionObject;
struct btGpuInternalData;//use this struct to avoid 'leaking' all OpenCL headers into clients code base struct btGpuInternalData;//use this struct to avoid 'leaking' all OpenCL headers into clients code base
class CLPhysicsDemo; class CLPhysicsDemo;
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
//#include "BulletDynamics/Dynamics/btDynamicsWorld.h" //#include "BulletDynamics/Dynamics/btDynamicsWorld.h"

2
demo/gpudemo/GpuDemo.cpp
View File

@@ -1,6 +1,6 @@
#include "GpuDemo.h" #include "GpuDemo.h"
#include "GpuDemoInternalData.h" #include "GpuDemoInternalData.h"
#include "BulletCommon/b3Scalar.h" #include "Bullet3Common/b3Scalar.h"
#include "basic_initialize/b3OpenCLUtils.h" #include "basic_initialize/b3OpenCLUtils.h"
#include "OpenGLWindow/ShapeData.h" #include "OpenGLWindow/ShapeData.h"
#include "OpenGLWindow/GLInstancingRenderer.h" #include "OpenGLWindow/GLInstancingRenderer.h"

4
demo/gpudemo/ParticleDemo.cpp
View File

@@ -9,7 +9,7 @@ static char* particleKernelsString =
#include "ParticleKernels.cl" #include "ParticleKernels.cl"
#define INTEROPKERNEL_SRC_PATH "demo/gpudemo/ParticleKernels.cl" #define INTEROPKERNEL_SRC_PATH "demo/gpudemo/ParticleKernels.cl"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "OpenGLWindow/OpenGLInclude.h" #include "OpenGLWindow/OpenGLInclude.h"
#include "OpenGLWindow/GLInstanceRendererInternalData.h" #include "OpenGLWindow/GLInstanceRendererInternalData.h"
#include "parallel_primitives/host/btLauncherCL.h" #include "parallel_primitives/host/btLauncherCL.h"
@@ -19,7 +19,7 @@ static char* particleKernelsString =
#include "GpuDemoInternalData.h" #include "GpuDemoInternalData.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
//1000000 particles //1000000 particles
//#define NUM_PARTICLES_X 100 //#define NUM_PARTICLES_X 100

4
demo/gpudemo/broadphase/PairBench.cpp
View File

@@ -1,8 +1,8 @@
#include "PairBench.h" #include "PairBench.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "OpenGLWindow/ShapeData.h" #include "OpenGLWindow/ShapeData.h"
#include "OpenGLWindow/GLInstancingRenderer.h" #include "OpenGLWindow/GLInstancingRenderer.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "OpenGLWindow/btgWindowInterface.h" #include "OpenGLWindow/btgWindowInterface.h"
#include "gpu_broadphase/host/b3GpuSapBroadphase.h" #include "gpu_broadphase/host/b3GpuSapBroadphase.h"
#include "../GpuDemoInternalData.h" #include "../GpuDemoInternalData.h"

2
demo/gpudemo/gwenUserInterface.cpp
View File

@@ -15,7 +15,7 @@
#include "Gwen/Controls/MenuStrip.h" #include "Gwen/Controls/MenuStrip.h"
#include "Gwen/Controls/Property/Text.h" #include "Gwen/Controls/Property/Text.h"
#include "Gwen/Controls/SplitterBar.h" #include "Gwen/Controls/SplitterBar.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
#include "Gwen/Gwen.h" #include "Gwen/Gwen.h"
#include "Gwen/Align.h" #include "Gwen/Align.h"
#include "Gwen/Utility.h" #include "Gwen/Utility.h"

6
demo/gpudemo/main_opengl3core.cpp
View File

@@ -16,7 +16,7 @@
#include "OpenGLWindow/GLPrimitiveRenderer.h" #include "OpenGLWindow/GLPrimitiveRenderer.h"
#include "OpenGLWindow/GLInstancingRenderer.h" #include "OpenGLWindow/GLInstancingRenderer.h"
//#include "OpenGL3CoreRenderer.h" //#include "OpenGL3CoreRenderer.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
//#include "btGpuDynamicsWorld.h" //#include "btGpuDynamicsWorld.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@@ -313,7 +313,7 @@ sth_stash* initFont(GLPrimitiveRenderer* primRender)
#include "OpenGLWindow/OpenGLInclude.h" #include "OpenGLWindow/OpenGLInclude.h"
#include "BulletCommon/b3CommandLineArgs.h" #include "Bullet3Common/b3CommandLineArgs.h"
void Usage() void Usage()
{ {
@@ -383,7 +383,7 @@ void DumpSimulationTime(FILE* f)
///extern const char* g_deviceName; ///extern const char* g_deviceName;
const char* g_deviceName = "blaat"; const char* g_deviceName = "blaat";
extern bool useNewBatchingKernel; extern bool useNewBatchingKernel;
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {

12
demo/gpudemo/premake4.lua
View File

@@ -41,12 +41,12 @@ function createProject(vendor)
"../ObjLoader/list.cpp", "../ObjLoader/list.cpp",
"../ObjLoader/list.h", "../ObjLoader/list.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp", "../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3AlignedAllocator.h", "../../src/Bullet3Common/b3AlignedAllocator.h",
"../../src/BulletCommon/b3Quickprof.cpp", "../../src/Bullet3Common/b3Quickprof.cpp",
"../../src/BulletCommon/b3Quickprof.h", "../../src/Bullet3Common/b3Quickprof.h",
"../../src/BulletGeometry/b3ConvexHullComputer.cpp", "../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
"../../src/BulletGeometry/b3ConvexHullComputer.h", "../../src/Bullet3Geometry/b3ConvexHullComputer.h",
"../../btgui/OpenGLWindow/GLInstancingRenderer.cpp", "../../btgui/OpenGLWindow/GLInstancingRenderer.cpp",
"../../btgui/OpenGLWindow/GLInstancingRenderer.h", "../../btgui/OpenGLWindow/GLInstancingRenderer.h",

6
demo/gpudemo/rigidbody/ConcaveScene.cpp
View File

@@ -1,10 +1,10 @@
#include "ConcaveScene.h" #include "ConcaveScene.h"
#include "GpuRigidBodyDemo.h" #include "GpuRigidBodyDemo.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "OpenGLWindow/ShapeData.h" #include "OpenGLWindow/ShapeData.h"
#include "OpenGLWindow/GLInstancingRenderer.h" #include "OpenGLWindow/GLInstancingRenderer.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "OpenGLWindow/btgWindowInterface.h" #include "OpenGLWindow/btgWindowInterface.h"
#include "gpu_broadphase/host/b3GpuSapBroadphase.h" #include "gpu_broadphase/host/b3GpuSapBroadphase.h"
#include "../GpuDemoInternalData.h" #include "../GpuDemoInternalData.h"
@@ -17,7 +17,7 @@
#include "gpu_rigidbody/host/b3Config.h" #include "gpu_rigidbody/host/b3Config.h"
#include "GpuRigidBodyDemoInternalData.h" #include "GpuRigidBodyDemoInternalData.h"
#include"../../ObjLoader/objLoader.h" #include"../../ObjLoader/objLoader.h"
#include "BulletCommon/b3Transform.h" #include "Bullet3Common/b3Transform.h"
#include "OpenGLWindow/GLInstanceGraphicsShape.h" #include "OpenGLWindow/GLInstanceGraphicsShape.h"
#define CONCAVE_GAPX 16 #define CONCAVE_GAPX 16

6
demo/gpudemo/rigidbody/GpuCompoundScene.cpp
View File

@@ -1,10 +1,10 @@
#include "GpuCompoundScene.h" #include "GpuCompoundScene.h"
#include "GpuRigidBodyDemo.h" #include "GpuRigidBodyDemo.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "OpenGLWindow/ShapeData.h" #include "OpenGLWindow/ShapeData.h"
#include "OpenGLWindow/GLInstancingRenderer.h" #include "OpenGLWindow/GLInstancingRenderer.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "OpenGLWindow/btgWindowInterface.h" #include "OpenGLWindow/btgWindowInterface.h"
#include "gpu_broadphase/host/b3GpuSapBroadphase.h" #include "gpu_broadphase/host/b3GpuSapBroadphase.h"
#include "../GpuDemoInternalData.h" #include "../GpuDemoInternalData.h"
@@ -16,7 +16,7 @@
#include "gpu_rigidbody/host/b3GpuNarrowPhase.h" #include "gpu_rigidbody/host/b3GpuNarrowPhase.h"
#include "gpu_rigidbody/host/b3Config.h" #include "gpu_rigidbody/host/b3Config.h"
#include "GpuRigidBodyDemoInternalData.h" #include "GpuRigidBodyDemoInternalData.h"
#include "BulletCommon/b3Transform.h" #include "Bullet3Common/b3Transform.h"
#include "OpenGLWindow/GLInstanceGraphicsShape.h" #include "OpenGLWindow/GLInstanceGraphicsShape.h"

4
demo/gpudemo/rigidbody/GpuConvexScene.cpp
View File

@@ -1,10 +1,10 @@
#include "GpuConvexScene.h" #include "GpuConvexScene.h"
#include "GpuRigidBodyDemo.h" #include "GpuRigidBodyDemo.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "OpenGLWindow/ShapeData.h" #include "OpenGLWindow/ShapeData.h"
#include "OpenGLWindow/GLInstancingRenderer.h" #include "OpenGLWindow/GLInstancingRenderer.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "OpenGLWindow/btgWindowInterface.h" #include "OpenGLWindow/btgWindowInterface.h"
#include "gpu_broadphase/host/b3GpuSapBroadphase.h" #include "gpu_broadphase/host/b3GpuSapBroadphase.h"
#include "../GpuDemoInternalData.h" #include "../GpuDemoInternalData.h"

4
demo/gpudemo/rigidbody/GpuRigidBodyDemo.cpp
View File

@@ -1,8 +1,8 @@
#include "GpuRigidBodyDemo.h" #include "GpuRigidBodyDemo.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "OpenGLWindow/ShapeData.h" #include "OpenGLWindow/ShapeData.h"
#include "OpenGLWindow/GLInstancingRenderer.h" #include "OpenGLWindow/GLInstancingRenderer.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "OpenGLWindow/btgWindowInterface.h" #include "OpenGLWindow/btgWindowInterface.h"
#include "gpu_broadphase/host/b3GpuSapBroadphase.h" #include "gpu_broadphase/host/b3GpuSapBroadphase.h"
#include "../GpuDemoInternalData.h" #include "../GpuDemoInternalData.h"

2
demo/gpudemo/rigidbody/GpuRigidBodyDemoInternalData.h
View File

@@ -3,7 +3,7 @@
#include "basic_initialize/b3OpenCLUtils.h" #include "basic_initialize/b3OpenCLUtils.h"
#include "parallel_primitives/host/btOpenCLArray.h" #include "parallel_primitives/host/btOpenCLArray.h"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
struct GpuRigidBodyDemoInternalData struct GpuRigidBodyDemoInternalData
{ {

4
demo/gpudemo/rigidbody/GpuSphereScene.cpp
View File

@@ -1,10 +1,10 @@
#include "GpuSphereScene.h" #include "GpuSphereScene.h"
#include "GpuRigidBodyDemo.h" #include "GpuRigidBodyDemo.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "OpenGLWindow/ShapeData.h" #include "OpenGLWindow/ShapeData.h"
#include "OpenGLWindow/GLInstancingRenderer.h" #include "OpenGLWindow/GLInstancingRenderer.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "OpenGLWindow/btgWindowInterface.h" #include "OpenGLWindow/btgWindowInterface.h"
#include "gpu_broadphase/host/b3GpuSapBroadphase.h" #include "gpu_broadphase/host/b3GpuSapBroadphase.h"
#include "../GpuDemoInternalData.h" #include "../GpuDemoInternalData.h"

6
opencl/gpu_broadphase/host/b3GpuSapBroadphase.cpp
View File

@@ -1,14 +1,14 @@
#include "b3GpuSapBroadphase.h" #include "b3GpuSapBroadphase.h"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "parallel_primitives/host/btLauncherCL.h" #include "parallel_primitives/host/btLauncherCL.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "basic_initialize/b3OpenCLUtils.h" #include "basic_initialize/b3OpenCLUtils.h"
#include "../kernels/sapKernels.h" #include "../kernels/sapKernels.h"
#include "../kernels/sapFastKernels.h" #include "../kernels/sapFastKernels.h"
#include "BulletCommon/b3MinMax.h" #include "Bullet3Common/b3MinMax.h"
b3GpuSapBroadphase::b3GpuSapBroadphase(cl_context ctx,cl_device_id device, cl_command_queue q ) b3GpuSapBroadphase::b3GpuSapBroadphase(cl_context ctx,cl_device_id device, cl_command_queue q )

6
opencl/gpu_broadphase/test/main.cpp
View File

@@ -16,13 +16,13 @@ subject to the following restrictions:
#include <stdio.h> #include <stdio.h>
#include "../basic_initialize/b3OpenCLUtils.h" #include "../basic_initialize/b3OpenCLUtils.h"
#include "../host/b3GpuSapBroadphase.h" #include "../host/b3GpuSapBroadphase.h"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "parallel_primitives/host/btFillCL.h" #include "parallel_primitives/host/btFillCL.h"
#include "parallel_primitives/host/btBoundSearchCL.h" #include "parallel_primitives/host/btBoundSearchCL.h"
#include "parallel_primitives/host/btRadixSort32CL.h" #include "parallel_primitives/host/btRadixSort32CL.h"
#include "parallel_primitives/host/btPrefixScanCL.h" #include "parallel_primitives/host/btPrefixScanCL.h"
#include "BulletCommon/b3CommandLineArgs.h" #include "Bullet3Common/b3CommandLineArgs.h"
#include "BulletCommon/b3MinMax.h" #include "Bullet3Common/b3MinMax.h"
int g_nPassed = 0; int g_nPassed = 0;
int g_nFailed = 0; int g_nFailed = 0;

10
opencl/gpu_broadphase/test/premake4.lua
View File

@@ -29,11 +29,11 @@ function createProject(vendor)
"../../parallel_primitives/host/btPrefixScanCL.h", "../../parallel_primitives/host/btPrefixScanCL.h",
"../../parallel_primitives/host/btRadixSort32CL.cpp", "../../parallel_primitives/host/btRadixSort32CL.cpp",
"../../parallel_primitives/host/btRadixSort32CL.h", "../../parallel_primitives/host/btRadixSort32CL.h",
"../../../src/BulletCommon/b3AlignedAllocator.cpp", "../../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../../src/BulletCommon/b3AlignedAllocator.h", "../../../src/Bullet3Common/b3AlignedAllocator.h",
"../../../src/BulletCommon/b3AlignedObjectArray.h", "../../../src/Bullet3Common/b3AlignedObjectArray.h",
"../../../src/BulletCommon/b3Quickprof.cpp", "../../../src/Bullet3Common/b3Quickprof.cpp",
"../../../src/BulletCommon/b3Quickprof.h", "../../../src/Bullet3Common/b3Quickprof.h",
} }

2
opencl/gpu_narrowphase/host/b3Contact4.h
View File

@@ -1,7 +1,7 @@
#ifndef BT_CONTACT4_H #ifndef BT_CONTACT4_H
#define BT_CONTACT4_H #define BT_CONTACT4_H
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
ATTRIBUTE_ALIGNED16(struct) b3Contact4 ATTRIBUTE_ALIGNED16(struct) b3Contact4

4
opencl/gpu_narrowphase/host/b3ConvexHullContact.cpp
View File

@@ -26,7 +26,7 @@ subject to the following restrictions:
typedef b3AlignedObjectArray<b3Vector3> btVertexArray; typedef b3AlignedObjectArray<b3Vector3> btVertexArray;
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include <float.h> //for FLT_MAX #include <float.h> //for FLT_MAX
#include "basic_initialize/b3OpenCLUtils.h" #include "basic_initialize/b3OpenCLUtils.h"
@@ -38,7 +38,7 @@ typedef b3AlignedObjectArray<b3Vector3> btVertexArray;
#include "../kernels/bvhTraversal.h" #include "../kernels/bvhTraversal.h"
#include "../kernels/primitiveContacts.h" #include "../kernels/primitiveContacts.h"
#include "BulletGeometry/b3AabbUtil.h" #include "Bullet3Geometry/b3AabbUtil.h"
#define dot3F4 btDot #define dot3F4 btDot

2
opencl/gpu_narrowphase/host/b3ConvexHullContact.h
View File

@@ -4,7 +4,7 @@
#include "parallel_primitives/host/btOpenCLArray.h" #include "parallel_primitives/host/btOpenCLArray.h"
#include "b3RigidBodyCL.h" #include "b3RigidBodyCL.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
#include "b3ConvexUtility.h" #include "b3ConvexUtility.h"
#include "b3ConvexPolyhedronCL.h" #include "b3ConvexPolyhedronCL.h"
#include "b3Collidable.h" #include "b3Collidable.h"

2
opencl/gpu_narrowphase/host/b3ConvexPolyhedronCL.h
View File

@@ -1,7 +1,7 @@
#ifndef CONVEX_POLYHEDRON_CL #ifndef CONVEX_POLYHEDRON_CL
#define CONVEX_POLYHEDRON_CL #define CONVEX_POLYHEDRON_CL
#include "BulletCommon/b3Transform.h" #include "Bullet3Common/b3Transform.h"
struct btGpuFace struct btGpuFace
{ {

8
opencl/gpu_narrowphase/host/b3ConvexUtility.cpp
View File

@@ -15,10 +15,10 @@ subject to the following restrictions:
#include "b3ConvexUtility.h" #include "b3ConvexUtility.h"
#include "BulletGeometry/b3ConvexHullComputer.h" #include "Bullet3Geometry/b3ConvexHullComputer.h"
#include "BulletGeometry/b3GrahamScan2dConvexHull.h" #include "Bullet3Geometry/b3GrahamScan2dConvexHull.h"
#include "BulletCommon/b3Quaternion.h" #include "Bullet3Common/b3Quaternion.h"
#include "BulletCommon/b3HashMap.h" #include "Bullet3Common/b3HashMap.h"
#include "b3ConvexPolyhedronCL.h" #include "b3ConvexPolyhedronCL.h"

4
opencl/gpu_narrowphase/host/b3ConvexUtility.h
View File

@@ -17,8 +17,8 @@ subject to the following restrictions:
#ifndef _BT_CONVEX_UTILITY_H #ifndef _BT_CONVEX_UTILITY_H
#define _BT_CONVEX_UTILITY_H #define _BT_CONVEX_UTILITY_H
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
#include "BulletCommon/b3Transform.h" #include "Bullet3Common/b3Transform.h"
#include "b3ConvexPolyhedronCL.h" #include "b3ConvexPolyhedronCL.h"

2
opencl/gpu_narrowphase/host/b3OptimizedBvh.cpp
View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#include "b3OptimizedBvh.h" #include "b3OptimizedBvh.h"
#include "b3StridingMeshInterface.h" #include "b3StridingMeshInterface.h"
#include "BulletGeometry/b3AabbUtil.h" #include "Bullet3Geometry/b3AabbUtil.h"
b3OptimizedBvh::b3OptimizedBvh() b3OptimizedBvh::b3OptimizedBvh()

2
opencl/gpu_narrowphase/host/b3QuantizedBvh.cpp
View File

@@ -15,7 +15,7 @@ subject to the following restrictions:
#include "b3QuantizedBvh.h" #include "b3QuantizedBvh.h"
#include "BulletGeometry/b3AabbUtil.h" #include "Bullet3Geometry/b3AabbUtil.h"
#define RAYAABB2 #define RAYAABB2

8
opencl/gpu_narrowphase/host/b3QuantizedBvh.h
View File

@@ -28,8 +28,8 @@ class btSerializer;
#include <stdlib.h> #include <stdlib.h>
#endif //DEBUG_CHECK_DEQUANTIZATION #endif //DEBUG_CHECK_DEQUANTIZATION
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "BulletCommon/b3AlignedAllocator.h" #include "Bullet3Common/b3AlignedAllocator.h"
#ifdef BT_USE_DOUBLE_PRECISION #ifdef BT_USE_DOUBLE_PRECISION
#define btQuantizedBvhData btQuantizedBvhDoubleData #define btQuantizedBvhData btQuantizedBvhDoubleData
@@ -157,8 +157,8 @@ public:
virtual void processNode(int subPart, int triangleIndex) = 0; virtual void processNode(int subPart, int triangleIndex) = 0;
}; };
#include "BulletCommon/b3AlignedAllocator.h" #include "Bullet3Common/b3AlignedAllocator.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"

4
opencl/gpu_narrowphase/host/b3RigidBodyCL.h
View File

@@ -1,8 +1,8 @@
#ifndef BT_RIGID_BODY_CL #ifndef BT_RIGID_BODY_CL
#define BT_RIGID_BODY_CL #define BT_RIGID_BODY_CL
#include "BulletCommon/b3Scalar.h" #include "Bullet3Common/b3Scalar.h"
#include "BulletCommon/b3Matrix3x3.h" #include "Bullet3Common/b3Matrix3x3.h"
ATTRIBUTE_ALIGNED16(struct) b3RigidBodyCL ATTRIBUTE_ALIGNED16(struct) b3RigidBodyCL
{ {

2
opencl/gpu_narrowphase/host/b3StridingMeshInterface.h
View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#ifndef BT_STRIDING_MESHINTERFACE_H #ifndef BT_STRIDING_MESHINTERFACE_H
#define BT_STRIDING_MESHINTERFACE_H #define BT_STRIDING_MESHINTERFACE_H
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "b3TriangleCallback.h" #include "b3TriangleCallback.h"
//#include "btConcaveShape.h" //#include "btConcaveShape.h"

2
opencl/gpu_narrowphase/host/b3TriangleCallback.h
View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#ifndef BT_TRIANGLE_CALLBACK_H #ifndef BT_TRIANGLE_CALLBACK_H
#define BT_TRIANGLE_CALLBACK_H #define BT_TRIANGLE_CALLBACK_H
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
///The b3TriangleCallback provides a callback for each overlapping triangle when calling processAllTriangles. ///The b3TriangleCallback provides a callback for each overlapping triangle when calling processAllTriangles.

4
opencl/gpu_narrowphase/host/b3TriangleIndexVertexArray.h
View File

@@ -17,8 +17,8 @@ subject to the following restrictions:
#define BT_TRIANGLE_INDEX_VERTEX_ARRAY_H #define BT_TRIANGLE_INDEX_VERTEX_ARRAY_H
#include "b3StridingMeshInterface.h" #include "b3StridingMeshInterface.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
#include "BulletCommon/b3Scalar.h" #include "Bullet3Common/b3Scalar.h"
///The btIndexedMesh indexes a single vertex and index array. Multiple btIndexedMesh objects can be passed into a b3TriangleIndexVertexArray using addIndexedMesh. ///The btIndexedMesh indexes a single vertex and index array. Multiple btIndexedMesh objects can be passed into a b3TriangleIndexVertexArray using addIndexedMesh.

6
opencl/gpu_narrowphase/test/main.cpp
View File

@@ -17,15 +17,15 @@ subject to the following restrictions:
#include "../basic_initialize/b3OpenCLUtils.h" #include "../basic_initialize/b3OpenCLUtils.h"
#include "../host/b3ConvexHullContact.h" #include "../host/b3ConvexHullContact.h"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "parallel_primitives/host/btFillCL.h" #include "parallel_primitives/host/btFillCL.h"
#include "parallel_primitives/host/btBoundSearchCL.h" #include "parallel_primitives/host/btBoundSearchCL.h"
#include "parallel_primitives/host/btRadixSort32CL.h" #include "parallel_primitives/host/btRadixSort32CL.h"
#include "parallel_primitives/host/btPrefixScanCL.h" #include "parallel_primitives/host/btPrefixScanCL.h"
#include "BulletCommon/b3CommandLineArgs.h" #include "Bullet3Common/b3CommandLineArgs.h"
#include "../host/b3ConvexHullContact.h" #include "../host/b3ConvexHullContact.h"
#include "BulletCommon/b3MinMax.h" #include "Bullet3Common/b3MinMax.h"
int g_nPassed = 0; int g_nPassed = 0;
int g_nFailed = 0; int g_nFailed = 0;
bool g_testFailed = 0; bool g_testFailed = 0;

14
opencl/gpu_narrowphase/test/premake4.lua
View File

@@ -29,13 +29,13 @@ function createProject(vendor)
"../../parallel_primitives/host/btPrefixScanCL.h", "../../parallel_primitives/host/btPrefixScanCL.h",
"../../parallel_primitives/host/btRadixSort32CL.cpp", "../../parallel_primitives/host/btRadixSort32CL.cpp",
"../../parallel_primitives/host/btRadixSort32CL.h", "../../parallel_primitives/host/btRadixSort32CL.h",
"../../../src/BulletCommon/b3AlignedAllocator.cpp", "../../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../../src/BulletCommon/b3AlignedAllocator.h", "../../../src/Bullet3Common/b3AlignedAllocator.h",
"../../../src/BulletCommon/b3AlignedObjectArray.h", "../../../src/Bullet3Common/b3AlignedObjectArray.h",
"../../../src/BulletCommon/b3Quickprof.cpp", "../../../src/Bullet3Common/b3Quickprof.cpp",
"../../../src/BulletCommon/b3Quickprof.h", "../../../src/Bullet3Common/b3Quickprof.h",
"../../../src/BulletGeometry/**.cpp", "../../../src/Bullet3Geometry/**.cpp",
"../../../src/BulletGeometry/**.h", "../../../src/Bullet3Geometry/**.h",
} }

2
opencl/gpu_rigidbody/host/b3GpuBatchingPgsSolver.cpp
View File

@@ -2,7 +2,7 @@
#include "b3GpuBatchingPgsSolver.h" #include "b3GpuBatchingPgsSolver.h"
#include "../../parallel_primitives/host/btRadixSort32CL.h" #include "../../parallel_primitives/host/btRadixSort32CL.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "../../parallel_primitives/host/btLauncherCL.h" #include "../../parallel_primitives/host/btLauncherCL.h"
#include "../../parallel_primitives/host/btBoundSearchCL.h" #include "../../parallel_primitives/host/btBoundSearchCL.h"
#include "../../parallel_primitives/host/btPrefixScanCL.h" #include "../../parallel_primitives/host/btPrefixScanCL.h"

2
opencl/gpu_rigidbody/host/b3GpuConstraint4.h
View File

@@ -1,7 +1,7 @@
#ifndef BT_CONSTRAINT4_h #ifndef BT_CONSTRAINT4_h
#define BT_CONSTRAINT4_h #define BT_CONSTRAINT4_h
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
ATTRIBUTE_ALIGNED16(struct) b3GpuConstraint4 ATTRIBUTE_ALIGNED16(struct) b3GpuConstraint4
{ {

2
opencl/gpu_rigidbody/host/b3GpuNarrowPhase.cpp
View File

@@ -9,7 +9,7 @@
#include "b3Config.h" #include "b3Config.h"
#include "../../gpu_narrowphase/host/b3OptimizedBvh.h" #include "../../gpu_narrowphase/host/b3OptimizedBvh.h"
#include "../../gpu_narrowphase/host/b3TriangleIndexVertexArray.h" #include "../../gpu_narrowphase/host/b3TriangleIndexVertexArray.h"
#include "BulletGeometry/b3AabbUtil.h" #include "Bullet3Geometry/b3AabbUtil.h"
struct btGpuNarrowPhaseInternalData struct btGpuNarrowPhaseInternalData
{ {

4
opencl/gpu_rigidbody/host/b3GpuNarrowPhase.h
View File

@@ -3,8 +3,8 @@
#include "../../gpu_narrowphase/host/b3Collidable.h" #include "../../gpu_narrowphase/host/b3Collidable.h"
#include "basic_initialize/b3OpenCLInclude.h" #include "basic_initialize/b3OpenCLInclude.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
class b3GpuNarrowPhase class b3GpuNarrowPhase
{ {

4
opencl/gpu_rigidbody/host/b3GpuRigidBodyPipeline.cpp
View File

@@ -5,7 +5,7 @@
#include "../../basic_initialize/b3OpenCLUtils.h" #include "../../basic_initialize/b3OpenCLUtils.h"
#include "b3GpuNarrowPhase.h" #include "b3GpuNarrowPhase.h"
#include "BulletGeometry/b3AabbUtil.h" #include "Bullet3Geometry/b3AabbUtil.h"
#include "../../gpu_broadphase/host/b3SapAabb.h" #include "../../gpu_broadphase/host/b3SapAabb.h"
#include "../../gpu_broadphase/host/b3GpuSapBroadphase.h" #include "../../gpu_broadphase/host/b3GpuSapBroadphase.h"
#include "parallel_primitives/host/btLauncherCL.h" #include "parallel_primitives/host/btLauncherCL.h"
@@ -20,7 +20,7 @@
#include "b3GpuBatchingPgsSolver.h" #include "b3GpuBatchingPgsSolver.h"
#include "b3Solver.h" #include "b3Solver.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "b3Config.h" #include "b3Config.h"
b3GpuRigidBodyPipeline::b3GpuRigidBodyPipeline(cl_context ctx,cl_device_id device, cl_command_queue q,class b3GpuNarrowPhase* narrowphase, class b3GpuSapBroadphase* broadphaseSap ) b3GpuRigidBodyPipeline::b3GpuRigidBodyPipeline(cl_context ctx,cl_device_id device, cl_command_queue q,class b3GpuNarrowPhase* narrowphase, class b3GpuSapBroadphase* broadphaseSap )

2
opencl/gpu_rigidbody/host/b3GpuRigidBodyPipelineInternalData.h
View File

@@ -2,7 +2,7 @@
#define BT_GPU_RIGIDBODY_PIPELINE_INTERNAL_DATA_H #define BT_GPU_RIGIDBODY_PIPELINE_INTERNAL_DATA_H
#include "../../basic_initialize/b3OpenCLInclude.h" #include "../../basic_initialize/b3OpenCLInclude.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
#include "../../parallel_primitives/host/btOpenCLArray.h" #include "../../parallel_primitives/host/btOpenCLArray.h"
#include "../../gpu_narrowphase/host/b3Collidable.h" #include "../../gpu_narrowphase/host/b3Collidable.h"

4
opencl/gpu_rigidbody/host/b3Solver.cpp
View File

@@ -39,9 +39,9 @@ bool useNewBatchingKernel = false;
#include "../kernels/batchingKernelsNew.h" #include "../kernels/batchingKernelsNew.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "../../parallel_primitives/host/btLauncherCL.h" #include "../../parallel_primitives/host/btLauncherCL.h"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
struct SolverDebugInfo struct SolverDebugInfo
{ {

4
opencl/lds_bank_conflict/main.cpp
View File

@@ -19,9 +19,9 @@
#include "b3OpenCLUtils.h" #include "b3OpenCLUtils.h"
#include "../parallel_primitives/host/btOpenCLArray.h" #include "../parallel_primitives/host/btOpenCLArray.h"
#include "../parallel_primitives/host/btLauncherCL.h" #include "../parallel_primitives/host/btLauncherCL.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
#include "../parallel_primitives/host/btFillCL.h" #include "../parallel_primitives/host/btFillCL.h"
#include "BulletCommon/b3CommandLineArgs.h" #include "Bullet3Common/b3CommandLineArgs.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

10
opencl/lds_bank_conflict/premake4.lua
View File

@@ -27,11 +27,11 @@ function createProject (vendor)
"main.cpp", "main.cpp",
"../basic_initialize/b3OpenCLUtils.cpp", "../basic_initialize/b3OpenCLUtils.cpp",
"../basic_initialize/b3OpenCLUtils.h", "../basic_initialize/b3OpenCLUtils.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp", "../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3AlignedAllocator.h", "../../src/Bullet3Common/b3AlignedAllocator.h",
"../../src/BulletCommon/b3AlignedObjectArray.h", "../../src/Bullet3Common/b3AlignedObjectArray.h",
"../../src/BulletCommon/b3Quickprof.cpp", "../../src/Bullet3Common/b3Quickprof.cpp",
"../../src/BulletCommon/b3Quickprof.h", "../../src/Bullet3Common/b3Quickprof.h",
} }
end end

10
opencl/parallel_primitives/benchmark/premake4.lua
View File

@@ -24,11 +24,11 @@ function createProject(vendor)
"../host/btFillCL.cpp", "../host/btFillCL.cpp",
"../host/btPrefixScanCL.cpp", "../host/btPrefixScanCL.cpp",
"../host/btRadixSort32CL.cpp", "../host/btRadixSort32CL.cpp",
"../../../src/BulletCommon/b3AlignedAllocator.cpp", "../../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../../src/BulletCommon/b3AlignedAllocator.h", "../../../src/Bullet3Common/b3AlignedAllocator.h",
"../../../src/BulletCommon/b3AlignedObjectArray.h", "../../../src/Bullet3Common/b3AlignedObjectArray.h",
"../../../src/BulletCommon/b3Quickprof.cpp", "../../../src/Bullet3Common/b3Quickprof.cpp",
"../../../src/BulletCommon/b3Quickprof.h", "../../../src/Bullet3Common/b3Quickprof.h",
} }
end end

2
opencl/parallel_primitives/benchmark/test_large_problem_sorting.cpp
View File

@@ -66,7 +66,7 @@
#include "../host/btRadixSort32CL.h" #include "../host/btRadixSort32CL.h"
#include "../../basic_initialize/b3OpenCLUtils.h" #include "../../basic_initialize/b3OpenCLUtils.h"
#include "BulletCommon/b3Quickprof.h" #include "Bullet3Common/b3Quickprof.h"
cl_context g_cxMainContext; cl_context g_cxMainContext;
cl_device_id g_device; cl_device_id g_device;

2
opencl/parallel_primitives/host/btFillCL.h
View File

@@ -2,7 +2,7 @@
#define BT_FILL_CL_H #define BT_FILL_CL_H
#include "btOpenCLArray.h" #include "btOpenCLArray.h"
#include "BulletCommon/b3Scalar.h" #include "Bullet3Common/b3Scalar.h"
#include "btInt2.h" #include "btInt2.h"
#include "btInt4.h" #include "btInt4.h"

2
opencl/parallel_primitives/host/btInt4.h
View File

@@ -1,7 +1,7 @@
#ifndef BT_INT4_H #ifndef BT_INT4_H
#define BT_INT4_H #define BT_INT4_H
#include "BulletCommon/b3Scalar.h" #include "Bullet3Common/b3Scalar.h"
ATTRIBUTE_ALIGNED16(struct) btUnsignedInt4 ATTRIBUTE_ALIGNED16(struct) btUnsignedInt4
{ {

2
opencl/parallel_primitives/host/btLauncherCL.h
View File

@@ -3,7 +3,7 @@
#define BT_LAUNCHER_CL_H #define BT_LAUNCHER_CL_H
#include "btBufferInfoCL.h" #include "btBufferInfoCL.h"
#include "BulletCommon/b3MinMax.h" #include "Bullet3Common/b3MinMax.h"
#include "btOpenCLArray.h" #include "btOpenCLArray.h"
#include <stdio.h> #include <stdio.h>

2
opencl/parallel_primitives/host/btOpenCLArray.h
View File

@@ -1,7 +1,7 @@
#ifndef BT_OPENCL_ARRAY_H #ifndef BT_OPENCL_ARRAY_H
#define BT_OPENCL_ARRAY_H #define BT_OPENCL_ARRAY_H
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
#include "../../basic_initialize/b3OpenCLInclude.h" #include "../../basic_initialize/b3OpenCLInclude.h"
template <typename T> template <typename T>

2
opencl/parallel_primitives/host/btPrefixScanCL.h
View File

@@ -4,7 +4,7 @@
#include "btOpenCLArray.h" #include "btOpenCLArray.h"
#include "btBufferInfoCL.h" #include "btBufferInfoCL.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
class btPrefixScanCL class btPrefixScanCL
{ {

4
opencl/parallel_primitives/test/main.cpp
View File

@@ -19,8 +19,8 @@ subject to the following restrictions:
#include "../host/btBoundSearchCL.h" #include "../host/btBoundSearchCL.h"
#include "../host/btRadixSort32CL.h" #include "../host/btRadixSort32CL.h"
#include "../host/btPrefixScanCL.h" #include "../host/btPrefixScanCL.h"
#include "BulletCommon/b3CommandLineArgs.h" #include "Bullet3Common/b3CommandLineArgs.h"
#include "BulletCommon/b3MinMax.h" #include "Bullet3Common/b3MinMax.h"
int g_nPassed = 0; int g_nPassed = 0;
int g_nFailed = 0; int g_nFailed = 0;

6
opencl/parallel_primitives/test/premake4.lua
View File

@@ -27,9 +27,9 @@ function createProject(vendor)
"../host/btPrefixScanCL.h", "../host/btPrefixScanCL.h",
"../host/btRadixSort32CL.cpp", "../host/btRadixSort32CL.cpp",
"../host/btRadixSort32CL.h", "../host/btRadixSort32CL.h",
"../../../src/BulletCommon/b3AlignedAllocator.cpp", "../../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../../src/BulletCommon/b3AlignedAllocator.h", "../../../src/Bullet3Common/b3AlignedAllocator.h",
"../../../src/BulletCommon/b3AlignedObjectArray.h", "../../../src/Bullet3Common/b3AlignedObjectArray.h",
} }
end end

6
opencl/reduce/premake4.lua
View File

@@ -27,9 +27,9 @@ function createProject (vendor)
"main.cpp", "main.cpp",
"../basic_initialize/b3OpenCLUtils.cpp", "../basic_initialize/b3OpenCLUtils.cpp",
"../basic_initialize/b3OpenCLUtils.h", "../basic_initialize/b3OpenCLUtils.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp", "../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3AlignedAllocator.h", "../../src/Bullet3Common/b3AlignedAllocator.h",
"../../src/BulletCommon/b3AlignedObjectArray.h", "../../src/Bullet3Common/b3AlignedObjectArray.h",
} }
end end

6
opencl/vector_add_simplified/premake4.lua
View File

@@ -27,9 +27,9 @@ function createProject (vendor)
"main.cpp", "main.cpp",
"../basic_initialize/b3OpenCLUtils.cpp", "../basic_initialize/b3OpenCLUtils.cpp",
"../basic_initialize/b3OpenCLUtils.h", "../basic_initialize/b3OpenCLUtils.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp", "../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3AlignedAllocator.h", "../../src/Bullet3Common/b3AlignedAllocator.h",
"../../src/BulletCommon/b3AlignedObjectArray.h", "../../src/Bullet3Common/b3AlignedObjectArray.h",
} }
end end

0
src/BulletCommon/b3AlignedAllocator.cpp → src/Bullet3Common/b3AlignedAllocator.cpp
View File

0
src/BulletCommon/b3AlignedAllocator.h → src/Bullet3Common/b3AlignedAllocator.h
View File

0
src/BulletCommon/b3AlignedObjectArray.h → src/Bullet3Common/b3AlignedObjectArray.h
View File

0
src/BulletCommon/b3CommandLineArgs.h → src/Bullet3Common/b3CommandLineArgs.h
View File

0
src/BulletCommon/b3HashMap.h → src/Bullet3Common/b3HashMap.h
View File

0
src/BulletCommon/b3Matrix3x3.h → src/Bullet3Common/b3Matrix3x3.h
View File

0
src/BulletCommon/b3MinMax.h → src/Bullet3Common/b3MinMax.h
View File

0
src/BulletCommon/b3PoolAllocator.h → src/Bullet3Common/b3PoolAllocator.h
View File

0
src/BulletCommon/b3QuadWord.h → src/Bullet3Common/b3QuadWord.h
View File

0
src/BulletCommon/b3Quaternion.h → src/Bullet3Common/b3Quaternion.h
View File

0
src/BulletCommon/b3Quickprof.cpp → src/Bullet3Common/b3Quickprof.cpp
View File

0
src/BulletCommon/b3Quickprof.h → src/Bullet3Common/b3Quickprof.h
View File

0
src/BulletCommon/b3Random.h → src/Bullet3Common/b3Random.h
View File

0
src/BulletCommon/b3Scalar.h → src/Bullet3Common/b3Scalar.h
View File

0
src/BulletCommon/b3StackAlloc.h → src/Bullet3Common/b3StackAlloc.h
View File

0
src/BulletCommon/b3Transform.h → src/Bullet3Common/b3Transform.h
View File

0
src/BulletCommon/b3TransformUtil.h → src/Bullet3Common/b3TransformUtil.h
View File

0
src/BulletCommon/b3Vector3.cpp → src/Bullet3Common/b3Vector3.cpp
View File

0
src/BulletCommon/b3Vector3.h → src/Bullet3Common/b3Vector3.h
View File

2
src/BulletCommon/premake4.lua → src/Bullet3Common/premake4.lua
View File

@@ -1,4 +1,4 @@
project "BulletCommon" project "Bullet3Common"
language "C++" language "C++"

6
src/BulletGeometry/b3AabbUtil.h → src/Bullet3Geometry/b3AabbUtil.h
View File

@@ -17,9 +17,9 @@ subject to the following restrictions:
#ifndef BT_AABB_UTIL2 #ifndef BT_AABB_UTIL2
#define BT_AABB_UTIL2 #define BT_AABB_UTIL2
#include "BulletCommon/b3Transform.h" #include "Bullet3Common/b3Transform.h"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "BulletCommon/b3MinMax.h" #include "Bullet3Common/b3MinMax.h"

6
src/BulletGeometry/b3ConvexHullComputer.cpp → src/Bullet3Geometry/b3ConvexHullComputer.cpp
View File

@@ -15,9 +15,9 @@ subject to the following restrictions:
#include <string.h> #include <string.h>
#include "b3ConvexHullComputer.h" #include "b3ConvexHullComputer.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
#include "BulletCommon/b3MinMax.h" #include "Bullet3Common/b3MinMax.h"
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#ifdef __GNUC__ #ifdef __GNUC__
#include <stdint.h> #include <stdint.h>

4
src/BulletGeometry/b3ConvexHullComputer.h → src/Bullet3Geometry/b3ConvexHullComputer.h
View File

@@ -15,8 +15,8 @@ subject to the following restrictions:
#ifndef BT_CONVEX_HULL_COMPUTER_H #ifndef BT_CONVEX_HULL_COMPUTER_H
#define BT_CONVEX_HULL_COMPUTER_H #define BT_CONVEX_HULL_COMPUTER_H
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
/// Convex hull implementation based on Preparata and Hong /// Convex hull implementation based on Preparata and Hong
/// See http://code.google.com/p/bullet/issues/detail?id=275 /// See http://code.google.com/p/bullet/issues/detail?id=275

0
src/BulletGeometry/b3GeometryUtil.cpp → src/Bullet3Geometry/b3GeometryUtil.cpp
View File

4
src/BulletGeometry/b3GeometryUtil.h → src/Bullet3Geometry/b3GeometryUtil.h
View File

@@ -16,8 +16,8 @@ subject to the following restrictions:
#ifndef BT_GEOMETRY_UTIL_H #ifndef BT_GEOMETRY_UTIL_H
#define BT_GEOMETRY_UTIL_H #define BT_GEOMETRY_UTIL_H
#include "BulletCommon/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "BulletCommon/b3AlignedObjectArray.h" #include "Bullet3Common/b3AlignedObjectArray.h"
///The b3GeometryUtil helper class provides a few methods to convert between plane equations and vertices. ///The b3GeometryUtil helper class provides a few methods to convert between plane equations and vertices.
class b3GeometryUtil class b3GeometryUtil

4
src/BulletGeometry/b3GrahamScan2dConvexHull.h → src/Bullet3Geometry/b3GrahamScan2dConvexHull.h
View File

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