135 commits

Author	SHA1	Message	Date
HifiExperiments	deb5aacfad	fix materialcachescriptinginterface	2019-10-25 18:16:08 -07:00
HifiExperiments	1e100a672e	merge with master and try to fix opacity mode stuff	2019-10-23 22:21:45 -07:00
HifiExperiments	97b9179144	merge with master	2019-09-05 00:46:56 -07:00
Sam Gateau	4a93b23d83	Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly	2019-08-13 18:47:57 -07:00
Sam Gateau	0b470b9ab8	Fixing the bad location assignment on gl41 on windows with Austin's help	2019-08-13 00:22:17 -07:00
SamGondelman	60600779c9	merge with master	2019-07-12 11:01:17 -07:00
SamGondelman	d545ba5bc6	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
SamGondelman	9c1b139d5f	merge with master	2019-06-25 23:46:39 -07:00
SamGondelman	37feb7f027	merge with master	2019-06-10 10:29:39 -07:00
Sam Gondelman	16a56dc1ec	Merge branch 'master' into proceduralMesh	2019-06-04 09:56:25 -07:00
SamGondelman	4eeff52746	add version to texmeta.json files, fallback to original file if version has changed for skyboxes	2019-05-21 15:30:28 -07:00
SamGondelman	6d3e23a7fe	merge with master	2019-05-16 20:03:10 -07:00
SamGondelman	de90c5088c	(✿◠‿◠)	2019-05-16 19:33:07 -07:00
SamGondelman	3eac2cf1d6	(づ｡◕‿‿◕｡)づ	2019-05-16 18:31:45 -07:00
SamGondelman	da254c2ccc	(¬‿¬)	2019-05-15 23:48:04 -07:00
SamGondelman	eb8c722080	fix runtime switch	2019-05-13 09:58:55 -07:00
SamGondelman	de5643b5b9	quint64 -> uint64_t	2019-03-25 10:33:32 -07:00
SamGondelman	4fd2c4449d	new procedural uniforms for time	2019-03-21 12:15:03 -07:00
SamGondelman	13ece79476	merge with master	2019-02-13 16:30:22 -08:00
sabrina-shanman	b2af6d1374	Have only one ColorChannel enum as header in image library	2019-02-12 16:14:41 -08:00
sabrina-shanman	2b355e9d52	Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared	2019-02-12 11:56:44 -08:00
SamGondelman	77a8ddb3f0	Merge remote-tracking branch 'upstream/master' into materialMapping	2019-02-11 16:35:05 -08:00
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -08:00
SamGondelman	4c9fb168c7	enable backface culling on procedurals	2019-02-06 10:55:36 -08:00
SamGondelman	93e32f1bd5	fix skybox depth testing	2019-01-30 12:25:48 -08:00
SamGondelman	835615fbbd	separate out v3 and v4	2018-12-20 16:33:13 -08:00
Sam Gondelman	7936dd1ac4	fix build errors again	2018-11-28 23:01:02 -08:00
Sam Gondelman	66d77d2df8	fix build error 2	2018-11-28 21:45:50 -08:00
Sam Gondelman	dc32472bd6	fix build error	2018-11-28 20:42:45 -08:00
SamGondelman	2acb6b6857	v3 procedurals and shader fixes	2018-11-28 17:58:27 -08:00
Brad Davis	b7c567af08	Fix procedurals using the iGlobalTime input	2018-11-14 15:28:22 -08:00
Roxanne Skelly	cef7000a72	Case 19754 - Remove logging URLs and related file locations. ... The goal is to strip out data that can be used by untoward users in copying models, avatars, etc.	2018-11-06 16:24:32 -08:00
Brad Davis	5a43462218	Remove unneeded shader directive	2018-10-23 10:40:12 -07:00
Brad Davis	3f2f5b18ec	Reimplement procedural uniforms without extension requirements	2018-10-23 10:40:12 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
Brad Davis	ac84a498b3	Cleanup dead declarations	2018-09-06 08:59:05 -07:00
SamGondelman	a7dec8fb75	parabola and particle shader fixes	2018-08-06 15:49:52 -07:00
Brad Davis	a0ef0c0b13	Fix procedurals	2018-08-06 10:31:14 -07:00
Brad Davis	8eb97dc79c	PR feedback	2018-08-03 14:58:12 -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	7771661948	fix particle spread properties	2018-06-15 17:35:49 -07:00
samcake	0e66ca1dfd	Fixing the procedural shader flickering key lighting, this is due to the LightingMOdel binding slot not assigned	2018-05-18 13:25:08 -07:00
John Conklin II	a6cda2166a	Merge pull request #13158 from highfidelity/stable ... RC67.1 stable mergeback to master	2018-05-15 14:01:06 -07:00
Olivier Prat	9e462e777c	Fixed compilation error with transparent procedurals	2018-05-11 11:01:24 +02:00
Brad Davis	72526781d9	Additional work on splash screen	2018-05-04 16:40:05 -07:00
SamGondelman	e0b2c076ef	cleanup and fix forward procedural rendering	2018-04-11 13:03:57 -07:00
SamGondelman	0c069574c5	forward pipelines for primitives	2018-04-10 15:56:08 -07:00
Bradley Austin Davis	fd007e845d	Squashed scribe changes	2018-02-07 10:29:29 -08:00
Brad Davis	4eb77b1970	Disable procedural surfaces on GLES	2018-01-23 12:25:43 -08:00