69 commits

Author	SHA1	Message	Date
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
samcake	4202e60ac3	trying to add the skymap on translucents	2016-04-26 18:20:15 -07:00
samcake	ca720efce6	Exposing the timing of the jobs by default	2016-04-18 14:53:06 -07:00
samcake	1b54a29491	small improvments adn exploring the jittering bug for reflections	2016-03-31 11:34:27 -07:00
samcake	10ddecd536	Debuggingh the reflection jittering	2016-03-31 01:51:26 -07:00
samcake	9fb318570b	Ajusting the pure Ambient SH lighting pass and more review issues	2016-03-01 12:24:44 -08:00
samcake	89920370db	A bunch of typo fixes after review	2016-03-01 10:53:08 -08:00
samcake	630c61e61d	Reflection is working correctly with the PBR property, ship t	2016-02-29 18:54:43 -08:00
samcake	99ba011996	Post merge with Zach work for environment map	2016-02-26 16:04:50 -08:00
Zach Pomerantz	1fbcaea4b4	Fix evalSkyboxGlobalColor	2016-02-26 14:20:21 -08:00
samcake	a0d7ce145e	Adding support for emissive and occlusion maps, on to pr land	2016-02-24 17:30:29 -08:00
samcake	39a7852979	MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders	2016-02-19 18:43:07 -08:00
samcake	903824809c	trying to have better support for the materials	2016-02-18 18:33:32 -08:00
samcake	b88501784c	Making progress toward the PBR material	2016-02-17 18:47:52 -08:00
samcake	71863a1550	Fixing the material names	2016-02-16 09:33:24 -08:00
samcake	4559e75f90	Trying to solve the ambient issue	2016-02-12 18:22:01 -08:00
samcake	584d50b594	Experimenting with AO on the lightmaped surface	2016-01-19 17:56:07 -08:00
samcake	df496b065c	Merging with master	2016-01-18 16:40:34 -08:00
samcake	31bea5034c	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-01-12 10:02:15 -08:00
Zach Pomerantz	c1e8fe88e4	Fix shader typo (ambien->ambient)	2016-01-08 20:14:31 -08:00
samcake	c31b943b88	APplying the AO to both direct lighting and ambient	2016-01-04 23:02:30 -04:00
samcake	32bb8f020c	FIxing the diffuse contribution bug maybe	2015-12-17 17:40:35 -08:00
samcake	64cf8590eb	fix typos	2015-09-18 11:51:58 -07:00
samcake	5f5cc3dbaf	fix typos	2015-09-18 11:51:28 -07:00
samcake	767407af9c	Merging and cleaning shaders	2015-09-18 11:46:44 -07:00
samcake	d4fd2ea4c6	merging	2015-09-18 11:31:53 -07:00
Sam Gateau	dc8756e465	Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation	2015-09-15 14:40:23 -07:00
Sam Gateau	00688172dd	work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes	2015-09-14 15:49:05 -07:00
Sam Gateau	3c9eed6e01	merging	2015-08-06 11:38:50 -07:00
Brad Davis	b84eef93c9	Core profile shader work and test code	2015-08-01 14:43:52 -07:00
samcake	1dba28860a	Merge master	2015-07-31 10:29:51 -07:00
Brad Davis	fbf3a0cbe6	Working on GL 4	2015-06-23 09:48:16 -07:00
Sam Cake	65e83df214	Generating the SH from the cube map!	2015-05-13 11:08:18 -07:00
samcake	67b9dd248d	Fix glsl failed compilation on Mac	2015-05-11 14:25:05 -07:00
Sam Gateau	f2c4e04a5a	clean up for pr	2015-05-11 14:06:10 -07:00
Sam Gateau	45e70c98f8	Fixed the cube map loading issue	2015-05-11 13:43:15 -07:00
Sam Gateau	5a11143a5d	Using the skybox cubemap for ambient lighting	2015-05-09 11:40:46 -07:00