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

reorganize files and add btgui

Browse Source
This commit is contained in:
erwin coumans
2013-03-12 23:52:31 -07:00
parent 9612c2cd3d
commit e4a7b6f487
262 changed files with 46553 additions and 14753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ subject to the following restrictions:
#include "btConvexPolyhedronCL.h"
typedef btAlignedObjectArray<btVector3> btVertexArray;
#include "parallel_primitives/host/btQuickprof.h"
#include "BulletCommon/btQuickprof.h"
#include <float.h> //for FLT_MAX
#include "../basic_initialize/btOpenCLUtils.h"
@@ -34,7 +34,7 @@ typedef btAlignedObjectArray<btVector3> btVertexArray;
#include "../kernels/satKernels.h"
#include "../kernels/satClipHullContacts.h"
#include "parallel_primitives/host/btAabbUtil2.h"
#include "BulletGeometry/btAabbUtil2.h"
#define dot3F4 btDot
@@ -52,7 +52,7 @@ m_totalContactsOut(m_context, m_queue)
if (1)
{
const char* src = satKernelsCL;
cl_program satProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,src,&errNum,"","opencl/gpu_rigidbody_pipeline2/sat.cl");
cl_program satProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,src,&errNum,"","opencl/gpu_sat/kernels/sat.cl");
btAssert(errNum==CL_SUCCESS);
m_findSeparatingAxisKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,src, "findSeparatingAxisKernel",&errNum,satProg );
@@ -67,7 +67,7 @@ m_totalContactsOut(m_context, m_queue)
if (1)
{
const char* srcClip = satClipKernelsCL;
cl_program satClipContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcClip,&errNum,"","opencl/gpu_rigidbody_pipeline2/satClipHullContacts.cl");
cl_program satClipContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcClip,&errNum,"","opencl/gpu_sat/kernels/satClipHullContacts.cl");
btAssert(errNum==CL_SUCCESS);
m_clipHullHullKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,srcClip, "clipHullHullKernel",&errNum,satClipContactsProg);