Commit Graph

110 Commits

Author SHA1 Message Date
Erwin Coumans (Google)
58d7a7b9d5 Merge branch 'master' of https://github.com/erwincoumans/bullet3 2014-09-01 09:21:26 -07:00
Erwin Coumans (Google)
e20c240178 make stringify_linux.sh compatible with mac osx (testing) 2014-09-01 09:17:21 -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
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
Erwin Coumans
d93b27f16c premake4: add option to force dynamic loading of OpenGL and X11
--force_dlopen_opengl and --force_dlopen_x11
2014-08-18 22:19:34 -07:00
Erwin Coumans
bf1bd07636 premake4 build: allow to dynamically load X11 if X11 system headers/library is missing
premake4 build: allow to dynamically load OpenGL/GLEW/glx if system headers are missing
2014-08-18 21:43:08 -07:00
erwin coumans
670576ec72 remove #include <stdbool.h> it breaks MSVC 2010
enable gtest by default when using premake, added flag without-gtest
use gtest ASSERT_EQ( expected_value, actual_value) instead of the reverse,
this fixes issue 205 (https://github.com/bulletphysics/bullet3/issues/205)
2014-08-12 12:18:32 -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
04632538ec add tinyxml, urdfdom and urdfdom_headers from https://github.com/ros/urdfdom
(removed BOOST dependency and make it compile on Windows)
2014-07-31 13:38:31 -07:00
Erwin Coumans
0c39cda57b enable png and mp4 output in SimpleOpenGL3App, see
Demos3/SimpleOpenGL3 use commandline parameter
--png_file="pngname" or
--mp4_file="video.mp4"

Thanks to http://blog.mmacklin.com/2013/06/11/real-time-video-capture-with-ffmpeg/
2014-07-29 16:58:22 -07:00
Erwin Coumans (Google)
f89d70b895 fix Linux build 2014-07-03 22:41:07 -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
46884e0f1f update the binary premake4_osx binary, avoid the -Wl,-x flag so clang linker doesn't produce an error
ld: internal error: atom not found in symbolIndex
see http://industriousone.com/topic/how-remove-flags-ldflags
2014-05-16 16:11:59 -07:00
Erwin Coumans
d65089e8e0 cmake improvements 2014-05-15 15:39:26 -07:00
Erwin Coumans
5c1fc2e3a4 fix OpenGL detection on Linux, and re-add TTF project to premake 2014-05-14 11:03:53 -07:00
Erwin Coumans
934df75ea6 more fixes in the build, related to CMake and some error (don't delete a void* pointer!)
revert BasicDemo.cpp to original Bullet 2.82 state
2014-05-13 21:52:46 -07:00
Erwin Coumans
7cec30dede fix Linux build
optional Midi under Linux (ALSA/libasound)
2014-05-05 15:37:02 -07:00
Erwin Coumans
4996a64238 fix CMake build on Mac OSX 2014-04-28 11:11:45 -07:00
Jackson Lee
b7b7356af8 Draft Parallel Linear BVH Broadphase. 2014-02-18 19:23:25 -08:00
erwincoumans
d65cd8060a add Lua and basic Lua->C/C++ integration test, in preparation for Bullet demos setup using Lua scripts. 2014-02-05 19:39:48 -08:00
Erwin Coumans
ed12452fe6 update stringify_linux.sh and make shader filename case sensitive correct 2014-02-04 15:45:24 -08:00
Erwin Coumans
ac32af2b1c fix linux build (case sensitive folder Test -> test etc) 2014-01-31 22:40:42 -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
Erwin Coumans
d37a40caf1 add GoogleTest gtest-1.7.0 and simple hello_gtest (preparation for unit tests) 2014-01-31 00:18:35 -08:00
erwincoumans
2901d4682e don't use the vendor OpenCL sdks (commented out in 'findOpenCL.lua' file), just use clew 2014-01-30 06:05:34 -08:00
Erwin Coumans
71f0537c6e add Bullet 2.x constraint solver tests for hinge, with large mass ratio
experiment with Midi controls in PairBenchmark to tune variables (will move it into a utility class, so every demo can easier use it in the future)
fix issue with broadphase, not initializing all pairs properly at pair array overflow
2014-01-28 10:25:04 -08:00
erwincoumans
7cdda65822 Experimenting with GUI in PairBench, still preliminary. Goal is to make it easier to add variables that can be tuned using GUI/gwen
Pre-compile PairBench OpenCL kernel
2014-01-26 11:27:20 -08:00
erwincoumans
ed73bce9da Move Bullet 2.x demos in a single demo 'AllBullet2Demos', for now only BasicDemo and FeatherstoneDemo is implemented. 2014-01-05 21:58:30 -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
12dd0daebc prepare for Bullet 2 demo collection 2013-12-19 22:14:37 -08:00
erwin coumans
abeea0c8b0 add Bullet icon files 2013-12-19 12:41:36 -08:00
erwin coumans
69e5454d18 Add the old Bullet 2.x obsolete demos, and CMake buildsystem files, and gradually move them to newer Bullet 3.x structure
Use statically linked freeglut, instead of dynamic glut for the obsolete Bullet 2.x demos
Add the 'reset' method to b3GpuDynamicsWorld, and use it in the BasicGpuDemo (pretty slow in debug mode, use release mode)
Don't crash in btCollisionWorld, if there is no collision dispatcher
2013-12-19 12:40:59 -08:00
erwin coumans
7964f2d8c1 split OpenCL kernels: fatal error C1091: compiler limit: string exceeds 65535 bytes in length 2013-12-17 12:33:38 -08:00
erwin coumans
ba2ba28a89 add Bullet 2.x CPU FeatherstoneMultiBodyDemo 2013-12-09 14:16:51 -08:00
erwincoumans
fca6d11381 created new Bullet 2 CPU BasicDemo, using the OpenGL 3 rendering. I will add picking soon. Hold ctrl/alt + mouse to move/zoom camera
remove reference to btGImpact (it is removed now)
2013-12-06 17:48:58 -08:00
erwin coumans
ec39c2f210 Removed to bitonic sort and ios, they were not used and confuse Bram :)
http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=9570
2013-11-25 21:38:44 -08:00
erwincoumans
b0c43520e3 more work towards re-enabling grid broadphase. 2013-11-10 22:00:35 -08:00
erwincoumans
6b5921b1b3 added a basic test for SimpleOpenGL3 2013-11-09 13:09:11 -08:00
erwincoumans
8f3051fdf1 add ImplicitCloth demo, by Stan Melax
add SimpleOpenGL3App, used in ImplicitCloth demo. The Bullet 3.x demos should use this as a template, it will clean up some of the mess.
2013-11-09 12:12:33 -08:00
erwincoumans
ef42c17143 add drawPoint/drawLine (both slow) and drawPoints (faster) to GLInstancingRenderer, with GLSL shaders 2013-09-06 12:05:56 -07: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
ac23dbc4be contact normal should point from B to A (to be consistent with Bullet 2.x)
stringify: pre-allocate bigger buffer (10MB, workaround)
2013-08-10 12:08:15 -07:00
erwincoumans
d158507c03 remove m_localPosA for now (it breaks NVIDIA OpenCL, copy of structs > 128 bytes) 2013-08-08 13:28:23 -07:00
erwincoumans
3bf003ace1 change lcpp Lua preprocessor, to keep #defines and comments, remove empty lines
remove duplicate data in b3Contact4 (now in btContact4Data shared between CPU/C++ and OpenCL)
OpenCL kernels use #include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
Increase number of batches back to 250 (from 50), need to fix this hard coded number (see https://github.com/erwincoumans/bullet3/issues/12)
Work towards GJK/EPA, in addition to SAT/clipping (early on)
2013-08-08 12:24:09 -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
906415429c added (and stripped) a simple C/C++ preprocessor (written in Lua), so the stringifier can handle the #include directive,
and embed the included files directly in the stringified files.
We need this, because we start sharing struct definitions and code between C/C++ and OpenCL (and potentially other languages)
preprocessor is from http://github.com/willsteel/lcpp
2013-08-01 21:05:19 -07:00
erwincoumans
1c0fc6bc2d report when compound pair capacity is exceeded (and avoid crash)
add tetrahedron, reorganized demos
2013-07-30 17:00:50 -07:00
erwin coumans
2793a174c6 added fracture scene .bullet file (doesn't work well yet)
added tetrahedral mesh test scene
expose b3Config as member variable for demos.
move a 'glFlush' out of the innerloop (render performance)
SSE -> SSE2 in premake
fix crash in broadphase (when no aabb's exist)
2013-07-30 12:37:16 -07:00
erwincoumans
2f0fd80c9c enable poxix MultiThreading sample under Linux 2013-07-18 21:18:09 -07:00
erwincoumans
a5b73e7c76 use Syoyo Fujita's Wavefront obj loader. made some performance improvements in debug mode for Visual Studio
use Maya style controls under Windows (need to fix Linux/OSX) use ALT+mouse to rotate, and mouse pick to pick objects
2013-07-18 15:55:38 -07:00
erwin coumans
061f7173b8 compute best axis on host and OpenCL for 1-axis SAP, based on best variance 2013-07-12 20:46:43 -07:00
erwincoumans
282e19171f fix Linux version of ConstraintDemo 2013-07-09 14:41:56 -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
f2cc840c31 move shaders to .glsl files and stringify to .h file.
add crude screenshot facility (using F1 key), it can also be used for debugging
start with shadows using shadowmap, not working yet
add experimental 'ignore' body index in raycast, using b3HitInfo.m_m_hitResult2
2013-06-28 14:10:23 -07:00
erwin coumans
bb723f9fd1 remove some un-used data from b3Generic6DofConstraint
add GLRenderToTexture helper class
enable OpenGLTrueTypeFont test
2013-06-26 16:09:40 -07:00
erwincoumans
6acf4d03a7 add Raycast kernel to stringify_linux.sh 2013-06-19 17:29:31 -07:00
erwincoumans
7561e6a4f9 move build to build3 to avoid naming conflict with Bullet 2.x
fix build error in BasicGpuDemo
Thanks to joen66 for the report here:
https://github.com/erwincoumans/bullet3/issues/5
2013-06-19 14:54:28 -07:00