1794 commits

Author	SHA1	Message	Date
Olivier Prat	0415364c0e	Removed fade transition on shape entities. Fixed broken custom shaders on shapes	2017-07-31 12:29:11 +02:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
Seth Alves	47ea32f4d3	vertex color support in ModelScriptingInterface	2017-07-23 08:06:26 -07:00
Olivier Prat	7bc7b1eabc	Merge branch 'master' of git://github.com/highfidelity/hifi into fade2	2017-07-21 09:27:30 +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	8f9deb3b0d	Modified fade version of voxel shaders to use real world position	2017-07-20 14:44:01 +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
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	0319a16e24	Modified PolyLines to use the new custom pipeline system	2017-07-19 16:40:20 +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	236270d798	Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape	2017-07-18 10:47:21 +02:00
Zach Fox	974dff36b0	Make hover overlays work for hand controller lasers	2017-07-17 13:16:53 -07:00
Zach Fox	147474e19a	Logging category and filter	2017-07-17 11:17:59 -07: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	95059e26c1	Fading working on voxels	2017-07-17 14:32:05 +02:00
Olivier Prat	76dd421ecd	Merge branch 'fade' into fadevoxel	2017-07-17 12:00:10 +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	290d106cf4	Shapes are working again. Had to re-specialize all the payload hooks for ShapePayload::Pointer...	2017-07-17 11:37:50 +02:00
Olivier Prat	5e5148ca91	Merge branch 'fade' into fadeshape	2017-07-17 09:53:26 +02:00
Olivier Prat	61de99dfe8	Merge branch 'fade' into fadevoxel	2017-07-17 09:42:14 +02:00
Zach Fox	e602d3610e	Initial commit for HoverOverlayInterface	2017-07-14 17:26:53 -07:00
Olivier Prat	b125fba2e1	Removed untested avatar bubble fade code. Made changes as requested by Andrew	2017-07-13 23:04:55 +02:00
Olivier Prat	93218da473	Fixed compilation errors on Mac and Linux	2017-07-13 17:51:16 +02:00
Olivier Prat	1b8696fdda	First draft of custom pipeline on geometry cache	2017-07-13 17:09:49 +02:00
Olivier Prat	c583de4d96	Fade working on voxel objects	2017-07-13 15:22:10 +02:00
Olivier Prat	0f60cca617	Merged cleaned up fader branch from Sam	2017-07-12 18:09:17 +02:00
Sam Gateau	5394ac8672	Cleaning up changes, removing comments and dead code etc...	2017-07-12 17:33:05 +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
Sam Gateau	49779754ff	Remove unecessary shaders and apply the custom shader pipeline to polyvox	2017-07-12 15:50:06 +02:00
Sam Gateau	98cc8c0683	Refining the custom shader pipeline design and registration mechanism	2017-07-12 14:13:58 +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	aba8be595e	Separated fade categories from transition event types	2017-07-11 11:37:24 +02:00
Sam Gateau	746812ff78	Merging with origin orange	2017-07-10 17:25:13 +02:00
Olivier Prat	cc4e168369	Working fade again	2017-07-10 16:45: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	c3dd25e499	Drafting the mechanism to add shape pipeline	2017-07-07 18:26:10 +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
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	5cee2cff9f	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-07-04 17:48:07 +02:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00