344 commits

Author	SHA1	Message	Date
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
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Brad Davis	2c35242af1	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-10 13:40:12 -08:00
Nissim Hadar	c3f6faed00	Deal correctly with inheritance at top-most level.	2018-01-09 13:27:57 -08:00
Brad Davis	bd5af2b493	Working on android avatar rendering	2018-01-09 11:40:32 -08:00
SamGondelman	a9d5dda976	always push default haze to current frame	2018-01-04 17:54:23 -08:00
Olivier Prat	dc55a16834	Fixed warnings on Mac and Ubuntu	2017-12-06 18:37:27 +01:00
Olivier Prat	f8c241c429	Merged disappearing shadow bug fix from pcf branch	2017-11-16 12:19:19 +01:00
Olivier Prat	14275b1cf3	Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded	2017-11-15 15:42:04 +01:00
Olivier Prat	8f84e5fbed	Added sampler array in shader to support future cascades	2017-11-10 15:39:26 +01:00
Olivier Prat	e0b36b800f	Added Cascade subclass in LightStage Shadow	2017-11-10 14:55:49 +01:00
Olivier Prat	dc8c75f403	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-10-27 15:56:40 +02:00
Olivier Prat	9eed69d7ef	Trying to pin point a zone bug	2017-10-26 15:11:42 +02:00
Nissim Hadar	bfab466827	Bug 8610.	2017-10-25 14:13:53 -07:00
Nissim Hadar	8d11ace1a6	Bug 8610.	2017-10-25 13:46:59 -07:00
Olivier Prat	a34db5f26d	Shadows are now cast by the current zone key light (sun)	2017-10-24 11:09:36 +02:00
Nissim	fe286aff83	Andrew's corrections (per coding standard).	2017-10-18 08:42:07 -07:00
Nissim Hadar	cdbf067a24	Rename (haze)getParametersBuffer to getHazeParametersBuffer. ... Add corrections from Sam	2017-10-02 16:54:02 -07:00
Nissim Hadar	29d5e772d4	Removed "..Is.." from various methods.	2017-10-02 12:42:46 -07:00
Nissim Hadar	5a7fed022c	Merging haze branch.	2017-09-30 00:04:28 -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	eaab056d66	Adding HazeStage	2017-09-27 09:12:57 -07:00
SamGondelman	1b85a453ab	working on text3d overlays and entities	2017-09-12 16:49:51 -07:00
Sam Gateau	0c3755483b	adding assert or checks whenever getting a scene stage	2017-07-10 12:37:26 +02:00
Sam Gateau	a8086764da	REmoving warnings for unused var	2017-07-07 12:19:22 +02:00
Sam Gateau	7687bdc060	less comments & constant	2017-06-26 17:02:45 +02:00
Sam Gateau	904f22985c	CLeaning up comments	2017-06-26 16:43:04 +02:00
samcake	20d8c11e28	ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore	2017-06-22 17:54:16 -07:00
Sam Cake	07e18eb3a8	Keep cleaning up the DeferredLightingEffect , removing stage s from there...	2017-06-22 01:12:32 -07:00
Zach Fox	52ea7e7994	Rendering improvements based on spectator-camera changes	2017-06-13 15:19:29 -07:00
samcake	bac66ee4c7	Introducing the renderview task	2017-06-06 18:00:41 -07:00
samcake	9c1e99fe3f	Removing cruft and organizing the stencil config	2017-06-01 13:06:22 -07:00
Sam Cake	b528c2fc60	Merged	2017-05-31 19:33:14 -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
Sam Gateau	589bcc19ce	Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer	2017-05-19 17:50:19 -07:00
samcake	2cd2c95940	Adding more debugging tool	2017-05-16 16:12:31 -07:00
samcake	db4387e55d	Trying to mess with the defautl texture for skybox	2017-05-15 17:31:29 -07:00
samcake	bc41be7ec1	Introucing the BackgroundStage to manage the background / skybox in one place	2017-05-09 17:10:05 -07:00
samcake	bbb513220b	Moving forward	2017-05-08 17:33:24 -07:00
Sam Cake	d3724116d9	Using the items to pick the key light!	2017-05-08 00:20:20 -07:00
samcake	b6c966ef39	Keep iterating on the zones	2017-05-05 18:07:21 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
sam gateau	0a615f35a7	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-21 14:31:15 -07:00
samcake	63fe579022	simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead'	2017-04-18 17:05:40 -07:00
Sam Cake	29545f0918	FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend	2017-04-13 23:53:56 -07:00
Sam Cake	dd73cb7b8e	Use a magic number gpu::Texture::SINGLE_MIP instead of 1	2017-03-30 23:46:37 -07:00
samcake	b6504bba56	Moving the num mips per texture to the creator so it s immutable and simpler	2017-03-29 17:58:56 -07:00