140 commits

Author	SHA1	Message	Date
Sam Gondelman	53e6e00773	Merge branch 'master' into uber	2019-06-10 10:36:54 -07:00
SamGondelman	129d96a997	get rid of lightmapMap	2019-06-07 14:53:31 -07:00
SamGondelman	6111c8a108	initial work on combining shader variants	2019-06-03 19:36:01 -07:00
Saracen	410679b9b7	Render lightmaps in the forward renderer	2019-05-08 00:56:34 +01:00
Olivier Prat	8dabcb76b8	Taking into account comments	2019-04-22 21:30:57 +02:00
Olivier Prat	7d412f9109	Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias.	2019-04-19 11:03:43 +02:00
Olivier Prat	3fc711dba2	Added opacity mask to shadow casters	2019-04-17 12:35:24 +02:00
SamGondelman	6e4ec15c9d	there we go	2019-02-25 17:14:51 -08:00
SamGondelman	dbc3ae3793	hmmm not working	2019-02-22 14:18:59 -08:00
SamGondelman	a31b09b204	handle models with no materials	2019-02-22 13:17:13 -08:00
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -08:00
SamGondelman	3ee448a89a	fix scattering and working on resource cache bug	2019-02-05 17:32:15 -08:00
Jeff Clinton	3b84580e88	Merge pull request #14794 from SamGondelman/colors ... Case 20888: Fix color space	2019-01-30 09:09:07 -08:00
SamGondelman	e41f5617e9	fix color space	2019-01-29 14:52:57 -08:00
SamGondelman	5be6a31b6c	possible fix for transparency	2019-01-29 12:20:46 -08:00
SamGondelman	717da1b6fa	track texture loading	2019-01-17 15:59:32 -08:00
SamGondelman	ff3545beab	working with texture transform fallthrough	2019-01-07 13:28:00 -08:00
SamGondelman	a9d798070a	wip	2019-01-02 18:08:59 -08:00
SamGondelman	9155853889	working on material fallthrough	2018-12-20 16:03:58 -08:00
SamGondelman	0efbdc1ab5	merge with master	2018-10-23 14:33:57 -07:00
SamGondelman	d254db02dc	small cleanup	2018-10-23 11:27:17 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
SamGondelman	09ea32dcc0	fix fading and highlighting issues	2018-10-22 14:12:43 -07:00
SamGondelman	cce0981d6c	Merge remote-tracking branch 'upstream/master' into police	2018-10-17 11:40:01 -07:00
SamGondelman	0f24c18de5	slightly fix forward pipelines	2018-09-26 15:01:46 -07:00
sam gateau	b5a47b2e76	Finalizing the renaming from Skinned to Deformed	2018-09-26 14:11:22 -07:00
sam gateau	efa1dd0274	rename the files from skin to deformed	2018-09-25 17:32:04 -07:00
Sam Gateau	4210ce46aa	bringing the tex corrd transform in the Material struct and shaving one ubo	2018-09-23 23:10:56 -07:00
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Brad Davis	04e84f1d23	Moving to cmake time shader compiling	2018-08-03 14:58:11 -07:00
SamGondelman	d2f8ee327d	properly reset highlight framebuffer	2018-06-05 18:18:24 -07:00
SamGondelman	aec7206901	get rid of overlay pipelines and just use forward rendering	2018-06-05 14:44:44 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
samcake	78053b8b48	Refix the normal map case foro translucents	2018-04-04 18:33:27 -07:00
Brad Davis	09996e0b65	Bindless texture work cleanup	2018-03-08 16:01:18 -08:00
Brad Davis	d858d34523	Update material binding	2018-03-07 17:27:47 -08:00
samcake	fc8f1c1e65	Resolving conflicts	2018-03-02 14:20:33 -08:00
samcake	b8fb97c824	Resolving conflicts	2018-03-02 10:36:55 -08:00
samcake	a227cf1edb	Fixing bad key/pipeline pair	2018-03-01 10:49:58 -08:00
samcake	dc286544c5	Merging with nissim's pr	2018-02-28 17:54:54 -08:00
samcake	a7542d5b90	fixing the shadow	2018-02-28 17:46:22 -08:00
NissimHadar	5d7e6651a7	Use correct pixel shader.	2018-02-28 11:05:02 -08:00
NissimHadar	faad930e35	WIP.	2018-02-28 08:44:01 -08:00
NissimHadar	5764a21c4a	WIP.	2018-02-28 08:12:48 -08:00
NissimHadar	7cae04883e	WIP.	2018-02-27 17:19:02 -08:00
NissimHadar	f52f146db5	WIP.	2018-02-27 16:28:46 -08:00
NissimHadar	00f3682bbe	NOT WORKING YET.	2018-02-27 14:09:31 -08:00
Brad Davis	f01c42dcc9	Fixing merged dual-quat pipelines	2018-02-27 08:54:46 -08:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00