From 76e74523f6f27b57331d84ee14a69bea80da5403 Mon Sep 17 00:00:00 2001 From: erwin coumans Date: Mon, 15 Apr 2013 12:43:46 -0700 Subject: [PATCH] rename gpu_sat -> gpu_narrowphase --- build/premake4.lua | 2 +- demo/gpudemo/premake4.lua | 4 ++-- .../host/ConvexHullContact.cpp | 12 ++++++------ .../host/ConvexHullContact.h | 0 .../{gpu_sat => gpu_narrowphase}/host/btCollidable.h | 0 .../{gpu_sat => gpu_narrowphase}/host/btContact4.h | 0 .../host/btConvexPolyhedronCL.h | 0 .../host/btConvexUtility.cpp | 0 .../host/btConvexUtility.h | 0 .../host/btOptimizedBvh.cpp | 0 .../host/btOptimizedBvh.h | 0 .../host/btQuantizedBvh.cpp | 0 .../host/btQuantizedBvh.h | 0 .../host/btRigidBodyCL.h | 0 .../host/btStridingMeshInterface.cpp | 0 .../host/btStridingMeshInterface.h | 0 .../host/btTriangleCallback.cpp | 0 .../host/btTriangleCallback.h | 0 .../host/btTriangleIndexVertexArray.cpp | 0 .../host/btTriangleIndexVertexArray.h | 0 .../kernels/bvhTraversal.cl | 0 .../kernels/bvhTraversal.h | 0 .../kernels/primitiveContacts.cl | 0 .../kernels/primitiveContacts.h | 0 opencl/{gpu_sat => gpu_narrowphase}/kernels/sat.cl | 0 .../kernels/satClipHullContacts.cl | 0 .../kernels/satClipHullContacts.h | 0 .../kernels/satKernels.h | 0 opencl/{gpu_sat => gpu_narrowphase}/test/main.cpp | 0 .../{gpu_sat => gpu_narrowphase}/test/premake4.lua | 0 opencl/gpu_rigidbody/host/Solver.h | 4 ++-- opencl/gpu_rigidbody/host/btGpuBatchingPgsSolver.h | 4 ++-- opencl/gpu_rigidbody/host/btGpuJacobiSolver.h | 4 ++-- opencl/gpu_rigidbody/host/btGpuNarrowPhase.cpp | 8 ++++---- opencl/gpu_rigidbody/host/btGpuNarrowPhase.h | 2 +- opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp | 4 ++-- .../host/btGpuRigidBodyPipelineInternalData.h | 2 +- opencl/gpu_rigidbody/host/btPgsJacobiSolver.cpp | 4 ++-- 38 files changed, 25 insertions(+), 25 deletions(-) rename opencl/{gpu_sat => gpu_narrowphase}/host/ConvexHullContact.cpp (99%) rename opencl/{gpu_sat => gpu_narrowphase}/host/ConvexHullContact.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btCollidable.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btContact4.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btConvexPolyhedronCL.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btConvexUtility.cpp (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btConvexUtility.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btOptimizedBvh.cpp (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btOptimizedBvh.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btQuantizedBvh.cpp (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btQuantizedBvh.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btRigidBodyCL.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btStridingMeshInterface.cpp (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btStridingMeshInterface.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btTriangleCallback.cpp (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btTriangleCallback.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btTriangleIndexVertexArray.cpp (100%) rename opencl/{gpu_sat => gpu_narrowphase}/host/btTriangleIndexVertexArray.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/kernels/bvhTraversal.cl (100%) rename opencl/{gpu_sat => gpu_narrowphase}/kernels/bvhTraversal.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/kernels/primitiveContacts.cl (100%) rename opencl/{gpu_sat => gpu_narrowphase}/kernels/primitiveContacts.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/kernels/sat.cl (100%) rename opencl/{gpu_sat => gpu_narrowphase}/kernels/satClipHullContacts.cl (100%) rename opencl/{gpu_sat => gpu_narrowphase}/kernels/satClipHullContacts.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/kernels/satKernels.h (100%) rename opencl/{gpu_sat => gpu_narrowphase}/test/main.cpp (100%) rename opencl/{gpu_sat => gpu_narrowphase}/test/premake4.lua (100%) diff --git a/build/premake4.lua b/build/premake4.lua index 6c947387d..54c07d8c6 100644 --- a/build/premake4.lua +++ b/build/premake4.lua @@ -102,7 +102,7 @@ -- include "../opencl/lds_bank_conflict" -- include "../opencl/reduce" -- include "../opencl/gpu_broadphase/test" --- include "../opencl/gpu_sat/test" +-- include "../opencl/gpu_narrowphase/test" include "../btgui/Gwen" include "../btgui/GwenOpenGLTest" -- include "../btgui/OpenGLTrueTypeFont" diff --git a/demo/gpudemo/premake4.lua b/demo/gpudemo/premake4.lua index 4f06913f5..94b77020a 100644 --- a/demo/gpudemo/premake4.lua +++ b/demo/gpudemo/premake4.lua @@ -64,8 +64,8 @@ function createProject(vendor) "../../opencl/basic_initialize/btOpenCLUtils.cpp", "../../opencl/basic_initialize/btOpenCLUtils.h", "../../opencl/gpu_broadphase/host/btGpuSapBroadphase.cpp", - "../../opencl/gpu_sat/host/**.cpp", - "../../opencl/gpu_sat/host/**.h", + "../../opencl/gpu_narrowphase/host/**.cpp", + "../../opencl/gpu_narrowphase/host/**.h", "../../opencl/parallel_primitives/host/btBoundSearchCL.cpp", "../../opencl/parallel_primitives/host/btBoundSearchCL.h", "../../opencl/parallel_primitives/host/btFillCL.cpp", diff --git a/opencl/gpu_sat/host/ConvexHullContact.cpp b/opencl/gpu_narrowphase/host/ConvexHullContact.cpp similarity index 99% rename from opencl/gpu_sat/host/ConvexHullContact.cpp rename to opencl/gpu_narrowphase/host/ConvexHullContact.cpp index a60af2534..f7403a42b 100644 --- a/opencl/gpu_sat/host/ConvexHullContact.cpp +++ b/opencl/gpu_narrowphase/host/ConvexHullContact.cpp @@ -60,10 +60,10 @@ m_totalContactsOut(m_context, m_queue) char flags[1024]={0}; //#ifdef CL_PLATFORM_INTEL -// sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_sat/kernels/sat.cl"); +// sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_narrowphase/kernels/sat.cl"); //#endif - cl_program satProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,src,&errNum,flags,"opencl/gpu_sat/kernels/sat.cl"); + cl_program satProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,src,&errNum,flags,"opencl/gpu_narrowphase/kernels/sat.cl"); btAssert(errNum==CL_SUCCESS); m_findSeparatingAxisKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,src, "findSeparatingAxisKernel",&errNum,satProg ); @@ -88,10 +88,10 @@ m_totalContactsOut(m_context, m_queue) char flags[1024]={0}; //#ifdef CL_PLATFORM_INTEL -// sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_sat/kernels/satClipHullContacts.cl"); +// sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_narrowphase/kernels/satClipHullContacts.cl"); //#endif - cl_program satClipContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcClip,&errNum,flags,"opencl/gpu_sat/kernels/satClipHullContacts.cl"); + cl_program satClipContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcClip,&errNum,flags,"opencl/gpu_narrowphase/kernels/satClipHullContacts.cl"); btAssert(errNum==CL_SUCCESS); m_clipHullHullKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,srcClip, "clipHullHullKernel",&errNum,satClipContactsProg); @@ -131,7 +131,7 @@ m_totalContactsOut(m_context, m_queue) if (1) { const char* srcBvh = bvhTraversalKernelCL; - cl_program bvhTraversalProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcBvh,&errNum,"","opencl/gpu_sat/kernels/bvhTraversal.cl"); + cl_program bvhTraversalProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcBvh,&errNum,"","opencl/gpu_narrowphase/kernels/bvhTraversal.cl"); btAssert(errNum==CL_SUCCESS); m_bvhTraversalKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,srcBvh, "bvhTraversalKernel",&errNum,bvhTraversalProg,""); @@ -141,7 +141,7 @@ m_totalContactsOut(m_context, m_queue) { const char* primitiveContactsSrc = primitiveContactsKernelsCL; - cl_program primitiveContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,primitiveContactsSrc,&errNum,"","opencl/gpu_sat/kernels/primitiveContacts.cl"); + cl_program primitiveContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,primitiveContactsSrc,&errNum,"","opencl/gpu_narrowphase/kernels/primitiveContacts.cl"); btAssert(errNum==CL_SUCCESS); m_primitiveContactsKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,primitiveContactsSrc, "primitiveContactsKernel",&errNum,primitiveContactsProg,""); diff --git a/opencl/gpu_sat/host/ConvexHullContact.h b/opencl/gpu_narrowphase/host/ConvexHullContact.h similarity index 100% rename from opencl/gpu_sat/host/ConvexHullContact.h rename to opencl/gpu_narrowphase/host/ConvexHullContact.h diff --git a/opencl/gpu_sat/host/btCollidable.h b/opencl/gpu_narrowphase/host/btCollidable.h similarity index 100% rename from opencl/gpu_sat/host/btCollidable.h rename to opencl/gpu_narrowphase/host/btCollidable.h diff --git a/opencl/gpu_sat/host/btContact4.h b/opencl/gpu_narrowphase/host/btContact4.h similarity index 100% rename from opencl/gpu_sat/host/btContact4.h rename to opencl/gpu_narrowphase/host/btContact4.h diff --git a/opencl/gpu_sat/host/btConvexPolyhedronCL.h b/opencl/gpu_narrowphase/host/btConvexPolyhedronCL.h similarity index 100% rename from opencl/gpu_sat/host/btConvexPolyhedronCL.h rename to opencl/gpu_narrowphase/host/btConvexPolyhedronCL.h diff --git a/opencl/gpu_sat/host/btConvexUtility.cpp b/opencl/gpu_narrowphase/host/btConvexUtility.cpp similarity index 100% rename from opencl/gpu_sat/host/btConvexUtility.cpp rename to opencl/gpu_narrowphase/host/btConvexUtility.cpp diff --git a/opencl/gpu_sat/host/btConvexUtility.h b/opencl/gpu_narrowphase/host/btConvexUtility.h similarity index 100% rename from opencl/gpu_sat/host/btConvexUtility.h rename to opencl/gpu_narrowphase/host/btConvexUtility.h diff --git a/opencl/gpu_sat/host/btOptimizedBvh.cpp b/opencl/gpu_narrowphase/host/btOptimizedBvh.cpp similarity index 100% rename from opencl/gpu_sat/host/btOptimizedBvh.cpp rename to opencl/gpu_narrowphase/host/btOptimizedBvh.cpp diff --git a/opencl/gpu_sat/host/btOptimizedBvh.h b/opencl/gpu_narrowphase/host/btOptimizedBvh.h similarity index 100% rename from opencl/gpu_sat/host/btOptimizedBvh.h rename to opencl/gpu_narrowphase/host/btOptimizedBvh.h diff --git a/opencl/gpu_sat/host/btQuantizedBvh.cpp b/opencl/gpu_narrowphase/host/btQuantizedBvh.cpp similarity index 100% rename from opencl/gpu_sat/host/btQuantizedBvh.cpp rename to opencl/gpu_narrowphase/host/btQuantizedBvh.cpp diff --git a/opencl/gpu_sat/host/btQuantizedBvh.h b/opencl/gpu_narrowphase/host/btQuantizedBvh.h similarity index 100% rename from opencl/gpu_sat/host/btQuantizedBvh.h rename to opencl/gpu_narrowphase/host/btQuantizedBvh.h diff --git a/opencl/gpu_sat/host/btRigidBodyCL.h b/opencl/gpu_narrowphase/host/btRigidBodyCL.h similarity index 100% rename from opencl/gpu_sat/host/btRigidBodyCL.h rename to opencl/gpu_narrowphase/host/btRigidBodyCL.h diff --git a/opencl/gpu_sat/host/btStridingMeshInterface.cpp b/opencl/gpu_narrowphase/host/btStridingMeshInterface.cpp similarity index 100% rename from opencl/gpu_sat/host/btStridingMeshInterface.cpp rename to opencl/gpu_narrowphase/host/btStridingMeshInterface.cpp diff --git a/opencl/gpu_sat/host/btStridingMeshInterface.h b/opencl/gpu_narrowphase/host/btStridingMeshInterface.h similarity index 100% rename from opencl/gpu_sat/host/btStridingMeshInterface.h rename to opencl/gpu_narrowphase/host/btStridingMeshInterface.h diff --git a/opencl/gpu_sat/host/btTriangleCallback.cpp b/opencl/gpu_narrowphase/host/btTriangleCallback.cpp similarity index 100% rename from opencl/gpu_sat/host/btTriangleCallback.cpp rename to opencl/gpu_narrowphase/host/btTriangleCallback.cpp diff --git a/opencl/gpu_sat/host/btTriangleCallback.h b/opencl/gpu_narrowphase/host/btTriangleCallback.h similarity index 100% rename from opencl/gpu_sat/host/btTriangleCallback.h rename to opencl/gpu_narrowphase/host/btTriangleCallback.h diff --git a/opencl/gpu_sat/host/btTriangleIndexVertexArray.cpp b/opencl/gpu_narrowphase/host/btTriangleIndexVertexArray.cpp similarity index 100% rename from opencl/gpu_sat/host/btTriangleIndexVertexArray.cpp rename to opencl/gpu_narrowphase/host/btTriangleIndexVertexArray.cpp diff --git a/opencl/gpu_sat/host/btTriangleIndexVertexArray.h b/opencl/gpu_narrowphase/host/btTriangleIndexVertexArray.h similarity index 100% rename from opencl/gpu_sat/host/btTriangleIndexVertexArray.h rename to opencl/gpu_narrowphase/host/btTriangleIndexVertexArray.h diff --git a/opencl/gpu_sat/kernels/bvhTraversal.cl b/opencl/gpu_narrowphase/kernels/bvhTraversal.cl similarity index 100% rename from opencl/gpu_sat/kernels/bvhTraversal.cl rename to opencl/gpu_narrowphase/kernels/bvhTraversal.cl diff --git a/opencl/gpu_sat/kernels/bvhTraversal.h b/opencl/gpu_narrowphase/kernels/bvhTraversal.h similarity index 100% rename from opencl/gpu_sat/kernels/bvhTraversal.h rename to opencl/gpu_narrowphase/kernels/bvhTraversal.h diff --git a/opencl/gpu_sat/kernels/primitiveContacts.cl b/opencl/gpu_narrowphase/kernels/primitiveContacts.cl similarity index 100% rename from opencl/gpu_sat/kernels/primitiveContacts.cl rename to opencl/gpu_narrowphase/kernels/primitiveContacts.cl diff --git a/opencl/gpu_sat/kernels/primitiveContacts.h b/opencl/gpu_narrowphase/kernels/primitiveContacts.h similarity index 100% rename from opencl/gpu_sat/kernels/primitiveContacts.h rename to opencl/gpu_narrowphase/kernels/primitiveContacts.h diff --git a/opencl/gpu_sat/kernels/sat.cl b/opencl/gpu_narrowphase/kernels/sat.cl similarity index 100% rename from opencl/gpu_sat/kernels/sat.cl rename to opencl/gpu_narrowphase/kernels/sat.cl diff --git a/opencl/gpu_sat/kernels/satClipHullContacts.cl b/opencl/gpu_narrowphase/kernels/satClipHullContacts.cl similarity index 100% rename from opencl/gpu_sat/kernels/satClipHullContacts.cl rename to opencl/gpu_narrowphase/kernels/satClipHullContacts.cl diff --git a/opencl/gpu_sat/kernels/satClipHullContacts.h b/opencl/gpu_narrowphase/kernels/satClipHullContacts.h similarity index 100% rename from opencl/gpu_sat/kernels/satClipHullContacts.h rename to opencl/gpu_narrowphase/kernels/satClipHullContacts.h diff --git a/opencl/gpu_sat/kernels/satKernels.h b/opencl/gpu_narrowphase/kernels/satKernels.h similarity index 100% rename from opencl/gpu_sat/kernels/satKernels.h rename to opencl/gpu_narrowphase/kernels/satKernels.h diff --git a/opencl/gpu_sat/test/main.cpp b/opencl/gpu_narrowphase/test/main.cpp similarity index 100% rename from opencl/gpu_sat/test/main.cpp rename to opencl/gpu_narrowphase/test/main.cpp diff --git a/opencl/gpu_sat/test/premake4.lua b/opencl/gpu_narrowphase/test/premake4.lua similarity index 100% rename from opencl/gpu_sat/test/premake4.lua rename to opencl/gpu_narrowphase/test/premake4.lua diff --git a/opencl/gpu_rigidbody/host/Solver.h b/opencl/gpu_rigidbody/host/Solver.h index e0898370a..dc54281e0 100644 --- a/opencl/gpu_rigidbody/host/Solver.h +++ b/opencl/gpu_rigidbody/host/Solver.h @@ -19,8 +19,8 @@ subject to the following restrictions: #include "../../parallel_primitives/host/btOpenCLArray.h" #include "../host/btGpuConstraint4.h" -#include "../../gpu_sat/host/btRigidBodyCL.h" -#include "../../gpu_sat/host/btContact4.h" +#include "../../gpu_narrowphase/host/btRigidBodyCL.h" +#include "../../gpu_narrowphase/host/btContact4.h" #include "../host/btGpuConstraint4.h" #include "../../parallel_primitives/host/btPrefixScanCL.h" diff --git a/opencl/gpu_rigidbody/host/btGpuBatchingPgsSolver.h b/opencl/gpu_rigidbody/host/btGpuBatchingPgsSolver.h index 034127901..4f8efcce1 100644 --- a/opencl/gpu_rigidbody/host/btGpuBatchingPgsSolver.h +++ b/opencl/gpu_rigidbody/host/btGpuBatchingPgsSolver.h @@ -4,8 +4,8 @@ #include "../../basic_initialize/btOpenCLInclude.h" #include "../../parallel_primitives/host/btOpenCLArray.h" -#include "../../gpu_sat/host/btRigidBodyCL.h" -#include "../../gpu_sat/host/btContact4.h" +#include "../../gpu_narrowphase/host/btRigidBodyCL.h" +#include "../../gpu_narrowphase/host/btContact4.h" #include "btGpuConstraint4.h" class btGpuBatchingPgsSolver diff --git a/opencl/gpu_rigidbody/host/btGpuJacobiSolver.h b/opencl/gpu_rigidbody/host/btGpuJacobiSolver.h index 0eeda3fba..9e8577c1b 100644 --- a/opencl/gpu_rigidbody/host/btGpuJacobiSolver.h +++ b/opencl/gpu_rigidbody/host/btGpuJacobiSolver.h @@ -3,8 +3,8 @@ #define BT_GPU_JACOBI_SOLVER_H #include "../../basic_initialize/btOpenCLUtils.h" -#include "../../gpu_sat/host/btRigidBodyCL.h" -#include "../../gpu_sat/host/btContact4.h" +#include "../../gpu_narrowphase/host/btRigidBodyCL.h" +#include "../../gpu_narrowphase/host/btContact4.h" #include "../../parallel_primitives/host/btOpenCLArray.h" class btTypedConstraint; diff --git a/opencl/gpu_rigidbody/host/btGpuNarrowPhase.cpp b/opencl/gpu_rigidbody/host/btGpuNarrowPhase.cpp index 99a8e7732..cabcabe3c 100644 --- a/opencl/gpu_rigidbody/host/btGpuNarrowPhase.cpp +++ b/opencl/gpu_rigidbody/host/btGpuNarrowPhase.cpp @@ -2,13 +2,13 @@ #include "parallel_primitives/host/btOpenCLArray.h" -#include "../../gpu_sat/host/btConvexPolyhedronCL.h" -#include "../../gpu_sat/host/ConvexHullContact.h" +#include "../../gpu_narrowphase/host/btConvexPolyhedronCL.h" +#include "../../gpu_narrowphase/host/ConvexHullContact.h" #include "../../gpu_broadphase/host/btSapAabb.h" #include #include "btConfig.h" -#include "../../gpu_sat/host/btOptimizedBvh.h" -#include "../../gpu_sat/host/btTriangleIndexVertexArray.h" +#include "../../gpu_narrowphase/host/btOptimizedBvh.h" +#include "../../gpu_narrowphase/host/btTriangleIndexVertexArray.h" #include "BulletGeometry/btAabbUtil2.h" struct btGpuNarrowPhaseInternalData diff --git a/opencl/gpu_rigidbody/host/btGpuNarrowPhase.h b/opencl/gpu_rigidbody/host/btGpuNarrowPhase.h index d8e0d55df..2508bd713 100644 --- a/opencl/gpu_rigidbody/host/btGpuNarrowPhase.h +++ b/opencl/gpu_rigidbody/host/btGpuNarrowPhase.h @@ -1,7 +1,7 @@ #ifndef BT_GPU_NARROWPHASE_H #define BT_GPU_NARROWPHASE_H -#include "../../gpu_sat/host/btCollidable.h" +#include "../../gpu_narrowphase/host/btCollidable.h" #include "basic_initialize/btOpenCLInclude.h" #include "BulletCommon/btAlignedObjectArray.h" #include "BulletCommon/btVector3.h" diff --git a/opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp b/opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp index 4fc45cbab..905d7b709 100644 --- a/opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp +++ b/opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp @@ -10,8 +10,8 @@ #include "../../gpu_broadphase/host/btGpuSapBroadphase.h" #include "parallel_primitives/host/btLauncherCL.h" #include "btPgsJacobiSolver.h" -#include "../../gpu_sat/host/btRigidBodyCL.h" -#include "../../gpu_sat/host/btContact4.h" +#include "../../gpu_narrowphase/host/btRigidBodyCL.h" +#include "../../gpu_narrowphase/host/btContact4.h" #include "btGpuBatchingPgsSolver.h" #include "Solver.h" #include "btGpuJacobiSolver.h" diff --git a/opencl/gpu_rigidbody/host/btGpuRigidBodyPipelineInternalData.h b/opencl/gpu_rigidbody/host/btGpuRigidBodyPipelineInternalData.h index b1c805299..e10b2ddeb 100644 --- a/opencl/gpu_rigidbody/host/btGpuRigidBodyPipelineInternalData.h +++ b/opencl/gpu_rigidbody/host/btGpuRigidBodyPipelineInternalData.h @@ -5,7 +5,7 @@ #include "BulletCommon/btAlignedObjectArray.h" #include "../../parallel_primitives/host/btOpenCLArray.h" -#include "../../gpu_sat/host/btCollidable.h" +#include "../../gpu_narrowphase/host/btCollidable.h" struct btGpuRigidBodyPipelineInternalData diff --git a/opencl/gpu_rigidbody/host/btPgsJacobiSolver.cpp b/opencl/gpu_rigidbody/host/btPgsJacobiSolver.cpp index 10706407d..23a36cf62 100644 --- a/opencl/gpu_rigidbody/host/btPgsJacobiSolver.cpp +++ b/opencl/gpu_rigidbody/host/btPgsJacobiSolver.cpp @@ -31,14 +31,14 @@ subject to the following restrictions: #include "BulletCommon/btAlignedObjectArray.h" #include //for memset //#include "../../dynamics/basic_demo/Stubs/AdlContact4.h" -#include "../../gpu_sat/host/btContact4.h" +#include "../../gpu_narrowphase/host/btContact4.h" bool usePgs = false;//true; int gNumSplitImpulseRecoveries2 = 0; #include "btRigidBody.h" //#include "../../dynamics/basic_demo/Stubs/AdlRigidBody.h" -#include "../../gpu_sat/host/btRigidBodyCL.h" +#include "../../gpu_narrowphase/host/btRigidBodyCL.h" btTransform getWorldTransform(btRigidBodyCL* rb) {