Commit graph

25 commits

Author SHA1 Message Date
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Gabriel Calero
dad526d22b Make Fade.slh compatible with Open GLES SL 2018-01-03 16:36:11 -03:00
Olivier Prat
aaba44cf4d Merge branch 'fade' into fade2 2017-07-20 13:39:56 +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
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
146f934019 Cleaned up shader code as fade position is now world position 2017-07-17 11:59:10 +02:00
Olivier Prat
aba8be595e Separated fade categories from transition event types 2017-07-11 11:37:24 +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
704effc0a6 Added cubic interpolation in noise for rounder effect 2017-07-04 17:38:45 +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
0d1d262db4 Working on bubble intersections 2017-07-03 16:28:00 +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
fb33b8d1c1 Working edition and emissive edge on fade element enter/leave 2017-06-29 12:59:43 +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
ace301945c Added scale and duration debug parameters in debugFade.qml 2017-06-13 15:31:04 +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
Olivier Prat
08fcd6c357 Added new shaders 2017-06-05 16:32:36 +02: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