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

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);