51 commits

Author	SHA1	Message	Date
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Olivier Prat	6814c487ec	Fixed slot collision between fade map and material texture table	2018-07-10 16:16:51 +02:00
Olivier Prat	50d16eca80	Added object fade parameters to shape pipeline locations	2018-07-10 12:26:51 +02:00
Olivier Prat	777ca7e010	Using shader locations directly in ShapePipeline	2018-07-10 12:11:30 +02:00
Olivier Prat	dfe51b57e8	Fade object params are now passed through uniform buffer	2018-07-10 10:53:38 +02:00
Brad Davis	0a0e5ab84b	Don't try to set invalid slots in the fade effect	2018-01-18 16:49:19 -08:00
Olivier Prat	22acf1aeaf	Removed unused variable to suppress warning on Mac and Ubuntu	2017-07-21 13:57:00 +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	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	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	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	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	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
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
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
Olivier Prat	69a7ec42fd	Added fade state in render::Item	2017-07-07 09:16:54 +02:00
Olivier Prat	b1b11ec756	Correct fix for mac and linux due to multiple Logging.h files	2017-07-05 09:08:51 +02:00
Olivier Prat	23bfc2c13d	Fixed compilation on mac and linux	2017-07-04 18:36:54 +02:00
Olivier Prat	45342a00fd	Forced faded objects to double sided (without correct lighting for the moment)	2017-07-04 17:45:32 +02:00
Olivier Prat	704effc0a6	Added cubic interpolation in noise for rounder effect	2017-07-04 17:38:45 +02:00
Olivier Prat	2525fe5869	Working save and load	2017-07-04 17:31:24 +02:00
Olivier Prat	98d915cf0f	Smoother ease in / out functions	2017-07-04 14:35:43 +02:00
Olivier Prat	7d851c1cbd	Added timing parameters and visual debug of threshold	2017-07-04 12:01:28 +02:00
Olivier Prat	0244dd6325	Working bubble isect trespasser POV	2017-07-04 09:47:23 +02:00
Olivier Prat	57b2bdf709	Working bubble isect owner POV	2017-07-04 09:14:08 +02:00
Olivier Prat	f2b8bd4c84	Merged with 21378	2017-07-03 16:44:00 +02:00
Olivier Prat	ec1cf9dc50	Changed array initialization to old style C	2017-07-03 16:42:27 +02:00
Olivier Prat	0d1d262db4	Working on bubble intersections	2017-07-03 16:28:00 +02:00
Olivier Prat	3fddac9f6e	Fixed compilation errors with array initializations	2017-07-03 16:12:23 +02:00
Olivier Prat	af7957491b	Working avater enter/leaves + manual threshold	2017-07-03 12:40:58 +02:00
Olivier Prat	87833abd31	Sky working again.	2017-06-30 16:46:25 +02:00
Olivier Prat	c5ca23f4ea	Changing edited fade category properly updates widgets in edit window	2017-06-29 17:14:20 +02:00
Olivier Prat	fb33b8d1c1	Working edition and emissive edge on fade element enter/leave	2017-06-29 12:59:43 +02:00
Olivier Prat	6a31dc2659	Selection of edited object working	2017-06-29 12:13:55 +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	2e3ffe7721	Disabled check on enabled physics when deciding is fade is adequate	2017-06-19 18:19:36 +02:00
Olivier Prat	ace301945c	Added scale and duration debug parameters in debugFade.qml	2017-06-13 15:31:04 +02:00
Olivier Prat	f3d252ee65	Switched fade curve to easeInOutQuad	2017-06-13 08:50:50 +02:00
Olivier Prat	cba70e6be0	Fade working on voxel objects	2017-06-08 14:57:09 +02:00
Olivier Prat	20d4fcbbc7	Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL	2017-06-08 09:24:12 +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