From 7561e6a4f9ea69018bba48ddb99c8d0f9ff5d18f Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Wed, 19 Jun 2013 14:54:28 -0700 Subject: [PATCH] move build to build3 to avoid naming conflict with Bullet 2.x fix build error in BasicGpuDemo Thanks to joen66 for the report here: https://github.com/erwincoumans/bullet3/issues/5 --- Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp | 3 ++- {build => build3}/bin2cpp.bat | 0 {build => build3}/bin2cpp.lua | 0 {build => build3}/findDirectX11.lua | 0 {build => build3}/findOpenCL.lua | 0 {build => build3}/findOpenGLGlewGlut.lua | 0 {build => build3}/premake4.exe | Bin {build => build3}/premake4.lua | 0 {build => build3}/premake4_linux | Bin {build => build3}/premake4_linux64 | Bin {build => build3}/premake4_osx | Bin {build => build3}/stringify.bat | 0 {build => build3}/stringifyKernel.lua | 0 {build => build3}/stringify_linux.sh | 0 {build => build3}/stringify_osx.sh | 0 {build => build3}/vs2010.bat | 0 {build => build3}/vs2010_bullet2gpu.bat | 0 {build => build3}/xcode.command | 0 18 files changed, 2 insertions(+), 1 deletion(-) rename {build => build3}/bin2cpp.bat (100%) rename {build => build3}/bin2cpp.lua (100%) rename {build => build3}/findDirectX11.lua (100%) rename {build => build3}/findOpenCL.lua (100%) rename {build => build3}/findOpenGLGlewGlut.lua (100%) rename {build => build3}/premake4.exe (100%) rename {build => build3}/premake4.lua (100%) rename {build => build3}/premake4_linux (100%) rename {build => build3}/premake4_linux64 (100%) rename {build => build3}/premake4_osx (100%) rename {build => build3}/stringify.bat (100%) rename {build => build3}/stringifyKernel.lua (100%) rename {build => build3}/stringify_linux.sh (100%) rename {build => build3}/stringify_osx.sh (100%) rename {build => build3}/vs2010.bat (100%) rename {build => build3}/vs2010_bullet2gpu.bat (100%) rename {build => build3}/xcode.command (100%) diff --git a/Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp b/Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp index 34779a429..3beb3bc4f 100644 --- a/Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp +++ b/Demos3/BasicGpuDemo/b3GpuDynamicsWorld.cpp @@ -145,7 +145,8 @@ int b3GpuDynamicsWorld::stepSimulation( btScalar timeStepUnused, int maxSubStep if (body) { b3Vector3 pos = (const b3Vector3&)m_collisionObjects[i]->getWorldTransform().getOrigin(); - b3Quaternion orn = (const b3Quaternion&)m_collisionObjects[i]->getWorldTransform().getRotation(); + btQuaternion orn2 = m_collisionObjects[i]->getWorldTransform().getRotation(); + b3Quaternion orn(orn2[0],orn2[1],orn2[2],orn2[3]); body->integrateVelocities(fixedTimeStep); m_np->setObjectTransformCpu(&pos[0],&orn[0],i); b3Vector3 linVel = (const b3Vector3&)body->getLinearVelocity(); diff --git a/build/bin2cpp.bat b/build3/bin2cpp.bat similarity index 100% rename from build/bin2cpp.bat rename to build3/bin2cpp.bat diff --git a/build/bin2cpp.lua b/build3/bin2cpp.lua similarity index 100% rename from build/bin2cpp.lua rename to build3/bin2cpp.lua diff --git a/build/findDirectX11.lua b/build3/findDirectX11.lua similarity index 100% rename from build/findDirectX11.lua rename to build3/findDirectX11.lua diff --git a/build/findOpenCL.lua b/build3/findOpenCL.lua similarity index 100% rename from build/findOpenCL.lua rename to build3/findOpenCL.lua diff --git a/build/findOpenGLGlewGlut.lua b/build3/findOpenGLGlewGlut.lua similarity index 100% rename from build/findOpenGLGlewGlut.lua rename to build3/findOpenGLGlewGlut.lua diff --git a/build/premake4.exe b/build3/premake4.exe similarity index 100% rename from build/premake4.exe rename to build3/premake4.exe diff --git a/build/premake4.lua b/build3/premake4.lua similarity index 100% rename from build/premake4.lua rename to build3/premake4.lua diff --git a/build/premake4_linux b/build3/premake4_linux similarity index 100% rename from build/premake4_linux rename to build3/premake4_linux diff --git a/build/premake4_linux64 b/build3/premake4_linux64 similarity index 100% rename from build/premake4_linux64 rename to build3/premake4_linux64 diff --git a/build/premake4_osx b/build3/premake4_osx similarity index 100% rename from build/premake4_osx rename to build3/premake4_osx diff --git a/build/stringify.bat b/build3/stringify.bat similarity index 100% rename from build/stringify.bat rename to build3/stringify.bat diff --git a/build/stringifyKernel.lua b/build3/stringifyKernel.lua similarity index 100% rename from build/stringifyKernel.lua rename to build3/stringifyKernel.lua diff --git a/build/stringify_linux.sh b/build3/stringify_linux.sh similarity index 100% rename from build/stringify_linux.sh rename to build3/stringify_linux.sh diff --git a/build/stringify_osx.sh b/build3/stringify_osx.sh similarity index 100% rename from build/stringify_osx.sh rename to build3/stringify_osx.sh diff --git a/build/vs2010.bat b/build3/vs2010.bat similarity index 100% rename from build/vs2010.bat rename to build3/vs2010.bat diff --git a/build/vs2010_bullet2gpu.bat b/build3/vs2010_bullet2gpu.bat similarity index 100% rename from build/vs2010_bullet2gpu.bat rename to build3/vs2010_bullet2gpu.bat diff --git a/build/xcode.command b/build3/xcode.command similarity index 100% rename from build/xcode.command rename to build3/xcode.command