191 commits

Author	SHA1	Message	Date
HifiExperiments	69714a89ca	material entities support cullFaceMode and support gltf doubleSided	2019-11-26 14:48:48 -08:00
David Rowe	c998148589	Revise recent changes to Entities.Material JSDoc	2019-11-26 17:43:41 +13:00
David Rowe	fafb3dd30b	MaterialCache JSDoc	2019-11-26 17:43:23 +13:00
David Rowe	5eb6e9dadd	Add recently added properties to caches' JSDoc	2019-11-26 17:00:13 +13:00
HifiExperiments	b73a608094	procedural vertex shaders	2019-11-15 00:22:40 -08:00
sabrina-shanman	7b14c00540	Merge branch 'master' into instancing	2019-11-05 10:22:24 -08:00
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
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Bradley Austin Davis	d6072f2bf2	Add bullet and draco to precompiled libraries	2017-11-28 11:32:34 -08:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
SamGondelman	1b85a453ab	working on text3d overlays and entities	2017-09-12 16:49:51 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
Sam Cake	f9aa400b95	Refining the stencil configuration and triggering only in hmd mode	2017-06-02 00:22:38 -07:00
samcake	9c1e99fe3f	Removing cruft and organizing the stencil config	2017-06-01 13:06:22 -07:00
samcake	82d348a2ef	Stencil rejection is working, and more cleaning	2017-05-31 16:46:20 -07:00
Ryan Huffman	aca7ad27c6	Fix ktx dependencies	2017-04-26 10:47:32 -07:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Sam Cake	29545f0918	FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend	2017-04-13 23:53:56 -07:00
samcake	b6504bba56	Moving the num mips per texture to the creator so it s immutable and simpler	2017-03-29 17:58:56 -07:00
Brad Hefta-Gaub	dbbed462b4	cleanup naked qDebug() calls	2016-12-19 22:24:25 -08:00
Ryan Jones	7b0756c745	remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions	2016-11-30 16:37:04 -08:00
Ryan Jones	3ccc493871	add helpers for v3 and shaders	2016-11-29 15:40:20 -08:00
Seth Alves	4470338663	catagorize some qDebugs	2016-09-14 21:39:45 -07:00
Zach Pomerantz	1971063b9a	clean up Procedural::parseShader	2016-08-29 13:56:39 -07:00
Zach Pomerantz	c740b263a8	detect unset skybox	2016-08-23 15:16:26 -07:00
Ryan Huffman	1d2ea3be03	Fix transparent items not being rendered correctly against procedural skybox	2016-08-15 16:35:25 -07:00
SamGondelman	0f988fb209	don't always mark _shaderDirty when user data changes unless url actually changes	2016-08-11 13:05:16 -07:00
SamGondelman	d8545bc7a3	fix procedural transparency	2016-08-10 13:49:35 -07:00
SamGondelman	36d9f92101	performance optimization to minimize calling usecTimestampNow	2016-08-09 13:10:02 -07:00
SamGondelman	b794259b7d	fixed procedural entity fade	2016-08-05 16:15:10 -07:00
SamGondelman	27bacc9165	try to fade in procedural shapes	2016-08-03 14:33:05 -07:00
Brad Hefta-Gaub	3b132e7376	Merge pull request #8076 from ZappoMan/reduceLogSpam ... don't log spam on empty URL	2016-06-16 18:25:54 -07:00
Brad Hefta-Gaub	5dae20975a	fix v1 procedural shaders	2016-06-16 09:18:44 -07:00
Brad Hefta-Gaub	3e459085ac	don't log spam on empty URL	2016-06-15 09:25:46 -07:00
SamGondelman	8a682450a9	still trying to fix cmake errors	2016-06-10 17:01:22 -07:00
SamGondelman	7b21d71180	try to fix cmake error	2016-06-10 14:09:04 -07:00
SamGondelman	53435fc730	removed extra argument	2016-06-10 14:04:33 -07:00
SamGondelman	f32e29ac2d	small changes	2016-06-10 13:46:02 -07:00
SamGondelman	da98ee0916	reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition	2016-06-10 13:42:19 -07:00
SamGondelman	8cccd5416a	try to fix mac errors	2016-06-09 16:10:27 -07:00
SamGondelman	24e5000aeb	exposed orientation and eye position to procedural entity shaders	2016-06-08 18:26:54 -07:00
Brad Davis	11de8a52b2	fix broken procedural skybox when leaving and re-entering	2016-05-22 22:52:56 -07:00
Brad Davis	5ba8372c21	Moving GL backend out of GPU	2016-05-16 12:54:17 -07:00
Zach Pomerantz	13945aa4d9	Annotate all virtual fns with override	2016-04-30 13:48:59 -07:00
Zach Pomerantz	eb2e254aa6	Release px resources when unused	2016-04-01 14:46:52 -07:00
Zach Pomerantz	0e9b783ca3	Release skybox texs when not rendering	2016-04-01 14:46:50 -07:00
Zach Pomerantz	1a8cca3dcc	Clarify use of procedural's dirty atomic flag	2016-03-15 10:51:55 -07:00
Zach Pomerantz	ff07e47626	Make procedural dirty marker atomic	2016-03-14 17:52:13 -07:00