1009 commits

Author	SHA1	Message	Date
Brad Davis	cb311408c6	Remove _compositeFramebuffer from display plugins	2019-03-12 12:20:20 -07:00
SamGondelman	5ce8f566cc	more overlay wip	2019-01-25 11:10:11 -08:00
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
Sam Gateau	a295c6ffc8	scripts\developer\utilities\lib\jet\qml\TaskListView.qml	2018-12-04 22:41:36 -08:00
sam gateau	2c4cd68a00	iterating on a simpler engine graph	2018-11-30 17:43:27 -08:00
sam gateau	14bf383c50	MIgrating everything to collect the items out from the render task	2018-11-29 17:59:04 -08:00
Sam Gondelman	f728a8ba5a	Update drawCellBounds.slv	2018-11-27 10:57:57 -08:00
sam gateau	f348cc35c4	separting debug in its own task	2018-11-26 15:20:45 -08:00
Sam Gondelman	968ffe7ec3	Merge branch 'master' into branching	2018-11-16 10:25:02 -08:00
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
John Conklin II	60c538309a	Merge pull request #14411 from SamGondelman/fading ... Fix for avatar flashing on fade out	2018-11-15 13:58:43 -08:00
SamGondelman	597ff773e1	fix for avatar flashing	2018-11-15 10:52:22 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
Olivier Prat	45e0f65972	Merge branch 'ao' of http://github.com/Zvork/hifi into ao	2018-11-14 09:48:24 +01:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
SamGondelman	df1a848811	fix fade out	2018-11-12 12:58:40 -08:00
John Conklin II	9d404a6cf3	Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo ... case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)	2018-11-12 10:45:52 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08:00
Olivier Prat	9d5dcec0a0	Merge from master	2018-11-08 09:14:42 +01:00
Sam Gateau	fa0c58fa0e	Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend	2018-11-02 00:08:47 -07:00
Sam Gondelman	e534e09801	Update LightClusterGrid_shared.slh	2018-11-01 15:35:48 -07:00
SamGondelman	dc9405775f	more branching removal	2018-10-29 16:42:46 -07:00
SamGondelman	e8c5324e39	start removing branching	2018-10-25 11:59:04 -07:00
Olivier Prat	69ace03919	Merged with master	2018-10-24 08:27:39 +02:00
SamGondelman	0efbdc1ab5	merge with master	2018-10-23 14:33:57 -07:00
sam gateau	4565422876	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-10-23 14:02:15 -07:00
SamGondelman	d254db02dc	small cleanup	2018-10-23 11:27:17 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
sam gateau	702f6229b8	Removing the pseudo fix for lod culling that is not ready in this pr	2018-10-23 08:50:10 -07:00
Olivier Prat	5f3a299fd9	Merge with master	2018-10-22 14:02:24 +02:00
Sam Gateau	0379e0dd05	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-20 23:52:35 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
Olivier Prat	cfcf6f05a2	Merge with master	2018-10-09 14:18:02 +02:00
Sam Gateau	5fbf10c2f3	INtroducing the LODEnabled flag on the render item in order prevent LOD to hide important objects regardless of the LOD level.	2018-10-08 23:48:12 -07:00
Olivier Prat	4c84ae02fa	Merge branch 'master' of http://github.com/highfidelity/hifi into ao	2018-10-02 18:13:57 +02:00
Sam Gateau	c593f00839	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-01 19:10:18 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
sam gateau	85b3b883f9	REmove cruft	2018-09-27 11:11:14 -07:00
sam gateau	b5a47b2e76	Finalizing the renaming from Skinned to Deformed	2018-09-26 14:11:22 -07:00
sam gateau	e41b8f06e1	Cleaning up the pipeline and checking that it is working for all cases	2018-09-25 13:57:50 -07:00
Sam Gateau	69734ce21b	Getting better'	2018-09-24 22:34:43 -07:00
Olivier Prat	b1db7ab403	Fixed for stereo rendering with resolution level 0	2018-09-20 10:18:06 +02:00
Bradley Austin Davis	fade3a8de0	Fixing shader implicit type conversions	2018-09-06 09:08:36 -07:00
Brad Davis	9a28e04e37	Remove all tabs from shaders	2018-09-06 08:59:07 -07:00
Brad Davis	87b9594bd0	Fix warnings	2018-09-06 08:59:06 -07:00
Brad Davis	07fba89f0f	Remove uniforms from item status	2018-09-06 08:59:06 -07:00
Brad Davis	719ae25adb	Remove uniforms from drawCellBounds	2018-09-06 08:59:05 -07:00
Brad Davis	c8eb4da6b6	Remove simple draw task uniforms	2018-09-06 08:59:05 -07:00
sam gateau	194903692e	clening up the code in LODmanager and the associated js/qml	2018-08-30 18:09:11 -07:00
Sam Gateau	63eb57c741	Exploring PID again	2018-08-28 08:58:25 -07:00
Sam Gateau	d97d655148	USing a simpler halfTan test for culling	2018-08-26 23:17:29 -07:00
Sam Gateau	294fe51fde	Trying to simplify the LOD culling test	2018-08-24 16:48:23 -07:00
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -07:00
Sam Gateau	3aa47a6695	Merging with master after a bunch ofchanges	2018-08-22 08:46:40 -07:00
John Conklin II	b28aa3951f	Merge pull request #13802 from jherico/feature/scribe_programs ... Migrating to scribe program descriptors	2018-08-20 14:48:54 -07:00
John Conklin II	61f0e9323a	Merge pull request #13800 from samcake/zvork-shadow ... Fixing PR13731 shader error on Mac	2018-08-10 14:10:47 -07:00
Brad Davis	f03370c826	Migrating to scribe program descriptors	2018-08-09 17:58:34 -07:00
SamGondelman	bba806f78c	merge with master, fix uniform slots, use varyings for sigma	2018-08-08 22:27:22 -07:00
Olivier Prat	2584ce4c96	Merged with master	2018-08-08 08:42:44 +02:00
SamGondelman	6ff0b9d417	fix debug tools	2018-08-07 15:25:56 -07:00
SamGondelman	a7dec8fb75	parabola and particle shader fixes	2018-08-06 15:49:52 -07:00
Olivier Prat	c56bb9a855	Small optimization by using squared distance and not distance in depth sort	2018-08-06 08:20:21 +02:00
Olivier Prat	92e64510ec	Fixed draw frustum and draw aabb code	2018-08-04 15:58:24 +02:00
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Brad Davis	04e84f1d23	Moving to cmake time shader compiling	2018-08-03 14:58:11 -07:00
Olivier Prat	30600dff93	Non shadow casters now increase shadow scene bounds only in light direction	2018-07-31 15:23:27 +02:00
Sam Gateau	bff372a118	Merge with master	2018-07-13 13:00:00 +02:00
John Conklin II	b59e9f9899	Merge pull request #13582 from Zvork/scale ... Render Scale Resolution applied only to 3D rendering not HUD	2018-07-12 10:56:03 -07:00
Olivier Prat	703fc20856	Separate scale between 3D rendering and HUD	2018-07-11 12:17:36 +02:00
Sam Gateau	66199e9aab	Cleaning up the isENabled interface andthe qml	2018-07-11 11:57:18 +02:00
Olivier Prat	6814c487ec	Fixed slot collision between fade map and material texture table	2018-07-10 16:16:51 +02:00
Olivier Prat	50d16eca80	Added object fade parameters to shape pipeline locations	2018-07-10 12:26:51 +02:00
Olivier Prat	dfe51b57e8	Fade object params are now passed through uniform buffer	2018-07-10 10:53:38 +02:00
Sam	c1856a5e36	Make shadows work with one cascade	2018-07-02 10:46:53 +02:00
SamGondelman	8af1beca8d	add isGroupCulled for model overlays	2018-06-04 12:07:57 -07:00
samcake	386c0f9ab2	Re review adjustments	2018-05-31 12:16:57 -07:00
Sam Gateau	513acc529e	INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine	2018-05-30 23:31:54 -07:00
samcake	457b77ca09	fixing static definition maybe	2018-05-30 13:37:32 -07:00
samcake	2e9076c71e	Clean up and trying to get ready for merge	2018-05-30 11:14:49 -07:00
samcake	873cabe284	Cleaning the code	2018-05-29 17:46:25 -07:00
Sam Gateau	678effdb48	Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey	2018-05-26 23:28:59 -07:00
samcake	44a8d880fa	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-24 14:31:53 -07:00
Sam Gateau	13d02011f3	There and back again...	2018-05-24 00:53:29 -07:00
samcake	cf58f31f3e	Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine'	2018-05-23 15:08:48 -07:00
samcake	b06356b0fd	Remove deprecated and commented code	2018-05-23 11:58:25 -07:00
samcake	072d0f262c	FIxing the problem of shadows not repecting the cull group	2018-05-21 18:07:04 -07:00
Sam Gateau	e1690a28e1	Merging with master	2018-05-20 23:04:11 -07:00
samcake	36a08fdd84	Friday night end of the day, last compilation.... almost	2018-05-18 17:41:28 -07:00
Clement	da08d747dc	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-05-17 12:10:08 -07:00
samcake	179801dab6	FIxing the transparent ambient lighting bug	2018-05-15 17:22:28 -07:00
Olivier Prat	bed7752a1a	Fixed bug with highlighting and TAA	2018-05-15 12:27:04 +02:00
Sam Gateau	aa75af5ca4	Merge pull request #12814 from Zvork/shadow ... Shadow bug fix : incorrect shadow map far plane when casting shadow on non-'shadow casters'	2018-05-14 13:00:15 -07:00
samcake	02be965271	more stuff fixed	2018-05-10 18:10:01 -07:00
Sam Gateau	9b65e0771b	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-05-05 12:17:20 -07:00
samcake	6424b91e86	Templatizing the timeProfiler for the task	2018-05-04 17:58:21 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
samcake	6d251c4cd3	Bringing the work and refinment done in workload branch to master branch	2018-05-03 17:46:50 -07:00
Olivier Prat	440e2b8452	Merged with master	2018-04-20 08:13:25 +02:00
Stephen Birarda	c4ad93bafb	Merge pull request #12782 from SimonWalton-HiFi/qregexp ... Replace LogHandler repeated regex scheme with assigned ID tracking scheme	2018-04-18 17:28:48 -07:00
Olivier Prat	89669b326b	Merge branch 'master' of http://github.com/highfidelity/hifi into taapre	2018-04-17 09:24:35 +02:00
Simon Walton	adcf991125	Improvements to profiling data capture ... Use code-provided task names for profile blocks; record QML URLs for loadInternal.	2018-04-11 17:36:32 -07:00
Simon Walton	9b6306601a	Merge Clement's PR12700 diffs for early trace start	2018-04-10 13:13:46 -07:00
Olivier Prat	2974e05cf2	Tweaked bloom intensity mix	2018-04-10 11:13:37 +02:00
Olivier Prat	573f399023	Fixed incorrect shadow frustum far clip computation due to not taking into account shadow receivers	2018-04-06 14:45:16 +02:00
Simon Walton	93bcd1df20	Fix Linux build for std::call_once with lambda ... MacOS & Ubuntu don't like the combination of std::call_once and lambda w/ reference param, for some reason. Change to pointer param.	2018-04-04 17:55:45 -07:00
Simon Walton	d05f0600d4	Handle one-time messages outside LogHandler class ... Also change to std::call_once for the file-scope message IDs.	2018-04-04 15:44:47 -07:00
Simon Walton	ed3347a89b	Repeated logging - reviewer fixes	2018-04-04 14:11:10 -07:00
Simon Walton	692ccfc09b	Create HIFI_FCDEBUG(_ID) variants that require a category ... Original macros use default settings.	2018-04-04 09:49:15 -07:00
Simon Walton	7d16ca9c1c	Remove uses of addRepeatedMessageRegex() and its implementation ... Change to new log-message ID scheme.	2018-04-03 17:54:01 -07:00
samcake	2ee0af03c8	Add an extra sanity check when calling fetchMetaSubItems when the subItems is not allocated yet	2018-03-28 16:17:55 -07:00
Olivier Prat	da6bd92ff6	Merged with master	2018-03-09 10:07:25 +01:00
samcake	b8fb97c824	Resolving conflicts	2018-03-02 10:36:55 -08:00
samcake	a7542d5b90	fixing the shadow	2018-02-28 17:46:22 -08:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
Olivier Prat	2d71d7da9f	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-02-27 09:11:43 +01:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
Anthony J. Thibault	f5fcaae283	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-26 10:55:44 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
Brad Davis	2f34fb2e42	Merge remote-tracking branch 'upstream/stable' into HEAD	2018-02-22 10:20:10 -08:00
Anthony J. Thibault	86351f19a9	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-22 08:44:21 -08:00
Olivier Prat	f53c2f41a5	Merge branch 'master' of http://github.com/highfidelity/hifi into prev	2018-02-21 09:46:38 +01:00
Olivier Prat	247a1f5769	Working ring frame buffer with antialiasing but still issues with TAA on HMD	2018-02-20 09:22:19 +01:00
Nissim Hadar	b2a06cdb98	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/ShapeEntityItem.h # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h	2018-02-19 13:05:57 -08:00
Nissim Hadar	6a9bbaf0a5	WIP - clean-up.	2018-02-19 12:00:30 -08:00
Olivier Prat	f5a2557a2e	Merged with master	2018-02-19 17:28:39 +01:00
Nissim Hadar	81c9e449e6	Models casting shadows (again). (Something stupid happened...)	2018-02-18 10:19:17 -08:00
Nissim Hadar	dc3b03c9bc	Added shadows to shapes - still sucks...	2018-02-16 18:37:47 -08:00
SamGondelman	b189433855	merge	2018-02-15 15:50:36 -08:00
SamGondelman	2d754edf74	CR	2018-02-15 15:48:41 -08:00
Sam Gondelman	15cdfef16a	Merge branch 'master' into decals	2018-02-14 17:33:01 -08:00
samcake	6357f36a97	Fixing names	2018-02-14 10:39:14 -08:00
samcake	1d3ae1b187	Work in progress to get the render items beeing tagged correctly for groupCulled	2018-02-13 17:50:01 -08:00
Anthony J. Thibault	d2c199104e	Avatars use Dual Quaternion Skinning and Model Entities do not.	2018-02-13 17:47:49 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -08:00
samcake	a98f55298b	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2018-02-13 13:06:58 -08:00
samcake	f64e5f2444	Introducing the cull group	2018-02-13 13:06:26 -08:00
Clément Brisset	593113c102	Merge pull request #12387 from Atlante45/new-master ... Merge stable back into master	2018-02-13 12:59:59 -08:00
Andrew Meadows	f1495d27f6	try task link dependency rather than include	2018-02-13 08:58:24 -08:00
Andrew Meadows	cfb64ad693	add LoggingCategory data member to JobContext	2018-02-13 08:57:20 -08:00
Andrew Meadows	8231a56b22	pull task out of render and into its own lib	2018-02-13 08:56:11 -08:00
Atlante45	94973fa1d0	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-02-12 15:21:01 -08:00
John Conklin II	51bf3c1466	Merge pull request #12323 from Zvork/shadow ... Shadow performance / acnee improvements	2018-02-12 14:41:13 -08:00
samcake	bc51f3643d	Adding a check for item existence before calling the update on the render::Item	2018-02-12 10:21:50 -08:00
SamGondelman	5337377ef5	Merge remote-tracking branch 'upstream/master' into decals	2018-02-09 14:40:20 -08:00
samcake	b66da1897d	improving the forward rendering pass, removing the specular variation and making it defautl	2018-02-08 17:59:07 -08:00
Bradley Austin Davis	fd007e845d	Squashed scribe changes	2018-02-07 10:29:29 -08:00
Olivier Prat	179aca2bf9	Shadow task now uses LOD culling from main view task	2018-02-06 11:47:39 +01:00