134 commits

Author	SHA1	Message	Date
Olivier Prat	3316be4dea	Working fade parameters through instanced draw calls	2017-07-18 17:01:17 +02:00
Olivier Prat	2f9885870b	First merge with Sam's fader branch with custom pipeline support in shape plumber	2017-07-12 17:29:21 +02:00
Olivier Prat	aba8be595e	Separated fade categories from transition event types	2017-07-11 11:37:24 +02:00
Sam Gateau	4edea433ce	Rename the _pipeline into _shapePipeline in the render::Args	2017-07-10 12:16:53 +02:00
Olivier Prat	4256a1f2a7	Preparing for merge with stage. DOESN'T COMPILE!	2017-07-07 15:16:20 +02:00
Olivier Prat	69a7ec42fd	Added fade state in render::Item	2017-07-07 09:16:54 +02:00
Olivier Prat	8a12d0c106	Fade effect working again for basic enter domain but with various Fade jobs	2017-06-29 08:54:23 +02:00
Olivier Prat	1bb0d51849	Merged with master	2017-06-26 11:55:46 +02:00
Olivier Prat	2e3ffe7721	Disabled check on enabled physics when deciding is fade is adequate	2017-06-19 18:19:36 +02:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Olivier Prat	5eeff5aa28	Fixed unwanted red tint due to unreset color attrib in ModelMeshPartPayload	2017-06-14 10:23:12 +02:00
Olivier Prat	cba70e6be0	Fade working on voxel objects	2017-06-08 14:57:09 +02:00
Olivier Prat	de143d0ea2	Switched to uniforms for sending fade shader data. Moved more fade functions to FadeEffect class	2017-06-06 17:07:20 +02:00
Olivier Prat	a9ab9d2476	Renamed FadeManager to FadeEffect	2017-06-06 16:27:56 +02:00
Olivier Prat	8af2f75996	Added FadeManager to centralize some common fade effect data and functions	2017-06-06 16:11:12 +02:00
Olivier Prat	e7eca7728f	Debug fade management moved out of the inner render loop	2017-06-06 14:57:52 +02:00
Olivier Prat	08fcd6c357	Added new shaders	2017-06-05 16:32:36 +02:00
Olivier Prat	1433ae4b34	Merged from 21274	2017-06-05 11:12:57 +02:00
Andrew Meadows	f7db877b7f	payload keeps weak pointer to Model	2017-05-22 17:29:15 -07:00
Olivier Prat	111f0762ea	Added debug scripts and fade position is now stable	2017-04-30 14:42:27 +02:00
Olivier Prat	6a39c25dc7	Merged from master because protocol has changed	2017-04-27 10:59:51 +02:00
Olivier Prat	8071c04e98	Added fade effect prototype version	2017-04-27 10:31:06 +02:00
Atlante45	70ece9f0fd	Load skybox first and sounds later	2017-04-26 14:57:23 -07:00
Atlante45	a2f7a88433	Start drawing models before we get the textures	2017-04-26 10:49:23 -07:00
Atlante45	6fb074715e	Fix alpha rendering bug	2017-04-26 10:48:57 -07:00
Ryan Huffman	8d03d50d35	Cleanup progressive ktx debugging	2017-04-26 10:48:57 -07:00
Ryan Huffman	472c888529	Fix handling of failed ktx downloads	2017-04-26 10:48:24 -07:00
samcake	9bc7e41642	Remove extra calls for binding default textures, not needed	2017-03-29 10:57:08 -07:00
Andrew Meadows	cf848d73e4	don't updateClusterMatrices() in render()	2017-03-15 16:03:36 -07:00
Andrew Meadows	f250c0d298	simpler bindTransform() for ModelMeshPartPayload	2017-03-15 14:41:13 -07:00
samcake	c7b164d8f2	Adding differenciation for the Material shapeKey bit	2017-02-22 18:21:18 -08:00
samcake	c88d070868	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-01-31 11:49:25 -08:00
samcake	04d5173328	Merge pull request #9530 from AndrewMeadows/computeBoundsOutsideLambda ... compute Model's local bounds outside pending changes queue	2017-01-31 11:40:21 -08:00
samcake	0b139c906c	Assigniing default textures that make sense	2017-01-31 10:56:30 -08:00
samcake	249ec80d74	Writting a better version of the no texture case	2017-01-30 15:48:48 -08:00
samcake	3c56bd2960	Adding support for disabling texturing from the material	2017-01-30 15:03:04 -08:00
Andrew Meadows	489fbc6299	compute Model's local bounds outside render lambda	2017-01-27 09:35:36 -08:00
Andrew Meadows	10cdea9cd8	cleanup model fade logic	2017-01-19 14:17:50 -08:00
Andrew Meadows	b7c1bfaf58	another attempt to fix model transform	2017-01-19 14:01:40 -08:00
Andrew Meadows	d3af420516	fix broken model transforms	2017-01-19 13:07:50 -08:00
Andrew Meadows	bfbef91f53	re-enable cauterization of meshes for MyAvatar	2017-01-19 12:56:07 -08:00
Andrew Meadows	3dd8fd838b	move cauterization out of Model class	2017-01-19 12:56:07 -08:00
Andrew Meadows	fd28457807	fix cauterization hack	2017-01-16 15:13:28 -08:00
Andrew Meadows	c060fd6a68	restore updateClusterMatrices() in render()	2017-01-11 17:33:30 -08:00
Andrew Meadows	e88f02d7b6	remove cruft	2017-01-11 06:55:13 -08:00
sam	7a01b856f7	Factorization of the modelTransform out of the cluster matrices	2017-01-11 02:33:56 -08:00
Andrew Meadows	44699fc661	modelToWorld rotation not in cluster matrices	2017-01-10 16:21:13 -08:00
Brad Davis	99af7f2819	Reduce unecessary copying in MeshPartPayload::bindMaterial	2016-12-28 12:11:27 -08:00
samcake	c435afb728	Introducing a fix for the overlayered model drawn in front	2016-12-19 13:17:56 -08:00
Brad Hefta-Gaub	7ef8e53d03	Merge pull request #8701 from ZappoMan/getShapeKeyCrashFix ... add guards to getShapeKey	2016-10-01 20:23:50 -07:00