Commit Graph

460 Commits

Author SHA1 Message Date
Erwin Coumans
35b260b252 Merge remote-tracking branch 'bp/master' 2016-07-08 08:20:16 -07:00
erwin coumans
60d2b99151 Physics runs in a separate thread from rendering in PhysicsServerExample (preliminary)
Improve rendering performance. OpenVR experience is smooth now.
commit needs a bit more testing before pushing in main repo.
2016-07-07 19:24:44 -07:00
Jasmine Hsu
993bd52fe2 fix minor issues - arg parse size, spelling, duplicate function definition 2016-07-07 13:56:32 -07:00
erwincoumans
9d629bdcd7 Merge pull request #672 from hellojas/renderImage
Render image with camera_pos, target_pos, camera_up vector as arguments
2016-07-07 12:42:41 -07:00
erwin coumans
d0f20eafd1 Allow to build PhysicsServer in VR mode, to see the URDF/SDF robots in proper scale in VR.
Add option to have Z as up-axis for VR examples.
Add OpenVR LICENSE + README file
Don't crash VR app when no HMD is detected, just exit.
For now, don't request debug lines in client, it slows down physics server in VR mode too much.
2016-07-02 18:53:19 -07:00
erwin coumans
58206b7962 Add preliminary support for VR/OpenVR for HTC Vive and Oculus Rift,
(Windows-only first, later Linux and OSX)
Use premake to build, use --enable_openvr flag
2016-06-30 16:03:38 -07:00
Jasmine Hsu
43011bdb3b merge upstream/master to latest commit ed9be25 2016-06-27 13:53:43 -07:00
Jasmine Hsu
f6bead7152 edit method definitions (docstring) for calling renderImage() 2016-06-27 13:51:28 -07:00
Jasmine Hsu
e24ec9e8c0 nearVal and farVal as params 2016-06-27 13:18:12 -07:00
Jasmine Hsu
5d5e7df7c5 exposing near/far values as params; commented out debug printf which caused failed checks 2016-06-27 11:19:57 -07:00
Benjamin Ellenberger
50b6003470 Merge remote-tracking branch 'upstream/master' 2016-06-27 15:14:47 +02:00
Benjamin Ellenberger
e16082a7cd Refactor Newton's Cradle. Implement Newton's Cradle with Softbody ropes. 2016-06-27 15:14:36 +02:00
erwincoumans
ed9be25570 Merge pull request #669 from hellojas/loadURDF
fix loading urdf at default position (0,0,0)
2016-06-26 19:12:20 -07:00
Erwin Coumans
013dbda023 implement a few more pybullet methods:
pybullet_applyExternalForce, pybullet_applyExternalTorque, pybullet_setTimeStep,
pybullet_resetBasePositionAndOrientation,
pybullet_getQuaternionFromEuler,
pybullet_getEulerFromQuaternion
2016-06-26 18:18:30 -07:00
Jasmine Hsu
d339cf5b74 ability to call renderImage with three vectors: camera position, target position, and up vector 2016-06-24 15:30:43 -07:00
Jasmine Hsu
aa91042ac8 merge bullet master 2016-06-24 15:20:46 -07:00
Erwin Coumans
c17c39c2c9 move PD control from PhysicsServerCommandProcessor into btMultiBodyJointMotor
improvements/changes in pybullet API
2016-06-24 11:06:56 -07:00
Erwin Coumans (Google)
6d1948e79e tweaks in pybullet and shared memory C-API:
allow to reset the state of a single joint
allow to set the target/mode for a single joint motor at a time
rename pybullet API: initializeJointPositions -> resetJointState
2016-06-24 07:31:17 -07:00
Jasmine Hsu
d2a2797201 accidently added pybullet.so 2016-06-23 14:06:14 -07:00
Jasmine Hsu
976e228be0 remove print debugger 2016-06-23 14:05:36 -07:00
Jasmine Hsu
a21889e225 remove print debugger 2016-06-23 14:01:57 -07:00
Jasmine Hsu
e0448c7613 fix loading urdf at default position (0,0,0) and adding b3 cmd to change orientation if args provided 2016-06-23 14:00:44 -07:00
Erwin Coumans
2cd0eba257 re-introduce old method in pybullet for temporary back-wards compatibility
b3JointControlCommandInit requires 3 args, but it was only 2,
use b3JointControlCommandInit2 for now.
2016-06-23 08:40:36 -07:00
Erwin Coumans
8b96e2de3c a few pybullet tweaks to set desired joint motor targets (pos/vel/torque) 2016-06-22 23:21:47 -07:00
Erwin Coumans
f5ffb11bc5 fix bus error on Raspberry Pi, unaligned float access when loading STL files
fix pybullet Python 3 issue (PyString_FromString -> PyBytes_FromString and PyInt_FromLong -> PyLong_FromLong)
2016-06-23 05:10:00 +00:00
Erwin Coumans
79fa4ebd7c Merge remote-tracking branch 'bp/master' 2016-06-22 10:01:22 -07:00
Erwin Coumans
2b8bd58e1c support single-scalar scale values in URDF, even though "officially" it should be a vector3. This will load quadcopter.urdf in Drake:
https://github.com/RobotLocomotion/drake/blob/master/drake/examples/Quadrotor/quadrotor.urdf
2016-06-22 09:59:25 -07:00
erwincoumans
0b249361c2 fix a c99 issue in pybullet 2016-06-21 09:01:27 -07:00
erwincoumans
01cad7c2a5 fix return type in pybullet
.
2016-06-20 15:00:35 -07:00
erwincoumans
b58978184c fix C99 issue, use malloc, not variable sized array.
.
2016-06-20 14:58:56 -07:00
Erwin Coumans
251fab0d75 expand b3ResourcePath automagic resource localization capability. 2016-06-20 12:40:08 -07:00
Erwin Coumans
a67df7fd03 fix cmake and premake build systems, after adding texture support in SDF,
in a nutshell, add the following two files:

examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
examples/ThirdPartyLibs/stb_image/stb_image.cpp
2016-06-19 17:35:25 -07:00
Erwin Coumans
e3b2b1a969 add texture support in SDF, URDF for both OpenGL and software renderer (TinyRenderer) 2016-06-18 18:02:20 -07:00
yunfeibai
d51320be2c Check diffuse field in sdf. 2016-06-17 15:47:11 -07:00
Erwin Coumans
26f6618f00 colors for sdf 2016-06-17 12:07:38 -07:00
erwincoumans
c7365837cd Merge pull request #661 from erwincoumans/master
fix some issues related to controlling a robot/multibody beyond body …
2016-06-17 07:34:07 -07:00
Erwin Coumans
53a0772257 fix some issues related to controlling a robot/multibody beyond body index 0
(most testing happened with a single robot/multibody so far)
preliminary pybullet.setJointControl implementation
2016-06-16 18:46:34 -07:00
yunfeibai
1329f265c8 Set view and projection matrices from camera and frustum parameters. 2016-06-16 11:48:37 -07:00
Erwin Coumans
3f5f8d3e00 Merge remote-tracking branch 'bp/master' 2016-06-15 18:07:58 -07:00
Erwin Coumans
95a09bec99 implement getJointInfo for objects loaded through SDF 2016-06-15 18:01:41 -07:00
Jasmine Hsu
03fded3dc7 getJointPositions returns a list of all joint positions for a given bodyIndex 2016-06-15 14:21:04 -07:00
Erwin Coumans
456c844a6b work-in-progress send object/joint information after loading SDF file 2016-06-14 18:41:19 -07:00
Jasmine Hsu
934725554f remove initializeJointPosition as setting one joint is not supported 2016-06-14 15:21:50 -07:00
Jasmine Hsu
d6ab1ab434 initialize a single joint position for a given body index 2016-06-14 14:58:36 -07:00
Jasmine Hsu
d53d6366de get the state of a specific joint given a body index 2016-06-14 14:35:45 -07:00
Jasmine Hsu
55560e114e merge bulletphysics:master to commit:b06e1cb 2016-06-14 14:13:54 -07:00
Jasmine Hsu
eeaff0747b return joint state given a joint index and body index 2016-06-14 14:08:24 -07:00
erwincoumans
b06e1cb873 Update CollisionShape2TriangleMesh.cpp
fix memory leak, thanks Ilya Kostrikov for the report.
2016-06-14 07:53:15 -07:00
Erwin Coumans
566ed87c93 fix a regression in a test 2016-06-13 18:58:52 -07:00
erwincoumans
6523df336e Fix pybullet Windows build errors: C99 requires variables to be defined at the start of the function.
Improve CMake Windows support to build PyBullet (BUILD_PYBULLET)
Implement b3LoadSdfCommandInit in shared memory API
Implement pybullet SDF loading binding, in loadSDF API
TODO for SDF support is provide way to query object/link/joint information.
2016-06-13 10:11:28 -07:00
Jasmine Hsu
9c5a7925f0 add internal set matrix function 2016-06-10 15:14:00 -07:00
Jasmine Hsu
ecc192df94 render image with ability to set pixel resolution and initial camera position 2016-06-10 15:07:52 -07:00
Jasmine Hsu
b0c7c086e3 render image with ability to set pixel resolution and initial camera position 2016-06-10 15:07:41 -07:00
Erwin Coumans
98d2f91f3c fix flipped tinyrenderer image 2016-06-09 12:12:46 -07:00
Erwin Coumans
e0c3392cee don't pass width/height into renderObject 2016-06-07 17:02:47 -07:00
Erwin Coumans
d2e50d045b fix issues related to camera width/height
add width,height as arguments to pybullet.renderImage(x,y,[viewMat4x4],[projMat4x4])
2016-06-07 16:11:58 -07:00
Erwin Coumans
bd668d11b0 add .stl file support in 'File/Open' of example browser. 2016-06-07 12:57:46 -07:00
Erwin Coumans
1c7f87aff1 implement first draft of pybullet.renderImage for synthetic camera
remove a few debug printf from tinyrenderer
2016-06-06 18:54:05 -07:00
Benjamin Ellenberger
e46a718807 Add btScalar fixes and correct M_PI to SIMD_PI. 2016-06-06 23:47:33 +02:00
Erwin Coumans
8076d5235c fix window resize/width bookkeeping bug in MacOpenGLWindow.mm 2016-06-04 21:51:21 -07:00
Benjamin Ellenberger
9872d2b20f Create InclinedPlane,Newton's Cradle and Multi-Pendulum examples for the Bullet Example Browser. 2016-06-04 12:09:37 +02:00
Benjamin Ellenberger
dfb2c51dc7 Merge remote-tracking branch 'upstream/master' 2016-06-04 11:36:43 +02:00
erwin coumans
4b2c0f6d89 make one of the cubes in two_cubes.sdf static (immovable) using the <static> tag in SDF
add an example using 'direct'
fix the send-desired-state commands, to add flags for arguments set, using default values.
Start exposing SDF loading in shared memory api, not fully implemented yet.
2016-06-03 19:03:56 -07:00
erwin coumans
0b69ba7f61 Support the <static> field under <model> in SDF to make the model immovable, similar to setting the mass to zero.
Add joint velocity motors in ImportSDF example.
2016-06-02 18:04:22 -07:00
Erwin Coumans
5bf125cab5 fix some compile issues using premake
use textured cube/sphere model for test
2016-06-02 13:54:52 -07:00
Erwin Coumans
aa4d2ae01d initial hookup of TinyRenderer to shared memory interface 2016-06-01 17:47:41 -07:00
erwin coumans
9a5394c4bc fix cmake build 2016-06-01 11:07:39 -07:00
erwin coumans
ef85a71d4b more work on synthetic camera 2016-06-01 11:04:10 -07:00
erwin coumans
f469a2cb49 update to tinyrenderer synthetic camera 2016-05-31 22:55:13 -07:00
erwin coumans
14aa666c6f preparation to receive camera image data from physics server
increase shadowmap world size default to 50 units (meter), 10 units (meter) was too small for most examples.
2016-05-31 10:23:04 -07:00
Erwin Coumans
de9bd65c19 fix compile issues 2016-05-26 19:22:26 -07:00
Erwin Coumans
098e0158ea fix compile issue(s) in BT_USE_DOUBLE_PRECISION mode 2016-05-26 18:21:57 -07:00
erwin coumans
0d50d8c73b Preliminary working version of TinyRenderer for standalone demos,
it works without OpenGL dependency now, so it runs in the cloud :-)
Add scaling support for TinyRenderer, remove some un-used normal mapping in TinyRenderer shader, expose light_dir_world,
remove accidental hard-coded path in tga write_tga_file,
Fix InverseDynamicsExampleCreateFunc, enum has to start at 0
2016-05-26 17:36:01 -07:00
erwin coumans
68545fb71a fix pybullet.getPositionAndOrientation crash/issues 2016-05-26 15:58:10 -07:00
Erwin Coumans
535ee33e3b fix build3/stringify.sh
fix some compile issues
2016-05-25 15:37:28 -07:00
Erwin Coumans
bd1620eda8 add pybullet.getBasePositionAndOrientation
add missing file to pybullet CMakeLists.txt
2016-05-24 15:29:26 -07:00
erwincoumans
ef19248daf Update URDFImporterInterface.h 2016-05-24 10:30:04 -07:00
Erwin Coumans
b1adc0d9ef avoid API change in URDFImporterInterface
fix .obj texture loading issue
2016-05-24 09:01:03 -07:00
erwin coumans
2fc0358750 Expose a better API to allow any render engine to be used for the physics simulation when loading URDF/SDF files.
See bullet3/examples/Importers/ImportURDFDemo/DefaultVisualShapeConverter.h
Give the kuka_iiwa/model.urdf some blue color, not just orange, to mimick the original a bit better
Preparation for the CMD_CAMERA_IMAGE_COMPLETED command, to expose a virtual camera to the robotics API
2016-05-19 18:37:15 -07:00
erwin coumans
f4775c360f Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-05-19 09:19:44 -07:00
erwin coumans
b961545292 prepare support for VR 2016-05-19 09:19:36 -07:00
erwin coumans
9cc028d44c fix issue, some paths didn't return a value 2016-05-19 09:16:47 -07:00
Erwin Coumans
cf1012aa3d minor update in TinyRenderer example 2016-05-18 18:32:13 -07:00
Erwin Coumans
fb2134f15f add combobox to select software/opengl rendering to compare 2016-05-18 17:57:13 -07:00
Erwin Coumans
7994a339ee disable RTC update for Physics Server by default 2016-05-18 16:21:40 -07:00
Erwin Coumans
5500fc81df fix #include 2016-05-18 16:01:36 -07:00
Erwin Coumans
cdd6954ada fix pybullet cmake compilation 2016-05-18 15:07:42 -07:00
erwin coumans
a395ddcb06 add option to embed a physics server in the physics client example, for easier debugging 2016-05-18 09:34:42 -07:00
erwin coumans
606f78da43 work-in-progress tinyrenderer -> shared memory API synthetic camera image 2016-05-17 23:57:19 -07:00
Benjamin Ellenberger
79be214d08 Merge resolve. 2016-05-15 14:19:01 +02:00
Erwin Coumans
876c9e57fe fixes 2016-05-13 22:57:41 -07:00
Erwin Coumans
578e4fc795 compile fixes 2016-05-13 22:10:18 -07:00
Erwin Coumans
f4a6b0cb9f move InProcessExampleBrowser.cpp into App instead of Lib 2016-05-13 21:10:16 -07:00
Erwin Coumans
d186320f30 fixes in rendering 2016-05-13 18:45:56 -07:00
erwin coumans
6a9c54c4ef Remove unused ROS urdf (was replaced by Bullet UrdfParser.
Small refactoring for ExampleBrowser: move examples cpp files in the app/executable
Move ExtendedTutorials in its own app/executable as a test.
2016-05-12 23:03:12 -07:00
yunfeibai
7929bee128 parse root transformation and test loading two robots 2016-05-11 15:52:50 -07:00
yunfeibai
06a2669b32 test load kuka arm sdf 2016-05-11 13:43:50 -07:00
yunfeibai
1bebcc6d9a Merge remote-tracking branch 'upstream/master' 2016-05-10 10:18:27 -07:00
erwincoumans
119d47166d Update test.py 2016-05-10 01:28:45 -07:00
erwincoumans
15ce069c04 Update test.py 2016-05-10 01:26:13 -07:00