Commit Graph

3876 Commits

Author SHA1 Message Date
Erwin Coumans
876c9e57fe fixes 2016-05-13 22:57:41 -07:00
Erwin Coumans
be7d07a193 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-05-13 22:42:25 -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
20e39d0abf fix premake build 2016-05-13 19:01:40 -07:00
Erwin Coumans
3f0d8d8dd0 Merge remote-tracking branch 'bp/master' 2016-05-13 18:46:07 -07:00
Erwin Coumans
d186320f30 fixes in rendering 2016-05-13 18:45:56 -07:00
Erwin Coumans
a725d59480 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-05-12 23:13:44 -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
erwincoumans
c5f2264a2b Merge pull request #627 from simotek/master
Fix bullet.pc when built with CMAKE_INSTALL_PREFIX #626
2016-05-12 20:26:49 -07:00
Simon Lees
e46b7b2e7b
Fix bullet.pc when built with CMAKE_INSTALL_PREFIX #626
This makes the macro usage consitent between bullet.pc.in and
BulletConfig.cmake.in, previously if the CMAKE_INSTALL_PREFIX
was set you would end up with -I/usr/usr/include/bullet rather then
-I/usr/include/bullet
2016-05-13 12:28:18 +09:30
erwincoumans
257c1425d7 Merge pull request #625 from YunfeiBai/master
SDF parser
2016-05-11 19:22:43 -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
erwincoumans
9ba3a844c0 Update test.py 2016-05-10 01:24:40 -07:00
erwincoumans
94fe96e2b4 Update test.py 2016-05-10 01:13:19 -07:00
erwincoumans
bad3ff9699 Merge pull request #624 from erwincoumans/master
Allow to compile pybullet on Windows, using CMake
2016-05-10 01:12:00 -07:00
erwin coumans
99073e03f7 Allow to compile pybullet on Windows, using CMake
(got it to run, rename pybullet.dll into pybullet.pyd and copy in c:\python34\dlls)
Update test.py
Allow to compile pybullet using Python 3.x and 2.7
2016-05-10 00:57:54 -07:00
erwincoumans
fa043429fe Merge pull request #623 from erwincoumans/master
add initial SDF importer, work-in-progress (still too incomplete to b…
2016-05-09 21:37:36 -07:00
Erwin Coumans
e9c6abff47 add initial SDF importer, work-in-progress (still too incomplete to be useful) 2016-05-09 17:25:07 -07:00
erwincoumans
95541cad4f Merge pull request #622 from erwincoumans/master
copy the data folder into the cmake build directory, for the ExampleB…
2016-05-09 14:21:11 -07:00
Erwin Coumans
2fee43b021 copy the data folder into the cmake build directory, for the ExampleBrowser
out-of-source builds of Example Browser don't find their resources...
2016-05-09 14:03:13 -07:00
erwincoumans
fe4fd4169c Merge pull request #620 from erwincoumans/master
Added new tutorial sources, thanks to Mobeen
2016-05-08 12:34:11 -07:00
erwincoumans
13734de2c2 Merge pull request #621 from benelot/master
Add missing m_callback call in SliderMove()
2016-05-08 11:47:33 -07:00
Benjamin Ellenberger
4f169b4d8f Add missing m_callback call in SliderMove().
-------
The MySliderEventHandler is missing the m_callback whereas the SliderParams contains the m_callback field. Therefore, the m_callback is never called if the slider position is changed. This commit adds the missing m_callback field and call in SliderMove().
Fixes #613.
2016-05-08 20:26:05 +02:00
erwincoumans
8a68e27bb7 move the RigidBodyFromObj to Importers section. 2016-05-07 16:36:14 -07:00
erwincoumans
db4fb750bc Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-05-07 16:19:43 -07:00
erwincoumans
5151519b94 https://github.com/bulletphysics/bullet3/pull/618 by Mobeen
Summary of changes:
1) Changed include paths to be relative to the current sources (affected
files: LoadMeshFromObj.cpp, Wavefront2GLInstanceGraphicsShape.h/cpp)
2) Added new tutorials in the ExtendedTutorials folder
3) Modified the main_opengl_single_example.cpp file to enable picking
support in standalone demos
2016-05-06 15:07:54 -07:00
erwincoumans
d26ee33433 Merge pull request #619 from erwincoumans/master
make standalone versions (console, tinyrender, opengl) of InverseDynamics/InverseDynamicsExample
2016-05-06 14:38:12 -07:00
erwin coumans
aae9e509a9 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2016-05-06 13:58:21 -07:00
erwin coumans
0a3efbe349 make standalone versions (console, tinyrender, opengl) of InverseDynamics/InverseDynamicsExample 2016-05-06 13:57:48 -07:00
Erwin Coumans
85368973a1 When using cmake -DBUILD_PYBULLET=ON, force BUILD_SHARED_LIBS option 2016-05-04 13:46:55 -07:00
Erwin Coumans
b0a4e126bf use cmake FIND_PACKAGE(PythonLibs 2.7 REQUIRED) if pybullet is build 2016-05-04 13:24:06 -07:00
Erwin Coumans
372c4ef9c1 Add btConvexHullShape::optimizeConvexHull method,
it automatically removes vertices that are not on the convex hull.
It uses the btConvexHullComputer for this.
2016-05-04 13:01:06 -07:00
erwincoumans
ec5806a979 Merge pull request #614 from erwincoumans/master
add BasicExampleGui for cmake, preliminary pybullet
2016-05-04 00:35:34 -07:00
Erwin Coumans (Google)
194009f46e linux fixes 2016-05-04 00:17:39 -07:00
erwin coumans
8360e2e66d windows fixes 2016-05-04 00:16:53 -07:00
Erwin Coumans
0d3440b388 fixes in Mac resizing example browser (if window size exceeds capability) 2016-05-03 23:46:29 -07:00
Erwin Coumans
f0b9037cd2 tweak cmake, add option BUILD_PYBULLET 2016-05-03 23:42:19 -07:00
Erwin Coumans
938db633df fixes in build system 2016-05-03 23:34:48 -07:00
Erwin Coumans
7a833a7ac2 fix target link libs in cmake 2016-05-03 22:05:30 -07:00
Erwin Coumans
a251ff4331 add 'dl' target libs in cmake 2016-05-03 21:48:28 -07:00
erwincoumans
50d86b98ff Merge pull request #612 from cirosantilli/hello-world
Improve HelloWorld
2016-05-03 21:43:08 -07:00
Erwin Coumans
a9ef145910 add standalone opengl version of BasicExample for cmake, called BasicExampleGui 2016-05-03 21:27:30 -07:00
Erwin Coumans
709a55d5ab add CMake support for pybullet (still preliminary)
requires shared library build:
cmake .. -DBUILD_SHARED_LIBS=on
then create a symbolic link from libpybullet.so to pybullet.so
2016-05-03 13:03:12 -07:00
Erwin Coumans
fb65c29033 use "world" to make door static (instead of using mass = 0)
minor improvements to pybullet
2016-05-03 12:59:21 -07:00
erwincoumans
927d846bb0 Merge pull request #611 from erwincoumans/master
add initial Python pybullet module, using the shared memory C API
2016-05-01 15:59:30 -07:00