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

2
demo/gpudemo/GpuDemo.cpp
View File

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

4
demo/gpudemo/ParticleDemo.cpp
View File

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

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

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

2
demo/gpudemo/gwenUserInterface.cpp
View File

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

6
demo/gpudemo/main_opengl3core.cpp
View File

@@ -16,7 +16,7 @@
#include "OpenGLWindow/GLPrimitiveRenderer.h"
#include "OpenGLWindow/GLInstancingRenderer.h"
//#include "OpenGL3CoreRenderer.h"
#include "BulletCommon/b3Quickprof.h"
#include "Bullet3Common/b3Quickprof.h"
//#include "btGpuDynamicsWorld.h"
#include <assert.h>
#include <string.h>
@@ -313,7 +313,7 @@ sth_stash* initFont(GLPrimitiveRenderer* primRender)
#include "OpenGLWindow/OpenGLInclude.h"
#include "BulletCommon/b3CommandLineArgs.h"
#include "Bullet3Common/b3CommandLineArgs.h"
void Usage()
{
@@ -383,7 +383,7 @@ void DumpSimulationTime(FILE* f)
///extern const char* g_deviceName;
const char* g_deviceName = "blaat";
extern bool useNewBatchingKernel;
#include "BulletCommon/b3Vector3.h"
#include "Bullet3Common/b3Vector3.h"
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.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3AlignedAllocator.h",
"../../src/BulletCommon/b3Quickprof.cpp",
"../../src/BulletCommon/b3Quickprof.h",
"../../src/BulletGeometry/b3ConvexHullComputer.cpp",
"../../src/BulletGeometry/b3ConvexHullComputer.h",
"../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/Bullet3Common/b3AlignedAllocator.h",
"../../src/Bullet3Common/b3Quickprof.cpp",
"../../src/Bullet3Common/b3Quickprof.h",
"../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
"../../src/Bullet3Geometry/b3ConvexHullComputer.h",
"../../btgui/OpenGLWindow/GLInstancingRenderer.cpp",
"../../btgui/OpenGLWindow/GLInstancingRenderer.h",

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

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

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

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

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

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

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

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

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

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

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

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