Commit Graph

52 Commits

Author SHA1 Message Date
Erwin Coumans
ba0dd676aa comment-out the memset in DEBUG mode in btVector3.cpp and b3Vector3.cpp 2014-11-02 14:12:54 -08:00
Erwin Coumans
5757de14d7 Merge remote-tracking branch 'bp/master'
Conflicts:
	btgui/Bullet3AppSupport/CommonParameterInterface.h
2014-11-02 13:12:16 -08:00
erwin coumans
4b665fa82b add btFileUtils::toLower to convert a string (char*) to lower case
URDF import demo: add COLLADA .dae file support
add FiniteElementMethod demo, extracted from the OpenTissue library (under the zlib license)
don't crash if loading an invalid STL file
add comparison with Assimp for COLLADA file loading (disabled by default, to avoid library dependency)
Gwen: disable some flags that make the build incompatible
2014-10-29 13:18:34 -07:00
sippeangelo
f9674d4b95 MSVC-specific function calls wrapped in a MSVC-specific macro instead of a Windows-specific one. 2014-10-07 18:21:13 +02:00
Erwin Coumans
a26f9c1871 premake: use *.cpp insteadl of **.cpp 2014-09-05 11:22:25 -07:00
Erwin Coumans
f199a4a972 add fileOpenDialog and enable loading of urdf from GUI
(will add .bullet file support soon)
Uses native Windows (getFileOpenFileName) and Mac OSX NSOpenPanel,
on Linux using pipe popen to zenity)
2014-08-31 11:53:44 -07:00
erwin coumans
dc16655d35 more bug fixes 2014-08-28 19:01:56 -07:00
erwin coumans
0dff61fbe0 fix two compile errors, thanks to Travis
https://travis-ci.org/bulletphysics/bullet3/jobs/33858712
2014-08-28 18:53:51 -07:00
erwin coumans
89addd438e add 'fixed' joint for btMultiBody
improve btMultiBody version of URDF reader (still work-in-progress)
enabled planar joint for btMultiBody (untested)
enable loading from relative path for .stl meshes
2014-08-28 18:42:08 -07:00
=
c487170196 remove OpenGL/glu.h from gl3 headers (warning), replace some OpenGL definitions ARB/non-ARB 2014-07-27 11:19:11 -07:00
Erwin Coumans
4996a64238 fix CMake build on Mac OSX 2014-04-28 11:11:45 -07:00
xantares
477cfc6fe6 Fix linux|mingw shared|static build 2014-04-09 08:59:09 -07:00
Erwin Coumans
cfb06f9cd3 make GLUT optional in cmake
fix for btMultiBody to avoid extreme energy gain
2014-03-17 23:58:03 -07:00
Erwin Coumans
7cf83a4be0 attempt to fix compile issue with Clang 2014-02-02 10:42:56 -08:00
erwincoumans
863ac2c477 add unit tests for OpenCL kernel compilation for all Bullet 3 kernels (using GoogleTest) 2014-01-31 20:41:13 -08:00
erwincoumans
271f458837 Ported Minkowski Portal Refinement mpr.c from libccd to OpenCL, for bettwe edge-edge performance (and additional contact point for degenerate/high detailed convex shapes)
Removed b3RigidBodyCL, replace by b3RigidBodyData and b3RigidBodyData_t shared between C++ host and OpenCL,
Same for b3InertiaCL -> b3InertiaData
2014-01-04 20:54:27 -08:00
erwin coumans
c155e126d0 move parts of collision pipeline to shared header files (work-in-progress) 2013-12-12 11:03:55 -08:00
erwincoumans
a6bc61ad1a tweaked the particle demo a little bit 2013-11-08 23:21:01 -08:00
erwin coumans
e85bae5fe3 share more data structures and code between OpenCL kernels and C/C++ code on CPU (non-OpenCL)
integrateSingleTransform
fix bug in registerRigidBody (could lead to random crashes, especially when performing picking/adding rigid bodies afterwards)
2013-11-07 15:49:57 -08:00
erwin coumans
e20cb22832 share more data structures and code between OpenCL and C/C++ on CPU:
move the setConstraint4/b3ConvertConstraint4 to shared code.
2013-11-07 12:46:01 -08:00
erwin coumans
a9a758dd54 share more code between OpenCL kernels and C++ by moving kernel data structures/code to the 'shared' folders 2013-11-06 19:57:36 -08:00
erwin coumans
a6d9cf382f more work towards cpu pipeline, sharing OpenCL kernel code 2013-08-30 16:30:22 -07:00
erwincoumans
0ccb6922a8 more work towards CPU version 2013-08-30 08:06:46 -07:00
erwincoumans
ad8d0e32f4 expose 2 new command-line options [--disable_cached_cl_kernels] [--load_cl_kernels_from_disk]
on Windows (_WIN32) debug output goes to BOTH console and Visual Studio output log window.
2013-08-26 21:58:55 -07:00
erwin coumans
96994d3dd5 fix typo in b3Vector3 2013-08-22 23:25:00 -07:00
Erwin Coumans
74948ede54 fix Linux build 2013-08-22 17:49:59 -07:00
Erwin Coumans
d860e7f51a fix Mac OSX build (compound-compound still broken on OSX)
remove operator= from b3Vector3 to make it POD/Plane Old Data
2013-08-20 12:45:05 -07:00
erwincoumans
677722bba3 support compound versus compound collision shape acceleration on GPU, using aabb tree versus aabb tree.
Remove constructor from b3Vector3,  to make it a POD type, so it can go into a union (and more compatible with OpenCL float4)
Use b3MakeVector3 instead of constructor
Share some code between C++ and GPU in a shared file: see b3TransformAabb2 in src/Bullet3Collision/BroadPhaseCollision/shared/b3Aabb.h
Improve PairBench a bit, show timings and #overlapping pairs.
Increase shadowmap default size to 8192x8192 (hope the GPU supports it)
2013-08-20 03:19:59 -07:00
erwin coumans
ef224370ab implement compound versus compound BVH acceleration (quantized tree-versus-tree, using subtrees and quantization) on host 2013-08-16 08:58:52 -07:00
erwin coumans
b32ae0c75c move some files to shared folders
use b3Aabb for compound vs compound on host (for testing, towards BVH)
2013-08-14 17:48:12 -07:00
erwincoumans
18eed5b067 further work towards sharing structures/code between C++ and OpenCL
(could break the build in C++/OpenCL)
2013-08-03 10:13:13 -07:00
erwincoumans
34de49d8a4 add gjk/epa (host only), possibly improve convex-convex with many edge-edge tests
more preparation towards persistent/incremental contact cache
2013-07-31 23:22:43 -07:00
erwin coumans
c4375a09e4 added GPU joint solver for non-contact constraints. Only point 2 point version for now, will add some other constraints soon (changes are very local) 2013-07-09 10:46:47 -07:00
erwin coumans
3a6e1ccff4 work towards GPU joint solver (non-contact constraints), not working yet. 2013-07-06 13:08:58 -07:00
erwin coumans
a69ba48de4 Move b3Quickprof.* from Bullet 3.x src folder to btgui/Timing
The Bullet 3.x B3_PROFILE can be customized using b3SetCustomEnterProfileZoneFunc/b3SetCustomLeaveProfileZoneFunc defined in Bullet3Common/b3Logging,
so you can hook Bullet 3.x up to your profiler of choice.
The Demos3/BasicGpuDemo will show the Bullet 3.x timings inside the Bullet 2.x btQuickprof profiler.
2013-06-19 22:08:03 -07:00
erwincoumans
561a44e5d8 Try to avoid crashes if memory allocations fail
Deal with cases exceeding allocations of bodies/shapes above the limits set in b3Config
(work-in-progress )
2013-06-17 15:55:41 -07:00
Erwin Coumans
7d3b656d2b fix b3Logging for Mac 2013-06-04 09:17:48 -07:00
Erwin Coumans
4dd529513f fix Mac OSX build 2013-06-04 09:09:10 -07:00
erwin coumans
5317b7d0c2 add do-while to logging functions, to avoid errors in user code: if b3Error("msg"); else {...} would fail before 2013-06-03 15:39:47 -07:00
erwin coumans
76b0d7697a Added b3Printf, b3Warning and b3Error that can be re-routed to custom handlers.
See in src/Bullet3Common/b3Logging.h for details
2013-06-03 13:10:27 -07:00
Erwin Coumans
084bc4ec32 improve the benchmark mode, with 2 files (csv and details) 2013-05-23 18:34:39 -07:00
erwincoumans
98a877a80d enable alignment macros for Linux 2013-05-22 17:59:13 -07:00
erwin coumans
d25e21614a Merge branch 'master' of https://github.com/erwincoumans/bullet3 2013-05-21 16:47:23 -07:00
erwincoumans
453952f202 fix Linux build (only OpenCL/gwen tested) 2013-05-20 16:53:43 -07:00
erwin coumans
2ec9599c87 fix duplicate link symbol when used with Bullet 2.x 2013-05-15 16:22:10 +02:00
erwin coumans
6ee9eb9bb5 fix bug in assignment of contact constraints to solver grid (always use dynamic body to determine constraint assignment, otherwise write conflicts can occur)
implement CPU version of narrowphase convex collision, for comparison/debug purposes
start towards cpu/gpu sync, for adding/removing bodies (work in progress)
2013-05-02 09:49:16 -07:00
erwincoumans
e999903c15 resolve some naming conflicts between Bullet 3.x and Bullet 2.x
add BasicGpuDemo that bridges Bullet 2.x and Bullet 3.x (still preliminary/crashing/instable)
2013-04-30 18:17:44 -07:00
erwincoumans
3ac332f3a7 reorder files, in preparation for Bullet 3 -> Bullet 2 merge 2013-04-29 19:04:08 -07:00
erwincoumans
55b69201a9 rename to b3 convention, to avoid naming conflicts when using in combination with Bullet 2.x 2013-04-29 15:19:36 -07:00
erwin coumans
7366e262fd bt -> b3 and BT -> B3 rename for content and filenames 2013-04-28 23:11:10 -07:00