340 commits

Author	SHA1	Message	Date
Olivier Prat	b619b2311d	Merged with master	2017-09-05 10:27:53 +02:00
Zach Fox	3f0d44990a	Hook up bounding box rendering to Selection Scripting Interface	2017-08-30 14:54:23 -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
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -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
Olivier Prat	d61652f958	Fixed compilation errors due to merge with master	2017-08-11 10:11:19 +02:00
Olivier Prat	1763ecd4c6	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-08-11 09:38:00 +02:00
SamGondelman	e4c954e862	merge from master	2017-08-10 16:30:33 -07:00
SamGondelman	353a3e8c68	properly fix AA stenciling	2017-08-10 16:07:40 -07:00
SamGondelman	96b179386f	working on fixing non-AA overlays	2017-08-10 16:07:40 -07:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
Olivier Prat	01a028cbb6	First alpha working version of outline	2017-08-09 18:03:52 +02:00
Olivier Prat	f36500a74c	Working outline debugging view	2017-08-09 14:52:52 +02:00
Olivier Prat	cfa23b1758	Writing out depth buffer of outlined objects to texture working	2017-08-09 12:32:32 +02:00
Olivier Prat	44ee7c4bf1	Renamed to OutlineEffect and working on debugging tool. Problems with outline framebuffer not complete	2017-08-08 18:41:57 +02:00
Olivier Prat	7de6079df8	Added PrepareOutline job to save outlined zbuffer	2017-08-08 15:28:36 +02:00
SamGondelman	658acd91f2	experimenting with drawHUDLayer depth testing	2017-07-25 14:17:39 -07:00
Olivier Prat	dbf0b64dfb	Refactored Fade.slh to take into account differences between instanced draw and normal draw	2017-07-18 12:49:34 +02:00
Olivier Prat	3f8daa21ec	Created FadeEffect singleton to be able to get fade item & batch setters for every special entity render	2017-07-17 14:26:41 +02:00
Olivier Prat	aba8be595e	Separated fade categories from transition event types	2017-07-11 11:37:24 +02:00
Olivier Prat	9758a6ded0	Edition picking again (but without bounding box highlighting)	2017-07-10 17:57:02 +02:00
Olivier Prat	4256a1f2a7	Preparing for merge with stage. DOESN'T COMPILE!	2017-07-07 15:16:20 +02:00
Olivier Prat	5ab093dc38	Preparing to introducte TransitionStage	2017-07-07 11:01:47 +02:00
Olivier Prat	57b2bdf709	Working bubble isect owner POV	2017-07-04 09:14:08 +02:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
Olivier Prat	87833abd31	Sky working again.	2017-06-30 16:46:25 +02:00
Olivier Prat	6a31dc2659	Selection of edited object working	2017-06-29 12:13:55 +02:00
Olivier Prat	8a12d0c106	Fade effect working again for basic enter domain but with various Fade jobs	2017-06-29 08:54:23 +02:00
Sam Gateau	93963b3257	Apply the projection and deferred transform fixes found while working on spectator camera	2017-06-28 15:44:17 +02:00
Olivier Prat	1bb0d51849	Merged with master	2017-06-26 11:55:46 +02:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Olivier Prat	ace301945c	Added scale and duration debug parameters in debugFade.qml	2017-06-13 15:31:04 +02:00
Olivier Prat	24d45e0f5b	Updated from upstream master because of change of protocol	2017-06-13 10:43:25 +02:00
Olivier Prat	7d58c9a741	Fixed fade for shadow job	2017-06-08 17:09:08 +02:00
Olivier Prat	de143d0ea2	Switched to uniforms for sending fade shader data. Moved more fade functions to FadeEffect class	2017-06-06 17:07:20 +02:00
Olivier Prat	a9ab9d2476	Renamed FadeManager to FadeEffect	2017-06-06 16:27:56 +02:00
Olivier Prat	8af2f75996	Added FadeManager to centralize some common fade effect data and functions	2017-06-06 16:11:12 +02:00
Olivier Prat	e7eca7728f	Debug fade management moved out of the inner render loop	2017-06-06 14:57:52 +02:00
Olivier Prat	08fcd6c357	Added new shaders	2017-06-05 16:32:36 +02:00
Olivier Prat	1433ae4b34	Merged from 21274	2017-06-05 11:12:57 +02:00
samcake	c5e9551bab	more cleanup	2017-06-01 18:05:18 -07:00
samcake	82d348a2ef	Stencil rejection is working, and more cleaning	2017-05-31 16:46:20 -07:00
Sam Cake	32c5dac66a	Big cleanup of unecessary shaders and legacy from deferred lighting, and messing around with the stencil	2017-05-31 00:55:28 -07:00
samcake	8559ed6260	Starting to add the stencil mask for hmd	2017-05-30 16:37:10 -07:00
samcake	c256893575	some clean up:	2017-05-23 18:00:22 -07:00
samcake	2cd2c95940	Adding more debugging tool	2017-05-16 16:12:31 -07:00
Sam Cake	4c3ddfbff9	Adding debuging of the ambient lighting	2017-05-16 01:01:19 -07:00