105 commits

Author	SHA1	Message	Date
Olivier Prat	0cc6471c7f	Merge branch 'master' of http://github.com/highfidelity/hifi into haze	2018-07-06 12:35:26 +02:00
Olivier Prat	4a25090a23	Fixing haze bug on Mac, and potentially AMD	2018-07-05 15:48:33 +02:00
Olivier Prat	d2a612580c	Fixed NaN with specular on transparent objects	2018-07-02 12:20:55 +02:00
Cristian Luis Duarte	c7edf72f71	Check isHazeEnabled() vs 0.0 to compile on GLES	2018-05-18 15:59:24 -03:00
samcake	179801dab6	FIxing the transparent ambient lighting bug	2018-05-15 17:22:28 -07:00
Olivier Prat	9ad9c070f8	Some small shader optimizations	2018-04-16 08:50:18 +02:00
Olivier Prat	190e9313c7	Sorted out the mix between eye space and world space vectors in translucent object shading	2018-04-13 15:38:55 +02:00
Olivier Prat	2adac241d0	Fixed incorrect fragment to eye dir computation in haze	2018-04-12 15:11:10 +02:00
Olivier Prat	24692f13fd	Added separate scribe function to evalGlobalLightingAlphaBlendedWithHaze to shorten shader C string	2018-01-23 14:19:39 +01:00
Olivier Prat	e6caa83d73	Merged with master	2018-01-17 16:35:31 +01:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Olivier Prat	8fb863e98c	Added SurfaceData mechanism to evalGlobalLight	2018-01-16 15:57:05 +01:00
Olivier Prat	705b475d0c	Merged with master	2018-01-16 15:07:20 +01:00
Olivier Prat	3382a35c3f	Fixed bug due to incorrect discard of fragments with no local lights	2018-01-16 12:13:45 +01:00
Olivier Prat	54eab1c878	First working local lights on transparent objects	2018-01-15 17:49:55 +01:00
Olivier Prat	053bd2ba98	Created SurfaceData structure to centralize computation of frequently used shader temporary values	2017-12-21 17:41:36 +01:00
Nissim Hadar	2c6868b03e	Pass keylight direction as parameter to the shader.	2017-12-19 11:12:27 -08:00
Nissim Hadar	82b94eaacd	Reduced size of parameters in (shader) function call.	2017-12-14 18:50:41 -08:00
Nissim Hadar	c352d5fc23	Passed light direction instead of light object into computeHazeColorKeyLightAttenuation.	2017-12-14 16:23:14 -08:00
Nissim Hadar	026b19d770	Set 4th position component from 0.0 to 1.0	2017-12-14 16:17:50 -08:00
Nissim Hadar	4433e79c9c	Seems to work.	2017-11-08 14:08:37 -08:00
Nissim Hadar	ee6a8510c6	Refactored haze computation.	2017-11-07 17:22:57 -08:00
Nissim Hadar	87aee7242a	Moved linearDepthMap into Haze.slf ... Refactored computation of keylight attenuation - now function in Haze.slh	2017-11-07 15:25:42 -08:00
Nissim Hadar	66c31caf4b	Refactoring of the haze	2017-10-27 09:08:58 -07:00
Nissim	fe286aff83	Andrew's corrections (per coding standard).	2017-10-18 08:42:07 -07:00
Nissim Hadar	5a7fed022c	Merging haze branch.	2017-09-30 00:04:28 -07:00
Zach Pomerantz	9a37ccbf3c	chmod -x to render-utils src	2016-12-13 14:36:41 -05:00
samcake	7956c7b10b	Fixing a mistake introduced in previous commit in a shader	2016-10-12 09:57:06 -07:00
samcake	5f9c713d44	Merging with upstream after resolving some conflicts	2016-10-12 09:22:12 -07:00
Gabriel Calero	834d9c0710	Adapt shader for GL ES support which requires operators of the same datatype	2016-10-11 12:15:49 -03:00
samcake	b09151f2a2	Rearrange the light struc description in the shader side, needs the c++ to match now	2016-09-28 18:32:35 -07:00
samcake	d2a15ca82c	Trying to migrate to a light array instead of each individual lights	2016-09-02 17:51:35 -07:00
samcake	51594fefa2	more clean up	2016-07-12 18:21:31 -07:00
samcake	2fbdb22493	Cleaning up the lighting with the simpler approach where emissive and lightmap is displayed on forward	2016-07-08 18:14:05 -07:00
samcake	37f7596183	Trying to unify the shaders with/without scattering eve more but found a scribe bug. REnder emissive and lightmap during forward pass	2016-07-08 09:04:10 -07:00
samcake	fff2a9a5a2	REfactoring the shading functions interface to account for scattering	2016-07-07 21:16:28 -07:00
samcake	1eb4acf815	Unifying the lighting pass for scaterring and not	2016-07-07 15:41:00 -07:00
samcake	8f2bf2b423	Integrating the scattering to the local lights	2016-07-06 17:13:16 -07:00
samcake	66b65391a4	Cleaning up the lighting equations	2016-07-05 18:21:49 -07:00
samcake	2a52f1db7f	Adding the lighting model class to configure accross the jobs the lighting	2016-07-01 18:36:51 -07:00
samcake	9a604d0ede	Bringing Beckmann specular to the lighting	2016-06-30 19:03:24 -07:00
samcake	7f5e22d0eb	Post tuesday review, clean up	2016-06-28 17:20:24 -07:00
samcake	d128af48db	Fix the curvature issue in stereo by evaluating in the mono clip space, not stereo. INtegrate the scattering in simple ambient without IBL	2016-06-28 13:47:55 -07:00
samcake	a619a142ed	Friday night build, working on getting the LUT generated on the GPU	2016-06-24 17:48:40 -07:00
samcake	e95a31f760	CLeaning up and debugging the splotch	2016-06-24 09:18:04 -07:00
samcake	884b9211c6	Curvature is looking correct now without artefact, moving on to the lighting	2016-06-23 17:13:48 -07:00
samcake	0c882832bf	Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now)	2016-06-20 17:58:35 -07:00
samcake	3fe9b67e45	FIxing the reflection jittering by moving the normal into world space	2016-05-27 19:24:56 -07:00
samcake	257c8c94c3	clean up the lighting function and put the global specular lighting in a separate function	2016-04-29 10:58:55 -07:00
samcake	88f816fab4	Adding reflection of the ambient map for translucent	2016-04-28 18:18:18 -07:00