Commit Graph

3788 Commits

Author SHA1 Message Date
yunfeibai
cbeddfc897 Modify shared memory client example to test joint motor torque measurement. 2016-04-19 16:52:47 -07:00
yunfeibai
c384383250 Merge branch 'master' of https://github.com/bulletphysics/bullet3
Update measured torque name.
2016-04-19 14:20:28 -07:00
yunfeibai
c3afbf7689 set desired position target 2016-04-19 14:19:18 -07:00
erwincoumans
fe5899ebfc Merge pull request #604 from erwincoumans/master
rename m_jointForce -> m_jointMotorForce to separate the name from m_…
2016-04-19 13:06:12 -07:00
Erwin Coumans
0f5ee7a0a9 rename m_jointForce -> m_jointMotorForce to separate the name from m_jointForceTorque (which should have been called m_jointReactionForce) 2016-04-19 12:22:38 -07:00
erwincoumans
05845d7df9 Merge pull request #602 from erwincoumans/master
handle window closing in InProcessPhysicsClientSharedMemoryMainThread
2016-04-19 10:58:13 -07:00
erwincoumans
9fa7356d28 Merge pull request #603 from YunfeiBai/master
Add measured joint motor force to joint sensor state.
2016-04-19 10:57:56 -07:00
yunfeibai
f9719e2405 Add measured joint motor force to joint sensor state. 2016-04-19 10:44:59 -07:00
Erwin Coumans
bebe9a728b handle window closing in InProcessPhysicsClientSharedMemoryMainThread 2016-04-19 08:29:20 -07:00
erwincoumans
f05bef2ea3 Merge pull request #601 from erwincoumans/master
fix scaling in URDF importer
2016-04-18 21:57:01 -07:00
Erwin Coumans (Google)
3a8ffebc28 fix possible division-by-zero if the profiler gui is called before stepSimulation is proceeding. 2016-04-18 21:43:42 -07:00
Erwin Coumans
476eb342ab fix scaling in URDF importer 2016-04-18 17:41:54 -07:00
erwincoumans
889a113cca Merge pull request #598 from erwincoumans/master
run GUI on main thread for Mac OSX/__APPLE__, due to OS limitation
2016-04-14 12:56:44 -07:00
Erwin Coumans
59e0bef988 remove compile errors and some debug code in ExampleBrowser. 2016-04-14 12:19:55 -07:00
Erwin Coumans
2cbfeb9590 run GUI on main thread for Mac OSX/__APPLE__, due to OS limitation
add b3CreateInProcessPhysicsServerAndConnectMainThread to test.c
2016-04-14 08:51:20 -07:00
erwincoumans
4dfbd2525f Merge pull request #597 from erwincoumans/master
add joint damping in PhysicsServerCommandProcessor, add some comments
2016-04-13 17:35:44 -07:00
Erwin Coumans
0ca56e756f add joint damping in PhysicsServerCommandProcessor 2016-04-13 17:21:43 -07:00
Erwin Coumans
4df7257250 more comments in SharedMemory C API 2016-04-13 17:09:48 -07:00
erwincoumans
5181592459 Merge pull request #595 from erwincoumans/master
add a few lines of documentation and some error checks in SharedMemor…
2016-04-13 13:43:52 -07:00
Erwin Coumans
34e6eb4a18 add a few lines of documentation and some error checks in SharedMemory API 2016-04-13 13:06:15 -07:00
erwincoumans
31eb3ea7c3 Merge pull request #594 from erwincoumans/master
fix some memory leaks in ImportURDF / PhysicsServerCommandProcessor
2016-04-11 17:00:13 -07:00
Erwin Coumans
f3c7f30684 fix some memory leaks in ImportURDF / PhysicsServerCommandProcessor 2016-04-11 16:42:02 -07:00
erwincoumans
920af5e127 Merge pull request #591 from erwincoumans/master
re-enable command log and playback in physics server, report applied motor torque
2016-04-08 18:29:01 -07:00
Erwin Coumans
59b32b7af1 re-enable command log and playback in physics server
report applied motor torque in physics server
2016-04-08 18:17:17 -07:00
erwincoumans
0c1a4551c4 Merge pull request #587 from erwincoumans/master
fix char -> int, to allow check with -1, some build systems fail
2016-03-31 16:28:43 -07:00
Erwin Coumans
d2793ec5c0 fix char -> int, to allow check with -1, some build systems fail
to make char a signed char
fix unused variable
removed duplicate header files in Gwen/Controls/Layout
2016-03-31 12:52:04 -07:00
erwincoumans
d5aa09cee5 Merge pull request #586 from erwincoumans/master
premake: disable linking system OpenGL and X11 by default,
2016-03-30 22:00:17 -07:00
Erwin Coumans
6c0ef7e597 fix resize issue on Linux, using i3 window manager on Linux
fix uninitialize modified key (ALT etc) on Linux/X11
2016-03-30 21:45:20 -07:00
Erwin Coumans
5c1eb2ec07 support 'world' tag for fixed objects in URDF 2016-03-30 14:43:59 -07:00
Erwin Coumans
84a136534a add preliminary Android build files for Bullet
add SimpleOpenGL3 example and show how to override
keyboard, mouse, wheel, resize callbacks
2016-03-27 10:21:05 -07:00
Erwin Coumans
7d72f23711 premake: disable linking system OpenGL and X11 by default,
use dlopen to dynamically load GL/X11
2016-03-24 21:15:49 -07:00
erwincoumans
df3ddaca5e Merge pull request #585 from erwincoumans/master
btMultiBody joint friction/damping infrastructure
2016-03-17 16:29:40 -07:00
Erwin Coumans
643cf5ab1d Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-03-17 16:12:48 -07:00
Erwin Coumans
7e4dfb7207 remove SimpleOpenGL3 demo, it breaks some builds
reset callback to 0 after exiting a demo to avoid issues
2016-03-17 16:11:53 -07:00
erwincoumans
fe92de3e50 add infrastructure float btMultiBodyLink m_jointDamping, m_jointFriction (actual damping/friction is in a separate commit)
add door.urdf for testing damping/friction
2016-03-17 14:54:46 -07:00
Erwin Coumans
937b6d84e5 re-enable --enable_experimental_opencl flag for
premake build of App_BulletExampleBrowser
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
(not enabled when using cmake!)
2016-03-16 09:02:39 -07:00
Erwin Coumans
6c9815c8f9 fix axis in r2d2.urdf
enable SimpleOpenGL3 demo for CMake
2016-03-16 08:13:53 -07:00
erwincoumans
857a4e98e8 Merge pull request #584 from erwincoumans/master
turn test/SharedMemory/test.c into a gtest for CI unit testing in github
2016-03-15 23:15:18 -07:00
Erwin Coumans
aa3daaa8c6 turn test/SharedMemory/test.c into a gtest for CI unit testing in github
remove overly verbose printfs in importers
fix axis in r2d2.urdf
2016-03-15 22:47:53 -07:00
erwincoumans
bc0717e3de Merge pull request #583 from erwincoumans/master
fixes in SharedMemory unit test, premake build issue on Linux
2016-03-15 19:08:27 -07:00
Erwin Coumans
005ef9d2f1 fixes in SharedMemory unit test, premake build issue on Linux 2016-03-15 18:29:32 -07:00
erwincoumans
2ef8669e75 Merge pull request #581 from erwincoumans/master
Use higher precision GJK/EPA collision tolerances in double precision mode. Fix Lua example
2016-03-12 08:58:16 -08:00
Erwin Coumans
87e5128ba8 fix some typos (need to merge into a single implementation later!) 2016-03-11 17:47:00 -08:00
erwincoumans
de3b6c31c1 Merge pull request #560 from bmcorser/patch-1
Typo in README
2016-03-10 23:42:20 -08:00
erwincoumans
4113293301 Merge pull request #580 from hujiajie/master
Fix ternary selection operator on float scalars in OpenCL kernels.
2016-03-10 23:37:55 -08:00
Erwin Coumans
625ea96a3e accidently moved line in wrong place 2016-03-10 23:28:02 -08:00
Erwin Coumans
ea6ecd3579 Use higher precision GJK/EPA collision tolerances in BT_USE_DOUBLE_PRECISION
See https://raw.githubusercontent.com/billhoffman/bullet-pod/ac6aae3e3ee8137de484471094a65bfe166898b4/bullet_gjk_accuracy_patch.diff
2016-03-10 23:12:22 -08:00
Erwin Coumans
c69524be9e fix Lua example 2016-03-10 21:15:23 -08:00
hujiajie
3ed7ecbb58 Fix ternary selection operator on float scalars in OpenCL kernels.
According to Section 6.3(i) of the OpenCL 1.1 specification, the first
expression of the operator cannot be a float.
2016-03-11 09:40:40 +08:00
erwincoumans
c30c10b906 Merge pull request #579 from erwincoumans/master
Allow InProcessExampleBrowser to use a malloc allocated memory block,…
2016-03-10 15:07:40 -08:00