Commit Graph

3222 Commits

Author SHA1 Message Date
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
erwincoumans
2442977725 Merge pull request #209 from erwincoumans/master
see 670576ec72
2014-08-12 12:21:52 -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
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
=
35fa146f13 fix build 2014-08-01 14:41:22 -07:00
=
3c9ee80504 fix compile error 2014-08-01 14:25:56 -07:00
Erwin Coumans
86f793a6ae start of URDF parsing (extremely preliminary) 2014-08-01 13:01:31 -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
a08d4a94e3 create URDF skeleton for a demo (only loading data, not converting it yet) 2014-07-31 16:54:28 -07:00
Haydn Trigg
3d944782e9 Update btQuickprof.cpp
removed inline declaration from get time seconds function definition
2014-08-01 07:25:31 +09:30
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
793bcb1cde move menuItems into constructor (was a typo) 2014-07-31 14:20:24 -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
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
4b8c8e7910 expose basic parameters in SimpleOpenGL3App, test with accumulated hinge angle, GUI is still preliminary 2014-07-31 11:47:04 -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 (Google)
e1abb8ba89 fix #include path and compile error 2014-07-30 08:27:17 -07:00
Erwin Coumans
a817b0bb24 support Retina for movie generation in SimpleOpenGL3App 2014-07-29 23:06:36 -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
fb01827aee expose debugDraw in gl3 2014-07-29 14:03:15 -07:00
=
cac50c1a8e remove a few warnings, fix GLInstancingRenderer::drawLines 2014-07-29 11:08:09 -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
811087b099 Merge branch 'master' of https://github.com/bulletphysics/bullet3
Conflicts:
	btgui/OpenGLWindow/X11OpenGLWindow.cpp
2014-07-27 10:55:58 -07:00
Erwin Coumans
0b40e1a899 add upAxis option for Y or Z up
remove some warnings
2014-07-27 10:29:10 -07:00
Erwin Coumans
5e9102bf00 fix warnings in OpenGLTrueTypeFont 2014-07-27 10:25:36 -07:00
Haydn Trigg
6ff7a6d48b Update btQuickprof.cpp 2014-07-26 00:44:16 +09:30
Haydn Trigg
4a43eab4dd Update btQuickprof.h 2014-07-26 00:44:15 +09:30
erwincoumans
d347bca2ba use lower-case input by default under Linux 2014-07-20 06:22:50 -07:00
bgossage
d58857f06b -- Corrected cast of 32-bit int to 64-bit pointer
-- Removes 64-bit portability issue.
2014-07-17 11:13:07 -05: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
Jukka Jylänki
1054fd1992 Fix CMakeLists.txt to not unconditionally add include paths to native system headers in /usr/include and /usr/local/include, which contain include files for the host architecture, and not the target architecture that is being compiled for. 2014-07-12 13:50:12 +03:00
Jack Andersen
d4fd695d56 Compile fix for parallelLinearBvh.cl on OS X Intel HD 5000 2014-07-11 14:11:11 -10:00
Erwin Coumans (Google)
433d349369 add option for newer Linux demos to dynamically load X11, glX and OpenGL 1 functions
(and avoid having to link against X, glx and GL)
-DGLEW_INIT_OPENGL11_FUNCTIONS
-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS
-DDYNAMIC_LOAD_X11_FUNCTIONS
and link against libdl (for example usingi -ldl)
2014-07-11 14:25:32 -07:00
Erwin Coumans (Google)
72ae3b6afb test commit for travis-ci.org 2014-07-11 13:21:00 -07:00
Erwin Coumans (Google)
b99ef60451 test commit for travis-ci.org 2014-07-11 13:17:33 -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 (Google)
27b0e4d1e6 experiments with params in AllBullet2Demos (quick hack for testing, will clean this up soon)
yet another workaround to make Intel GPU work with glDrawBuffers on Ubuntu
2014-07-08 16:42:57 -07:00
Erwin Coumans (Google)
f89d70b895 fix Linux build 2014-07-03 22:41:07 -07:00