Commit Graph
100 Commits
Author SHA1 Message Date
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
erwincoumans 1215d4b01c fix build issue 2015-05-02 11:42:43 -07:00
erwincoumans 551709a74b more example browser tweaks, mostly related to (debug) rendering 2015-05-02 11:40:06 -07:00
erwincoumans 01d14f538a fix some out-of-bounds error in the OpenCL rigid body pipeline
re-enable an OpenCL/gpu rigid body example (box-box stack)
2015-05-01 21:34:27 -07:00
erwincoumans 7ca20f529a add Doxyfile 2015-05-01 16:51:59 -07:00
erwincoumans 2f442bd47b Merge remote-tracking branch 'bp/master' 2015-05-01 16:45:53 -07:00
erwincoumans d50242fc27 add starting point for btGeneric6DofSpring2ConstraintData import, not all parameters are deserialized though
restore activation state after picking
add .bullet file import (only tested/available on Windows)
2015-05-01 16:27:09 -07:00
erwincoumans d7c7fdf517 fix build issue when OpenCL (B3_USE_CLEW) is not enabled 2015-05-01 14:32:39 -07:00
erwincoumans 218e9f9bf9 enable URDF loading throught the 'File/Open' menu
set a default camera targets for each demo. note that it is only reset when switching to a different demo, so you can restart at your chosen location.
no OpenCL pairbench drawing in OpenGL2 (there is no VBO available etc)
2015-05-01 11:42:14 -07:00
erwincoumans 3dd41b84a8 add GPU_rigidbody_using_OpenCL document 2015-05-01 08:22:32 -07:00
erwincoumans 4f9b9b05ad Merge pull request #363 from erwincoumans/master
replace btgui/Demos/Demos3 with 'examples' and move all demos in 'ExampleBrowser'
2015-05-01 08:19:48 -07:00
erwincoumans aad9a5a396 add OpenCL PairBench (missing GUI, so not really useful) 2015-05-01 00:18:49 -07:00
Erwin Coumans aec360f158 add Raycast demo 2015-04-30 15:31:44 -07:00
Erwin Coumans c95fe654ad add example to import and export a binary .bullet file 2015-04-30 14:03:50 -07:00
Erwin Coumans 9d3f8803b8 add Stan Melax' ImplicitCloth demo 2015-04-30 13:36:39 -07:00
Erwin Coumans 49a71a9296 start updating docs 2015-04-29 15:32:07 -07:00
Erwin Coumans 5a86aa63e3 add Bullet 2.82 user manual, todo: update to version 2.83 2015-04-29 15:13:29 -07:00
Erwin Coumans 283c7ffd12 add latex source of Bullet 2.82 quickstart guide, todo: update to current release 2015-04-29 15:12:31 -07:00
Erwin Coumans fcb841018a remove 'Custom' multi body demo, it has no point on its own 2015-04-29 15:02:12 -07:00
Erwin Coumans df86a69a71 fix Mac OSX build, minor addition in example descriptions 2015-04-27 20:58:01 -07:00
erwincoumans b91ac0045b Update README.md 2015-04-23 14:48:33 -07:00
erwincoumans e884511924 Merge pull request #353 from cameronwhite/fix-conetwist-nans
Fix a potential division by zero for cone twist constraints.
2015-04-22 11:44:29 -07:00
erwincoumans b8e030f396 Merge pull request #361 from kbogert/master
Prevent SSE Alignment crash in VS2010 and up
2015-04-22 07:35:20 -07:00
erwincoumans 8d4802f15c Merge pull request #360 from CapsAdmin/patch-1
Update README.md
2015-04-20 10:10:57 -07:00
erwincoumans 60593f41ed make OpenGL2 version work (still very rudimentary, no filled rendering, only debug wireframe) 2015-04-16 23:46:01 -07:00
Erwin Coumans 8ce75fd7a7 fix mac build 2015-04-16 22:23:34 -07:00
erwincoumans ad8f705bcb more cmake support for examples 2015-04-16 22:14:27 -07:00
erwincoumans c99ac6cfa1 cmake with 2 examples (HelloWorld, BasicDemo) 2015-04-16 18:11:22 -07:00
Erwin Coumans 889cbdc0ef fixes in Mac modifier keys, remove enet/lua tests 2015-04-16 17:35:34 -07:00
Erwin Coumans b2ba615874 fixed for Mac in examples 2015-04-16 15:52:30 -07:00
erwincoumans ffb0cab2e7 glew/GL fixes 2015-04-16 15:38:08 -07:00
erwincoumans b33d17f91c rename GL/glew to CustomGL/glew.h to avoid clashes with system glew 2015-04-16 15:29:39 -07:00
erwincoumans 57d8567ca3 more example refactoring 2015-04-16 15:16:13 -07:00
erwincoumans 794c8ec064 add BspDemo.bsp data file
add sphere2.urdf
move btSpatialAlgebra into LinearMath
remove some warnings, introduce BT_ZERO, BT_ONE, BT_HALF as defines for 0.f/0., 1.f/1., 0.5f/0.5 respectively
2015-04-16 10:17:35 -07:00
erwincoumans a1bf9c5556 add initial examples, replacing the 'Demos/Demos3'. Will make it work cross-platform, OpenGL3/OpenGL2 and add more examples to it. 2015-04-16 09:55:32 -07:00
erwincoumans d9feaf2d2a delete Demos, Demos3, btgui, it will be replaced by 'examples' 2015-04-16 09:50:46 -07:00
erwincoumans 3a997a0ee7 Merge pull request #350 from erwincoumans/master
maintain backward compatibility using BT_ENABLE_GYROPSCOPIC_FORCE = BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY
2015-04-15 10:58:54 -07:00
erwincoumans d605cc1cd7 render the wheels of the ForkLiftDemo 2015-03-28 12:36:57 -07:00
Erwin Coumans 9931dd9684 remove Cooper implicit (it was just for comparison, it is buggy)
add btMatrix3x3::solve33, thanks to Erin Catto, and added safety against division by zero
2015-03-25 19:33:02 -07:00
erwincoumans 4100db0c70 Merge pull request #346 from erwincoumans/master
Add global and local implicit Gyroscopic force integration, with Dzhanibekov effect demo
2015-03-25 14:54:24 -07:00
Erwin Coumans 0a04a745dd added Erin Catto's 'local' implicit coriolis/gyroscopic force, next to 'Ewert', Cooper, explicit and none
Configured the gyroscopic demo to show the Dzhanibekov effect
see also https://www.youtube.com/watch?v=L2o9eBl_Gzw
2015-03-24 23:16:45 -07:00
erwincoumans 8382ccdc3d Merge pull request #343 from erwincoumans/master
re-enable auto-joint velocity target motors in URDF multibody import
2015-03-23 12:13:14 -07:00
erwincoumans a6690f97a3 Merge pull request #342 from erwincoumans/master
small URDF2Bullet refactor to make URDF import a little bit more re-useable
2015-03-20 13:33:45 -07:00
erwincoumans 3d19aec7fa add some minor fixes for URDF2Bullet to make it work (needs more testing) 2015-03-18 15:12:27 -07:00
erwincoumans e336c480bd Merge pull request #338 from erwincoumans/master
ImportURDFSetup: add Wavefront/obj support
2015-03-10 08:39:13 -07:00
erwincoumans 5e78feb4cb Merge pull request #253 from TimothyGu/patch-1
Install pkg-config file on MinGW systems as well
2015-03-04 16:11:03 -08:00
erwincoumans 97e9b5ccad Merge pull request #337 from erwincoumans/master
add btMultiBodyConstraint::finalizeMultiDof API: if you add multi-body c...
2015-03-03 17:06:04 -08:00
erwincoumans a391e619ed Update README.md 2015-03-01 10:30:20 -08:00
erwincoumans 98ac437649 Merge pull request #326 from erwincoumans/master
_N -> n, _C -> c, _L ->l, some collision with a standard C++ header?
2015-02-20 13:53:54 -08:00
erwincoumans 2a0787907b Merge pull request #324 from erwincoumans/master
improved URDF support and fixes in btMultiBody
2015-02-13 19:04:34 -08:00
Erwin Coumans 4e02f6673b fix a bug related to gyroscopic forces in btMultiBody 2015-02-13 18:27:01 -08:00
Erwin Coumans d8b08eaf2a fix in URDF loading: apply visual transform locally, not after compensating for inertia transform.
add option in COLLADA loading to specify client up axis (so that if client=Z and COLLADA =Z, upAxisTransform is identity,
while if client=Y and COLLADA=Y, upAxisTransform is identity etc)
2015-02-13 16:18:16 -08:00
erwincoumans 01a14e4daf Merge pull request #322 from scpeters/issue_321
Add extra -I flag to bullet.pc to allow namespaced includes
2015-02-12 13:34:58 -08:00
erwincoumans 5a91c9ea3c Merge pull request #317 from namar0x0309/master
Fix for 64bit builds btSqrt and USE_APPROXIMATION
2015-02-12 13:34:22 -08:00
erwincoumans 078afee015 Merge pull request #323 from erwincoumans/master
fix some btMultiBody URDF conversion issues in ImportURDFSetup, add RenderInstancingDemo, use GLInstanceVertex
2015-02-12 13:34:07 -08:00
erwincoumans b36936a4ab Update Test_v3interp.cpp
add test case for https://github.com/bulletphysics/bullet3/pull/313
2015-02-10 18:12:55 -08:00
erwincoumans 15d5659483 Merge pull request #313 from jackoalan/neon-setinterpolate3-fix
Fixed self-referencial bug in btVector3's setInterpolate3 (NEON)
2015-02-10 18:10:26 -08:00
erwincoumans e3a77042cd Merge pull request #320 from erwincoumans/master
btTriangleMesh::addTriangleIndices, pthread link fix for OpenGLWindow
2015-02-04 11:44:05 -08:00
erwincoumans b975248e05 Merge pull request #319 from scpeters/fix_pkgconfig_2.83
Use absolute paths in pkg-config file, thanks to Steven Peters for the contribution!
2015-02-04 11:43:44 -08:00
erwincoumans 76b80ca71b Merge pull request #309 from erwincoumans/master
minor fixes (GL2, preSwapFileNameOut), improved URDF/btMultiBody (work in progress), basic debug drawing for btMultiBody
2015-01-27 13:33:37 -08:00
erwincoumans bd16df8dd6 add basic debug drawing interface for btMultiBodyPoint2Point constraint
add basic debug drawing drawText3D in SimpleOpenGL3App
remove a few warnings
add drawTexturedRect3D to GLPrimitiveRenderer to support debug drawing
2015-01-27 10:45:56 -08:00
Erwin Coumans 51f41d0cfc fix issue, when debug drawer doesn't exist don't try to use it
enable simulation by default (was accidently switched off at startup of AllBullet2Demos)
2015-01-22 18:28:00 -08:00
erwincoumans c5b7d5011e Merge pull request #307 from a0121536/patch-1
Fix the shadows in the 'Gyroscopic' demo
2015-01-22 17:58:20 -08:00
erwincoumans a159fbac69 Improved URDF support for btMultiBody and separate graphics/collision/inertial frames and shapes
Fix WinXP GetTickCount64 with a typedef
Expose debug drawing mode/flags in UI (hot keys A,D,L,W for now, buttons later)
GLInstancingRenderer: tweak near/far planes to allow closer approach of camera
btDiscreteDynamicsWorld: enable debug drawing for btGeneric6DofSpring2Constraint
btMultiBodyDynamicsWorld: enable basic debug drawing for btMultiBody
btMultibody: allow center-of-mass shift for prismatic and fixed constraint
2015-01-22 17:56:24 -08:00
erwincoumans 46b9f7fbee Merge pull request #299 from erwincoumans/master
fix crash in BasicDemo and some other minor things (see commits)
2014-12-16 16:32:39 -08:00
erwincoumans bb2805379c Merge pull request #292 from lunkhound/fix-sse-win32
quickfix: SSE was accidentally disabled on windows desktop
2014-12-16 14:38:17 -08:00
erwincoumans c7d9c5ba5b Merge pull request #296 from rraallvv/master
Stop adding motion in the kinematic character controller if the walk dir...
2014-12-16 14:37:05 -08:00
erwincoumans 6e6c6812ec Merge pull request #297 from Orbots/convex-hull-fix
Convex hull fix
2014-12-12 21:18:49 -08:00
erwincoumans 366b2ef500 Merge pull request #295 from erwincoumans/master
fix a problem in the btMultiBodyConstraint related to self-collision, se...
2014-12-09 16:58:11 -08:00
erwincoumans dc731280b8 Merge pull request #281 from erwincoumans/master
comment-out the memset in DEBUG mode in btVector3.cpp and b3Vector3.cpp
2014-11-05 12:27:55 -08:00
erwincoumans df6d377224 Merge pull request #280 from erwincoumans/master
Minkowski Portal Refinement, Finite Element Method demo
2014-11-02 13:51:45 -08:00
erwincoumans 959e86eb1a Merge pull request #276 from erwincoumans/master
Enable CMake support for Windows Phone (_WIN32+_M_ARM) and Windows Store...
2014-10-27 12:47:59 -07:00
erwincoumans 5f53ebd430 Merge pull request #278 from dbasilioesp/master
Stylized ReadMe
2014-10-27 12:32:11 -07:00
erwincoumans 0160512a01 Merge pull request #275 from erwincoumans/master
fix build
2014-10-22 14:47:53 -07:00