486 commits

Author	SHA1	Message	Date
Olivier Prat	c04bf095ec	Limited sharpen range	2018-02-26 16:48:10 +01:00
Olivier Prat	419e064e65	Moved antialiasing before tonemapping	2018-02-26 14:57:59 +01:00
Olivier Prat	9cfe53be3e	Merged from orgin taa	2018-02-19 17:50:10 +01:00
Olivier Prat	f5a2557a2e	Merged with master	2018-02-19 17:28:39 +01:00
Olivier Prat	1aa41918d0	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-01-26 15:01:30 +01:00
Olivier Prat	5af4337b0e	Merged with master	2018-01-25 10:11:53 +01:00
Olivier Prat	f3aac2a7b5	Merged with samcake/black	2018-01-25 09:27:48 +01: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	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
Olivier Prat	54eab1c878	First working local lights on transparent objects	2018-01-15 17:49:55 +01:00
Brad Davis	105dffebaf	Fixing UI	2018-01-09 18:36:42 -08:00
samcake	403e77b023	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-12-21 09:17:23 -08:00
samcake	df3b4421f4	Merging	2017-12-18 12:20:56 -08:00
Olivier Prat	0fc496d44c	Fixed merge conflicts with master	2017-12-18 15:23:11 +01:00
Nissim Hadar	409eade006	Merge branch 'master' into hazeOnTransparent	2017-12-14 11:41:53 -08:00
Olivier Prat	92e1fe8e5c	Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug	2017-12-08 18:02:27 +01:00
samcake	e0110ff7e6	Merging with upstream	2017-12-07 09:23:38 -08:00
Olivier Prat	1ce1aca79f	Merged with samcake's 'black' branch	2017-12-07 08:59:38 +01:00
Olivier Prat	dc55a16834	Fixed warnings on Mac and Ubuntu	2017-12-06 18:37:27 +01:00
Olivier Prat	0b6dcb2717	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-05 09:18:26 +01: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	917ce7165c	Working shadow cascade debugging view in Luci app	2017-11-16 15:36:48 +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	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
Olivier Prat	bf46ccefaf	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-15 08:59:36 +01:00
Olivier Prat	5102c8e1b1	Merged with master	2017-11-14 21:56:00 +01:00
David Back	4b8021bc4a	Merge pull request #11802 from dback2/mirrorfanciness2 ... prevent rendering HUD elements in secondary camera	2017-11-14 10:49:18 -08:00
Olivier Prat	74b0b52edb	Working CSM with smooth blend between cascades. Switched to 4 1024 cascades	2017-11-14 16:57:22 +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
David Back	163de649bf	prevent rendering HUD elements in secondary camera	2017-11-10 17:44:09 -08:00
Olivier Prat	103e036b70	Shadow maps rendered in cascades	2017-11-10 18:30:37 +01:00
Olivier Prat	e0b36b800f	Added Cascade subclass in LightStage Shadow	2017-11-10 14:55:49 +01:00
Nissim Hadar	3c5fd73ca8	Removed unused argument.	2017-11-08 14:56:21 -08: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
Nissim Hadar	803e5d143d	Moved Haze pass to be before transparency pass.	2017-11-07 11:48:46 -08: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
Olivier Prat	ae8a9e68c8	Added debug tool to view shadow & view frustums	2017-10-25 11:58:16 +02:00
SamGondelman	046e5ca716	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00
Olivier Prat	32df0209f3	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-10-19 17:38:05 +02:00
Olivier Prat	fc66dcfdea	Added outline to statsGPU script	2017-10-19 16:52:29 +02:00
Olivier Prat	25b3549e04	Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled	2017-10-18 15:00:53 +02:00
Olivier Prat	1b67223e0e	Preparing for multiple outline groups in shader	2017-10-16 12:38:44 +02:00
Olivier Prat	e42699c0ea	Added multiple selections but still only first linked to outline	2017-10-16 10:57:06 +02:00
Sam Gateau	ec934335dc	CLeaning up the pr regarding the scripts with my branch blue	2017-10-15 22:34:58 -07:00
Olivier Prat	2658d65814	Preparing for outline color mask	2017-10-13 12:02:21 +02:00
Nissim Hadar	30fdf9d08e	Merge branch 'master' into hazeZone	2017-10-11 22:12:52 -07:00
Nissim Hadar	7d5a887f43	Refactoring.	2017-10-09 17:25:19 -07:00
Olivier Prat	50ab73009a	Working threshold mask and debug on Bloom	2017-10-09 11:09:51 +02:00
Olivier Prat	98d39ff9e0	Merged with master	2017-10-09 09:37:18 +02:00
Olivier Prat	27a0fb62d3	Multiple gaussians as Unreal. First draft	2017-10-09 09:35:38 +02:00
SamGondelman	b4a3ab9204	fix debugDeferredLighting	2017-10-06 15:46:10 -07:00
SamGondelman	477dfdff1e	wip hud layering and fix crashes	2017-10-04 11:45:21 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
samcake	6639287418	Merging with master	2017-10-02 17:03:09 -07:00
Nissim Hadar	20a42d6fbd	Fixed model name string	2017-10-02 10:11:34 -07:00
Nissim Hadar	97756146b1	Attempt to add qml configuration	2017-10-02 09:09:36 -07:00
Nissim Hadar	bdd469cec4	Integrated haze shader into this branch.	2017-10-01 21:52:34 -07:00
Nissim Hadar	5a7fed022c	Merging haze branch.	2017-09-30 00:04:28 -07:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
Nissim Hadar	9d0cf16c20	Fixed Ubuntu warnings.	2017-09-27 19:33:04 -07:00
Nissim Hadar	4d8a1db895	Merge branch 'master' into hazeZone ... # Conflicts: # libraries/entities-renderer/src/RenderableModelEntityItem.cpp	2017-09-27 17:50:51 -07:00
Nissim Hadar	55fafeacb1	Implemented HazePropertyGroup and added the haze shader. Shader does not work yet!	2017-09-27 17:43:09 -07:00
SamGondelman	553829f7ab	make sure FadeEffect dependency is created early	2017-09-27 11:58:35 -07:00
Olivier Prat	bcec3680b6	First draft	2017-09-25 11:51:23 +02:00
samcake	89682a2e2c	SImple first steps to apply jittering correctly in stereo	2017-09-20 10:18:25 -07:00
samcake	2d2e75e933	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-09-08 12:39:59 -07:00
Olivier Prat	d6d36cbd43	Outline working on voxels	2017-09-08 11:14:06 +02:00
Olivier Prat	6b5ca0c6ce	Optimized by removing unnecessary Z buffer copy	2017-09-07 18:33:00 +02:00
Olivier Prat	10643feb78	Working with specific zpass rendering for outline. Debug script needs relinking to correct config	2017-09-06 18:40:38 +02:00
Olivier Prat	d6ea01c4f3	Created outline task but still need to create specific render job with z-pass shaders	2017-09-06 17:34:29 +02:00
Olivier Prat	75e06b691f	Simplified version that works directly with metas	2017-09-06 15:59:04 +02:00
Olivier Prat	700d4a4b43	First working version of outline working with selection interface.	2017-09-06 15:47:10 +02:00
Olivier Prat	b619b2311d	Merged with master	2017-09-05 10:27:53 +02:00
samcake	f031bf5661	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-31 09:22:19 -07:00
Zach Fox	3f0d44990a	Hook up bounding box rendering to Selection Scripting Interface	2017-08-30 14:54:23 -07:00
Sam Gateau	0f67f9bc52	Eposing the jitter sequence and debugging it	2017-08-27 22:08:33 -07:00
Sam Gateau	bf982c3a85	using the linear depth buffer and voila	2017-08-25 00:25:13 -07:00
samcake	767cccbbb2	Sharing the common resource and shader componenet and introducing debuging feature	2017-08-21 17:43:03 -07:00
Chris Collins	2456126bcc	Merge pull request #11157 from SamGondelman/tabletLayer ... Render non-AA overlays correctly	2017-08-18 14:59:20 -07:00
Olivier Prat	1e4cf5d797	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-08-17 09:46:49 +02:00
samcake	800e4cb4d7	Messing around with the velocity buffer	2017-08-16 18:29:59 -07:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
samcake	2f0eee5e4a	introducing the Velocity buffer pass generation	2017-08-15 18:11:23 -07:00
samcake	fe0b597aa1	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-15 09:55:08 -07:00
Sam Gateau	d624413c14	Merge pull request #11189 from SamGondelman/line3DFix ... Fix drawInFront overlays only rendering in left eye	2017-08-15 09:26:18 -07:00
SamGondelman	8163430282	fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds	2017-08-14 15:03:14 -07:00
Olivier Prat	d86c3c4f2a	Outline is now drawn with framebuffer with no depth buffer attached to prevent concurrent depth clear on NVidia GPU cards	2017-08-11 11:33:46 +02:00