Commit Graph

9674 Commits

Author SHA1 Message Date
rdb c9ea02445e Fix state attribs at primitive level in bam2egg; also prevent duplication of state attribs at primitive level if possible 2016-09-18 11:31:04 +02:00
rdb 7c79a999a5 Fix optimize=4 build on Windows; adjust Travis to make one opt4 build 2016-09-16 12:58:27 +02:00
rdb 3eed7bc042 Fix compilation issue for gcc versions before 4.3 2016-09-16 00:54:00 +02:00
rdb 0bdafe45ce Fix various issues in bam2egg:
* No longer inserts an extra root group for the ModelRoot
 * Support depth test, offset and cull bin attributes
 * Preserve non-GeomNodes under Character
 * Render attributes are applied on group level if possible
2016-09-14 21:54:35 +02:00
rdb 08ea4bf2e5 Merge branch 'release/1.9.x' 2016-09-14 20:57:26 +02:00
rdb 2c651dc96b Fix is_playing() when playing an animation backwards 2016-09-14 20:55:57 +02:00
rdb 9904980ce4 Fix async flatten of node without parents 2016-09-14 17:29:53 +02:00
deflected 234e7eefee loader: Added loading of 2D texture array
Signed-off-by: deflected <deflected@users.noreply.github.com>
2016-09-12 13:21:23 +03:00
rdb 70f10a70d1 Merge branch 'release/1.9.x' 2016-09-12 00:48:03 +02:00
rdb 632ad5e3ef Acquire mutex in cache_unref() - fixes race cond in async flatten 2016-09-12 00:36:36 +02:00
rdb a0b2a98178 Fix crash that happens when using OdeTriMeshData incorrectly 2016-09-11 12:23:28 +02:00
rdb 558f84a95f Backport normalized() method to 1.9 branch 2016-09-08 22:53:36 +02:00
rdb dc29ac8d34 Merge remote-tracking branch 'origin/release/1.9.x' 2016-09-08 22:31:04 +02:00
rdb 4d8a9aa3a1 Fix automerge failure 2016-09-08 22:27:25 +02:00
rdb 61b7af74db Merge branch 'release/1.9.x' 2016-09-08 22:18:50 +02:00
rdb 206d361f49 Support for CollisionBox, InvSphere and Tube in bam2egg 2016-09-08 22:14:44 +02:00
deflected abb6ee0542 gobj: Fixed wrong texture pool key for 2D texture arrays
- 2D texture arrays are added to internal storage with
        specific unique name, so keep it as texture pool key
        instead of filename.
2016-09-08 20:36:02 +02:00
David Rose 05d74624ee Merge branch 'master' of https://github.com/panda3d/panda3d 2016-08-29 16:44:05 -07:00
David Rose fb6637ddac expand PfmFile::merge() to support other than 3 channels, and not to fuss about NaN's in the result 2016-08-29 16:43:13 -07:00
rdb a9345ad633 Fix bug: bam2egg ignores non-GeomNodes directly under Character node
This result in some animated models only properly exporting the skeleton without geometry if the geometry is under non-GeomNodes.
Fixes LP https://bugs.launchpad.net/panda3d/+bug/1617834
2016-08-29 02:09:03 +02:00
rdb 20353f33eb Fix missed switch cases for 1d texture arrays 2016-08-09 01:47:44 +02:00
rdb 1d2e17932c Don't require spaces around : in #extension directive 2016-07-30 12:59:42 +02:00
rdb 47f999fdec Improve GLSL preprocessor; support GL_GOOGLE_include_directive 2016-07-20 16:00:34 +02:00
rdb 2eba4dea9b Change handling of unsupported render mode so that behaviour can be shared among renderers 2016-07-20 15:59:42 +02:00
rdb 82b7728683 Merge remote-tracking branch 'origin/release/1.9.x' 2016-07-20 14:32:34 +02:00
rdb 47388b0dbc Separate out CPython calls from core libs; eliminate need for pystub 2016-07-20 14:30:41 +02:00
rdb 339eb58007 Fix compile error on some Mac versions 2016-07-20 11:45:14 +02:00
rdb 400bc2cc26 Support .ktx textures, ETC1/ETC2/EAC compression 2016-07-15 11:50:57 +02:00
rdb 8381118a97 Assorted tweaks and compile warning fixes 2016-07-14 12:54:39 +02:00
rdb 106cf2cad0 Fix randomly slanted/crashing TextGraphics 2016-07-12 19:31:23 +02:00
rdb 6f168446d0 Merge branch 'release/1.9.x' 2016-07-12 14:57:48 +02:00
rdb 7b7bf93118 Fix frame chug when loading big model asynchronously (LP #1019599) 2016-07-12 11:27:52 +02:00
rdb f94db0661e Add move semantics to CDLockedReader/CDWriter 2016-07-10 17:22:34 +02:00
rdb 8b67ab31f5 Fix obscure compile error 2016-07-10 16:49:00 +02:00
rdb bfe7a7b1d3 Merge from 1.9, cleanup DX9/shader, fix built-in shadow mapping in DX9 2016-07-10 16:44:09 +02:00
rdb e098da9030 Support uint8 indices in DX9 renderer 2016-07-10 15:48:17 +02:00
rdb c34758ea5c Cg fixes for DX9 2016-07-10 14:31:58 +02:00
rdb fa7730819f Fix assertion when using aux render targets in DX9 2016-07-10 14:05:29 +02:00
rdb f7fde882b8 Fix uninitialised variable 2016-07-10 12:25:35 +02:00
rdb 85386049f0 Merge branch 'release/1.9.x' 2016-07-09 15:39:07 +02:00
rdb 44d59edc30 Fix cube map render and rendering the same camera with two GSGs
The problem was that the cull result was being reused across different lens indices and GSGs
2016-07-09 14:42:25 +02:00
rdb 11861cb73d Backport shadow-depth-bits config var to 1.9 2016-07-09 14:27:33 +02:00
rdb 47d1b4e220 PythonTask: don't crash if repr(owner) errors, deal better with bad owners 2016-07-09 10:02:55 +02:00
rdb fd8dd360b2 Fix compile error statically linking build with DX9 2016-07-09 09:59:51 +02:00
rdb f35a7612e5 Fix interrogate error with PhysX 2016-07-03 09:20:55 +02:00
rdb a906f34eee M_alpha now no longer squares the alpha component it writes to the framebuffer.
To re-enable the old behaviour, set old-alpha-blend in Config.prc.
2016-06-28 22:13:33 +02:00
rdb 1b33fec978 Remove assertion when reregistering the same AudioManager constructor 2016-06-28 21:35:53 +02:00
rdb 54819dbcde Fix crash when using TextGraphic in texts 2016-06-28 19:11:58 +02:00
rdb 365e1d53ef Merge branch 'release/1.9.x'
Conflicts:
	makepanda/makepandacore.py
	panda/src/cocoadisplay/cocoaGraphicsStateGuardian.mm
2016-06-27 01:18:02 +02:00
rdb 7dfd907e17 Try to report red/green/blue bits for Cocoa windows 2016-06-27 00:38:14 +02:00