Commit Graph
100 Commits
Author SHA1 Message Date
erwincoumans 99c41f3c4d Merge pull request #479 from erwincoumans/master
improvements to the shared memory physics API:
2015-09-24 23:05:04 -07:00
erwincoumans e5e71bebc9 Merge pull request #476 from erwincoumans/master
fix warning
2015-09-17 13:50:42 -07:00
erwincoumans cb13054f2e Merge pull request #465 from cameronwhite/conetwist-motor
Use the max motor impulse for cone twist constraints when the motor is enabled.
2015-09-10 18:08:19 -07:00
erwincoumans 9b9ec21a5f Merge pull request #475 from erwincoumans/master
fix some warnings, re-enable ground in URDF import example, fix COLLADA up axis issue in URDF collision element
2015-09-10 18:06:48 -07:00
erwincoumans 3025ad4536 Merge pull request #474 from erwincoumans/master
fixes in shared memory client/server: check for valid pointers
2015-09-09 17:30:28 -07:00
erwincoumans e4b5f4730d Merge pull request #473 from takuyanakaoka/detach-shared-mem
Detach posix shared memory correctly
2015-09-09 15:13:27 -07:00
erwincoumans c99f4057fe Merge pull request #472 from erwincoumans/master
run the PhysicsServerExample 'stepSimulation' smoother, fix a few warnings
2015-09-08 14:32:08 -07:00
erwincoumans 9e7f8e614b Merge pull request #470 from erwincoumans/master
add picking to shared memory physics server
2015-09-05 13:12:05 -07:00
erwincoumans b5edc75161 Merge pull request #469 from erwincoumans/master
Debug lines for Shared Memory Physics Server, preparation for IMU sensor
2015-09-04 10:37:04 -07:00
erwincoumans 3a262d0b7c Merge pull request #467 from erwincoumans/master
fix some warnings
2015-08-27 18:42:32 -07:00
erwincoumans d07e1082bc Merge pull request #462 from erwincoumans/master
add a robot joint sensor example, reading joint reaction forces/torqu…
2015-08-26 14:25:13 -07:00
erwincoumans 10de7db29a Merge pull request #461 from erwincoumans/master
simple multithreading test (empty skeleton)
2015-08-24 10:25:02 -07:00
Erwin Coumans 9ec08592b6 fix a copy/paste typo, thanks Roland! 2015-08-21 18:18:12 -07:00
erwincoumans 83c4d25819 Merge pull request #460 from erwincoumans/master
initial implementation to send debug lines from physics server to client
2015-08-20 19:47:23 -07:00
erwincoumans 081a40d254 initial implementation to send debug lines from physics server to client,
need to add streaming because memory is too small to store all lines
initial test of PD control in physics server, need to switch to PD control for motor constraint, instead of using external forces.
2015-08-19 22:51:16 -07:00
Erwin Coumans 9c71a0bb7a Google Code -> github in btCollisionWorld.h documentation 2015-08-12 21:16:23 -07:00
erwincoumans 6c2419323e Merge pull request #458 from erwincoumans/master
add Bullet logos in the docs/logo folder
2015-08-12 20:15:24 -07:00
Erwin Coumans 97e9052aaa add Bullet logos in the docs/logo folder 2015-08-12 20:14:30 -07:00
erwincoumans a4b050e31e Update README.md 2015-08-11 09:17:42 -07:00
erwincoumans 7ff74f40df Update README.md 2015-08-11 09:15:06 -07:00
erwincoumans dd1d096e43 Merge pull request #456 from erwincoumans/master
update tutorial for SIGGRAPH course
2015-08-11 09:02:03 -07:00
Erwin Coumans 2721d67634 remote unused TEST macro, conflicts with other libraries 2015-08-11 08:35:52 -07:00
Erwin Coumans d08a7af7e2 fix compile issue in double precision build 2015-08-10 14:49:52 -07:00
Erwin Coumans f89d587a02 update tutorial for SIGGRAPH course
allow multiple graphing windows at the same time
2015-08-10 14:30:00 -07:00
erwincoumans 72e22f480b Merge pull request #455 from erwincoumans/master
Improved simple TimeSeriesCanvas
2015-08-07 16:44:18 -07:00
Erwin Coumans edaa92c286 fix retina API 2015-08-07 16:21:33 -07:00
Erwin Coumans 3c0e67298a add command-line option --disable_retina for Mac
improve TimeSeries and Dof6ConstaintTutorial
2015-08-07 16:05:03 -07:00
erwincoumans de4dcdbb18 more tutorial work
add fixed_timestep command-line parameter, 0 means disabled (variable timestep)
2015-08-07 14:18:57 -07:00
erwincoumans 89c2a729ce Improved simple TimeSeriesCanvas
Fixes in RobotControlExample
Disable gravity by default in PhysicsServer
2015-08-07 13:17:33 -07:00
erwincoumans 8e62a5ed10 Merge pull request #452 from erwincoumans/master
add command-line argument for example browser and shared memory app, …
2015-08-07 00:21:15 -07:00
Erwin Coumans 03d991c92b add command-line argument for example browser and shared memory app, --shared_memory_key=<int>
fix some shared memory issues, client uses attach/detach, server uses create/remove shared memory
implement CMD_RESET_SIMULATION
2015-08-07 00:13:26 -07:00
erwincoumans d93b00fa39 Merge pull request #451 from erwincoumans/master
shared memory fixes
2015-08-06 12:35:40 -07:00
Erwin Coumans dcab0e2b1f use multibody by default when using FILE/Open URDF (instead of maximal coordinate rigid body+typed constraints) 2015-08-06 00:35:03 -07:00
erwincoumans 12d8c676a4 Merge pull request #449 from erwincoumans/master
start with Tutorial file for rigid body course, improve graphics, enable texturing, fix shaders
2015-08-05 22:16:45 -07:00
erwincoumans 5853d071fb Merge pull request #445 from erwincoumans/master
improve usability of ExampleBrowser
2015-08-05 10:09:42 -07:00
Erwin Coumans 250068d5eb re-enable enter key in example browser 2015-08-04 22:03:53 -07:00
erwincoumans b316f30040 improve usability of ExampleBrowser
store command-line arguments in bulletDemo.txt
save/load of configuration, save demo name instead of index
add setBackgroundColor as example (background_color_red) and
mouse move/wheel speed config (mouse_wheel_multiplier and mouse_move_multiplier)
(saved after changing the demo)
default btIDebugDraw colors can be changed
b3CommandLineArgs::GetCmdLineArgument returns bool, and b3CommandLineArgs::addArgs added
fix copy/paste
2015-08-04 18:24:30 -07:00
erwincoumans 5e956154ce Merge pull request #444 from AndrewMeadows/btCompoundShape-with-protected-data-memebers
Make btCompoundShape data members protected instead of private
2015-08-03 17:00:23 -07:00
erwincoumans 9d7d5caa8b Merge pull request #404 from donggas90/master
Improve Compound Shape Construction.
2015-08-03 08:49:30 -07:00
erwincoumans 88961b9e6f Merge pull request #443 from erwincoumans/master
further work on shared memory API
2015-08-02 19:36:29 -07:00
erwincoumans 49a89ab0e7 fix SharedMemory/test.c compile errors 2015-08-02 19:10:42 -07:00
erwincoumans 29e0488fec Merge pull request #438 from erwincoumans/master
small progress towards shared memory C-api and test.c.
2015-07-31 10:07:24 -07:00
erwincoumans 19c5be5646 small progress towards shared memory C-api and test.c. 2015-07-30 23:22:44 -07:00
erwincoumans 63150432e0 Merge pull request #436 from erwincoumans/master
minor refactoring,update stb_truetype, disable gimpact by default in btWorldImporter
2015-07-27 13:41:26 -07:00
Erwin Coumans ad03dba2fa update stb_truetype.h to latest from
https://raw.githubusercontent.com/nothings/stb/master/stb_truetype.h
2015-07-23 23:17:58 -07:00
Erwin Coumans e6859bde13 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2015-07-23 18:37:14 -07:00
Erwin Coumans 346bc00ac7 add kuka_lwr urdf file for testing, the r2d2 gets boring 2015-07-23 18:36:46 -07:00
erwincoumans f866142ebe Merge pull request #435 from erwincoumans/master
fix various warnings, more work on shared memory API
2015-07-23 11:11:21 -07:00
erwin coumans 0fe6d343bc move m_updateFlags to command, and make it 64bit 2015-07-23 10:51:09 -07:00
erwincoumans c812fce343 Merge pull request #434 from erwincoumans/master
add xacro_standalone.py, more work on Shared Memory client/server
2015-07-22 11:37:21 -07:00
Erwin Coumans fd1c00dbb2 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2015-07-21 21:48:54 -07:00
Erwin Coumans 05fc203ec1 Separate SharedMemoryStatus from SharedMemoryCommand
Added CMD_CMD_SEND_PHYSICS_SIMULATION_PARAMETERS (set gravity as example)
and CMD_INIT_POSE, not fully implemented yet.
2015-07-21 21:46:28 -07:00
erwincoumans eb8acf3689 Merge pull request #433 from erwincoumans/master
allow to control of powered joints after loading a URDF file, through…
2015-07-20 23:44:20 -07:00
Erwin Coumans 8e163c984d allow to control of powered joints after loading a URDF file, through shared memory
more refactor of shared memory joint control API
2015-07-20 23:35:29 -07:00
erwincoumans 9bbc88cbe1 Merge pull request #432 from erwincoumans/master
add Inverted Pendulum example with PD control
2015-07-17 00:15:44 -07:00
erwincoumans 68b53feb9c add Inverted Pendulum example with PD control 2015-07-16 23:58:36 -07:00
erwincoumans 0b96d0f14d Merge pull request #430 from erwincoumans/master
add prismatic.urdf test file and revert to r2d2.urdf in import example
2015-07-15 17:52:32 -07:00
Erwin Coumans 26e175013d add prismatic.urdf test file and revert to r2d2.urdf in import example 2015-07-15 17:51:49 -07:00
erwincoumans 78bd53a531 Merge pull request #429 from erwincoumans/master
fix some out-of-date comments in btMultiBody, thanks to Thomas Buschmann
2015-07-15 17:50:09 -07:00
Erwin Coumans 7698d5f95c fix some out-of-date comments in btMultiBody, thanks to Thomas Buschmann
disable disactivation for btRigidBody in import urdf demo, increase strength of joint motor for btMultiBody
2015-07-15 17:39:43 -07:00
erwincoumans b8e07e6a55 Merge pull request #428 from erwincoumans/master
add very simple (rudimentary) time series graphing example
2015-07-15 16:07:38 -07:00
erwin coumans b563c7c8ce add additional example using server and client for future simple robot control of simulated robot
(load urdf, get state, set desired state, step simulation)
Create SharedMemoryCommand and put that into the queue
move arrays for Q, Qdot etc into the command
2015-07-15 15:23:40 -07:00
erwin coumans 80f8f940b3 add Time Series example to cmake build file. 2015-07-15 13:02:20 -07:00
erwin coumans 259bcb1989 mix physics client/server into a single example for easier/faster development of shared memory experiment
add premake option to choose targetdir for binaries/libraries
add simple hinge.urdf file
2015-07-15 12:57:45 -07:00
Erwin Coumans a6fa717dac add very simple (rudimentary) time series graphing example
tweak camera near plane distance, less sensitive mouse wheel
2015-07-15 09:07:47 -07:00
erwincoumans 8f87ccee88 Merge pull request #426 from erwincoumans/master
Refactor of PhysicsClient/PhysicsServer, to separate from the example…
2015-07-14 17:00:34 -07:00
erwin coumans 54a76f6e0c Refactor of PhysicsClient/PhysicsServer, to separate from the example browser code.
(as usual, work-in-progress)
2015-07-14 15:30:17 -07:00
erwincoumans 6836121e29 Merge pull request #425 from erwincoumans/master
implement preliminary CMD_SEND_DESIRED_STATE with CONTROL_MODE_VELOCI…
2015-07-14 10:09:37 -07:00
erwincoumans 70837d2d0b Merge pull request #424 from erwincoumans/master
some improvements for ExampleBrowser (--demo-name="Basic Example, shared memory experiment etc)
2015-07-12 15:09:28 -07:00
erwincoumans 51ec862582 Merge pull request #421 from erwincoumans/master
fix shadowmap crash on some Intel GPUs, see https://github.com/bullet…
2015-07-12 14:17:56 -07:00
erwincoumans 6c9ce344ea fix shadowmap crash on some Intel GPUs, see https://github.com/bulletphysics/bullet3/issues/4
remove targetdir from all libraries in premake, so it is much easier to create a separate folder for all binary+lib
transmit the serialized btMultiBody data back from server to client, after the server loads a URDF file. This includes base+link+joint names
tweak the serialization routines, so it is easier to skip pointers and to serialize directly to a shared memory buffer
also tweak the serialization code to allow to process data without 'DNA' schema data (assuming file-DNA = memory DNA)
2015-07-10 22:20:06 -07:00
erwincoumans ae3e392b69 Merge pull request #420 from erwincoumans/master
some work towards streaming Bullet data over shared memory for client…
2015-07-09 18:19:59 -07:00
erwincoumans f6f76901fd First draft of btMultiBody serialization, including optional names for base, link and joints (see ImportURDFDemo/ImportURDFSetup.cpp how this is done)
Bump up version number to 2.84 because of new serialization data.
2015-07-09 17:36:00 -07:00
erwincoumans 285ac286fa some work towards streaming Bullet data over shared memory for client/server 2015-07-09 14:04:58 -07:00
erwincoumans c293c3df8f Update btQuickprof.cpp 2015-07-08 23:22:41 -07:00
erwincoumans 4366070611 Update btQuickprof.cpp
deal with Windows XP users, see https://github.com/bulletphysics/bullet3/issues/289#issuecomment-119133169
2015-07-08 22:28:20 -07:00
erwincoumans 187edd7a66 Merge pull request #419 from erwincoumans/master
add forceFixedBase option for URDF import example
2015-07-07 16:17:10 -07:00
erwincoumans b2fc337544 Merge pull request #418 from erwincoumans/master
expose btMultiBodyConstraint applied impulse (force) on its degree of…
2015-07-07 09:01:55 -07:00
erwincoumans 7ef36ea8b9 Merge pull request #417 from erwincoumans/master
apply newForceTorque.diff patch: it will allow to report
2015-07-06 16:54:16 -07:00
erwincoumans 841a7fcd88 Merge pull request #415 from erwincoumans/master
fix various warning
2015-07-03 19:01:33 -07:00
erwincoumans 4630d0abb1 fix windows build for b3ResourcePath
replace print -> b3Printf in URDF2Bullet.cpp
2015-07-03 18:54:41 -07:00
erwincoumans 4a9441c5fd Merge pull request #414 from erwincoumans/master
add alternative URDF parser that doens't use ROS urdf
2015-07-02 11:30:06 -07:00
erwincoumans e7bafbc71c make Bullet URDF parser more similar to the ROS URDF parser. There is still a difference in ordering of links,
due to the use of different hash-map implementations, with a difference in iterator order
(btHashMap versus std::hashmap)
2015-06-29 21:30:44 -07:00
Erwin Coumans 3fbe9f63ef more case-sensitivity fixes 2015-06-28 22:12:59 -07:00
Erwin Coumans 5d44d596ed fix build system (case sensitive filename) 2015-06-28 22:00:03 -07:00
Erwin Coumans f8add8bba0 fixes in build system for URDF parser 2015-06-28 21:21:57 -07:00
Erwin Coumans 039174a809 add alternative URDF parser that doens't use ROS urdf 2015-06-28 14:09:21 -07:00
erwincoumans 3da6763371 Merge pull request #411 from erwincoumans/master
more work on btMultiBody joint force/torque feedback, velocity target control for rigid body urdf importer
2015-06-26 13:00:38 -07:00
Erwin Coumans 6a282601cf Merge remote-tracking branch 'bp/master' 2015-06-24 23:46:54 -07:00
Erwin Coumans bdab994208 re-enable gravity for import urdf demo (accidently turned it off for debugging) 2015-06-24 23:27:50 -07:00
Erwin Coumans d830681674 add option for rigid body/typed constraint to set target velocity
compare joint feedback between multi body and rigid body. initial results are promising (not exactly the same, but reasonably close)
2015-06-24 23:19:00 -07:00
Erwin Coumans 4688540a98 minor update for shared memory interface 2015-06-21 13:24:36 -07:00
erwincoumans 0a086c8492 Merge pull request #410 from erwincoumans/master
support joint force/torque feedback for btMultiBody internal joints (mobilizers)
2015-06-20 21:43:32 -07:00
erwincoumans 89edc40d61 First step in btMultiBody joint force/torque feedback. There is still some work to be done for 'mobilizer limit/motor'.
See examples/MultiBody/TestJointTorqueSetup and examples/Constraints/TestHingeTorque for joint feedback.
2015-06-19 09:18:27 -07:00
erwincoumans 1fa4819afc Merge pull request #408 from erwincoumans/master
more work on shared memory example (still preliminary), and fix of infinite recursion in 'getMargin'
2015-06-11 12:16:30 -07:00
erwin coumans 2d79dda032 prepare for joint/torque feedback. First for btRigidBody, then btMultiBody. 2015-06-09 18:13:05 -07:00
erwin coumans 2c3db1c631 Add a "add button" option in the CommonParameterInterface and implement it for Gwen.
Add some buttons for shared memory requests in the PhysicsClient
2015-06-09 16:51:55 -07:00
erwincoumans 2c6cf94bdf Merge pull request #397 from erwincoumans/master
simple lua script test, fix relative path issue in urdf importer
2015-06-05 14:47:51 -07:00
erwin coumans a94ac6300a add Windows version of shared memory, very basic implementation (only allows one single allocation) 2015-06-04 15:37:18 -07:00
Erwin Coumans f74e3782aa enable prismatic joint motor in URDF demo, by default. Thanks to Takuya!
prepare for prismatic joint limit for btMultiBody in the URDF demo.
There is an issue with it, working on fixing this.
2015-06-03 18:02:15 -07:00