diff --git a/btgui/GwenOpenGLTest/premake4.lua b/btgui/GwenOpenGLTest/premake4.lua index 011073183..31e555f7f 100644 --- a/btgui/GwenOpenGLTest/premake4.lua +++ b/btgui/GwenOpenGLTest/premake4.lua @@ -37,11 +37,11 @@ "../OpenGLTrueTypeFont/fontstash.h", "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp", "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h", - "../../src/BulletGeometry/b3ConvexHullComputer.cpp", - "../../src/BulletGeometry/b3ConvexHullComputer.h", - "../../src/BulletCommon/b3AlignedAllocator.cpp", - "../../src/BulletCommon/b3Quickprof.cpp", - "../../src/BulletCommon/b3Quickprof.h", + "../../src/Bullet3Geometry/b3ConvexHullComputer.cpp", + "../../src/Bullet3Geometry/b3ConvexHullComputer.h", + "../../src/Bullet3Common/b3AlignedAllocator.cpp", + "../../src/Bullet3Common/b3Quickprof.cpp", + "../../src/Bullet3Common/b3Quickprof.h", "**.cpp", "**.h", } diff --git a/btgui/OpenGLTrueTypeFont/main.cpp b/btgui/OpenGLTrueTypeFont/main.cpp index b95dbb184..545ccb266 100644 --- a/btgui/OpenGLTrueTypeFont/main.cpp +++ b/btgui/OpenGLTrueTypeFont/main.cpp @@ -32,9 +32,9 @@ subject to the following restrictions: #include "opengl_fontstashcallbacks.h" -#include "BulletCommon/b3Quickprof.h" -#include "BulletCommon/b3Quaternion.h" -#include "BulletCommon/b3CommandLineArgs.h" +#include "Bullet3Common/b3Quickprof.h" +#include "Bullet3Common/b3Quaternion.h" +#include "Bullet3Common/b3CommandLineArgs.h" #include "../OpenGLWindow/LoadShader.h" extern char OpenSansData[]; bool printStats = false; diff --git a/btgui/OpenGLTrueTypeFont/premake4.lua b/btgui/OpenGLTrueTypeFont/premake4.lua index e4d3aed08..024def253 100644 --- a/btgui/OpenGLTrueTypeFont/premake4.lua +++ b/btgui/OpenGLTrueTypeFont/premake4.lua @@ -23,9 +23,9 @@ "../FontFiles/OpenSans.cpp", "../OpenGLWindow/LoadShader.cpp", "../OpenGLWindow/LoadShader.h", - "../../src/BulletCommon/b3AlignedAllocator.cpp", - "../../src/BulletCommon/b3Quickprof.cpp", - "../../src/BulletCommon/b3Quickprof.h" , + "../../src/Bullet3Common/b3AlignedAllocator.cpp", + "../../src/Bullet3Common/b3Quickprof.cpp", + "../../src/Bullet3Common/b3Quickprof.h" , "fontstash.cpp", "fontstash.h", "opengl_fontstashcallbacks.cpp", diff --git a/btgui/OpenGLWindow/GLInstanceGraphicsShape.h b/btgui/OpenGLWindow/GLInstanceGraphicsShape.h index 02e097cd9..84aef93d3 100644 --- a/btgui/OpenGLWindow/GLInstanceGraphicsShape.h +++ b/btgui/OpenGLWindow/GLInstanceGraphicsShape.h @@ -1,7 +1,7 @@ #ifndef GL_INSTANCE_GRAPHICS_SHAPE_H #define GL_INSTANCE_GRAPHICS_SHAPE_H -#include "BulletCommon/b3AlignedObjectArray.h" +#include "Bullet3Common/b3AlignedObjectArray.h" struct GLInstanceVertex { diff --git a/btgui/OpenGLWindow/GLInstanceRendererInternalData.h b/btgui/OpenGLWindow/GLInstanceRendererInternalData.h index 8d3a3e67a..3cc24b47f 100644 --- a/btgui/OpenGLWindow/GLInstanceRendererInternalData.h +++ b/btgui/OpenGLWindow/GLInstanceRendererInternalData.h @@ -2,7 +2,7 @@ #define GL_INSTANCE_RENDERER_INTERNAL_DATA_H #include "OpenGLInclude.h" -#include "BulletCommon/b3AlignedObjectArray.h" +#include "Bullet3Common/b3AlignedObjectArray.h" struct GLInstanceRendererInternalData { diff --git a/btgui/OpenGLWindow/GLInstancingRenderer.cpp b/btgui/OpenGLWindow/GLInstancingRenderer.cpp index b7813a025..23ca672f9 100644 --- a/btgui/OpenGLWindow/GLInstancingRenderer.cpp +++ b/btgui/OpenGLWindow/GLInstancingRenderer.cpp @@ -22,10 +22,10 @@ subject to the following restrictions: //#include "DemoSettings.h" #include #include -#include "BulletCommon/b3Vector3.h" -#include "BulletCommon/b3Quaternion.h" -#include "BulletCommon/b3Quickprof.h" -#include "BulletCommon/b3Matrix3x3.h" +#include "Bullet3Common/b3Vector3.h" +#include "Bullet3Common/b3Quaternion.h" +#include "Bullet3Common/b3Quickprof.h" +#include "Bullet3Common/b3Matrix3x3.h" #include "LoadShader.h" diff --git a/btgui/OpenGLWindow/GLInstancingRenderer.h b/btgui/OpenGLWindow/GLInstancingRenderer.h index e103bdd73..e5f8040cd 100644 --- a/btgui/OpenGLWindow/GLInstancingRenderer.h +++ b/btgui/OpenGLWindow/GLInstancingRenderer.h @@ -16,7 +16,7 @@ subject to the following restrictions: #ifndef GL_INSTANCING_RENDERER_H #define GL_INSTANCING_RENDERER_H -#include "BulletCommon/b3AlignedObjectArray.h" +#include "Bullet3Common/b3AlignedObjectArray.h" void btDefaultMouseButtonCallback( int button, int state, float x, float y); void btDefaultMouseMoveCallback( float x, float y); diff --git a/btgui/OpenGLWindow/Win32OpenGLWindow.cpp b/btgui/OpenGLWindow/Win32OpenGLWindow.cpp index 57ca3639c..1aa9d16ef 100644 --- a/btgui/OpenGLWindow/Win32OpenGLWindow.cpp +++ b/btgui/OpenGLWindow/Win32OpenGLWindow.cpp @@ -18,7 +18,7 @@ subject to the following restrictions: #include "OpenGLInclude.h" -#include "BulletCommon/b3Vector3.h" +#include "Bullet3Common/b3Vector3.h" #include "Win32InternalWindowData.h" #include diff --git a/btgui/OpenGLWindow/Win32Window.cpp b/btgui/OpenGLWindow/Win32Window.cpp index 3d8b272d7..017a70a67 100644 --- a/btgui/OpenGLWindow/Win32Window.cpp +++ b/btgui/OpenGLWindow/Win32Window.cpp @@ -17,7 +17,7 @@ subject to the following restrictions: #include "Win32Window.h" #include "OpenGLInclude.h" -#include "BulletCommon/b3Vector3.h" +#include "Bullet3Common/b3Vector3.h" #include static InternalData2* sData = 0; diff --git a/btgui/OpenGLWindow/gwenWindow.cpp b/btgui/OpenGLWindow/gwenWindow.cpp index 88b7c1337..0b36ff4a7 100644 --- a/btgui/OpenGLWindow/gwenWindow.cpp +++ b/btgui/OpenGLWindow/gwenWindow.cpp @@ -19,7 +19,7 @@ #include "Gwen/Controls/TabControl.h" #include "Gwen/Controls/ListBox.h" -#include "BulletCommon/b3Quickprof.h" +#include "Bullet3Common/b3Quickprof.h" #include "GwenOpenGL3CoreRenderer.h" #include "GLPrimitiveRenderer.h" diff --git a/btgui/OpenGLWindow/main.cpp b/btgui/OpenGLWindow/main.cpp index 9f4142e32..4730b46b5 100644 --- a/btgui/OpenGLWindow/main.cpp +++ b/btgui/OpenGLWindow/main.cpp @@ -37,10 +37,10 @@ extern char OpenSansData[]; #include "renderscene.h" -#include "BulletCommon/b3Quickprof.h" -#include "BulletCommon/b3Quaternion.h" +#include "Bullet3Common/b3Quickprof.h" +#include "Bullet3Common/b3Quaternion.h" -#include "BulletCommon/b3CommandLineArgs.h" +#include "Bullet3Common/b3CommandLineArgs.h" #include "../OpenGLTrueTypeFont/fontstash.h" #include "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h" diff --git a/btgui/OpenGLWindow/premake4.lua b/btgui/OpenGLWindow/premake4.lua index 405da77db..de648d5d6 100644 --- a/btgui/OpenGLWindow/premake4.lua +++ b/btgui/OpenGLWindow/premake4.lua @@ -41,11 +41,11 @@ "../OpenGLTrueTypeFont/fontstash.h", "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp", "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h", - "../../src/BulletGeometry/b3ConvexHullComputer.cpp", - "../../src/BulletGeometry/b3ConvexHullComputer.h", - "../../src/BulletCommon/b3AlignedAllocator.cpp", - "../../src/BulletCommon/b3Quickprof.cpp", - "../../src/BulletCommon/b3Quickprof.h" + "../../src/Bullet3Geometry/b3ConvexHullComputer.cpp", + "../../src/Bullet3Geometry/b3ConvexHullComputer.h", + "../../src/Bullet3Common/b3AlignedAllocator.cpp", + "../../src/Bullet3Common/b3Quickprof.cpp", + "../../src/Bullet3Common/b3Quickprof.h" } if os.is("Windows") then diff --git a/btgui/OpenGLWindow/renderscene.cpp b/btgui/OpenGLWindow/renderscene.cpp index d2a4b0767..d8a1be081 100644 --- a/btgui/OpenGLWindow/renderscene.cpp +++ b/btgui/OpenGLWindow/renderscene.cpp @@ -16,8 +16,8 @@ bool keepStaticObjects = false; #include "GLInstancingRenderer.h" //#include "LinearMath/b3Quickprof.h" -#include "BulletCommon/b3Quaternion.h" -#include "BulletCommon/b3Matrix3x3.h" +#include "Bullet3Common/b3Quaternion.h" +#include "Bullet3Common/b3Matrix3x3.h" //#include "../opencl/gpu_rigidbody_pipeline/b3ConvexUtility.h" #include "ShapeData.h" ///work-in-progress diff --git a/demo/donttouch/GpuDemo.h b/demo/donttouch/GpuDemo.h index b3917dee7..96bdc133e 100644 --- a/demo/donttouch/GpuDemo.h +++ b/demo/donttouch/GpuDemo.h @@ -16,7 +16,7 @@ subject to the following restrictions: #define GPU_DEMO_H -#include "BulletCommon/b3AlignedObjectArray.h" +#include "Bullet3Common/b3AlignedObjectArray.h" class btBroadphaseInterface; diff --git a/demo/donttouch/OpenGL3CoreRenderer.cpp b/demo/donttouch/OpenGL3CoreRenderer.cpp index 1e388580a..b36038609 100644 --- a/demo/donttouch/OpenGL3CoreRenderer.cpp +++ b/demo/donttouch/OpenGL3CoreRenderer.cpp @@ -4,7 +4,7 @@ #include "OpenGLWindow/ShapeData.h" //#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" //#include "BulletCollision/CollisionDispatch/btCollisionObject.h" -#include "BulletCommon/b3Quickprof.h" +#include "Bullet3Common/b3Quickprof.h" /*#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" #include "BulletCollision/CollisionShapes/btConvexPolyhedron.h" diff --git a/demo/donttouch/btGpuDynamicsWorld.h b/demo/donttouch/btGpuDynamicsWorld.h index 6e782dbae..2bb93ecc2 100644 --- a/demo/donttouch/btGpuDynamicsWorld.h +++ b/demo/donttouch/btGpuDynamicsWorld.h @@ -7,7 +7,7 @@ class btCollisionObject; struct btGpuInternalData;//use this struct to avoid 'leaking' all OpenCL headers into clients code base class CLPhysicsDemo; -#include "BulletCommon/b3AlignedObjectArray.h" +#include "Bullet3Common/b3AlignedObjectArray.h" //#include "BulletDynamics/Dynamics/btDynamicsWorld.h" diff --git a/demo/gpudemo/GpuDemo.cpp b/demo/gpudemo/GpuDemo.cpp index 77e7fcfb2..334109ec6 100644 --- a/demo/gpudemo/GpuDemo.cpp +++ b/demo/gpudemo/GpuDemo.cpp @@ -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" diff --git a/demo/gpudemo/ParticleDemo.cpp b/demo/gpudemo/ParticleDemo.cpp index 3308a739e..a9e72db77 100644 --- a/demo/gpudemo/ParticleDemo.cpp +++ b/demo/gpudemo/ParticleDemo.cpp @@ -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 diff --git a/demo/gpudemo/broadphase/PairBench.cpp b/demo/gpudemo/broadphase/PairBench.cpp index 459e0e4f5..02dc1e4e9 100644 --- a/demo/gpudemo/broadphase/PairBench.cpp +++ b/demo/gpudemo/broadphase/PairBench.cpp @@ -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" diff --git a/demo/gpudemo/gwenUserInterface.cpp b/demo/gpudemo/gwenUserInterface.cpp index 44bd68ce5..590965470 100644 --- a/demo/gpudemo/gwenUserInterface.cpp +++ b/demo/gpudemo/gwenUserInterface.cpp @@ -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" diff --git a/demo/gpudemo/main_opengl3core.cpp b/demo/gpudemo/main_opengl3core.cpp index be0e2dbe9..315f1abeb 100644 --- a/demo/gpudemo/main_opengl3core.cpp +++ b/demo/gpudemo/main_opengl3core.cpp @@ -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 #include @@ -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[]) { diff --git a/demo/gpudemo/premake4.lua b/demo/gpudemo/premake4.lua index 491f0461d..8a9b92f68 100644 --- a/demo/gpudemo/premake4.lua +++ b/demo/gpudemo/premake4.lua @@ -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", diff --git a/demo/gpudemo/rigidbody/ConcaveScene.cpp b/demo/gpudemo/rigidbody/ConcaveScene.cpp index 40b4e657a..cf32e4de9 100644 --- a/demo/gpudemo/rigidbody/ConcaveScene.cpp +++ b/demo/gpudemo/rigidbody/ConcaveScene.cpp @@ -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 diff --git a/demo/gpudemo/rigidbody/GpuCompoundScene.cpp b/demo/gpudemo/rigidbody/GpuCompoundScene.cpp index bf92200cd..783dd9a74 100644 --- a/demo/gpudemo/rigidbody/GpuCompoundScene.cpp +++ b/demo/gpudemo/rigidbody/GpuCompoundScene.cpp @@ -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" diff --git a/demo/gpudemo/rigidbody/GpuConvexScene.cpp b/demo/gpudemo/rigidbody/GpuConvexScene.cpp index 2157f6a08..05728a23c 100644 --- a/demo/gpudemo/rigidbody/GpuConvexScene.cpp +++ b/demo/gpudemo/rigidbody/GpuConvexScene.cpp @@ -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" diff --git a/demo/gpudemo/rigidbody/GpuRigidBodyDemo.cpp b/demo/gpudemo/rigidbody/GpuRigidBodyDemo.cpp index 2eb22e677..f110190d2 100644 --- a/demo/gpudemo/rigidbody/GpuRigidBodyDemo.cpp +++ b/demo/gpudemo/rigidbody/GpuRigidBodyDemo.cpp @@ -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" diff --git a/demo/gpudemo/rigidbody/GpuRigidBodyDemoInternalData.h b/demo/gpudemo/rigidbody/GpuRigidBodyDemoInternalData.h index 9cc52693d..609faffd1 100644 --- a/demo/gpudemo/rigidbody/GpuRigidBodyDemoInternalData.h +++ b/demo/gpudemo/rigidbody/GpuRigidBodyDemoInternalData.h @@ -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 { diff --git a/demo/gpudemo/rigidbody/GpuSphereScene.cpp b/demo/gpudemo/rigidbody/GpuSphereScene.cpp index 6c3931cbb..cbcebfdc3 100644 --- a/demo/gpudemo/rigidbody/GpuSphereScene.cpp +++ b/demo/gpudemo/rigidbody/GpuSphereScene.cpp @@ -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" diff --git a/opencl/gpu_broadphase/host/b3GpuSapBroadphase.cpp b/opencl/gpu_broadphase/host/b3GpuSapBroadphase.cpp index 22af300fe..f9d93b88b 100644 --- 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 ) diff --git a/opencl/gpu_broadphase/test/main.cpp b/opencl/gpu_broadphase/test/main.cpp index b12bdfa43..b448c3535 100644 --- a/opencl/gpu_broadphase/test/main.cpp +++ b/opencl/gpu_broadphase/test/main.cpp @@ -16,13 +16,13 @@ subject to the following restrictions: #include #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; diff --git a/opencl/gpu_broadphase/test/premake4.lua b/opencl/gpu_broadphase/test/premake4.lua index f88090e1a..af93fab90 100644 --- 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", } diff --git a/opencl/gpu_narrowphase/host/b3Contact4.h b/opencl/gpu_narrowphase/host/b3Contact4.h index f316f825f..0282f831b 100644 --- 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 diff --git a/opencl/gpu_narrowphase/host/b3ConvexHullContact.cpp b/opencl/gpu_narrowphase/host/b3ConvexHullContact.cpp index 69e2de270..4b931b5c3 100644 --- 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 btVertexArray; -#include "BulletCommon/b3Quickprof.h" +#include "Bullet3Common/b3Quickprof.h" #include //for FLT_MAX #include "basic_initialize/b3OpenCLUtils.h" @@ -38,7 +38,7 @@ typedef b3AlignedObjectArray btVertexArray; #include "../kernels/bvhTraversal.h" #include "../kernels/primitiveContacts.h" -#include "BulletGeometry/b3AabbUtil.h" +#include "Bullet3Geometry/b3AabbUtil.h" #define dot3F4 btDot diff --git a/opencl/gpu_narrowphase/host/b3ConvexHullContact.h b/opencl/gpu_narrowphase/host/b3ConvexHullContact.h index 19562cb24..6b6d6fe59 100644 --- 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" diff --git a/opencl/gpu_narrowphase/host/b3ConvexPolyhedronCL.h b/opencl/gpu_narrowphase/host/b3ConvexPolyhedronCL.h index ce3572154..ec63bca26 100644 --- 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 { diff --git a/opencl/gpu_narrowphase/host/b3ConvexUtility.cpp b/opencl/gpu_narrowphase/host/b3ConvexUtility.cpp index 248724901..16ca87725 100644 --- 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" diff --git a/opencl/gpu_narrowphase/host/b3ConvexUtility.h b/opencl/gpu_narrowphase/host/b3ConvexUtility.h index 75b2b8b6d..27f55800a 100644 --- 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" diff --git a/opencl/gpu_narrowphase/host/b3OptimizedBvh.cpp b/opencl/gpu_narrowphase/host/b3OptimizedBvh.cpp index c7536d20d..cc2fa8b1e 100644 --- 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() diff --git a/opencl/gpu_narrowphase/host/b3QuantizedBvh.cpp b/opencl/gpu_narrowphase/host/b3QuantizedBvh.cpp index ba278e317..03a3f6191 100644 --- 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 diff --git a/opencl/gpu_narrowphase/host/b3QuantizedBvh.h b/opencl/gpu_narrowphase/host/b3QuantizedBvh.h index 2bd6df7e1..2f9a0dfc6 100644 --- a/opencl/gpu_narrowphase/host/b3QuantizedBvh.h +++ b/opencl/gpu_narrowphase/host/b3QuantizedBvh.h @@ -28,8 +28,8 @@ class btSerializer; #include #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" diff --git a/opencl/gpu_narrowphase/host/b3RigidBodyCL.h b/opencl/gpu_narrowphase/host/b3RigidBodyCL.h index 9646e244a..135e5ece3 100644 --- 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 { diff --git a/opencl/gpu_narrowphase/host/b3StridingMeshInterface.h b/opencl/gpu_narrowphase/host/b3StridingMeshInterface.h index 67d06eb4e..edc0fccd1 100644 --- 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" diff --git a/opencl/gpu_narrowphase/host/b3TriangleCallback.h b/opencl/gpu_narrowphase/host/b3TriangleCallback.h index 9ddb051dd..c76712eb0 100644 --- 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. diff --git a/opencl/gpu_narrowphase/host/b3TriangleIndexVertexArray.h b/opencl/gpu_narrowphase/host/b3TriangleIndexVertexArray.h index 1e13e582b..2b42cfa8c 100644 --- 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. diff --git a/opencl/gpu_narrowphase/test/main.cpp b/opencl/gpu_narrowphase/test/main.cpp index dd2be0934..2c86ef5bc 100644 --- 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; diff --git a/opencl/gpu_narrowphase/test/premake4.lua b/opencl/gpu_narrowphase/test/premake4.lua index e1ced407c..45d0064de 100644 --- 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", } diff --git a/opencl/gpu_rigidbody/host/b3GpuBatchingPgsSolver.cpp b/opencl/gpu_rigidbody/host/b3GpuBatchingPgsSolver.cpp index 9d67d8c99..a4163a704 100644 --- 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" diff --git a/opencl/gpu_rigidbody/host/b3GpuConstraint4.h b/opencl/gpu_rigidbody/host/b3GpuConstraint4.h index 069f6bed4..33c02e352 100644 --- 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 { diff --git a/opencl/gpu_rigidbody/host/b3GpuNarrowPhase.cpp b/opencl/gpu_rigidbody/host/b3GpuNarrowPhase.cpp index 028a06646..3bc06e2e6 100644 --- 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 { diff --git a/opencl/gpu_rigidbody/host/b3GpuNarrowPhase.h b/opencl/gpu_rigidbody/host/b3GpuNarrowPhase.h index c564fb17a..c5a3f78b8 100644 --- 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 { diff --git a/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipeline.cpp b/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipeline.cpp index 0a83e3fd5..34016b272 100644 --- 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 ) diff --git a/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipelineInternalData.h b/opencl/gpu_rigidbody/host/b3GpuRigidBodyPipelineInternalData.h index 064209c92..a6b0a80ed 100644 --- 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" diff --git a/opencl/gpu_rigidbody/host/b3Solver.cpp b/opencl/gpu_rigidbody/host/b3Solver.cpp index c2ff172f7..fe60d0533 100644 --- 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 { diff --git a/opencl/lds_bank_conflict/main.cpp b/opencl/lds_bank_conflict/main.cpp index 248f5f673..83e6e0ad0 100644 --- 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 #include diff --git a/opencl/lds_bank_conflict/premake4.lua b/opencl/lds_bank_conflict/premake4.lua index 701476df4..b568e9ab8 100644 --- 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 diff --git a/opencl/parallel_primitives/benchmark/premake4.lua b/opencl/parallel_primitives/benchmark/premake4.lua index c8b13b81b..da57316f8 100644 --- 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 diff --git a/opencl/parallel_primitives/benchmark/test_large_problem_sorting.cpp b/opencl/parallel_primitives/benchmark/test_large_problem_sorting.cpp index 83bba01ed..40b9a3f46 100644 --- 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; diff --git a/opencl/parallel_primitives/host/btFillCL.h b/opencl/parallel_primitives/host/btFillCL.h index 79900acab..9eb5292dd 100644 --- 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" diff --git a/opencl/parallel_primitives/host/btInt4.h b/opencl/parallel_primitives/host/btInt4.h index ce9b05b7a..a66a0d10d 100644 --- 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 { diff --git a/opencl/parallel_primitives/host/btLauncherCL.h b/opencl/parallel_primitives/host/btLauncherCL.h index 885e4fdfc..aebad90b3 100644 --- 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 diff --git a/opencl/parallel_primitives/host/btOpenCLArray.h b/opencl/parallel_primitives/host/btOpenCLArray.h index 91bfd4d8c..9e446b67a 100644 --- 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 diff --git a/opencl/parallel_primitives/host/btPrefixScanCL.h b/opencl/parallel_primitives/host/btPrefixScanCL.h index 05205a9fb..087df14c0 100644 --- 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 { diff --git a/opencl/parallel_primitives/test/main.cpp b/opencl/parallel_primitives/test/main.cpp index ce94e3283..8b06e32f8 100644 --- 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; diff --git a/opencl/parallel_primitives/test/premake4.lua b/opencl/parallel_primitives/test/premake4.lua index f734afb0f..e1a800003 100644 --- 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 diff --git a/opencl/reduce/premake4.lua b/opencl/reduce/premake4.lua index b858120d6..d5d1dcacc 100644 --- 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 diff --git a/opencl/vector_add_simplified/premake4.lua b/opencl/vector_add_simplified/premake4.lua index 0091c40e8..58444b798 100644 --- 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 diff --git a/src/BulletCommon/b3AlignedAllocator.cpp b/src/Bullet3Common/b3AlignedAllocator.cpp similarity index 100% rename from src/BulletCommon/b3AlignedAllocator.cpp rename to src/Bullet3Common/b3AlignedAllocator.cpp diff --git a/src/BulletCommon/b3AlignedAllocator.h b/src/Bullet3Common/b3AlignedAllocator.h similarity index 100% rename from src/BulletCommon/b3AlignedAllocator.h rename to src/Bullet3Common/b3AlignedAllocator.h diff --git a/src/BulletCommon/b3AlignedObjectArray.h b/src/Bullet3Common/b3AlignedObjectArray.h similarity index 100% rename from src/BulletCommon/b3AlignedObjectArray.h rename to src/Bullet3Common/b3AlignedObjectArray.h diff --git a/src/BulletCommon/b3CommandLineArgs.h b/src/Bullet3Common/b3CommandLineArgs.h similarity index 100% rename from src/BulletCommon/b3CommandLineArgs.h rename to src/Bullet3Common/b3CommandLineArgs.h diff --git a/src/BulletCommon/b3HashMap.h b/src/Bullet3Common/b3HashMap.h similarity index 100% rename from src/BulletCommon/b3HashMap.h rename to src/Bullet3Common/b3HashMap.h diff --git a/src/BulletCommon/b3Matrix3x3.h b/src/Bullet3Common/b3Matrix3x3.h similarity index 100% rename from src/BulletCommon/b3Matrix3x3.h rename to src/Bullet3Common/b3Matrix3x3.h diff --git a/src/BulletCommon/b3MinMax.h b/src/Bullet3Common/b3MinMax.h similarity index 100% rename from src/BulletCommon/b3MinMax.h rename to src/Bullet3Common/b3MinMax.h diff --git a/src/BulletCommon/b3PoolAllocator.h b/src/Bullet3Common/b3PoolAllocator.h similarity index 100% rename from src/BulletCommon/b3PoolAllocator.h rename to src/Bullet3Common/b3PoolAllocator.h diff --git a/src/BulletCommon/b3QuadWord.h b/src/Bullet3Common/b3QuadWord.h similarity index 100% rename from src/BulletCommon/b3QuadWord.h rename to src/Bullet3Common/b3QuadWord.h diff --git a/src/BulletCommon/b3Quaternion.h b/src/Bullet3Common/b3Quaternion.h similarity index 100% rename from src/BulletCommon/b3Quaternion.h rename to src/Bullet3Common/b3Quaternion.h diff --git a/src/BulletCommon/b3Quickprof.cpp b/src/Bullet3Common/b3Quickprof.cpp similarity index 100% rename from src/BulletCommon/b3Quickprof.cpp rename to src/Bullet3Common/b3Quickprof.cpp diff --git a/src/BulletCommon/b3Quickprof.h b/src/Bullet3Common/b3Quickprof.h similarity index 100% rename from src/BulletCommon/b3Quickprof.h rename to src/Bullet3Common/b3Quickprof.h diff --git a/src/BulletCommon/b3Random.h b/src/Bullet3Common/b3Random.h similarity index 100% rename from src/BulletCommon/b3Random.h rename to src/Bullet3Common/b3Random.h diff --git a/src/BulletCommon/b3Scalar.h b/src/Bullet3Common/b3Scalar.h similarity index 100% rename from src/BulletCommon/b3Scalar.h rename to src/Bullet3Common/b3Scalar.h diff --git a/src/BulletCommon/b3StackAlloc.h b/src/Bullet3Common/b3StackAlloc.h similarity index 100% rename from src/BulletCommon/b3StackAlloc.h rename to src/Bullet3Common/b3StackAlloc.h diff --git a/src/BulletCommon/b3Transform.h b/src/Bullet3Common/b3Transform.h similarity index 100% rename from src/BulletCommon/b3Transform.h rename to src/Bullet3Common/b3Transform.h diff --git a/src/BulletCommon/b3TransformUtil.h b/src/Bullet3Common/b3TransformUtil.h similarity index 100% rename from src/BulletCommon/b3TransformUtil.h rename to src/Bullet3Common/b3TransformUtil.h diff --git a/src/BulletCommon/b3Vector3.cpp b/src/Bullet3Common/b3Vector3.cpp similarity index 100% rename from src/BulletCommon/b3Vector3.cpp rename to src/Bullet3Common/b3Vector3.cpp diff --git a/src/BulletCommon/b3Vector3.h b/src/Bullet3Common/b3Vector3.h similarity index 100% rename from src/BulletCommon/b3Vector3.h rename to src/Bullet3Common/b3Vector3.h diff --git a/src/BulletCommon/premake4.lua b/src/Bullet3Common/premake4.lua similarity index 79% rename from src/BulletCommon/premake4.lua rename to src/Bullet3Common/premake4.lua index 181bf82cd..efbb26f0e 100644 --- a/src/BulletCommon/premake4.lua +++ b/src/Bullet3Common/premake4.lua @@ -1,4 +1,4 @@ - project "BulletCommon" + project "Bullet3Common" language "C++" diff --git a/src/BulletGeometry/b3AabbUtil.h b/src/Bullet3Geometry/b3AabbUtil.h similarity index 98% rename from src/BulletGeometry/b3AabbUtil.h rename to src/Bullet3Geometry/b3AabbUtil.h index 6adc555e8..3728fd75f 100644 --- a/src/BulletGeometry/b3AabbUtil.h +++ b/src/Bullet3Geometry/b3AabbUtil.h @@ -17,9 +17,9 @@ subject to the following restrictions: #ifndef BT_AABB_UTIL2 #define BT_AABB_UTIL2 -#include "BulletCommon/b3Transform.h" -#include "BulletCommon/b3Vector3.h" -#include "BulletCommon/b3MinMax.h" +#include "Bullet3Common/b3Transform.h" +#include "Bullet3Common/b3Vector3.h" +#include "Bullet3Common/b3MinMax.h" diff --git a/src/BulletGeometry/b3ConvexHullComputer.cpp b/src/Bullet3Geometry/b3ConvexHullComputer.cpp similarity index 99% rename from src/BulletGeometry/b3ConvexHullComputer.cpp rename to src/Bullet3Geometry/b3ConvexHullComputer.cpp index 734c27dfe..b3a0e6094 100644 --- a/src/BulletGeometry/b3ConvexHullComputer.cpp +++ b/src/Bullet3Geometry/b3ConvexHullComputer.cpp @@ -15,9 +15,9 @@ subject to the following restrictions: #include #include "b3ConvexHullComputer.h" -#include "BulletCommon/b3AlignedObjectArray.h" -#include "BulletCommon/b3MinMax.h" -#include "BulletCommon/b3Vector3.h" +#include "Bullet3Common/b3AlignedObjectArray.h" +#include "Bullet3Common/b3MinMax.h" +#include "Bullet3Common/b3Vector3.h" #ifdef __GNUC__ #include diff --git a/src/BulletGeometry/b3ConvexHullComputer.h b/src/Bullet3Geometry/b3ConvexHullComputer.h similarity index 97% rename from src/BulletGeometry/b3ConvexHullComputer.h rename to src/Bullet3Geometry/b3ConvexHullComputer.h index 1b64c4006..48ce27c34 100644 --- a/src/BulletGeometry/b3ConvexHullComputer.h +++ b/src/Bullet3Geometry/b3ConvexHullComputer.h @@ -15,8 +15,8 @@ subject to the following restrictions: #ifndef BT_CONVEX_HULL_COMPUTER_H #define BT_CONVEX_HULL_COMPUTER_H -#include "BulletCommon/b3Vector3.h" -#include "BulletCommon/b3AlignedObjectArray.h" +#include "Bullet3Common/b3Vector3.h" +#include "Bullet3Common/b3AlignedObjectArray.h" /// Convex hull implementation based on Preparata and Hong /// See http://code.google.com/p/bullet/issues/detail?id=275 diff --git a/src/BulletGeometry/b3GeometryUtil.cpp b/src/Bullet3Geometry/b3GeometryUtil.cpp similarity index 100% rename from src/BulletGeometry/b3GeometryUtil.cpp rename to src/Bullet3Geometry/b3GeometryUtil.cpp diff --git a/src/BulletGeometry/b3GeometryUtil.h b/src/Bullet3Geometry/b3GeometryUtil.h similarity index 95% rename from src/BulletGeometry/b3GeometryUtil.h rename to src/Bullet3Geometry/b3GeometryUtil.h index 921accc87..c3e7cb651 100644 --- a/src/BulletGeometry/b3GeometryUtil.h +++ b/src/Bullet3Geometry/b3GeometryUtil.h @@ -16,8 +16,8 @@ subject to the following restrictions: #ifndef BT_GEOMETRY_UTIL_H #define BT_GEOMETRY_UTIL_H -#include "BulletCommon/b3Vector3.h" -#include "BulletCommon/b3AlignedObjectArray.h" +#include "Bullet3Common/b3Vector3.h" +#include "Bullet3Common/b3AlignedObjectArray.h" ///The b3GeometryUtil helper class provides a few methods to convert between plane equations and vertices. class b3GeometryUtil diff --git a/src/BulletGeometry/b3GrahamScan2dConvexHull.h b/src/Bullet3Geometry/b3GrahamScan2dConvexHull.h similarity index 97% rename from src/BulletGeometry/b3GrahamScan2dConvexHull.h rename to src/Bullet3Geometry/b3GrahamScan2dConvexHull.h index 12b0f5cd9..1ed7e796b 100644 --- a/src/BulletGeometry/b3GrahamScan2dConvexHull.h +++ b/src/Bullet3Geometry/b3GrahamScan2dConvexHull.h @@ -18,8 +18,8 @@ subject to the following restrictions: #define GRAHAM_SCAN_2D_CONVEX_HULL_H -#include "BulletCommon/b3Vector3.h" -#include "BulletCommon/b3AlignedObjectArray.h" +#include "Bullet3Common/b3Vector3.h" +#include "Bullet3Common/b3AlignedObjectArray.h" struct GrahamVector3 : public b3Vector3 {