Commit Graph
2103 Commits
Author SHA1 Message Date
Erwin Coumans 8c0913d96b Merge remote-tracking branch 'bp/master' 2017-12-01 10:25:43 -08:00
Erwin Coumans c556ad651d expose pybullet 'enableConeFriction' to switch between pyramid and cone friction model. 2017-12-01 10:07:07 -08:00
Erwin Coumans e1df1534f3 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-11-30 13:11:39 -08:00
erwincoumans aa82003174 Update btMultiBodyConstraintSolver.h 2017-11-29 10:53:29 -08:00
erwincoumans e76804173a Merge pull request #1463 from erwincoumans/master
fixes related to torsional friction, due to recent cone friction update.
2017-11-28 21:18:57 -08:00
erwincoumans 8ff75e11cd fixes related to torsional friction, due to recent cone friction update. 2017-11-28 20:09:56 -08:00
Erwin Coumans b031ba0333 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-11-28 11:52:07 -08:00
Joey Liaw bbc536d887 add const to masses for calculatePrincipalAxisTransform 2017-11-25 13:33:26 -08:00
erwincoumans e6e3da11e5 Implement true implicit friction cone, instead of friction pyramid, for btMultiBody vs btMultiBody and btMultiBody vs btRigidBody
See data/sphere_small_zeroinertia.urdf for an example.
2017-11-23 17:38:23 -08:00
erwincoumans 29aa9cb789 Bullet bump up to version 2.88
add preliminary support to import btMultiBody from a .bullet file (will help save/restore state)
fix some Windows char/widechar issues
2017-11-22 18:12:02 -08:00
Erwin Coumans b468f7c07b Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-11-16 10:48:37 -08:00
erwincoumans 6214ce5f93 Merge pull request #1431 from kwasimensah/master
Fix MACROS for when BT_THREADSAFE is defined
2017-11-15 17:57:22 -08:00
Erwin Coumans 04aa7cc24d Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-11-12 22:05:50 -08:00
kwasimensah 2f58cf0d00 Fix MACROS for when BT_THREADSAFE is defined 2017-11-12 00:48:59 -05:00
erwincoumans 99f9584a2c revert #1419 broken pull request https://github.com/bulletphysics/bullet3/pull/1419 2017-11-11 21:24:49 -08:00
Erwin Coumans 13f0c1ad8b Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-11-10 16:36:22 -08:00
erwincoumans d45cc49a90 Merge pull request #1421 from elect86/master
Update btTriangleIndexVertexArray.h
2017-11-09 12:09:33 -08:00
erwincoumans d6b3f735b6 fix a bug related to joint reaction forces (clearMultiBodyConstraintForces was clearing forces after they were computed in some cases) 2017-11-09 10:46:13 -08:00
Erwin Coumans e261d55cee Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-11-08 22:19:12 -08:00
erwincoumans 89ada39a86 Merge pull request #1424 from erwincoumans/master
expose COV_ENABLE_Y_AXIS_UP, obj2sdf, add option to merge shapes (better performance), tiny_obj_loader support transparency ("d" and "Tr")
2017-11-07 20:29:15 -08:00
erwincoumans ee2f56875d Merge pull request #1419 from kwasimensah/master
Update support for buggy android NDK
2017-11-07 19:55:38 -08:00
Erwin Coumans 378020f864 divide by numWheelsOnGround, see hiker/https://github.com/bulletphysics/bullet3/issues/1400 2017-11-07 19:41:14 -08:00
Erwin Coumans 344005a8f0 catch invalid mass/inertia instead of division by zero/nan. also, avoid indexing <0 2017-11-07 19:25:14 -08:00
Giuseppe Barbieri 16ed6ec10b Update btTriangleIndexVertexArray.h 2017-11-04 12:06:45 +01:00
kwasimensah 8aefa7e8d0 Updating Macros
Don't take away ability to do profiling on MacOS
2017-11-03 11:59:12 -04:00
erwincoumans 62f4737bb1 Merge pull request #1417 from elect86/master
Update btContinuousConvexCollision.h
2017-11-03 08:11:37 -07:00
kwasimensah e03383e612 Update support for buggy android NDK
Expand logic for when __thread is supported to work around https://github.com/android-ndk/ndk/issues/8
2017-11-02 15:35:59 -04:00
Giuseppe Barbieri 9d50a167b0 Update btContinuousConvexCollision.cpp 2017-11-01 23:29:50 +01:00
Giuseppe Barbieri 5436336a38 Update btStaticPlaneShape.cpp 2017-11-01 22:53:39 +01:00
Giuseppe Barbieri 5e017a1e4d Update btContinuousConvexCollision.h 2017-11-01 22:32:48 +01:00
Erwin Coumans 32312e60a8 Merge remote-tracking branch 'bp/master' 2017-10-29 12:28:00 -07:00
d3x0r 88b49947b5 Composite of fixed code for mingw64(on windows) and general fixes for msvc.
1) (win32window) don't convert char to wide, use char direct to window.
2) (CMakeLists) Don't link one library as static CPPLIB and no others (mismatched allocations)
3) (macros) Fix Gwen macros for mingw64 on windows build.  (changes are by compiler(msc_ver) not platform)
4) (FileUtils) sprintf_s reference by platform, not compiler (mingw64 support)
5) (b3OpenCLUtils) fix bad define name _MSVC_VER->_MSC_VER
6) (compoundCollision) remove unused variables, simplify operation.
7) (impulseconstraint) remove duplicated code block
2017-10-28 14:42:38 -07:00
Erwin Coumans a5a73ba0d8 fix for issue 1400
use default output name for VHACD test binary
2017-10-26 08:11:58 -07:00
erwincoumans d05ad4b821 Merge pull request #1394 from davilovick/master
Optimize rayTest with btScaledBvhTriangleMeshShape
2017-10-24 00:33:07 +00:00
erwincoumans 931cee06fc Merge pull request #1388 from ShFil119/master
Fix jump(without argument)
2017-10-24 00:31:13 +00:00
erwincoumans a50a20ab9f Merge pull request #1383 from AndreaCatania/master
Customize restitution and friction
2017-10-23 21:00:18 +00:00
David Ávila 88758e44cb Add comments to btCollisionWorld 2017-10-23 08:50:24 +02:00
David Ávila Membrives 2cc9ff2176 Optimize rayTest with btScaledBvhTriangleMeshShape 2017-10-19 22:55:18 +02:00
Erwin Coumans c480fab9a0 make btMultiBodyFixedConstraint.cpp linear/angular constraint frame consistent 2017-10-18 19:47:32 -07:00
Filip Gawin 250c7d4407 Fix jump(without argument)
Actually jump require btVector3,
unfortunately default argument isn't using
constructor with initialization.

http://bulletphysics.org/Bullet/BulletFull/classbtVector3.html#a82b4c5da54ecd4c91bd9b056dea0d288
2017-10-18 10:31:45 +02:00
AndreaCatania 45558fc25a Implemented callbacks to customize combining algorithm of Friction, Restitution, etc.. 2017-10-15 11:42:02 +02:00
Erwin Coumans c21e7a8a8e fix potentially uninitialized data warning 2017-10-14 10:16:33 -07:00
Giuseppe Barbieri b81252fbc4 Update btVector3.h 2017-10-08 10:49:20 +02:00
erwincoumans fe38e827cd Merge pull request #1363 from elect86/patch-1
Typo
2017-10-07 16:33:12 -07:00
Giuseppe Barbieri 8755f51bec Typo 2017-10-07 16:58:38 +02:00
Giuseppe Barbieri b31f372e3b Typo 2017-10-07 13:47:34 +02:00
erwincoumans 6e4707df5f Merge pull request #1349 from piluke/patch-1
Fix a shadow warning by renaming a parameter in btInfMaskConverter
2017-09-29 16:20:39 -07:00
Luke 1360641ad9 Fix a shadow warning by renaming a parameter in btInfMaskConverter 2017-09-29 15:44:14 -05:00
Erwin Coumans abdcb0a5a1 remove b3GjkPairDetector.cpp from cmake 2017-09-29 12:53:34 -07:00
erwincoumans a632b6c6a4 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2017-09-29 08:01:11 -07:00