New Simplified Transition view with icons on source and target

This commit is contained in:
Bruno Herbelin
2024-03-17 19:59:07 +01:00
parent 59ac3a0bb8
commit b6213e1ed8
11 changed files with 501 additions and 88 deletions

View File

@@ -595,6 +595,7 @@ set(VMIX_RSC_FILES
./rsc/mesh/icon_receive.ply ./rsc/mesh/icon_receive.ply
./rsc/mesh/icon_text.ply ./rsc/mesh/icon_text.ply
./rsc/mesh/icon_play.ply ./rsc/mesh/icon_play.ply
./rsc/mesh/icon_fastforward.ply
./rsc/mesh/h_line.ply ./rsc/mesh/h_line.ply
./rsc/mesh/h_mark.ply ./rsc/mesh/h_mark.ply
./rsc/shaders/filters/default.glsl ./rsc/shaders/filters/default.glsl

Binary file not shown.

View File

@@ -0,0 +1,383 @@
ply
format ascii 1.0
comment Created by Blender 3.6.2 - www.blender.org
element vertex 185
property float x
property float y
property float z
property float nx
property float ny
property float nz
property float s
property float t
element face 183
property list uchar uint vertex_indices
end_header
0.244805 0.237729 0.000000 0.000000 0.000000 1.000000 0.869565 0.000000
0.247792 0.237865 0.000000 0.000000 0.000000 1.000000 0.880435 0.000000
0.246816 0.237865 0.000000 0.000000 0.000000 1.000000 0.875000 0.000000
0.250490 0.237865 0.000000 0.000000 0.000000 1.000000 0.885870 0.000000
0.254565 0.237865 0.000000 0.000000 0.000000 1.000000 0.891304 0.000000
0.259673 0.237865 0.000000 0.000000 0.000000 1.000000 0.896739 0.000000
0.265470 0.237865 0.000000 0.000000 0.000000 1.000000 0.902174 0.000000
0.271612 0.237865 0.000000 0.000000 0.000000 1.000000 0.907609 0.000000
0.277753 0.237865 0.000000 0.000000 0.000000 1.000000 0.913043 0.000000
0.283550 0.237865 0.000000 0.000000 0.000000 1.000000 0.918478 0.000000
0.288658 0.237865 0.000000 0.000000 0.000000 1.000000 0.923913 0.000000
0.292733 0.237865 0.000000 0.000000 0.000000 1.000000 0.929348 0.000000
0.295431 0.237865 0.000000 0.000000 0.000000 1.000000 0.934783 0.000000
0.296407 0.237865 0.000000 0.000000 0.000000 1.000000 0.940217 0.000000
0.298418 0.237729 0.000000 0.000000 0.000000 1.000000 0.945652 0.000000
-0.293734 0.236557 0.000000 0.000000 0.000000 1.000000 0.576087 0.000000
-0.279332 0.237646 0.000000 0.000000 0.000000 1.000000 0.586957 0.000000
-0.286613 0.237755 0.000000 0.000000 0.000000 1.000000 0.581522 0.000000
-0.016027 0.236557 0.000000 0.000000 0.000000 1.000000 0.711957 0.000000
-0.001625 0.237646 0.000000 0.000000 0.000000 1.000000 0.722826 0.000000
-0.008906 0.237755 0.000000 0.000000 0.000000 1.000000 0.717391 0.000000
0.242873 0.237332 0.000000 0.000000 0.000000 1.000000 0.864130 0.000000
0.300350 0.237332 0.000000 0.000000 0.000000 1.000000 0.951087 0.000000
-0.272077 0.236152 0.000000 0.000000 0.000000 1.000000 0.592391 0.000000
0.005630 0.236152 0.000000 0.000000 0.000000 1.000000 0.728261 0.000000
0.241040 0.236692 0.000000 0.000000 0.000000 1.000000 0.858696 0.000000
0.302183 0.236692 0.000000 0.000000 0.000000 1.000000 0.956522 0.000000
0.239323 0.235827 0.000000 0.000000 0.000000 1.000000 0.853261 0.000000
0.303901 0.235827 0.000000 0.000000 0.000000 1.000000 0.961957 0.000000
-0.300509 0.234131 0.000000 0.000000 0.000000 1.000000 0.570652 0.000000
-0.022801 0.234131 0.000000 0.000000 0.000000 1.000000 0.706522 0.000000
-0.265033 0.233194 0.000000 0.000000 0.000000 1.000000 0.597826 0.000000
0.012674 0.233194 0.000000 0.000000 0.000000 1.000000 0.733696 0.000000
0.237740 0.234756 0.000000 0.000000 0.000000 1.000000 0.847826 0.000000
0.305483 0.234756 0.000000 0.000000 0.000000 1.000000 0.967391 0.000000
0.236309 0.233496 0.000000 0.000000 0.000000 1.000000 0.842391 0.000000
0.306914 0.233496 0.000000 0.000000 0.000000 1.000000 0.972826 0.000000
-0.306751 0.230556 0.000000 0.000000 0.000000 1.000000 0.565217 0.000000
-0.029044 0.230556 0.000000 0.000000 0.000000 1.000000 0.701087 0.000000
0.235049 0.232066 0.000000 0.000000 0.000000 1.000000 0.836957 0.000000
0.308174 0.232066 0.000000 0.000000 0.000000 1.000000 0.978261 0.000000
-0.258388 0.228693 0.000000 0.000000 0.000000 1.000000 0.603261 0.000000
0.019320 0.228693 0.000000 0.000000 0.000000 1.000000 0.739130 0.000000
0.233978 0.230483 0.000000 0.000000 0.000000 1.000000 0.831522 0.000000
0.309245 0.230483 0.000000 0.000000 0.000000 1.000000 0.983696 0.000000
-0.312276 0.225911 0.000000 0.000000 0.000000 1.000000 0.559783 0.000000
-0.034569 0.225911 0.000000 0.000000 0.000000 1.000000 0.695652 0.000000
0.233113 0.228767 0.000000 0.000000 0.000000 1.000000 0.826087 0.000000
0.310110 0.228767 0.000000 0.000000 0.000000 1.000000 0.989130 0.000000
0.232473 0.226934 0.000000 0.000000 0.000000 1.000000 0.820652 0.000000
0.310750 0.226934 0.000000 0.000000 0.000000 1.000000 0.994565 0.000000
-0.254204 0.224903 0.000000 0.000000 0.000000 1.000000 0.608696 0.000000
0.023503 0.224903 0.000000 0.000000 0.000000 1.000000 0.744565 0.000000
0.232076 0.225002 0.000000 0.000000 0.000000 1.000000 0.815217 0.000000
0.311148 0.225002 0.000000 0.000000 0.000000 1.000000 1.000000 0.000000
-0.316897 0.220274 0.000000 0.000000 0.000000 1.000000 0.554348 0.000000
-0.039190 0.220274 0.000000 0.000000 0.000000 1.000000 0.690217 0.000000
0.231939 0.222991 0.000000 0.000000 0.000000 1.000000 0.809783 0.000000
0.311284 0.222991 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000
-0.242638 0.214425 0.000000 0.000000 0.000000 1.000000 0.614130 0.000000
0.035069 0.214425 0.000000 0.000000 0.000000 1.000000 0.750000 0.000000
0.231939 0.036074 0.000000 0.000000 0.000000 1.000000 0.804348 0.000000
0.311284 -0.223230 0.000000 0.000000 0.000000 1.000000 0.005435 0.000000
-0.320428 0.213724 0.000000 0.000000 0.000000 1.000000 0.548913 0.000000
-0.042720 0.213724 0.000000 0.000000 0.000000 1.000000 0.684783 0.000000
-0.225166 0.198596 0.000000 0.000000 0.000000 1.000000 0.619565 0.000000
0.052541 0.198596 0.000000 0.000000 0.000000 1.000000 0.755435 0.000000
-0.322682 0.206340 0.000000 0.000000 0.000000 1.000000 0.543478 0.000000
-0.044975 0.206340 0.000000 0.000000 0.000000 1.000000 0.679348 0.000000
-0.323475 0.198201 0.000000 0.000000 0.000000 1.000000 0.538043 0.000000
-0.045768 0.198201 0.000000 0.000000 0.000000 1.000000 0.673913 0.000000
-0.203264 0.178755 0.000000 0.000000 0.000000 1.000000 0.625000 0.000000
0.074443 0.178755 0.000000 0.000000 0.000000 1.000000 0.760870 0.000000
-0.323475 0.190397 0.000000 0.000000 0.000000 1.000000 0.532609 0.000000
-0.045768 0.036074 0.000000 0.000000 0.000000 1.000000 0.668478 0.000000
-0.323475 0.168820 0.000000 0.000000 0.000000 1.000000 0.527174 0.000000
-0.178409 0.156238 0.000000 0.000000 0.000000 1.000000 0.630435 0.000000
0.099298 0.156238 0.000000 0.000000 0.000000 1.000000 0.766304 0.000000
-0.323475 0.136226 0.000000 0.000000 0.000000 1.000000 0.521739 0.000000
-0.152078 0.132384 0.000000 0.000000 0.000000 1.000000 0.635870 0.000000
0.125629 0.132384 0.000000 0.000000 0.000000 1.000000 0.771739 0.000000
-0.323475 0.095368 0.000000 0.000000 0.000000 1.000000 0.516304 0.000000
-0.125747 0.108529 0.000000 0.000000 0.000000 1.000000 0.641304 0.000000
0.151961 0.108529 0.000000 0.000000 0.000000 1.000000 0.777174 0.000000
-0.100892 0.086012 0.000000 0.000000 0.000000 1.000000 0.646739 0.000000
0.176815 0.086012 0.000000 0.000000 0.000000 1.000000 0.782609 0.000000
-0.323475 0.049002 0.000000 0.000000 0.000000 1.000000 0.510870 0.000000
-0.078990 0.066171 0.000000 0.000000 0.000000 1.000000 0.652174 0.000000
0.198717 0.066171 0.000000 0.000000 0.000000 1.000000 0.788043 0.000000
-0.061518 0.050342 0.000000 0.000000 0.000000 1.000000 0.657609 0.000000
0.216189 0.050342 0.000000 0.000000 0.000000 1.000000 0.793478 0.000000
-0.049952 0.039864 0.000000 0.000000 0.000000 1.000000 0.663043 0.000000
0.227756 0.039864 0.000000 0.000000 0.000000 1.000000 0.798913 0.000000
-0.323475 -0.000119 0.000000 0.000000 0.000000 1.000000 0.505435 0.000000
0.231939 -0.034949 0.000000 0.000000 0.000000 1.000000 0.266304 0.000000
-0.323475 -0.049240 0.000000 0.000000 0.000000 1.000000 0.500000 0.000000
-0.045768 -0.034949 0.000000 0.000000 0.000000 1.000000 0.402174 0.000000
-0.258388 -0.228931 0.000000 0.000000 0.000000 1.000000 0.407609 0.000000
-0.045768 -0.038166 0.000000 0.000000 0.000000 1.000000 0.396739 0.000000
0.019320 -0.228931 0.000000 0.000000 0.000000 1.000000 0.271739 0.000000
0.231939 -0.038654 0.000000 0.000000 0.000000 1.000000 0.260870 0.000000
-0.045768 -0.047060 0.000000 0.000000 0.000000 1.000000 0.391304 0.000000
0.231939 -0.048896 0.000000 0.000000 0.000000 1.000000 0.255435 0.000000
-0.045768 -0.060495 0.000000 0.000000 0.000000 1.000000 0.385870 0.000000
0.231939 -0.064368 0.000000 0.000000 0.000000 1.000000 0.250000 0.000000
-0.323475 -0.095607 0.000000 0.000000 0.000000 1.000000 0.494565 0.000000
-0.045768 -0.077336 0.000000 0.000000 0.000000 1.000000 0.380435 0.000000
0.231939 -0.083763 0.000000 0.000000 0.000000 1.000000 0.244565 0.000000
-0.045768 -0.096447 0.000000 0.000000 0.000000 1.000000 0.375000 0.000000
0.231939 -0.105772 0.000000 0.000000 0.000000 1.000000 0.239130 0.000000
-0.323475 -0.136464 0.000000 0.000000 0.000000 1.000000 0.489130 0.000000
-0.045768 -0.116694 0.000000 0.000000 0.000000 1.000000 0.369565 0.000000
0.231939 -0.129089 0.000000 0.000000 0.000000 1.000000 0.233696 0.000000
-0.045768 -0.136941 0.000000 0.000000 0.000000 1.000000 0.364130 0.000000
0.231939 -0.152407 0.000000 0.000000 0.000000 1.000000 0.228261 0.000000
-0.323475 -0.169059 0.000000 0.000000 0.000000 1.000000 0.483696 0.000000
-0.045768 -0.156053 0.000000 0.000000 0.000000 1.000000 0.358696 0.000000
0.231939 -0.174416 0.000000 0.000000 0.000000 1.000000 0.222826 0.000000
-0.045768 -0.172894 0.000000 0.000000 0.000000 1.000000 0.353261 0.000000
-0.323475 -0.190635 0.000000 0.000000 0.000000 1.000000 0.478261 0.000000
-0.045768 -0.186329 0.000000 0.000000 0.000000 1.000000 0.347826 0.000000
0.231939 -0.193811 0.000000 0.000000 0.000000 1.000000 0.217391 0.000000
-0.045768 -0.195223 0.000000 0.000000 0.000000 1.000000 0.342391 0.000000
-0.323475 -0.198440 0.000000 0.000000 0.000000 1.000000 0.472826 0.000000
0.231939 -0.209283 0.000000 0.000000 0.000000 1.000000 0.211957 0.000000
-0.045768 -0.198440 0.000000 0.000000 0.000000 1.000000 0.336957 0.000000
-0.322682 -0.206581 0.000000 0.000000 0.000000 1.000000 0.467391 0.000000
-0.044975 -0.206581 0.000000 0.000000 0.000000 1.000000 0.331522 0.000000
-0.320428 -0.213971 0.000000 0.000000 0.000000 1.000000 0.461957 0.000000
-0.042720 -0.213971 0.000000 0.000000 0.000000 1.000000 0.326087 0.000000
0.231939 -0.219525 0.000000 0.000000 0.000000 1.000000 0.206522 0.000000
-0.316897 -0.220530 0.000000 0.000000 0.000000 1.000000 0.456522 0.000000
-0.039190 -0.220530 0.000000 0.000000 0.000000 1.000000 0.320652 0.000000
0.231939 -0.223230 0.000000 0.000000 0.000000 1.000000 0.201087 0.000000
-0.312276 -0.226177 0.000000 0.000000 0.000000 1.000000 0.451087 0.000000
-0.034569 -0.226177 0.000000 0.000000 0.000000 1.000000 0.315217 0.000000
0.232076 -0.225241 0.000000 0.000000 0.000000 1.000000 0.195652 0.000000
0.311148 -0.225241 0.000000 0.000000 0.000000 1.000000 0.010870 0.000000
0.232473 -0.227172 0.000000 0.000000 0.000000 1.000000 0.190217 0.000000
0.310750 -0.227172 0.000000 0.000000 0.000000 1.000000 0.016304 0.000000
-0.306751 -0.230832 0.000000 0.000000 0.000000 1.000000 0.445652 0.000000
-0.029044 -0.230832 0.000000 0.000000 0.000000 1.000000 0.309783 0.000000
0.233113 -0.229005 0.000000 0.000000 0.000000 1.000000 0.184783 0.000000
0.310110 -0.229005 0.000000 0.000000 0.000000 1.000000 0.021739 0.000000
-0.265033 -0.233459 0.000000 0.000000 0.000000 1.000000 0.413043 0.000000
0.012674 -0.233459 0.000000 0.000000 0.000000 1.000000 0.277174 0.000000
0.233978 -0.230722 0.000000 0.000000 0.000000 1.000000 0.179348 0.000000
0.309245 -0.230722 0.000000 0.000000 0.000000 1.000000 0.027174 0.000000
0.235049 -0.232304 0.000000 0.000000 0.000000 1.000000 0.173913 0.000000
0.308174 -0.232304 0.000000 0.000000 0.000000 1.000000 0.032609 0.000000
-0.300509 -0.234416 0.000000 0.000000 0.000000 1.000000 0.440217 0.000000
-0.022801 -0.234416 0.000000 0.000000 0.000000 1.000000 0.304348 0.000000
0.236309 -0.233734 0.000000 0.000000 0.000000 1.000000 0.168478 0.000000
0.306914 -0.233734 0.000000 0.000000 0.000000 1.000000 0.038043 0.000000
-0.272077 -0.236434 0.000000 0.000000 0.000000 1.000000 0.418478 0.000000
0.005630 -0.236434 0.000000 0.000000 0.000000 1.000000 0.282609 0.000000
0.237740 -0.234994 0.000000 0.000000 0.000000 1.000000 0.163043 0.000000
0.305483 -0.234994 0.000000 0.000000 0.000000 1.000000 0.043478 0.000000
-0.293734 -0.236848 0.000000 0.000000 0.000000 1.000000 0.434783 0.000000
-0.016027 -0.236848 0.000000 0.000000 0.000000 1.000000 0.298913 0.000000
0.239323 -0.236065 0.000000 0.000000 0.000000 1.000000 0.157609 0.000000
0.303901 -0.236065 0.000000 0.000000 0.000000 1.000000 0.048913 0.000000
0.241040 -0.236930 0.000000 0.000000 0.000000 1.000000 0.152174 0.000000
0.302183 -0.236930 0.000000 0.000000 0.000000 1.000000 0.054348 0.000000
-0.279332 -0.237937 0.000000 0.000000 0.000000 1.000000 0.423913 0.000000
-0.001625 -0.237937 0.000000 0.000000 0.000000 1.000000 0.288043 0.000000
-0.286613 -0.238049 0.000000 0.000000 0.000000 1.000000 0.429348 0.000000
-0.008906 -0.238049 0.000000 0.000000 0.000000 1.000000 0.293478 0.000000
0.242873 -0.237570 0.000000 0.000000 0.000000 1.000000 0.146739 0.000000
0.300350 -0.237570 0.000000 0.000000 0.000000 1.000000 0.059783 0.000000
0.244805 -0.237967 0.000000 0.000000 0.000000 1.000000 0.141304 0.000000
0.298418 -0.237967 0.000000 0.000000 0.000000 1.000000 0.065217 0.000000
0.246816 -0.238104 0.000000 0.000000 0.000000 1.000000 0.135870 0.000000
0.296407 -0.238104 0.000000 0.000000 0.000000 1.000000 0.070652 0.000000
0.247792 -0.238104 0.000000 0.721063 -0.692870 0.000000 0.130435 0.000000
0.250490 -0.238104 0.000000 0.724799 -0.688960 0.000000 0.125000 0.000000
0.254565 -0.238104 0.000000 0.730325 -0.683100 0.000000 0.119565 0.000000
0.259673 -0.238104 0.000000 0.737055 -0.675833 0.000000 0.114130 0.000000
0.265470 -0.238104 0.000000 0.744436 -0.667694 0.000000 0.108696 0.000000
0.271611 -0.238104 0.000000 0.751968 -0.659200 0.000000 0.103261 0.000000
0.277753 -0.238104 0.000000 0.759216 -0.650838 0.000000 0.097826 0.000000
0.283550 -0.238104 0.000000 0.765809 -0.643068 0.000000 0.092391 0.000000
0.288658 -0.238104 0.000000 0.771425 -0.636320 0.000000 0.086957 0.000000
0.292733 -0.238104 0.000000 0.775780 -0.631004 0.000000 0.081522 0.000000
0.295431 -0.238104 0.000000 0.778603 -0.627517 0.000000 0.076087 0.000000
3 0 1 2
3 0 3 1
3 0 4 3
3 0 5 4
3 0 6 5
3 0 7 6
3 0 8 7
3 0 9 8
3 0 10 9
3 0 11 10
3 0 12 11
3 0 13 12
3 0 14 13
3 15 16 17
3 18 19 20
3 21 14 0
3 21 22 14
3 15 23 16
3 18 24 19
3 25 22 21
3 25 26 22
3 27 26 25
3 27 28 26
3 29 23 15
3 30 24 18
3 29 31 23
3 30 32 24
3 33 28 27
3 33 34 28
3 35 34 33
3 35 36 34
3 37 31 29
3 38 32 30
3 39 36 35
3 39 40 36
3 37 41 31
3 38 42 32
3 43 40 39
3 43 44 40
3 45 41 37
3 46 42 38
3 47 44 43
3 47 48 44
3 49 48 47
3 49 50 48
3 45 51 41
3 46 52 42
3 53 50 49
3 53 54 50
3 55 51 45
3 56 52 46
3 57 54 53
3 57 58 54
3 55 59 51
3 56 60 52
3 61 58 57
3 61 62 58
3 63 59 55
3 64 60 56
3 63 65 59
3 64 66 60
3 67 65 63
3 68 66 64
3 69 65 67
3 70 66 68
3 69 71 65
3 70 72 66
3 73 71 69
3 74 72 70
3 75 71 73
3 75 76 71
3 74 77 72
3 78 76 75
3 78 79 76
3 74 80 77
3 81 79 78
3 81 82 79
3 74 83 80
3 81 84 82
3 74 85 83
3 86 84 81
3 86 87 84
3 74 88 85
3 86 89 87
3 74 90 88
3 86 91 89
3 74 92 90
3 93 91 86
3 93 74 91
3 74 61 92
3 93 61 74
3 93 94 61
3 94 62 61
3 95 96 93
3 96 94 93
3 95 97 96
3 98 94 96
3 98 99 94
3 100 62 94
3 101 99 98
3 102 62 100
3 103 99 101
3 104 62 102
3 105 97 95
3 106 99 103
3 107 62 104
3 108 99 106
3 109 62 107
3 110 97 105
3 111 99 108
3 112 62 109
3 113 99 111
3 114 62 112
3 115 97 110
3 116 99 113
3 117 62 114
3 118 99 116
3 119 97 115
3 120 99 118
3 121 62 117
3 122 99 120
3 123 97 119
3 124 62 121
3 125 99 122
3 126 97 123
3 127 99 125
3 128 97 126
3 129 99 127
3 130 62 124
3 131 97 128
3 132 99 129
3 133 62 130
3 134 97 131
3 135 99 132
3 136 62 133
3 136 137 62
3 138 137 136
3 138 139 137
3 140 97 134
3 141 99 135
3 142 139 138
3 142 143 139
3 140 144 97
3 141 145 99
3 146 143 142
3 146 147 143
3 148 147 146
3 148 149 147
3 150 144 140
3 151 145 141
3 152 149 148
3 152 153 149
3 150 154 144
3 151 155 145
3 156 153 152
3 156 157 153
3 158 154 150
3 159 155 151
3 160 157 156
3 160 161 157
3 162 161 160
3 162 163 161
3 158 164 154
3 159 165 155
3 166 164 158
3 167 165 159
3 168 163 162
3 168 169 163
3 170 169 168
3 170 171 169
3 172 171 170
3 172 173 171
3 174 173 172
3 175 173 174
3 176 173 175
3 177 173 176
3 178 173 177
3 179 173 178
3 180 173 179
3 181 173 180
3 182 173 181
3 183 173 182
3 184 173 183

View File

@@ -8,70 +8,72 @@ property float z
property float nx property float nx
property float ny property float ny
property float nz property float nz
property float s
property float t
element face 59 element face 59
property list uchar uint vertex_indices property list uchar uint vertex_indices
end_header end_header
-0.070374 0.120216 0.000000 0.000000 0.000000 1.000000 -0.158401 0.243060 0.000000 0.000000 0.000000 1.000000 0.083333 0.000000
-0.062764 0.120037 0.000000 0.000000 0.000000 1.000000 -0.143008 0.242698 0.000000 0.000000 0.000000 1.000000 0.050000 0.000000
-0.066565 0.120433 0.000000 0.000000 0.000000 1.000000 -0.150696 0.243499 0.000000 0.000000 0.000000 1.000000 0.066667 0.000000
-0.074096 0.119398 0.000000 0.000000 0.000000 1.000000 -0.165930 0.241406 0.000000 0.000000 0.000000 1.000000 0.100000 0.000000
-0.059069 0.119014 0.000000 0.000000 0.000000 1.000000 -0.135532 0.240629 0.000000 0.000000 0.000000 1.000000 0.033333 0.000000
-0.077634 0.117992 0.000000 0.000000 0.000000 1.000000 -0.173087 0.238563 0.000000 0.000000 0.000000 1.000000 0.116667 0.000000
-0.055574 0.117352 0.000000 0.000000 0.000000 1.000000 -0.128464 0.237268 0.000000 0.000000 0.000000 1.000000 0.016667 0.000000
-0.080892 0.116012 0.000000 0.000000 0.000000 1.000000 -0.179678 0.234558 0.000000 0.000000 0.000000 1.000000 0.133333 0.000000
0.109905 0.019542 0.000000 0.000000 0.000000 1.000000 0.206265 0.039420 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000
-0.083774 0.113470 0.000000 0.000000 0.000000 1.000000 -0.185507 0.229415 0.000000 0.000000 0.000000 1.000000 0.150000 0.000000
-0.086183 0.110379 0.000000 0.000000 0.000000 1.000000 -0.190379 0.223163 0.000000 0.000000 0.000000 1.000000 0.166667 0.000000
-0.088023 0.106752 0.000000 0.000000 0.000000 1.000000 -0.194101 0.215826 0.000000 0.000000 0.000000 1.000000 0.183333 0.000000
-0.089198 0.102601 0.000000 0.000000 0.000000 1.000000 -0.196477 0.207430 0.000000 0.000000 0.000000 1.000000 0.200000 0.000000
-0.089610 0.097941 0.000000 0.000000 0.000000 1.000000 -0.197312 0.198002 0.000000 0.000000 0.000000 1.000000 0.216667 0.000000
-0.089610 0.094092 0.000000 0.000000 0.000000 1.000000 -0.197312 0.190219 0.000000 0.000000 0.000000 1.000000 0.233333 0.000000
-0.089610 0.083454 0.000000 0.000000 0.000000 1.000000 -0.197312 0.168699 0.000000 0.000000 0.000000 1.000000 0.250000 0.000000
-0.089610 0.067382 0.000000 0.000000 0.000000 1.000000 -0.197312 0.136190 0.000000 0.000000 0.000000 1.000000 0.266667 0.000000
-0.089610 0.047237 0.000000 0.000000 0.000000 1.000000 -0.197312 0.095439 0.000000 0.000000 0.000000 1.000000 0.283333 0.000000
-0.089610 0.024375 0.000000 0.000000 0.000000 1.000000 -0.197312 0.049194 0.000000 0.000000 0.000000 1.000000 0.300000 0.000000
-0.089610 0.000154 0.000000 0.000000 0.000000 1.000000 -0.197312 0.000202 0.000000 0.000000 0.000000 1.000000 0.316667 0.000000
0.113298 0.017118 0.000000 0.000000 0.000000 1.000000 0.213128 0.034516 0.000000 0.000000 0.000000 1.000000 1.000000 0.000000
0.116072 0.014251 0.000000 0.000000 0.000000 1.000000 0.218740 0.028717 0.000000 0.000000 0.000000 1.000000 0.983333 0.000000
0.118228 0.011031 0.000000 0.000000 0.000000 1.000000 0.223101 0.022202 0.000000 0.000000 0.000000 1.000000 0.966667 0.000000
0.119767 0.007545 0.000000 0.000000 0.000000 1.000000 0.226214 0.015151 0.000000 0.000000 0.000000 1.000000 0.950000 0.000000
0.120689 0.003882 0.000000 0.000000 0.000000 1.000000 0.228078 0.007742 0.000000 0.000000 0.000000 1.000000 0.933333 0.000000
0.120994 0.000131 0.000000 0.000000 0.000000 1.000000 0.228696 0.000154 0.000000 0.000000 0.000000 1.000000 0.916667 0.000000
-0.089610 -0.024066 0.000000 0.000000 0.000000 1.000000 -0.197312 -0.048790 0.000000 0.000000 0.000000 1.000000 0.333333 0.000000
0.120683 -0.003620 0.000000 0.000000 0.000000 1.000000 0.228067 -0.007434 0.000000 0.000000 0.000000 1.000000 0.900000 0.000000
0.119756 -0.007283 0.000000 0.000000 0.000000 1.000000 0.226193 -0.014843 0.000000 0.000000 0.000000 1.000000 0.883333 0.000000
0.118215 -0.010769 0.000000 0.000000 0.000000 1.000000 0.223075 -0.021894 0.000000 0.000000 0.000000 1.000000 0.866667 0.000000
0.116059 -0.013989 0.000000 0.000000 0.000000 1.000000 0.218713 -0.028408 0.000000 0.000000 0.000000 1.000000 0.850000 0.000000
0.113289 -0.016856 0.000000 0.000000 0.000000 1.000000 0.213110 -0.034207 0.000000 0.000000 0.000000 1.000000 0.833333 0.000000
0.109905 -0.019281 0.000000 0.000000 0.000000 1.000000 0.206265 -0.039111 0.000000 0.000000 0.000000 1.000000 0.816667 0.000000
0.106649 -0.021204 0.000000 0.000000 0.000000 1.000000 0.199679 -0.043002 0.000000 0.000000 0.000000 1.000000 0.800000 0.000000
0.097647 -0.026522 0.000000 0.000000 0.000000 1.000000 0.181470 -0.053759 0.000000 0.000000 0.000000 1.000000 0.783333 0.000000
-0.089610 -0.046928 0.000000 0.000000 0.000000 1.000000 -0.197312 -0.095036 0.000000 0.000000 0.000000 1.000000 0.350000 0.000000
0.084049 -0.034556 0.000000 0.000000 0.000000 1.000000 0.153964 -0.070010 0.000000 0.000000 0.000000 1.000000 0.766667 0.000000
0.067003 -0.044626 0.000000 0.000000 0.000000 1.000000 0.119483 -0.090380 0.000000 0.000000 0.000000 1.000000 0.750000 0.000000
0.047659 -0.056055 0.000000 0.000000 0.000000 1.000000 0.080354 -0.113497 0.000000 0.000000 0.000000 1.000000 0.733333 0.000000
-0.089610 -0.067074 0.000000 0.000000 0.000000 1.000000 -0.197312 -0.135786 0.000000 0.000000 0.000000 1.000000 0.366667 0.000000
0.027165 -0.068162 0.000000 0.000000 0.000000 1.000000 0.038900 -0.137988 0.000000 0.000000 0.000000 1.000000 0.716667 0.000000
-0.089610 -0.083145 0.000000 0.000000 0.000000 1.000000 -0.197312 -0.168295 0.000000 0.000000 0.000000 1.000000 0.383333 0.000000
0.006672 -0.080269 0.000000 0.000000 0.000000 1.000000 -0.002553 -0.162478 0.000000 0.000000 0.000000 1.000000 0.700000 0.000000
-0.012672 -0.091697 0.000000 0.000000 0.000000 1.000000 -0.041683 -0.185595 0.000000 0.000000 0.000000 1.000000 0.683333 0.000000
-0.089610 -0.093784 0.000000 0.000000 0.000000 1.000000 -0.197312 -0.189815 0.000000 0.000000 0.000000 1.000000 0.400000 0.000000
-0.029718 -0.101768 0.000000 0.000000 0.000000 1.000000 -0.076163 -0.205965 0.000000 0.000000 0.000000 1.000000 0.666667 0.000000
-0.089610 -0.097632 0.000000 0.000000 0.000000 1.000000 -0.197312 -0.197599 0.000000 0.000000 0.000000 1.000000 0.416667 0.000000
-0.089225 -0.101885 0.000000 0.000000 0.000000 1.000000 -0.196533 -0.206202 0.000000 0.000000 0.000000 1.000000 0.433333 0.000000
-0.043317 -0.109802 0.000000 0.000000 0.000000 1.000000 -0.103670 -0.222216 0.000000 0.000000 0.000000 1.000000 0.650000 0.000000
-0.088124 -0.105803 0.000000 0.000000 0.000000 1.000000 -0.194306 -0.214128 0.000000 0.000000 0.000000 1.000000 0.450000 0.000000
-0.086388 -0.109343 0.000000 0.000000 0.000000 1.000000 -0.190794 -0.221289 0.000000 0.000000 0.000000 1.000000 0.466667 0.000000
-0.084098 -0.112461 0.000000 0.000000 0.000000 1.000000 -0.186162 -0.227596 0.000000 0.000000 0.000000 1.000000 0.483333 0.000000
-0.052318 -0.115120 0.000000 0.000000 0.000000 1.000000 -0.121878 -0.232973 0.000000 0.000000 0.000000 1.000000 0.633333 0.000000
-0.081335 -0.115115 0.000000 0.000000 0.000000 1.000000 -0.180573 -0.232964 0.000000 0.000000 0.000000 1.000000 0.500000 0.000000
-0.078181 -0.117261 0.000000 0.000000 0.000000 1.000000 -0.174193 -0.237304 0.000000 0.000000 0.000000 1.000000 0.516667 0.000000
-0.055574 -0.117043 0.000000 0.000000 0.000000 1.000000 -0.128464 -0.236864 0.000000 0.000000 0.000000 1.000000 0.616667 0.000000
-0.059375 -0.118854 0.000000 0.000000 0.000000 1.000000 -0.136152 -0.240527 0.000000 0.000000 0.000000 1.000000 0.600000 0.000000
-0.074716 -0.118855 0.000000 0.000000 0.000000 1.000000 -0.167184 -0.240529 0.000000 0.000000 0.000000 1.000000 0.533333 0.000000
-0.063270 -0.119897 0.000000 0.000000 0.000000 1.000000 -0.144031 -0.242638 0.000000 0.000000 0.000000 1.000000 0.583333 0.000000
-0.071022 -0.119855 0.000000 0.000000 0.000000 1.000000 -0.159712 -0.242551 0.000000 0.000000 0.000000 1.000000 0.550000 0.000000
-0.067180 -0.120217 0.000000 0.000000 0.000000 1.000000 -0.151939 -0.243283 0.000000 0.000000 0.000000 1.000000 0.566667 0.000000
3 0 1 2 3 0 1 2
3 3 1 0 3 3 1 0
3 3 4 1 3 3 4 1

View File

@@ -573,8 +573,10 @@ Symbol::Symbol(Type t, glm::vec3 pos) : Node(), type_(t)
shadows[GRID] = nullptr; shadows[GRID] = nullptr;
icons[CROSS] = new Mesh("mesh/icon_cross.ply"); icons[CROSS] = new Mesh("mesh/icon_cross.ply");
shadows[CROSS] = nullptr; shadows[CROSS] = nullptr;
icons[PLAY] = new Mesh("mesh/icon_play.ply"); icons[PLAY] = new Mesh("mesh/icon_play.ply");
shadows[PLAY] = shadow; shadows[PLAY] = shadow;
icons[FFWRD] = new Mesh("mesh/icon_fastforward.ply");
shadows[FFWRD] = shadow;
icons[EMPTY] = new Mesh("mesh/icon_empty.ply"); icons[EMPTY] = new Mesh("mesh/icon_empty.ply");
shadows[EMPTY] = shadow; shadows[EMPTY] = shadow;
} }

View File

@@ -113,6 +113,7 @@ public:
GRID, GRID,
CROSS, CROSS,
PLAY, PLAY,
FFWRD,
EMPTY EMPTY
} Type; } Type;
Symbol(Type t, glm::vec3 pos = glm::vec3(0.f)); Symbol(Type t, glm::vec3 pos = glm::vec3(0.f));

View File

@@ -37,7 +37,7 @@
#include "defines.h" #include "defines.h"
#include "Scene.h" #include "Scene.h"
#include "Primitives.h" #include "Primitives.h"
#include "ImageShader.h" //#include "ImageShader.h"
#include "ImageProcessingShader.h" #include "ImageProcessingShader.h"
#include "MediaPlayer.h" #include "MediaPlayer.h"
#include "MediaSource.h" #include "MediaSource.h"

View File

@@ -235,7 +235,6 @@ bool SessionSource::playable () const
SessionFileSource::SessionFileSource(uint64_t id) : SessionSource(id), path_(""), initialized_(false), wait_for_sources_(false) SessionFileSource::SessionFileSource(uint64_t id) : SessionSource(id), path_(""), initialized_(false), wait_for_sources_(false)
{ {
// specific node for transition view // specific node for transition view
groups_[View::TRANSITION]->visible_ = false;
groups_[View::TRANSITION]->scale_ = glm::vec3(0.1f, 0.1f, 1.f); groups_[View::TRANSITION]->scale_ = glm::vec3(0.1f, 0.1f, 1.f);
groups_[View::TRANSITION]->translation_ = glm::vec3(-1.f, 0.f, 0.f); groups_[View::TRANSITION]->translation_ = glm::vec3(-1.f, 0.f, 0.f);
@@ -254,6 +253,10 @@ SessionFileSource::SessionFileSource(uint64_t id) : SessionSource(id), path_("")
frames_[View::TRANSITION]->attach(frame); frames_[View::TRANSITION]->attach(frame);
groups_[View::TRANSITION]->attach(frames_[View::TRANSITION]); groups_[View::TRANSITION]->attach(frames_[View::TRANSITION]);
Symbol *center = new Symbol(Symbol::CIRCLE_POINT, glm::vec3(0.f, -1.05f, 0.1f));
center->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.75f);
groups_[View::TRANSITION]->attach(center);
overlays_[View::TRANSITION] = new Group; overlays_[View::TRANSITION] = new Group;
overlays_[View::TRANSITION]->translation_.z = 0.1; overlays_[View::TRANSITION]->translation_.z = 0.1;
overlays_[View::TRANSITION]->visible_ = false; overlays_[View::TRANSITION]->visible_ = false;
@@ -262,8 +265,11 @@ SessionFileSource::SessionFileSource(uint64_t id) : SessionSource(id), path_("")
loader->scale_ = glm::vec3(2.f, 2.f, 1.f); loader->scale_ = glm::vec3(2.f, 2.f, 1.f);
loader->update_callbacks_.push_back(new InfiniteGlowCallback); loader->update_callbacks_.push_back(new InfiniteGlowCallback);
overlays_[View::TRANSITION]->attach(loader); overlays_[View::TRANSITION]->attach(loader);
Symbol *center = new Symbol(Symbol::CIRCLE_POINT, glm::vec3(0.f, -1.05f, 0.1f));
overlays_[View::TRANSITION]->attach(center); Symbol *playicon = new Symbol(Symbol::PLAY);
playicon->color = glm::vec4( COLOR_TRANSITION_SOURCE, 1.0f );
overlays_[View::TRANSITION]->attach(playicon);
groups_[View::TRANSITION]->attach(overlays_[View::TRANSITION]); groups_[View::TRANSITION]->attach(overlays_[View::TRANSITION]);
// set symbol // set symbol

View File

@@ -51,6 +51,7 @@ SourceCore::SourceCore()
groups_[View::TEXTURE] = new Group; groups_[View::TEXTURE] = new Group;
groups_[View::TEXTURE]->visible_ = false; groups_[View::TEXTURE]->visible_ = false;
groups_[View::TRANSITION] = new Group; groups_[View::TRANSITION] = new Group;
groups_[View::TRANSITION]->visible_ = false;
// temp node // temp node
stored_status_ = new Group; stored_status_ = new Group;

View File

@@ -81,10 +81,9 @@ TransitionView::TransitionView() : View(TRANSITION), transition_source_(nullptr)
output_surface_ = new Surface; output_surface_ = new Surface;
scene.bg()->attach(output_surface_); scene.bg()->attach(output_surface_);
playicon = new Symbol(Symbol::PLAY); fastopenicon = new Symbol(Symbol::FFWRD);
playicon->color = glm::vec4( COLOR_FRAME_LIGHT, 1.0f ); fastopenicon->color = glm::vec4( COLOR_FRAME_LIGHT, 1.0f );
playicon->scale_ = glm::vec3(2.f, 2.f, 1.f); scene.bg()->attach(fastopenicon);
scene.bg()->attach(playicon);
Frame *border = new Frame(Frame::ROUND, Frame::THIN, Frame::GLOW); Frame *border = new Frame(Frame::ROUND, Frame::THIN, Frame::GLOW);
border->color = glm::vec4( COLOR_FRAME, 1.0f ); border->color = glm::vec4( COLOR_FRAME, 1.0f );
@@ -214,7 +213,6 @@ void TransitionView::draw()
const glm::vec2 pos_canl = Rendering::manager().project(glm::vec3(-1.0f, -0.15f, 0.f), scene.root()->transform_, false); const glm::vec2 pos_canl = Rendering::manager().project(glm::vec3(-1.0f, -0.15f, 0.f), scene.root()->transform_, false);
const glm::vec2 pos_tran = Rendering::manager().project(glm::vec3(-0.5f, -0.15f, 0.f), scene.root()->transform_, false); const glm::vec2 pos_tran = Rendering::manager().project(glm::vec3(-0.5f, -0.15f, 0.f), scene.root()->transform_, false);
const glm::vec2 pos_play = Rendering::manager().project(glm::vec3(0.f, -0.15f, 0.f), scene.root()->transform_, false); const glm::vec2 pos_play = Rendering::manager().project(glm::vec3(0.f, -0.15f, 0.f), scene.root()->transform_, false);
const glm::vec2 pos_open = Rendering::manager().project(glm::vec3(POS_TARGET, -0.15f, 0.f), scene.root()->transform_, false);
// style grey // style grey
ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.27f, 0.27f, 0.27f, 0.55f)); ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.27f, 0.27f, 0.27f, 0.55f));
@@ -235,13 +233,6 @@ void TransitionView::draw()
} }
// toggle transition mode // toggle transition mode
if (!Settings::application.transition.cross_fade) {
// black background in icon 'transition to black'
ImGui::SetCursorScreenPos(ImVec2(pos_tran.x - 20.f, pos_tran.y +2.f));
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.0f, 0.0f, 0.0f, 1.f));
ImGuiToolkit::Icon(19,1);
ImGui::PopStyleColor();
}
ImGui::SetCursorScreenPos(ImVec2(pos_tran.x - 20.f, pos_tran.y +2.f)); ImGui::SetCursorScreenPos(ImVec2(pos_tran.x - 20.f, pos_tran.y +2.f));
const char *tooltip[2] = {"Fade to black", "Cross fading"}; const char *tooltip[2] = {"Fade to black", "Cross fading"};
ImGuiToolkit::IconToggle(0,2,0,8, &Settings::application.transition.cross_fade, tooltip ); ImGuiToolkit::IconToggle(0,2,0,8, &Settings::application.transition.cross_fade, tooltip );
@@ -253,12 +244,6 @@ void TransitionView::draw()
ImGui::SliderFloat("##transitionduration", &Settings::application.transition.duration, ImGui::SliderFloat("##transitionduration", &Settings::application.transition.duration,
TRANSITION_MIN_DURATION, TRANSITION_MAX_DURATION, "%.1f s"); TRANSITION_MIN_DURATION, TRANSITION_MAX_DURATION, "%.1f s");
// Fast forwardoutput_surface_ button on the target frame
float w = output_surface_->scale_.x * 80.f;
ImGui::SetCursorScreenPos(ImVec2(pos_open.x + w, pos_open.y + 2.f));
if (ImGuiToolkit::IconButton(ICON_FA_FAST_FORWARD, "Fast Open"))
open();
ImGui::PopFont(); ImGui::PopFont();
ImGui::PopStyleColor(7); // 7 colors ImGui::PopStyleColor(7); // 7 colors
ImGui::End(); ImGui::End();
@@ -339,10 +324,15 @@ void TransitionView::zoom (float factor)
std::pair<Node *, glm::vec2> TransitionView::pick(glm::vec2 P) std::pair<Node *, glm::vec2> TransitionView::pick(glm::vec2 P)
{ {
std::pair<Node *, glm::vec2> pick = View::pick(P); std::pair<Node *, glm::vec2> pick = View::pick(P);
// get pointer to play icon that is in the overlays of source
Node *playicon = transition_source_->overlays_[View::TRANSITION]->back();
if (transition_source_ != nullptr) { if (transition_source_ != nullptr) {
// start animation when clic on target // fast open animation when clic on target icon
if (pick.first == output_surface_ || pick.first == playicon) if (pick.first == fastopenicon)
open();
// play transition when clic on source overlay icon
else if (pick.first == playicon)
play(true); play(true);
// otherwise cancel animation // otherwise cancel animation
else else
@@ -446,6 +436,32 @@ bool TransitionView::doubleclic (glm::vec2 )
return true; return true;
} }
View::Cursor TransitionView::over(glm::vec2 pos)
{
View::Cursor ret = Cursor();
std::pair<Node *, glm::vec2> pick = View::pick(pos);
if (transition_source_ != nullptr && transition_source_->ready()) {
// get pointer to play icon that is in the overlays of source
Node *playicon = transition_source_->overlays_[View::TRANSITION]->back();
// reset scale of icons by default
playicon->scale_ = glm::vec3(1.f);
fastopenicon->scale_ = glm::vec3(1.f);
// overlay play icon
if (pick.first == playicon) {
playicon->scale_ = glm::vec3(1.5f, 1.5f, 1.f);
ret = Cursor(Cursor_Hand, "Play transition");
}
// overlay fast open icon
else if (pick.first == fastopenicon) {
fastopenicon->scale_ = glm::vec3(1.5f, 1.5f, 1.f);
ret = Cursor(Cursor_Hand, "Fast open");
}
}
return ret;
}
void TransitionView::arrow (glm::vec2 movement) void TransitionView::arrow (glm::vec2 movement)
{ {
Source *s = Mixer::manager().currentSource(); Source *s = Mixer::manager().currentSource();

View File

@@ -20,6 +20,7 @@ public:
Cursor grab (Source *s, glm::vec2 from, glm::vec2 to, std::pair<Node *, glm::vec2> pick) override; Cursor grab (Source *s, glm::vec2 from, glm::vec2 to, std::pair<Node *, glm::vec2> pick) override;
bool doubleclic (glm::vec2) override; bool doubleclic (glm::vec2) override;
void arrow (glm::vec2) override; void arrow (glm::vec2) override;
Cursor over (glm::vec2) override;
Cursor drag (glm::vec2, glm::vec2) override; Cursor drag (glm::vec2, glm::vec2) override;
void attach(SessionFileSource *ts); void attach(SessionFileSource *ts);
@@ -30,7 +31,7 @@ public:
private: private:
Surface *output_surface_; Surface *output_surface_;
Symbol *playicon; Symbol *fastopenicon;
Mesh *mark_100ms_, *mark_1s_; Mesh *mark_100ms_, *mark_1s_;
Switch *gradient_; Switch *gradient_;
SessionFileSource *transition_source_; SessionFileSource *transition_source_;