Commit Graph

20292 Commits

Author SHA1 Message Date
Sam Edwards 58bd610b94 Merge branch 'master' into cmake 2014-11-15 16:36:13 -08:00
rdb 9f46ad7835 FreezeTool shouldn't assume that panda3d.py exists 2014-11-09 11:09:24 +00:00
David Rose 980ed44a59 fix py2exe support 2014-11-04 19:16:02 +00:00
rdb 5ee64279a4 Oops, stupid debug message, how embarrassing 2014-11-04 15:07:01 +00:00
rdb ce1282c7e3 Fixes for primitive restart index stuff 2014-11-04 14:14:49 +00:00
rdb 0f35480fcf Allow disabling primitive restart index. Also, better handling of unsupported shader languages. 2014-11-03 02:29:05 +00:00
Sam Edwards cc94222757 Merge branch 'master' into cmake 2014-11-01 23:58:23 -07:00
rdb 2c4fbf08be Also use MSVC intrinsics for bit scanning (up to 2x as fast on 64-bit systems) 2014-10-31 17:05:10 +00:00
rdb 10a72e595b Improve pbitops performance by enabling GCC intrinsics when available 2014-10-29 21:18:28 +00:00
David Rose 747e1fe381 we have to install config_framework.h now 2014-10-29 17:00:24 +00:00
rdb 457714d86d Fix compiler warnings in gtk-stats 2014-10-29 13:19:08 +00:00
rdb 52a4278b80 Fix cwiseProduct compile error when building with Eigen 2014-10-29 12:20:22 +00:00
David Rose 5d5150c5aa componentwise_mult() 2014-10-28 21:46:15 +00:00
David Rose 5dad10cf78 PfmFile::add_sub_image(), mult_sub_image() 2014-10-28 21:45:41 +00:00
David Rose 7bce2d6124 support GL_RGBA16, GL_LUMINANCE16, GL_LUMINANCE_ALPHA16 etc. 2014-10-28 21:44:45 +00:00
David Rose df33105e30 workaround for some artifacts with missing points in distortion map 2014-10-28 21:43:27 +00:00
rdb d3947d4b01 Fix scissoring crash. Also prevent crash when GLSL is not supported. 2014-10-27 16:09:33 +00:00
rdb d7b21c9aeb Replace assert with more helpful error 2014-10-27 15:18:49 +00:00
rdb 6d6a4398c6 Change max vertices to 65534 to avoid conflict with strip cut index 2014-10-27 13:25:38 +00:00
rdb 241adfe34d Implement comparison and hashing in NetAddress. Clean up Socket_Address code a bit. 2014-10-27 12:09:56 +00:00
rdb c7a3a7d4ff Fix compile error 2014-10-25 12:11:17 +00:00
rdb 105e26092a Fix compile error 2014-10-25 12:09:33 +00:00
Sam Edwards e8164d3b06 include: Revert a couple of include changes that are no longer needed since the last upstream merge. 2014-10-22 00:22:11 -07:00
Sam Edwards 9ec74a0421 Merge branch 'master' into cmake
Conflicts:
	panda/src/display/graphicsWindow_ext.cxx
	panda/src/mathutil/triangulator3.cxx
	panda/src/putil/pythonCallbackObject.cxx
2014-10-21 22:34:13 -07:00
Chris Brunner f950b01dbf i need dis 2014-10-21 22:37:19 +00:00
rdb 5c681a0346 public -> private 2014-10-21 21:40:53 +00:00
rdb c3bf91d608 GCC atomics also work in clang 3.0+ 2014-10-21 20:49:58 +00:00
rdb 0181fae076 This should fix LP bug #954257; replace locked BamWriters mechanism with atomic list. 2014-10-21 20:45:30 +00:00
David Rose a9d1d1ad54 fix build issue, should include look_at.h instead of look_at_src.h 2014-10-21 18:07:27 +00:00
rdb 3ce705519d Oops, forgot these two files. Part of cfsworks' patch 2014-10-20 11:02:42 +00:00
rdb a65b477734 Commit patches by cfsworks:
cxx: Fix missing includes masked by composite builds.
misc: Fix typos in comments.
config: Fix missing config forward-declarations.
direct: Adjust Python imports to panda3d.* instead of pandac.*.
display: Split graphicsWindow out into an extension.
framework: Use if/elif/elif/endif instead of ifdef/elif/elif/endif.
ode: Remove erroneous INLINE declarations.
interval: Fix missing import.
2014-10-19 22:41:47 +00:00
rdb 783d8552ef Fix bin2c to generate an include to stddef.h (for size_t definition) 2014-10-19 22:32:30 +00:00
rdb f3094043df Fix left shift in Python (LP bug #1289475) 2014-10-19 15:50:54 +00:00
rdb 1c25bb4ad8 Automatically enable stereo FBOs when stereo is enabled 2014-10-19 15:21:02 +00:00
Sam Edwards edd2a45d38 CMake: Don't test host system's /proc paths for availability on target. This allows better cross-compilation. 2014-10-18 20:19:16 -07:00
Sam Edwards 1db28bb0c8 ode: Remove erroneous INLINE declarations. 2014-10-18 16:53:17 -07:00
Sam Edwards 442f58986d include: Fix a couple more missing includes... 2014-10-18 16:53:17 -07:00
Sam Edwards eaeff00901 dtool: Undo a few changes to dtoolbase that aren't strictly necessary, to better parallel upstream. 2014-10-18 16:53:13 -07:00
Sam Edwards a85d1f4cc2 Merge remote-tracking branch 'upstream/master' into cmake 2014-10-18 15:13:30 -07:00
Chris Brunner 01c9ffc7ca Added option to convert lights to locators 2014-10-16 22:00:44 +00:00
David Rose 9f896821e7 fix scissoring during the DisplayRegion's glClear() operation 2014-10-16 00:57:21 +00:00
rdb 1bf3738124 oops, I broke non-OSX build 2014-10-13 11:34:19 +00:00
rdb 31a71c990d Fix issues with OS X 10.9 compilation, fix issues uncovered by clang 2014-10-12 18:45:37 +00:00
Sam Edwards d1c6d453ba CMake: Update pandac.__init__ to match the extensions_native. 2014-10-12 01:28:46 -07:00
Sam Edwards 53f5455d4d cocoadisplay: Add missing #import for NSEvent. 2014-10-12 01:09:18 -07:00
Sam Edwards 43036db554 cmake: Bring cocoadisplay back up to parity with ppremake. 2014-10-12 00:57:23 -07:00
Sam Edwards 52dc814a3b interrogate: Isolate out remaining Python objects from the Panda3D core libraries to the Interrogate extensions. 2014-10-11 20:45:16 -07:00
Sam Edwards eaa323aa65 display: Migrate the Python window func stuff to an extension. 2014-10-11 20:39:16 -07:00
Sam Edwards 3bd9750439 Merge branch 'cmake-proper-interrogate' into cmake 2014-10-11 18:15:59 -07:00
Sam Edwards 7c876e03ae CMake: Update CMakeLists for new upstream changes. 2014-10-11 18:13:20 -07:00