438 commits

Author	SHA1	Message	Date
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
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
samcake	9e4daa6688	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-10 14:20:25 -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
samcake	339ba60201	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-05 10:15:23 -07: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
samcake	b006fb9ccf	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-06-23 20:06:40 -07: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
samcake	c60bfe2b65	Adding a camera Jittering	2017-06-10 18:42:57 -07: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
samcake	bc41be7ec1	Introucing the BackgroundStage to manage the background / skybox in one place	2017-05-09 17:10:05 -07:00
Sam Cake	d3724116d9	Using the items to pick the key light!	2017-05-08 00:20:20 -07:00