AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-14 05:40:05 +00:00
Code Issues Releases Wiki Activity

patch to make Bullet 2.x bridge work (should be applied soon)

Browse Source
This commit is contained in:
erwin coumans 2013-05-03 09:25:57 -07:00
parent 1185de51d5
commit 09ddf554e4
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bullet2.patch
View File

@ -406,6 +406,14 @@ Index: build/premake4.lua
- include "../Demos/HelloWorld" - include "../Demos/HelloWorld"
- include "../Demos/Benchmarks" - include "../Demos/Benchmarks"
- -
Index: build/premake4_linux
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: build/premake4_osx
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: build/vs2010.bat Index: build/vs2010.bat
=================================================================== ===================================================================
--- build/vs2010.bat (revision 2640) --- build/vs2010.bat (revision 2640)
@ -433,6 +441,22 @@ Index: Demos/OpenGL/DemoApplication.cpp
aabbMin-=btVector3(BT_LARGE_FLOAT,BT_LARGE_FLOAT,BT_LARGE_FLOAT); aabbMin-=btVector3(BT_LARGE_FLOAT,BT_LARGE_FLOAT,BT_LARGE_FLOAT);
aabbMax+=btVector3(BT_LARGE_FLOAT,BT_LARGE_FLOAT,BT_LARGE_FLOAT); aabbMax+=btVector3(BT_LARGE_FLOAT,BT_LARGE_FLOAT,BT_LARGE_FLOAT);
Index: Demos/OpenGL/DemoApplication.h
===================================================================
--- Demos/OpenGL/DemoApplication.h (revision 2640)
+++ Demos/OpenGL/DemoApplication.h (working copy)
@@ -149,6 +149,11 @@
{
m_azi = azi;
}
+
+ void setEle(float ele)
+ {
+ m_ele = ele;
+ }
void setCameraUp(const btVector3& camUp)
{
Index: src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp Index: src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
=================================================================== ===================================================================
--- src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (revision 2640) --- src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (revision 2640)