723 commits

Author	SHA1	Message	Date
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
Brad Davis	bde5282541	Fix loading of the render config JSON	2018-01-25 12:43:49 -08:00
Olivier Prat	c92a9975ba	Merged with master	2018-01-24 09:53:38 +01:00
Brad Davis	bdfa1273ba	Merge remote-tracking branch 'upstream/master' into android	2018-01-18 17:33:10 -08:00
Olivier Prat	902bfac380	Merged with master	2018-01-18 18:31:04 +01:00
SamGondelman	a44c965f56	fix black flashing on transparent objects	2018-01-17 15:59:07 -08:00
Olivier Prat	e6caa83d73	Merged with master	2018-01-17 16:35:31 +01:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Olivier Prat	54eab1c878	First working local lights on transparent objects	2018-01-15 17:49:55 +01:00
Sam Gateau	d6e771f01d	Adding the batch as aprameter to the custom pipeline register to be able to make program through a call to runLamda in order to perform the make call in the present thread where the gl context is valid	2018-01-13 10:02:53 -08:00
SamGondelman	a9d5dda976	always push default haze to current frame	2018-01-04 17:54:23 -08:00
Nissim Hadar	409eade006	Merge branch 'master' into hazeOnTransparent	2017-12-14 11:41:53 -08:00
Sam Gateau	a75010fb94	Merge pull request #11938 from Zvork/csm ... Cascaded Shadow Maps and bug fix	2017-12-14 00:32:43 +07:00
samcake	63fb9b5503	fix float literal syntax	2017-12-11 09:30:31 -08:00
Olivier Prat	a679dc6705	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-11 08:48:48 +01:00
Sam Gateau	eec4e966a7	Fix the linux build and correct the name of the property Intensity to Opacity	2017-12-10 10:13:49 -08:00
samcake	6148458aeb	Workable state, need final clean up and testing	2017-12-07 16:04:08 -08:00
samcake	5f85e8e2cb	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-07 08:48:12 -08:00
Bradley Austin Davis	2a91e98813	Fix iterator names	2017-12-06 14:26:07 -08:00
Brad Davis	e626ca3ccd	Working on scene threading optimizations	2017-12-06 14:26:07 -08:00
Olivier Prat	0b6dcb2717	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-05 09:18:26 +01:00
samcake	1514cdfb2f	extend the set of interface for multi highlight	2017-11-21 17:59:45 -08:00
samcake	a74372b233	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-20 09:26:29 -08:00
Brad Hefta-Gaub	33d35bbe14	Merge pull request #11770 from AndrewMeadows/sort-and-throttle ... sort and throttle UpdateRenderables work... when necessary	2017-11-19 11:09:08 -08:00
samcake	e0740b323d	keep debuging the seelction highlight	2017-11-17 18:11:18 -08:00
Olivier Prat	d98dfff0a8	Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage)	2017-11-17 19:25:21 +01:00
Olivier Prat	f8c241c429	Merged disappearing shadow bug fix from pcf branch	2017-11-16 12:19:19 +01:00
Sam Gateau	3f5b21ec22	Merge pull request #11559 from Zvork/bloom ... Bloom	2017-11-15 15:11:31 -08:00
Olivier Prat	e4818f1b4f	Merged request changes from shadow	2017-11-15 17:51:06 +01:00
Olivier Prat	f47a3e7d2c	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
Andrew Meadows	5050a554a2	remove warning about signed/unsigned comparison	2017-11-14 15:57:17 -08:00
Olivier Prat	5102c8e1b1	Merged with master	2017-11-14 21:56:00 +01:00
Olivier Prat	7515c341ad	Merged with PCF fix with dithered filtering	2017-11-13 14:47:35 +01:00
Olivier Prat	dd6b7b04c2	Merged with master	2017-11-13 14:33:59 +01:00
Olivier Prat	fa58cf2e60	Merged with master	2017-11-13 14:07:48 +01:00
Olivier Prat	103e036b70	Shadow maps rendered in cascades	2017-11-10 18:30:37 +01:00
Olivier Prat	4f7ed38e98	Fixed potential link errors on Mac	2017-11-09 11:26:08 +01:00
Olivier Prat	bccd6df57c	Fixed warning on Mac and Ubuntu	2017-11-09 11:19:28 +01:00
Nissim Hadar	a8a118582d	WIP - passing uniform into model translucency shader.	2017-11-08 09:37:58 -08:00
Nissim Hadar	3d2c8186e7	Added Haze model as input to transparency shader.	2017-11-08 08:01:19 -08:00
Olivier Prat	39604363ea	Optimized performance of bloom by reducing blur resolution and merging some downsampling passes with blur passes	2017-11-08 11:38:20 +01:00
Olivier Prat	ffa46b487a	Only non empty selections are now linked to highlight passes	2017-11-07 17:07:37 +01:00
Olivier Prat	9817cb4c44	Added highlight configuration in HighlightStageSetup job	2017-11-07 15:35:43 +01:00
Olivier Prat	3cc445ff02	Renamed outline to highlight	2017-11-07 11:07:25 +01:00
Olivier Prat	9e6472b577	Added OutlineStyleStage	2017-11-06 15:55:57 +01:00
Olivier Prat	fcf1c301b6	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-03 18:12:15 +01:00
Olivier Prat	4b598a6e24	Working stencil mask with object bounding boxes	2017-11-03 14:26:36 +01:00
Olivier Prat	bced566510	Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo	2017-10-27 10:45:43 +02:00