bt->b3

2013-04-17 17:52:51 -07:00
parent 3cb80ad1a3
commit 626f0cf1e3
92 changed files with 158 additions and 158 deletions
--- a/opencl/gpu_broadphase/host/b3GpuSapBroadphase.cpp
+++ b/opencl/gpu_broadphase/host/b3GpuSapBroadphase.cpp
@@ -1,14 +1,14 @@

 #include "b3GpuSapBroadphase.h"
-#include "BulletCommon/b3Vector3.h"
+#include "Bullet3Common/b3Vector3.h"
 #include "parallel_primitives/host/btLauncherCL.h"
-#include "BulletCommon/b3Quickprof.h"
+#include "Bullet3Common/b3Quickprof.h"
 #include "basic_initialize/b3OpenCLUtils.h"


 #include "../kernels/sapKernels.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 )
--- a/opencl/gpu_broadphase/test/main.cpp
+++ b/opencl/gpu_broadphase/test/main.cpp
@@ -16,13 +16,13 @@ subject to the following restrictions:
 #include <stdio.h>
 #include "../basic_initialize/b3OpenCLUtils.h"
 #include "../host/b3GpuSapBroadphase.h"
-#include "BulletCommon/b3Vector3.h"
+#include "Bullet3Common/b3Vector3.h"
 #include "parallel_primitives/host/btFillCL.h"
 #include "parallel_primitives/host/btBoundSearchCL.h"
 #include "parallel_primitives/host/btRadixSort32CL.h"
 #include "parallel_primitives/host/btPrefixScanCL.h"
-#include "BulletCommon/b3CommandLineArgs.h"
-#include "BulletCommon/b3MinMax.h"
+#include "Bullet3Common/b3CommandLineArgs.h"
+#include "Bullet3Common/b3MinMax.h"

 int g_nPassed = 0;
 int g_nFailed = 0;
--- a/opencl/gpu_broadphase/test/premake4.lua
+++ b/opencl/gpu_broadphase/test/premake4.lua
@@ -29,11 +29,11 @@ function createProject(vendor)
 			"../../parallel_primitives/host/btPrefixScanCL.h",
 			"../../parallel_primitives/host/btRadixSort32CL.cpp",
 			"../../parallel_primitives/host/btRadixSort32CL.h",
-			"../../../src/BulletCommon/b3AlignedAllocator.cpp",
-			"../../../src/BulletCommon/b3AlignedAllocator.h",
-			"../../../src/BulletCommon/b3AlignedObjectArray.h",
-			"../../../src/BulletCommon/b3Quickprof.cpp",
-			"../../../src/BulletCommon/b3Quickprof.h",
+			"../../../src/Bullet3Common/b3AlignedAllocator.cpp",
+			"../../../src/Bullet3Common/b3AlignedAllocator.h",
+			"../../../src/Bullet3Common/b3AlignedObjectArray.h",
+			"../../../src/Bullet3Common/b3Quickprof.cpp",
+			"../../../src/Bullet3Common/b3Quickprof.h",

 		}
 		
--- a/opencl/gpu_narrowphase/host/b3Contact4.h
+++ b/opencl/gpu_narrowphase/host/b3Contact4.h
@@ -1,7 +1,7 @@
 #ifndef BT_CONTACT4_H
 #define BT_CONTACT4_H

-#include "BulletCommon/b3Vector3.h"
+#include "Bullet3Common/b3Vector3.h"


 ATTRIBUTE_ALIGNED16(struct) b3Contact4
--- a/opencl/gpu_narrowphase/host/b3ConvexHullContact.cpp
+++ b/opencl/gpu_narrowphase/host/b3ConvexHullContact.cpp
@@ -26,7 +26,7 @@ subject to the following restrictions:


 typedef b3AlignedObjectArray<b3Vector3> btVertexArray;
-#include "BulletCommon/b3Quickprof.h"
+#include "Bullet3Common/b3Quickprof.h"

 #include <float.h> //for FLT_MAX
 #include "basic_initialize/b3OpenCLUtils.h"
@@ -38,7 +38,7 @@ typedef b3AlignedObjectArray<b3Vector3> btVertexArray;
 #include "../kernels/bvhTraversal.h"
 #include "../kernels/primitiveContacts.h"

-#include "BulletGeometry/b3AabbUtil.h"
+#include "Bullet3Geometry/b3AabbUtil.h"


 #define dot3F4 btDot
--- a/opencl/gpu_narrowphase/host/b3ConvexHullContact.h
+++ b/opencl/gpu_narrowphase/host/b3ConvexHullContact.h
@@ -4,7 +4,7 @@

 #include "parallel_primitives/host/btOpenCLArray.h"
 #include "b3RigidBodyCL.h"
-#include "BulletCommon/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
 #include "b3ConvexUtility.h"
 #include "b3ConvexPolyhedronCL.h"
 #include "b3Collidable.h"
--- a/opencl/gpu_narrowphase/host/b3ConvexPolyhedronCL.h
+++ b/opencl/gpu_narrowphase/host/b3ConvexPolyhedronCL.h
@@ -1,7 +1,7 @@
 #ifndef CONVEX_POLYHEDRON_CL
 #define CONVEX_POLYHEDRON_CL

-#include "BulletCommon/b3Transform.h"
+#include "Bullet3Common/b3Transform.h"

 struct btGpuFace
 {
--- a/opencl/gpu_narrowphase/host/b3ConvexUtility.cpp
+++ b/opencl/gpu_narrowphase/host/b3ConvexUtility.cpp
@@ -15,10 +15,10 @@ subject to the following restrictions:


 #include "b3ConvexUtility.h"
-#include "BulletGeometry/b3ConvexHullComputer.h"
-#include "BulletGeometry/b3GrahamScan2dConvexHull.h"
-#include "BulletCommon/b3Quaternion.h"
-#include "BulletCommon/b3HashMap.h"
+#include "Bullet3Geometry/b3ConvexHullComputer.h"
+#include "Bullet3Geometry/b3GrahamScan2dConvexHull.h"
+#include "Bullet3Common/b3Quaternion.h"
+#include "Bullet3Common/b3HashMap.h"

 #include "b3ConvexPolyhedronCL.h"

--- a/opencl/gpu_narrowphase/host/b3ConvexUtility.h
+++ b/opencl/gpu_narrowphase/host/b3ConvexUtility.h
@@ -17,8 +17,8 @@ subject to the following restrictions:
 #ifndef _BT_CONVEX_UTILITY_H
 #define _BT_CONVEX_UTILITY_H

-#include "BulletCommon/b3AlignedObjectArray.h"
-#include "BulletCommon/b3Transform.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3Transform.h"

 #include "b3ConvexPolyhedronCL.h"

--- a/opencl/gpu_narrowphase/host/b3OptimizedBvh.cpp
+++ b/opencl/gpu_narrowphase/host/b3OptimizedBvh.cpp
@@ -16,7 +16,7 @@ subject to the following restrictions:

 #include "b3OptimizedBvh.h"
 #include "b3StridingMeshInterface.h"
-#include "BulletGeometry/b3AabbUtil.h"
+#include "Bullet3Geometry/b3AabbUtil.h"


 b3OptimizedBvh::b3OptimizedBvh()
--- a/opencl/gpu_narrowphase/host/b3QuantizedBvh.cpp
+++ b/opencl/gpu_narrowphase/host/b3QuantizedBvh.cpp
@@ -15,7 +15,7 @@ subject to the following restrictions:

 #include "b3QuantizedBvh.h"

-#include "BulletGeometry/b3AabbUtil.h"
+#include "Bullet3Geometry/b3AabbUtil.h"


 #define RAYAABB2
--- a/opencl/gpu_narrowphase/host/b3QuantizedBvh.h
+++ b/opencl/gpu_narrowphase/host/b3QuantizedBvh.h
@@ -28,8 +28,8 @@ class btSerializer;
 #include <stdlib.h>
 #endif //DEBUG_CHECK_DEQUANTIZATION

-#include "BulletCommon/b3Vector3.h"
-#include "BulletCommon/b3AlignedAllocator.h"
+#include "Bullet3Common/b3Vector3.h"
+#include "Bullet3Common/b3AlignedAllocator.h"

 #ifdef BT_USE_DOUBLE_PRECISION
 #define btQuantizedBvhData btQuantizedBvhDoubleData
@@ -157,8 +157,8 @@ public:
 	virtual void processNode(int subPart, int triangleIndex) = 0;
 };

-#include "BulletCommon/b3AlignedAllocator.h"
-#include "BulletCommon/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3AlignedAllocator.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"



--- a/opencl/gpu_narrowphase/host/b3RigidBodyCL.h
+++ b/opencl/gpu_narrowphase/host/b3RigidBodyCL.h
@@ -1,8 +1,8 @@
 #ifndef BT_RIGID_BODY_CL
 #define BT_RIGID_BODY_CL

-#include "BulletCommon/b3Scalar.h"
-#include "BulletCommon/b3Matrix3x3.h"
+#include "Bullet3Common/b3Scalar.h"
+#include "Bullet3Common/b3Matrix3x3.h"

 ATTRIBUTE_ALIGNED16(struct) b3RigidBodyCL
 {
--- a/opencl/gpu_narrowphase/host/b3StridingMeshInterface.h
+++ b/opencl/gpu_narrowphase/host/b3StridingMeshInterface.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_STRIDING_MESHINTERFACE_H
 #define BT_STRIDING_MESHINTERFACE_H

-#include "BulletCommon/b3Vector3.h"
+#include "Bullet3Common/b3Vector3.h"
 #include "b3TriangleCallback.h"
 //#include "btConcaveShape.h"

--- a/opencl/gpu_narrowphase/host/b3TriangleCallback.h
+++ b/opencl/gpu_narrowphase/host/b3TriangleCallback.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef 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.
--- a/opencl/gpu_narrowphase/host/b3TriangleIndexVertexArray.h
+++ b/opencl/gpu_narrowphase/host/b3TriangleIndexVertexArray.h
@@ -17,8 +17,8 @@ subject to the following restrictions:
 #define BT_TRIANGLE_INDEX_VERTEX_ARRAY_H

 #include "b3StridingMeshInterface.h"
-#include "BulletCommon/b3AlignedObjectArray.h"
-#include "BulletCommon/b3Scalar.h"
+#include "Bullet3Common/b3AlignedObjectArray.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.
--- a/opencl/gpu_narrowphase/test/main.cpp
+++ b/opencl/gpu_narrowphase/test/main.cpp
@@ -17,15 +17,15 @@ subject to the following restrictions:
 #include "../basic_initialize/b3OpenCLUtils.h"
 #include "../host/b3ConvexHullContact.h"

-#include "BulletCommon/b3Vector3.h"
+#include "Bullet3Common/b3Vector3.h"
 #include "parallel_primitives/host/btFillCL.h"
 #include "parallel_primitives/host/btBoundSearchCL.h"
 #include "parallel_primitives/host/btRadixSort32CL.h"
 #include "parallel_primitives/host/btPrefixScanCL.h"
-#include "BulletCommon/b3CommandLineArgs.h"
+#include "Bullet3Common/b3CommandLineArgs.h"
 #include "../host/b3ConvexHullContact.h"

-#include "BulletCommon/b3MinMax.h"
+#include "Bullet3Common/b3MinMax.h"
 int g_nPassed = 0;
 int g_nFailed = 0;
 bool g_testFailed = 0;
--- a/opencl/gpu_narrowphase/test/premake4.lua
+++ b/opencl/gpu_narrowphase/test/premake4.lua
@@ -29,13 +29,13 @@ function createProject(vendor)
 			"../../parallel_primitives/host/btPrefixScanCL.h",
 			"../../parallel_primitives/host/btRadixSort32CL.cpp",
 			"../../parallel_primitives/host/btRadixSort32CL.h",
-			"../../../src/BulletCommon/b3AlignedAllocator.cpp",
-			"../../../src/BulletCommon/b3AlignedAllocator.h",
-			"../../../src/BulletCommon/b3AlignedObjectArray.h",
-			"../../../src/BulletCommon/b3Quickprof.cpp",
-			"../../../src/BulletCommon/b3Quickprof.h",
-			"../../../src/BulletGeometry/**.cpp",
-			"../../../src/BulletGeometry/**.h",
+			"../../../src/Bullet3Common/b3AlignedAllocator.cpp",
+			"../../../src/Bullet3Common/b3AlignedAllocator.h",
+			"../../../src/Bullet3Common/b3AlignedObjectArray.h",
+			"../../../src/Bullet3Common/b3Quickprof.cpp",
+			"../../../src/Bullet3Common/b3Quickprof.h",
+			"../../../src/Bullet3Geometry/**.cpp",
+			"../../../src/Bullet3Geometry/**.h",
 			

 		}
--- a/opencl/gpu_rigidbody/host/b3GpuBatchingPgsSolver.cpp
+++ b/opencl/gpu_rigidbody/host/b3GpuBatchingPgsSolver.cpp
@@ -2,7 +2,7 @@

 #include "b3GpuBatchingPgsSolver.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/btBoundSearchCL.h"
 #include "../../parallel_primitives/host/btPrefixScanCL.h"
--- a/opencl/gpu_rigidbody/host/b3GpuConstraint4.h
+++ b/opencl/gpu_rigidbody/host/b3GpuConstraint4.h
@@ -1,7 +1,7 @@

 #ifndef BT_CONSTRAINT4_h
 #define BT_CONSTRAINT4_h
-#include "BulletCommon/b3Vector3.h"
+#include "Bullet3Common/b3Vector3.h"

 ATTRIBUTE_ALIGNED16(struct) b3GpuConstraint4
 {
--- a/opencl/gpu_rigidbody/host/b3GpuNarrowPhase.cpp
+++ b/opencl/gpu_rigidbody/host/b3GpuNarrowPhase.cpp
@@ -9,7 +9,7 @@
 #include "b3Config.h"
 #include "../../gpu_narrowphase/host/b3OptimizedBvh.h"
 #include "../../gpu_narrowphase/host/b3TriangleIndexVertexArray.h"
-#include "BulletGeometry/b3AabbUtil.h"
+#include "Bullet3Geometry/b3AabbUtil.h"

 struct btGpuNarrowPhaseInternalData
 {
--- a/opencl/gpu_rigidbody/host/b3GpuNarrowPhase.h
+++ b/opencl/gpu_rigidbody/host/b3GpuNarrowPhase.h
@@ -3,8 +3,8 @@

 #include "../../gpu_narrowphase/host/b3Collidable.h"
 #include "basic_initialize/b3OpenCLInclude.h"
-#include "BulletCommon/b3AlignedObjectArray.h"
-#include "BulletCommon/b3Vector3.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3Vector3.h"

 class b3GpuNarrowPhase
 {
--- a/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipeline.cpp
+++ b/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipeline.cpp
@@ -5,7 +5,7 @@

 #include "../../basic_initialize/b3OpenCLUtils.h"
 #include "b3GpuNarrowPhase.h"
-#include "BulletGeometry/b3AabbUtil.h"
+#include "Bullet3Geometry/b3AabbUtil.h"
 #include "../../gpu_broadphase/host/b3SapAabb.h"
 #include "../../gpu_broadphase/host/b3GpuSapBroadphase.h"
 #include "parallel_primitives/host/btLauncherCL.h"
@@ -20,7 +20,7 @@
 #include "b3GpuBatchingPgsSolver.h"
 #include "b3Solver.h"

-#include "BulletCommon/b3Quickprof.h"
+#include "Bullet3Common/b3Quickprof.h"
 #include "b3Config.h"

 b3GpuRigidBodyPipeline::b3GpuRigidBodyPipeline(cl_context ctx,cl_device_id device, cl_command_queue  q,class b3GpuNarrowPhase* narrowphase, class b3GpuSapBroadphase* broadphaseSap )
--- a/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipelineInternalData.h
+++ b/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipelineInternalData.h
@@ -2,7 +2,7 @@
 #define BT_GPU_RIGIDBODY_PIPELINE_INTERNAL_DATA_H

 #include "../../basic_initialize/b3OpenCLInclude.h"
-#include "BulletCommon/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"

 #include "../../parallel_primitives/host/btOpenCLArray.h"
 #include "../../gpu_narrowphase/host/b3Collidable.h"
--- a/opencl/gpu_rigidbody/host/b3Solver.cpp
+++ b/opencl/gpu_rigidbody/host/b3Solver.cpp
@@ -39,9 +39,9 @@ bool useNewBatchingKernel = false;
 #include "../kernels/batchingKernelsNew.h"


-#include "BulletCommon/b3Quickprof.h"
+#include "Bullet3Common/b3Quickprof.h"
 #include "../../parallel_primitives/host/btLauncherCL.h"
-#include "BulletCommon/b3Vector3.h"
+#include "Bullet3Common/b3Vector3.h"

 struct SolverDebugInfo
 {
--- a/opencl/lds_bank_conflict/main.cpp
+++ b/opencl/lds_bank_conflict/main.cpp
@@ -19,9 +19,9 @@
 #include "b3OpenCLUtils.h"
 #include "../parallel_primitives/host/btOpenCLArray.h"
 #include "../parallel_primitives/host/btLauncherCL.h"
-#include "BulletCommon/b3Quickprof.h"
+#include "Bullet3Common/b3Quickprof.h"
 #include "../parallel_primitives/host/btFillCL.h"
-#include "BulletCommon/b3CommandLineArgs.h"
+#include "Bullet3Common/b3CommandLineArgs.h"

 #include <string.h>
 #include <stdio.h>
--- a/opencl/lds_bank_conflict/premake4.lua
+++ b/opencl/lds_bank_conflict/premake4.lua
@@ -27,11 +27,11 @@ function createProject (vendor)
 			"main.cpp",
 			"../basic_initialize/b3OpenCLUtils.cpp",
 			"../basic_initialize/b3OpenCLUtils.h",
-			"../../src/BulletCommon/b3AlignedAllocator.cpp",
-			"../../src/BulletCommon/b3AlignedAllocator.h",
-			"../../src/BulletCommon/b3AlignedObjectArray.h",
-			"../../src/BulletCommon/b3Quickprof.cpp",
-			"../../src/BulletCommon/b3Quickprof.h",
+			"../../src/Bullet3Common/b3AlignedAllocator.cpp",
+			"../../src/Bullet3Common/b3AlignedAllocator.h",
+			"../../src/Bullet3Common/b3AlignedObjectArray.h",
+			"../../src/Bullet3Common/b3Quickprof.cpp",
+			"../../src/Bullet3Common/b3Quickprof.h",
 			
 		}
 	end
--- a/opencl/parallel_primitives/benchmark/premake4.lua
+++ b/opencl/parallel_primitives/benchmark/premake4.lua
@@ -24,11 +24,11 @@ function createProject(vendor)
 			"../host/btFillCL.cpp",
 			"../host/btPrefixScanCL.cpp",
 			"../host/btRadixSort32CL.cpp",
-			"../../../src/BulletCommon/b3AlignedAllocator.cpp",
-			"../../../src/BulletCommon/b3AlignedAllocator.h",
-			"../../../src/BulletCommon/b3AlignedObjectArray.h",
-			"../../../src/BulletCommon/b3Quickprof.cpp",
-			"../../../src/BulletCommon/b3Quickprof.h",
+			"../../../src/Bullet3Common/b3AlignedAllocator.cpp",
+			"../../../src/Bullet3Common/b3AlignedAllocator.h",
+			"../../../src/Bullet3Common/b3AlignedObjectArray.h",
+			"../../../src/Bullet3Common/b3Quickprof.cpp",
+			"../../../src/Bullet3Common/b3Quickprof.h",
 		}
 		
 	end
--- a/opencl/parallel_primitives/benchmark/test_large_problem_sorting.cpp
+++ b/opencl/parallel_primitives/benchmark/test_large_problem_sorting.cpp
@@ -66,7 +66,7 @@

 #include "../host/btRadixSort32CL.h"
 #include "../../basic_initialize/b3OpenCLUtils.h"
-#include "BulletCommon/b3Quickprof.h"
+#include "Bullet3Common/b3Quickprof.h"

 cl_context g_cxMainContext;
 cl_device_id g_device;
--- a/opencl/parallel_primitives/host/btFillCL.h
+++ b/opencl/parallel_primitives/host/btFillCL.h
@@ -2,7 +2,7 @@
 #define BT_FILL_CL_H

 #include "btOpenCLArray.h"
-#include "BulletCommon/b3Scalar.h"
+#include "Bullet3Common/b3Scalar.h"

 #include "btInt2.h"
 #include "btInt4.h"
--- a/opencl/parallel_primitives/host/btInt4.h
+++ b/opencl/parallel_primitives/host/btInt4.h
@@ -1,7 +1,7 @@
 #ifndef BT_INT4_H
 #define BT_INT4_H

-#include "BulletCommon/b3Scalar.h"
+#include "Bullet3Common/b3Scalar.h"

 ATTRIBUTE_ALIGNED16(struct) btUnsignedInt4
 {
--- a/opencl/parallel_primitives/host/btLauncherCL.h
+++ b/opencl/parallel_primitives/host/btLauncherCL.h
@@ -3,7 +3,7 @@
 #define BT_LAUNCHER_CL_H

 #include "btBufferInfoCL.h"
-#include "BulletCommon/b3MinMax.h"
+#include "Bullet3Common/b3MinMax.h"
 #include "btOpenCLArray.h"
 #include <stdio.h>

--- a/opencl/parallel_primitives/host/btOpenCLArray.h
+++ b/opencl/parallel_primitives/host/btOpenCLArray.h
@@ -1,7 +1,7 @@
 #ifndef BT_OPENCL_ARRAY_H
 #define BT_OPENCL_ARRAY_H

-#include "BulletCommon/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"
 #include "../../basic_initialize/b3OpenCLInclude.h"

 template <typename T> 
--- a/opencl/parallel_primitives/host/btPrefixScanCL.h
+++ b/opencl/parallel_primitives/host/btPrefixScanCL.h
@@ -4,7 +4,7 @@

 #include "btOpenCLArray.h"
 #include "btBufferInfoCL.h"
-#include "BulletCommon/b3AlignedObjectArray.h"
+#include "Bullet3Common/b3AlignedObjectArray.h"

 class btPrefixScanCL
 {
--- a/opencl/parallel_primitives/test/main.cpp
+++ b/opencl/parallel_primitives/test/main.cpp
@@ -19,8 +19,8 @@ subject to the following restrictions:
 #include "../host/btBoundSearchCL.h"
 #include "../host/btRadixSort32CL.h"
 #include "../host/btPrefixScanCL.h"
-#include "BulletCommon/b3CommandLineArgs.h"
-#include "BulletCommon/b3MinMax.h"
+#include "Bullet3Common/b3CommandLineArgs.h"
+#include "Bullet3Common/b3MinMax.h"

 int g_nPassed = 0;
 int g_nFailed = 0;
--- a/opencl/parallel_primitives/test/premake4.lua
+++ b/opencl/parallel_primitives/test/premake4.lua
@@ -27,9 +27,9 @@ function createProject(vendor)
 			"../host/btPrefixScanCL.h",
 			"../host/btRadixSort32CL.cpp",
 			"../host/btRadixSort32CL.h",
-			"../../../src/BulletCommon/b3AlignedAllocator.cpp",
-			"../../../src/BulletCommon/b3AlignedAllocator.h",
-			"../../../src/BulletCommon/b3AlignedObjectArray.h",
+			"../../../src/Bullet3Common/b3AlignedAllocator.cpp",
+			"../../../src/Bullet3Common/b3AlignedAllocator.h",
+			"../../../src/Bullet3Common/b3AlignedObjectArray.h",
 		}
 		
 	end
--- a/opencl/reduce/premake4.lua
+++ b/opencl/reduce/premake4.lua
@@ -27,9 +27,9 @@ function createProject (vendor)
 			"main.cpp",
 			"../basic_initialize/b3OpenCLUtils.cpp",
 			"../basic_initialize/b3OpenCLUtils.h",
-			"../../src/BulletCommon/b3AlignedAllocator.cpp",
-			"../../src/BulletCommon/b3AlignedAllocator.h",
-			"../../src/BulletCommon/b3AlignedObjectArray.h",
+			"../../src/Bullet3Common/b3AlignedAllocator.cpp",
+			"../../src/Bullet3Common/b3AlignedAllocator.h",
+			"../../src/Bullet3Common/b3AlignedObjectArray.h",
 		}
 	end
 	
--- a/opencl/vector_add_simplified/premake4.lua
+++ b/opencl/vector_add_simplified/premake4.lua
@@ -27,9 +27,9 @@ function createProject (vendor)
 			"main.cpp",
 			"../basic_initialize/b3OpenCLUtils.cpp",
 			"../basic_initialize/b3OpenCLUtils.h",
-			"../../src/BulletCommon/b3AlignedAllocator.cpp",
-			"../../src/BulletCommon/b3AlignedAllocator.h",
-			"../../src/BulletCommon/b3AlignedObjectArray.h",
+			"../../src/Bullet3Common/b3AlignedAllocator.cpp",
+			"../../src/Bullet3Common/b3AlignedAllocator.h",
+			"../../src/Bullet3Common/b3AlignedObjectArray.h",
 		}
 	end