2740 commits

Author	SHA1	Message	Date
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
Seth Alves	a3f4aeb182	code review	2017-07-24 19:41:30 -07:00
Seth Alves	a1107deef1	cleanups	2017-07-23 08:21:50 -07:00
Seth Alves	47ea32f4d3	vertex color support in ModelScriptingInterface	2017-07-23 08:06:26 -07:00
Olivier Prat	22acf1aeaf	Removed unused variable to suppress warning on Mac and Ubuntu	2017-07-21 13:57:00 +02:00
Olivier Prat	b08e2598c2	Some factorization in transition management and transition item application is now completely recursive on sub items and not just level 1 subitems	2017-07-21 12:49:51 +02:00
Seth Alves	72e5fecb4e	do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex	2017-07-20 16:34:34 -07:00
Olivier Prat	aaba44cf4d	Merge branch 'fade' into fade2	2017-07-20 13:39:56 +02:00
Olivier Prat	a50c267d0b	Fading on polyline now works when the polyline is added to the scene	2017-07-20 12:45:14 +02:00
Olivier Prat	7cfccc03a4	Fixed bug on AMD due to improper alignement issues on UBO with layout(std140) in GLSL	2017-07-20 10:31:35 +02:00
Seth Alves	be48268be8	getMeshes handles registration point	2017-07-19 15:02:40 -07:00
Seth Alves	750b7192af	trying to get the resulting model to line up with the originals	2017-07-19 13:58:03 -07:00
Seth Alves	a8698c2fbc	EntityScriptingInterface::getMeshes support for Model entities	2017-07-19 08:59:09 -07:00
Olivier Prat	b652d94a43	Added fade on poly line entities	2017-07-19 17:11:06 +02:00
Olivier Prat	abc751ef9c	Fade seems to be working on shape items with instanced drawing.	2017-07-18 18:25:54 +02:00
Olivier Prat	3316be4dea	Working fade parameters through instanced draw calls	2017-07-18 17:01:17 +02:00
Olivier Prat	dbf0b64dfb	Refactored Fade.slh to take into account differences between instanced draw and normal draw	2017-07-18 12:49:34 +02:00
Olivier Prat	1f14b6ef38	Shape entities have the correct pipeline picked when fading is activated. Still need to support instanced rendering	2017-07-17 17:50:59 +02:00
Olivier Prat	f8b2ffe359	Removed transparency on fading shapes	2017-07-17 15:06:32 +02:00
Olivier Prat	db7871fca7	Merge branch 'fadevoxel' into fadeshape	2017-07-17 14:33:00 +02:00
Olivier Prat	3f8daa21ec	Created FadeEffect singleton to be able to get fade item & batch setters for every special entity render	2017-07-17 14:26:41 +02:00
Olivier Prat	146f934019	Cleaned up shader code as fade position is now world position	2017-07-17 11:59:10 +02:00
Olivier Prat	5e5148ca91	Merge branch 'fade' into fadeshape	2017-07-17 09:53:26 +02:00
Olivier Prat	82da9fb537	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-14 17:28:35 +02:00
Seth Alves	12f52e8f20	don't do SoftAttachmentModel::updateClusterMatrices if geometry isn't ready	2017-07-13 13:18:21 -07:00
Olivier Prat	4d5f2ebdfe	Removed unused variable that prevented build on Linux	2017-07-13 18:45:08 +02:00
Olivier Prat	96f0c35b79	Yet some more compilation fixes for Mac and Linux	2017-07-13 18:22:18 +02:00
Olivier Prat	1b8696fdda	First draft of custom pipeline on geometry cache	2017-07-13 17:09:49 +02:00
Olivier Prat	736ecf0082	Fixed infinite recursion in collectMetaSubItems due to meta sending itself as sub-item	2017-07-13 14:43:41 +02:00
Olivier Prat	53a92c1506	Fade edit is working again and time based transitions are garbage collected	2017-07-13 12:31:10 +02:00
Olivier Prat	2d2722bfc5	Added async transition query on scene	2017-07-13 11:05:04 +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	7552cca316	First alpha version of bubble collision fade events. Missing a lot of information.	2017-07-11 19:26:15 +02:00
Olivier Prat	381e0c64a8	Working avatar fade in / fade out except that it is also triggered on bubble collisions	2017-07-11 16:43:27 +02:00
Olivier Prat	aba8be595e	Separated fade categories from transition event types	2017-07-11 11:37:24 +02:00
Olivier Prat	9758a6ded0	Edition picking again (but without bounding box highlighting)	2017-07-10 17:57:02 +02:00
Sam Gateau	746812ff78	Merging with origin orange	2017-07-10 17:25:13 +02:00
Olivier Prat	66d09a4c3c	Some objects fade and fixed crash due to invalid meta item id	2017-07-10 16:02:12 +02:00
Olivier Prat	267531cc1a	First working fade	2017-07-10 15:27:09 +02:00
Sam Gateau	0c3755483b	adding assert or checks whenever getting a scene stage	2017-07-10 12:37:26 +02:00
Sam Gateau	4edea433ce	Rename the _pipeline into _shapePipeline in the render::Args	2017-07-10 12:16:53 +02:00
Olivier Prat	06d69d04c3	TransitionStage + FadeJob compiling but not linked to entity events	2017-07-07 18:22:11 +02:00
Olivier Prat	4256a1f2a7	Preparing for merge with stage. DOESN'T COMPILE!	2017-07-07 15:16:20 +02:00
Sam Gateau	d15c4ea2d3	Merging with the stage branch	2017-07-07 15:12:40 +02:00
Sam Gateau	a8086764da	REmoving warnings for unused var	2017-07-07 12:19:22 +02:00
Sam Gateau	4c1bf6af47	REmoving comments	2017-07-07 11:38:25 +02:00
Olivier Prat	5ab093dc38	Preparing to introducte TransitionStage	2017-07-07 11:01:47 +02:00
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02:00
Olivier Prat	69a7ec42fd	Added fade state in render::Item	2017-07-07 09:16:54 +02:00
Olivier Prat	018c0489f4	Merged with 21378	2017-07-06 16:53:47 +02:00