975 commits

Author	SHA1	Message	Date
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
Olivier Prat	92279b5939	Merged with master	2018-02-05 18:24:05 +01:00
Olivier Prat	2940a67b3e	Merged with master	2018-02-03 16:55:25 +01:00
SamGondelman	4d4294dd6a	Merge remote-tracking branch 'upstream/master' into decals	2018-02-02 16:50:01 -08:00
SamGondelman	d7f4b033e8	wip finish adding material entity	2018-02-02 16:49:33 -08:00
John Conklin II	c8bb26ae74	Merge pull request #12294 from samcake/pastel ... Improve startup time by optimizing shader bookkeeping	2018-02-02 16:37:44 -08:00
Olivier Prat	8a011036ef	Removed warnings on mac and ubuntu	2018-02-02 18:07:35 +01:00
Olivier Prat	ac92b3c130	Merge branch 'master' of http://github.com/highfidelity/hifi into scribe	2018-02-02 14:01:59 +01:00
Olivier Prat	234cb1e3e6	Added anti frustum test to remove lower cascade objects from higher shadow cascades	2018-02-02 12:15:43 +01:00
Olivier Prat	3804917cf4	Orthographic octree selection seems to be working	2018-02-02 09:40:57 +01:00
Seth Alves	96b6e85745	formatting	2018-01-31 12:24:23 -08:00
Seth Alves	64a46bf5df	merge from upstream	2018-01-31 10:43:41 -08:00
Olivier Prat	d422545c78	Changed shadow task to do a single octree query as well as pipeline/depth sort for all cascades. Still issue with disapearing objects from shadow map with viewpoint	2018-01-31 17:13:06 +01:00
samcake	062bfbd7b6	Merging with master	2018-01-30 18:33:34 -08:00
samcake	f044cf76d6	add the count of compilations of shaders to avoid recompiling them if ot needed	2018-01-30 18:31:30 -08:00
Atlante45	bc819c698e	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
samcake	2dcedf9f39	cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation	2018-01-30 12:52:05 -08:00
Anthony Thibault	1e8a5485c1	8x shader compilation optimization and watchdog disable ... addPlumberPipeline in RenderPipelines.cpp would recompile a single program 7 more times then necessary. This was causing startup times on Mac OS X to trigger the deadlock watchdog. Even with this fix, compiling shaders is still too slow, As a workaround, we disable the watchdog thread during rendering pipeline setup.	2018-01-30 10:27:06 -08:00
Olivier Prat	5e6300ce46	Merged with master	2018-01-30 09:52:30 +01:00
samcake	1fd4c5c1a4	Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information	2018-01-29 12:20:51 -08:00
samcake	8dfa3aace3	cleaning en route	2018-01-26 17:34:37 -08:00
Sam Gateau	51dac04374	Introducing the tag in lieu of the vsisiblity mask	2018-01-26 02:59:43 -08:00
Sam Gateau	23b99f04cd	Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch	2018-01-25 18:33:37 -08:00
samcake	2f4e61888f	Making it work maybe	2018-01-25 16:57:35 -08:00
Brad Davis	bde5282541	Fix loading of the render config JSON	2018-01-25 12:43:49 -08:00
samcake	ae6a95ec0d	fixing my bugs on vissibility	2018-01-24 18:07:35 -08:00
Olivier Prat	95882e0cde	Merged with master	2018-01-24 10:51:54 +01:00
Olivier Prat	c92a9975ba	Merged with master	2018-01-24 09:53:38 +01:00
Seth Alves	1cbc2e31cf	merge from upstream	2018-01-23 15:21:03 -08:00
Seth Alves	bce9b5f459	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-01-19 09:53:54 -08:00
Seth Alves	6aa389cad0	trying to now show overlays in mirrors	2018-01-19 09:53:41 -08:00
Brad Davis	bdfa1273ba	Merge remote-tracking branch 'upstream/master' into android	2018-01-18 17:33:10 -08:00
Seth Alves	31c007d167	more backwards logic, added withViewVisibilityMask call in ItemKey	2018-01-18 14:15:30 -08:00
Olivier Prat	902bfac380	Merged with master	2018-01-18 18:31:04 +01:00
Seth Alves	97a4f141eb	fix link trouble	2018-01-18 08:12:14 -08:00