400 commits

Author	SHA1	Message	Date
Olivier Prat	1ce1aca79f	Merged with samcake's 'black' branch	2017-12-07 08:59:38 +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	dd6b7b04c2	Merged with master	2017-11-13 14:33:59 +01:00
David Back	163de649bf	prevent rendering HUD elements in secondary camera	2017-11-10 17:44:09 -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