Commit Graph
100 Commits
Author SHA1 Message Date
erwincoumans d6c78426bd Merge pull request #231 from erwincoumans/master
stringify unified between linux and mac
2014-09-01 09:30:34 -07:00
erwincoumans 3b7a7007ce Merge pull request #230 from erwincoumans/master
remove BUILD_MULTITHREADING option from CMakeLists.txt
2014-08-31 13:10:11 -07:00
erwincoumans 57b3886c1f Merge pull request #229 from erwincoumans/master
add fileOpenDialog selector (Win/Mac/Linux), CMake remote CMAKE_INSTALL_PREFIX,fix support for dynamic loading of X11 functions
2014-08-31 13:01:22 -07:00
erwincoumans 6760cee950 Merge pull request #224 from erwincoumans/master
update badges in README.md
2014-08-28 23:20:03 -07:00
Erwin Coumans 8595928949 update appveyor badge 2014-08-28 23:02:19 -07:00
Erwin Coumans 145123260c update badges for README.md 2014-08-28 22:58:10 -07:00
Erwin Coumans 81bafacca1 rename to see if travis message works with .md extension? 2014-08-28 22:50:28 -07:00
erwincoumans 613beab593 Update readme.txt
attempt to get travis results in readme
2014-08-28 22:37:04 -07:00
erwincoumans 09e758b9e5 Update appveyor.yml
aaargh, trial-and-error appveyor scripting
2014-08-28 22:27:24 -07:00
erwincoumans 4004ab4dbc Update appveyor.yml
aargh, a few more examples how to use simple cmd use would help, please appveyor
2014-08-28 22:26:17 -07:00
erwincoumans 7c4a5fc311 Update appveyor.yml 2014-08-28 22:17:22 -07:00
erwincoumans 8f27aaa5df Update appveyor.yml 2014-08-28 22:05:40 -07:00
erwincoumans d0d6de121c Update appveyor.yml 2014-08-28 22:04:46 -07:00
erwincoumans aa8c1e9270 Create appveyor.yml
test script for appveyor
2014-08-28 21:42:11 -07:00
erwincoumans a51382e13b Merge pull request #223 from erwincoumans/master
add 'fixed' joint for btMultiBody
2014-08-28 19:13:44 -07:00
erwincoumans e40606efd1 Merge pull request #222 from erwincoumans/master
Fixes CMake, X11 stencil shadow , capsule deserialization,add TestJointTorqueSetup demo in App_AllBullet2Demos
2014-08-26 18:06:30 -07:00
Erwin Coumans 3c558ec995 explicitly deserialize btCapsuleShape date (margin, scaling, halfextents), because the API modifies them 2014-08-26 17:21:08 -07:00
Erwin Coumans a0778a1d49 CMakeLists.txt: OSX check is below 10.9 (not below 10.10), and add new files 2014-08-26 11:37:00 -07:00
Erwin Coumans 2b35911f2a X11OpenGLWindow: create stencil buffer for shadows in OpenGL2 mode (OpenGL3 uses shadow maps)
Add 'createCollisionObjectGraphicsObject' API for CommonPhysicsSetup
Add 'pthread' dependency as workaround for NVIDIA graphics driver issue
(see //See https://bugs.launchpad.net/ubuntu/+source/nvidia-graphics-drivers-319/+bug/1248642
)
2014-08-26 11:28:44 -07:00
erwincoumans 1e956c8002 Merge pull request #220 from erwincoumans/master
fix a few warnings, and matching class/struct in forward declaration
2014-08-25 11:51:07 -07:00
Erwin Coumans 6cbf89905f move the clearForceAndTorque to after the stepVelocities,
see also https://github.com/bulletphysics/bullet3/pull/221
todo: create test
2014-08-25 08:48:45 -07:00
Erwin Coumans 8e64ee57c9 fix a few warnings, and matching class/struct in forward declaration 2014-08-22 18:15:17 -07:00
Erwin Coumans 2c19a27694 add missing ConstraintPhysicsSetup.* files 2014-08-22 14:50:42 -07:00
Erwin Coumans 954d488756 cmake+premake disable OpenGL 3 demos on Mac OSX versions below 10.9
See also http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=10073
Move ConstraintPhysicsSetup to Demos3/bullet3/ConstraintDemo
2014-08-22 14:41:21 -07:00
erwincoumans ade897c132 Merge pull request #219 from erwincoumans/master
fix another warning
2014-08-22 11:52:00 -07:00
erwincoumans bc96d5e82c Update ImportURDFSetup.cpp
fix signed/unsigned warning
2014-08-22 11:45:17 -07:00
erwincoumans edbc1872c6 Merge pull request #218 from erwincoumans/master
remove a lot of warnings (more todo in demos and serialization code)
2014-08-22 11:17:46 -07:00
erwincoumans e1e54f748c Merge pull request #217 from erwincoumans/master
fix more warnings, implement missing X11 function for dynamic loading
2014-08-21 17:36:41 -07:00
erwincoumans 60ab931dbd Merge pull request #216 from erwincoumans/master
fix more warnings in BulletCollision, and fix CMakeLists for Linux
2014-08-21 16:03:14 -07:00
erwincoumans 4118495de3 Merge pull request #215 from erwincoumans/master
remove some warnings
2014-08-21 14:05:47 -07:00
erwincoumans 590504bf72 Merge pull request #201 from bgossage/fix_pointer_cast
-- Corrected cast of 32-bit int to 64-bit pointer
2014-08-21 11:19:45 -07:00
Erwin Coumans ed637a6942 fix mac build 2014-08-20 17:24:12 -07:00
erwincoumans cb55f7df30 Merge pull request #214 from erwincoumans/master
fix Linux  and Cmake build
2014-08-20 16:51:02 -07:00
Erwin Coumans 7b28e86c7b add improved btGeneric6DofSpring2Constraint, thanks to Puhr Gabor and Tamas Umenhoffer!
improved the new demo testbed (work-in-progress)
add basic Lua demo, import URDF test, STL import, obj import
2014-08-20 16:28:16 -07:00
erwincoumans d2509ae7a1 Merge pull request #212 from erwincoumans/master
dynamic loading of OpenGL/X11
2014-08-19 08:35:09 -07:00
erwincoumans cd22ccdbcf Merge pull request #187 from filipwasil/subproject_build_fix
fix: path resolving was wrong when built as a subproject
2014-08-19 08:34:48 -07:00
erwincoumans 34baab5077 Merge pull request #196 from jackoalan/parallel_linear_bvh_cl_fix
Compile fix for parallelLinearBvh.cl on OS X Intel HD 5000
2014-08-19 08:30:56 -07:00
erwincoumans 2442977725 Merge pull request #209 from erwincoumans/master
see https://github.com/erwincoumans/bullet3/commit/670576ec721c0d490f319a65778dad19814d3fc3
2014-08-12 12:21:52 -07:00
Erwin Coumans 4027ed09ae Merge remote-tracking branch 'bulletphysics/master' 2014-08-03 21:18:32 -07:00
Erwin Coumans 5ed49cc3a2 fix missing implementation 2014-08-03 14:00:22 -07:00
Erwin Coumans f85e251a5b add missing files to CMakeLists 2014-08-03 13:56:45 -07:00
Erwin Coumans ae98ffe218 add Obj and STL import demo, work on URDF import 2014-08-03 13:45:05 -07:00
Erwin Coumans ba5a8a450b Merge remote-tracking branch 'bulletphysics/master' 2014-08-03 13:19:44 -07:00
Erwin Coumans 070802f4de fix premake build 2014-07-31 18:19:59 -07:00
Erwin Coumans 85e5a0c55b Merge branch 'master' of https://github.com/bulletphysics/bullet3 2014-07-31 18:11:03 -07:00
Erwin Coumans fa3d01e6af fix build 2014-07-31 18:10:50 -07:00
erwincoumans c471e27280 Merge pull request #203 from AussieBacom/master
added get elapsed time from clock in seconds
2014-07-31 18:05:24 -07:00
Erwin Coumans af446c79b5 Merge branch 'master' of https://github.com/bulletphysics/bullet3 2014-07-31 14:43:11 -07:00
Erwin Coumans f9691957c1 fix Windows version of urdf parser 2014-07-31 14:42:33 -07:00
Erwin Coumans 8e1fbb482b add GwenParameterInterface.cpp and ConstraintPhysicsSetup.cpp to CMakeLists.txt
should fix the build
2014-07-31 14:06:53 -07:00
Erwin Coumans e4f64d91f1 add CommonParameterInterface.h 2014-07-31 14:04:09 -07:00
Erwin Coumans d798144167 don't add collision shapes to the list twice 2014-07-30 22:28:38 -07:00
Erwin Coumans 1d00d91707 add btHingeAccumulatedAngleConstraint derived from btHingeConstraint,
that exposes a new method getAccumulatedHingeAngle
See also https://github.com/bulletphysics/bullet3/issues/42
2014-07-30 16:13:34 -07:00
Erwin Coumans 97fc144134 fix Windows compile error, SIMD data needs to be passed by reference 2014-07-30 09:48:18 -07:00
Erwin Coumans a817b0bb24 support Retina for movie generation in SimpleOpenGL3App 2014-07-29 23:06:36 -07:00
erwincoumans e317b64643 Merge pull request #197 from juj/no_xcompile_system_includes
No system headers when cross-compiling.
2014-07-14 09:26:16 -07:00
erwincoumans 8e11121ced Merge pull request #178 from scpeters/travis_yml
Add .travis.yml for continuous integration
2014-07-11 12:58:16 -07:00
Erwin Coumans 9b9fa7509f Add option to let glew initialize the OpenGL 1.1 function pointers (not just all OpenGL 1.2 and above function pointers)
so you can avoid linking against OpenGL / libGL library at link-time.
See also http://sourceforge.net/p/glew/mailman/message/22729161/ and
http://portal.nersc.gov/svn/visit/branches/2.6RC/src/third_party_builtin/glew/glew/
Thanks to Tom Fogal for the help.
2014-07-10 11:45:35 -07:00
Erwin Coumans b438b91009 fix Mac build 2014-07-03 22:30:50 -07:00
Erwin Coumans bae303c5da add preliminary glut replacement test for Bullet 2.x demos 2014-07-03 16:42:50 -07:00
Erwin Coumans dca234ec02 use included glew on Linux, only if glew is not installed in /usr/include/GL/glew.h 2014-07-01 13:01:42 -07:00
Erwin Coumans 6598d1fdde update Windows glew source 2014-07-01 12:57:32 -07:00
Erwin Coumans 6d62a318ae only apply the Intel glDrawBuffers fix on Linux (not Win/Mac) 2014-07-01 10:26:45 -07:00
erwincoumans 473c2d43bf Merge pull request #188 from gjaegy/master
fix crash on CPU not having AVX support
2014-06-30 12:13:26 -07:00
Erwin Coumans 791b5149f6 prepare to re-enable Gwen user interface (OpenGL_DebugFont) for OpenGL2.x
prepare to add improved btGeneric6DofSpringConstraint
2014-06-30 12:09:59 -07:00
erwin coumans 771a2e0bcb enable auto-conversion of btConvexHullShape to basic graphics representation for the GLInstancedPrimitiveRenderer 2014-06-26 22:06:01 -07:00
Erwin Coumans a7f0567d04 more workaround for the Intel glDrawBuffers issue 2014-06-24 20:44:01 -07:00
Erwin Coumans b063cfc509 more workaround for glDrawBuffers issue 2014-06-24 20:24:31 -07:00
Erwin Coumans f82f016621 add missing file 2014-06-24 10:27:03 -07:00
Erwin Coumans 68f798a2da Start re-organizing demos so the physics setup can be shared easier (explicit create graphics objects, init/exit physics etc)
Add B3G_RETURN key code, only implemented in Windows so far (todo: Mac, Linux)
Fix Windows key management (use WM_CHAR event instead of WM_KEYUP
Add Return (OnKeyReturn) key support TreeNode, so we can select an item using the return key.
2014-06-24 10:14:06 -07:00
erwin coumans eb74688c18 Add setUserIndex/getUserIndex (int index) to btCollisionShape
Share physics setup of BasicDemo between different graphics frameworks, see Demos\BasicDemo\BasicDemoPhysicsSetup.*
Plan is to do this for all Bullet demos.
Improve gwen performance and cursor navigation for tree control.
tweak shadowmap size
SimpleOpenGL3App::registerCubeShape accepts half extents
2014-05-20 12:02:01 -07:00
Erwin Coumans f213b00022 fix BUILD_SHARED_LIBS and add it as an OPTION (cross fingers that CMake lets you expose existing vars as OPTION)
this should fix issue 176, thanks to Stephen Peters!
2014-05-19 20:50:10 -07:00
erwincoumans 2601932249 fix issue related to addConstraint/removeConstraint, introduced by filtering collision between two particular bodies
https://github.com/bulletphysics/bullet3/issues/173
2014-05-17 14:24:22 -07:00
erwin coumans 01ce7a0288 remove a few unused variable, and add casts to avoid warnings 2014-05-16 08:59:34 -07:00
Erwin Coumans a22e129f8b remove unused/uninitialized data in BulletWorldImporterDemo 2014-05-15 23:25:00 -07:00
Erwin Coumans 7f3cbc066f Remove @workaround for sticky convex collisions in btGjkPairDetector, it suffers from many artifacts,
We still need to do more work on GJK when using very small collision margins...
Fix premake build on Windows
2014-05-15 22:55:54 -07:00
erwincoumans 732e4de22a Merge pull request #172 from tcShadowWalker/master
fix gcc warning message in public header when using c++11
2014-05-15 09:58:21 -07:00
Erwin Coumans 9ab755fc07 fix build (missing glut include path, #include <algorithm> for std::max in hacdICHull.cpp) 2014-05-13 12:59:32 -07:00
erwincoumans 6c01c83986 Merge pull request #170 from erwincoumans/master
sync repos
2014-05-07 09:00:24 -07:00
erwin coumans f98f24b697 fix in Extras/Serialize/BulletFileLoader related to optional endian swap between 64bit and 32bit platforms 2014-05-07 08:55:25 -07:00
erwin coumans 2cf7806c87 add the 'extras' and Bullet 2 tests, to make it easier to create a new intermediate release 2014-05-07 08:54:08 -07:00
erwincoumans a1febdcf3d Merge pull request #169 from erwincoumans/master
fix name 'BulletCollisions' -> BulletCollision
2014-05-05 08:34:17 -07:00
erwin coumans e0784b2da6 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2014-05-05 08:29:10 -07:00
erwin coumans 7328ed900b fix type, BulletCollisions -> BulletCollision
Thanks to pfanne for the report: https://github.com/bulletphysics/bullet3/issues/168
2014-05-05 08:29:01 -07:00
erwincoumans 0b6d1af1d4 Only enable SSE4 for Visual Studio 2012 or later (_MSC_FULL_VER >= 170050727), it breaks the build for Visual Studio 2010
Add additional constructor for btMultiBodyJointMotor
2014-05-01 22:23:37 -07:00
Erwin Coumans 0e1b90d708 Added SSE4/FMA optimized constraint row solver implementation for btSequentialImpulseConstraintSolver,
thanks to Vladimir Bondarev (https://github.com/VladimirBondarev/bullet3/tree/c25d)
2014-05-01 17:13:50 -07:00
Erwin Coumans 7151865c16 Introduce kF_UseGjkConvexCastRaytest, and make kF_UseSubSimplexConvexCastRaytest the default for btCollisionWorld::rayTest See https://github.com/bulletphysics/bullet3/issues/34
Add btCollisionObject::setIgnoreCollisionCheck to disable collisions between specific instances, without having a btTypedConstraint. See https://github.com/bulletphysics/bullet3/issues/165

Make btMultiBody and btMultiBodyJointMotor backwards compatible with Bullet 2.82 API (single-DOF API)
2014-05-01 13:51:56 -07:00
erwincoumans 55f045956e Merge pull request #161 from XBog/master
subdivision backface shouldnt be in front
2014-04-13 10:58:15 -07:00
Erwin Coumans a3369e2d14 minor fix in GL3+ rendering 2014-04-12 19:53:44 -07:00
erwincoumans 5dafea7c06 avoid allocations in renderer (messes up AMD buggy OpenGL driver)
add missing file in cmake build system (BroadphaseCollision/b3GpuParallelLinearBvhBroadphase.cpp and BroadphaseCollision/b3GpuParallelLinearBvh.cpp)
2014-04-09 21:23:22 -07:00
erwincoumans 6311824bc1 Merge branch 'master' of https://github.com/bulletphysics/bullet3 2014-04-09 11:17:01 -07:00
erwincoumans be889f5eff Merge pull request #159 from xantares/master
Fix linux|mingw shared|static build
2014-04-09 11:14:58 -07:00
erwincoumans 6cc5311216 Merge pull request #160 from rtrius/plbvh_raycast
Plbvh raycast
2014-04-09 11:14:34 -07:00
erwincoumans aa76b88936 Added btSoftBodyHelpers::ReoptimizeLinkOrder(btSoftBody* softBody) method, to help improve performance for modern out-of-core CPUs.
It is tested in Aero2 demo (13) of AppSoftBodyDemo. Note that the cloth in Areo2 is not expensive enough to see benefits. Increase segments to see benefits.
Thanks a lot for the contribution.
2014-04-08 09:45:09 -07:00
erwincoumans 050c7d9289 allow to disable 'useMpr' without crash 2014-04-08 09:05:02 -07:00
erwincoumans a50dfe8e19 add CMake support to build gtest 2014-04-08 09:04:32 -07:00
erwincoumans a981c3382b Merge pull request #158 from xantares/master
Fixed win32 build on a case-sensitive fs
2014-04-07 15:57:23 -07:00
erwincoumans 781831574d Merge pull request #45 from erwincoumans/master
improve CMake support
2014-03-24 15:46:59 -07:00
Erwin Coumans 01fe7159d9 Added CMake support to compile App_Bullet3_OpenCL_Demos 2014-03-24 15:44:45 -07:00
Erwin Coumans 35c916f487 add CMake support for AppAllBullet2Demos demo. See also https://github.com/bulletphysics/bullet3/issues/43 2014-03-24 13:18:24 -07:00