Bart/bullet3
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,391 Commits 10 Branches 0 Tags
12d8c676a4ba70fa1ed8009230aee13804dd1e6d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
erwincoumans 8005b7167e Update README.md 
trigger a new build
 2015-05-27 16:12:45 -07:00
erwincoumans 8c0727bf95 Merge pull request #392 from GaborPuhr/master 
Auto limitation of spring stiffness and damping in btGeneric6DofSprin…
 2015-05-27 13:06:41 -07:00
erwin c9a630e7c6 rename loadUrdf -> loadMultiBodyFromUrdf in lua script 
remove unused m_usrd2mblink
 2015-05-14 09:16:13 -07:00
erwin e196ed1edb load a urdf in the lua script test 2015-05-13 21:54:00 -07:00
Erwin Coumans 91252db59a fix Lua example 2015-05-13 16:27:58 -07:00
Erwin Coumans dbae21ae5a prepare for some basic lua scripting example 2015-05-13 09:17:59 -07:00
erwincoumans a34d04d211 Merge pull request #382 from erwincoumans/master 
Update .travis.yml, add iOS support
 2015-05-13 08:31:17 -07:00
Erwin Coumans 074b869a9f enable premake4 option --ios and Test_LinearMath 
usage: ./premake4_osx --ios xcode4
open xcode4ios/0_Bullet3Solution.xcworkspace
 2015-05-12 09:17:27 -07:00
erwincoumans 21430f7d44 Update .travis.yml 
add '- sudo make install' and hope it works on Travis' OSX machines too.
 2015-05-08 14:36:09 -07:00
erwincoumans 30ebb32228 Merge pull request #381 from erwincoumans/master 
test again, for mac travis support
 2015-05-07 15:55:39 -07:00
erwincoumans c4f6303a0a Update .travis.yml 2015-05-07 15:13:20 -07:00
erwincoumans 0e91358e66 attempt to get osx and linux support for travis: disable linux specific things 2015-05-07 15:12:23 -07:00
erwincoumans 4e588d2887 Merge pull request #378 from erwincoumans/master 
try if we can get OSX support with travis
 2015-05-07 14:09:54 -07:00
erwincoumans 525a8ad390 Merge pull request #376 from erwincoumans/master 
fix Yosemite build
 2015-05-07 13:32:03 -07:00
erwincoumans 2a50dae011 Merge pull request #375 from erwincoumans/master 
don't use glSwapAPPLE, it fails on some OSX versions
 2015-05-06 18:44:05 -07:00
erwincoumans 2199a9fa71 Merge pull request #374 from erwincoumans/master 
add simple 3d debug text for OpenGL2 in example browser
 2015-05-06 17:14:50 -07:00
erwincoumans 619cfa2f15 Merge pull request #373 from erwincoumans/master 
disable building examples on old Mac OSX version (no OpenGL3) and fix for https://github.com/bulletphysics/bullet3/issues/372
 2015-05-06 12:36:12 -07:00
erwincoumans 80a2167870 Merge pull request #369 from erwincoumans/master 
use wall-time delta time for examples, fix btDbvt (disable memmove)
 2015-05-04 17:22:46 -07:00
Erwin Coumans 3da8dbce1c disable memmove in btDbvt 
forgot to reset clock
 2015-05-04 17:03:37 -07:00
Erwin Coumans 633ea613ab tweak gui description window size 
use system clock for delta time
fix urdf file name
 2015-05-04 16:52:43 -07:00
erwincoumans 0f567be549 Merge pull request #366 from erwincoumans/master 
add .bullet extension in File/Open on Mac
 2015-05-03 23:05:47 -07:00
Erwin Coumans ce91764644 update docs 2015-05-03 22:14:09 -07:00
Erwin Coumans db5f280c3d tweaks to rolling friction demo/dof2spring2 demo 2015-05-03 12:01:38 -07:00
Erwin Coumans 184a0013b4 add RollingFrictionDemo 
tweak benchmark demo camera
 2015-05-03 11:45:30 -07:00
Erwin Coumans 78f01243c1 fix double-precision compile bug 2015-05-03 11:10:12 -07:00
Erwin Coumans d90578ec98 fix premake 2015-05-03 10:59:35 -07:00
Erwin Coumans 488b86fece render the rays in benchmark demo 2015-05-03 10:56:39 -07:00
Erwin Coumans 8ee491abfa converted DynamicControlDemo/MotorDemo 
set default camera position for benchmarks, fracturedemo
 2015-05-03 10:46:22 -07:00
Erwin Coumans 7288313970 converted FractureDemo 2015-05-03 10:01:30 -07:00
Erwin Coumans 59b511a14e add .bullet extension in File/Open on Mac 
add importer support for FIXED_CONSTRAINT_TYPE, to be replaced by btGeneric6DofSpring2Constraint
btFixedConstraint now derives from btGeneric6DofSpring2Constraint
 2015-05-03 09:23:35 -07:00
erwincoumans 10aa67e1d6 Merge pull request #365 from erwincoumans/master 
more finishing touches for Bullet 2.83 release
 2015-05-02 22:54:47 -07:00
Erwin Coumans 7a0288bf56 fix issue with btDbvt::collideOCL, related to memmove (needs further testing) 
only enable OpenCL demo if flag --enable_experimental_opencl is passed to ExampleBrowser
 2015-05-02 22:33:33 -07:00
erwincoumans 37c788841a fix another compile issue 2015-05-02 13:09:29 -07:00