40 commits

Author	SHA1	Message	Date
Simon Walton	b469cdfda2	More shaders to deferred compile scheme	2018-04-13 17:52:33 -07:00
Olivier Prat	f5a2557a2e	Merged with master	2018-02-19 17:28:39 +01:00
Olivier Prat	5e6300ce46	Merged with master	2018-01-30 09:52:30 +01:00
Olivier Prat	e6caa83d73	Merged with master	2018-01-17 16:35:31 +01:00
Olivier Prat	efa6a8c0b5	Merged with master	2018-01-17 15:49:46 +01:00
Olivier Prat	49549ced17	Fixed compilation with new shader system	2018-01-17 10:52:58 +01:00
Olivier Prat	3911ce59cc	Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code	2018-01-16 19:02:12 +01: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
Olivier Prat	814de4ab81	Scribe now outputs shaders as cpp files.	2018-01-12 11:59:19 +01:00
Nissim Hadar	79f0124244	Protect against use of null HazePointer.	2017-12-13 15:02:03 -08:00
Nissim Hadar	b4df115507	Protect against use of null HazePointer.	2017-12-13 12:53:01 -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
Olivier Prat	8b6a2eeb24	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-10 10:19:32 +01:00
Olivier Prat	fbcb2924e8	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-03 15:08:15 +01:00
Nissim Hadar	d8191e3bd2	Fixed Mask test.	2017-11-02 12:45:18 -07:00
Nissim Hadar	67552d2b7d	Change stencil mask used with Haze.	2017-11-01 17:39:37 -07:00
Nissim Hadar	03d2ca19b9	Moving consts into mode::Haze namespace.	2017-10-31 13:46:58 -07:00
Nissim Hadar	636f7858a3	Removed _degs and _m suffixes.	2017-10-30 19:45:08 -07:00
Nissim Hadar	1357877618	Replaced separate RGB components of colours with vec3's.	2017-10-30 12:41:09 -07:00
Nissim Hadar	66c31caf4b	Refactoring of the haze	2017-10-27 09:08:58 -07:00
Olivier Prat	9eed69d7ef	Trying to pin point a zone bug	2017-10-26 15:11:42 +02:00
Nissim	fe286aff83	Andrew's corrections (per coding standard).	2017-10-18 08:42:07 -07:00
Nissim Hadar	9c9dfc7211	Replace light blend with glare.	2017-10-13 13:36:46 -07:00
Nissim Hadar	7d5a887f43	Refactoring.	2017-10-09 17:25:19 -07:00
Nissim Hadar	8fad23aefd	Keylight working.	2017-10-06 12:49:43 -07:00
Nissim Hadar	47a6f2d7c9	Initial work on adding keylight direction.	2017-10-06 12:01:15 -07:00
Nissim Hadar	9918757061	Initial work on adding keylight direction.	2017-10-06 11:43:57 -07:00
Nissim Hadar	320c888ce4	Added checkbox to allow separate control of keylight attenuation.	2017-10-05 20:31:45 -07:00
Nissim Hadar	ad03301df8	WIP - implementing range+altitude mode.	2017-10-04 23:03:21 -07:00
Nissim Hadar	6dcd8b7b57	Haze Range works.	2017-10-04 21:47:20 -07:00
Nissim Hadar	48e5b9d1bc	Haze enable/disable from UI works.	2017-10-03 17:42:04 -07:00
Nissim Hadar	1cf7f5a732	For testing.	2017-10-03 09:54:44 -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	bdd469cec4	Integrated haze shader into this branch.	2017-10-01 21:52:34 -07:00
Nissim Hadar	ffecf42ebb	Some clean-up.	2017-10-01 21:12:29 -07:00
Nissim Hadar	0acf4b9de9	Working on adding zone to haze.	2017-09-28 23:53:53 -07:00
Nissim Hadar	784f928433	After merge.	2017-09-27 18:46:55 -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