Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
@brunoherbelin
brunoherbelin committed Nov 3, 2024
2 parents 0f48899 + 19221e1 commit 6e62ce1
Show file tree
Hide file tree
Showing 36 changed files with 1,173 additions and 1,629 deletions.
10 changes: 8 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,6 @@ set(VMIX_RSC_FILES
./rsc/mesh/icon_vimix.ply
./rsc/mesh/icon_group_vimix.ply
./rsc/mesh/icon_circles.ply
./rsc/mesh/icon_dots.ply
./rsc/mesh/icon_empty.ply
./rsc/mesh/icon_lock.ply
./rsc/mesh/icon_unlock.ply
Expand All @@ -603,7 +602,6 @@ set(VMIX_RSC_FILES
./rsc/mesh/icon_clock.ply
./rsc/mesh/icon_clock_hand.ply
./rsc/mesh/icon_grid.ply
./rsc/mesh/icon_rightarrow.ply
./rsc/mesh/icon_crop.ply
./rsc/mesh/icon_eye.ply
./rsc/mesh/icon_eye_slash.ply
Expand All @@ -614,6 +612,14 @@ set(VMIX_RSC_FILES
./rsc/mesh/icon_text.ply
./rsc/mesh/icon_play.ply
./rsc/mesh/icon_fastforward.ply
./rsc/mesh/icon_blend_normal.ply
./rsc/mesh/icon_blend_add.ply
./rsc/mesh/icon_blend_subtract.ply
./rsc/mesh/icon_blend_mult.ply
./rsc/mesh/icon_blend_soft_light.ply
./rsc/mesh/icon_blend_hard_light.ply
./rsc/mesh/icon_blend_soft_sub.ply
./rsc/mesh/icon_blend_lighten.ply
./rsc/mesh/h_line.ply
./rsc/mesh/h_mark.ply
./rsc/shaders/filters/default.glsl
Expand Down
Binary file modified rsc/images/icons.dds
View file
Binary file not shown.
54 changes: 54 additions & 0 deletions rsc/mesh/icon_blend_add.ply
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
ply
format ascii 1.0
comment Created in Blender version 4.2.2 LTS
element vertex 22
property float x
property float y
property float z
property float s
property float t
element face 20
property list uchar uint vertex_indices
end_header
-0.072711065 0.091354586 0 0.04761905 0
0.11023354 0.109645195 0 0.23809524 0
-0.072711065 0.109645195 0 0 0
0.091939084 0.091354586 0 0.0952381 0
0.11023354 -0.07326077 0 0.1904762 0
0.091939084 -0.07326077 0 0.14285715 0
-0.10929998 -0.109841965 0 0.33333334 0
-0.0544166 -0.0092436895 0 0.95238096 0
-0.10929998 0.07306399 0 0.2857143 0
-0.026974909 0.01819221 0 0.47619048 0
0.073644616 0.07306399 0 0.42857143 0
-0.008680448 0.01819221 0 0.52380955 0
0.01876124 -0.0092436895 0 0.61904764 0
0.073644616 -0.109841965 0 0.3809524 0
-0.026974909 -0.0092436895 0 1 0
-0.008680448 -0.0092436895 0 0.5714286 0
-0.0544166 -0.027534284 0 0.9047619 0
0.01876124 -0.027534284 0 0.6666667 0
-0.026974909 -0.027534284 0 0.85714287 0
-0.026974909 -0.054970175 0 0.8095238 0
-0.008680448 -0.054970175 0 0.7619048 0
-0.008680448 -0.027534284 0 0.71428573 0
3 0 1 2
3 0 3 1
3 3 4 1
3 5 4 3
3 6 7 8
3 7 9 8
3 9 10 8
3 9 11 10
3 11 12 10
3 12 13 10
3 7 14 9
3 15 12 11
3 6 16 7
3 17 13 12
3 6 18 16
3 6 19 18
3 20 17 21
3 20 13 17
3 6 20 19
3 6 13 20
222 changes: 222 additions & 0 deletions rsc/mesh/icon_blend_hard_light.ply
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
ply
format ascii 1.0
comment Created in Blender version 4.2.2 LTS
element vertex 106
property float x
property float y
property float z
property float s
property float t
element face 104
property list uchar uint vertex_indices
end_header
-0.07268818 0.09148041 0 0.00952381 0
0.11037082 0.109782435 0 0.04761905 0
-0.07268818 0.109782435 0 0 0
0.092064925 0.09148041 0 0.01904762 0
0.11037082 -0.073237896 0 0.03809524 0
0.092064925 -0.073237896 0 0.028571429 0
-0.10929998 -0.109841965 0 0.06666667 0
-0.06168455 -0.00045199692 0 0.83809525 0
-0.10929998 0.07317837 0 0.057142857 0
-0.060415167 0.0023493767 0 0.84761906 0
-0.05896481 0.005064994 0 0.85714287 0
-0.057337295 0.0076856837 0 0.8666667 0
-0.055536423 0.010202259 0 0.8761905 0
-0.053566005 0.012605518 0 0.8857143 0
-0.051429853 0.0148862675 0 0.8952381 0
-0.049147803 0.017021112 0 0.9047619 0
-0.046743296 0.018990196 0 0.9142857 0
-0.044225514 0.020789735 0 0.9238095 0
-0.041603655 0.022415929 0 0.93333334 0
-0.038886912 0.023864947 0 0.94285715 0
-0.036084473 0.025133006 0 0.95238096 0
0.07375901 0.07317837 0 0.08571429 0
-0.03320553 0.026216306 0 0.96190476 0
-0.030259289 0.027111016 0 0.9714286 0
-0.027254917 0.027813353 0 0.9809524 0
-0.024201617 0.028319515 0 0.9904762 0
-0.021108583 0.02862569 0 1 0
-0.017985001 0.02872803 0 0.0952381 0
-0.014862224 0.028624527 0 0.104761906 0
-0.011770047 0.02831734 0 0.114285715 0
-0.008717656 0.027810268 0 0.123809524 0
-0.0057142302 0.027107142 0 0.13333334 0
-0.0027689561 0.026211746 0 0.14285715 0
0.00010898709 0.02512788 0 0.15238096 0
0.0029104128 0.023859344 0 0.16190477 0
0.005626127 0.022409968 0 0.17142858 0
0.008246966 0.020783536 0 0.18095239 0
0.01076372 0.018983863 0 0.1904762 0
0.013167232 0.01701472 0 0.2 0
0.015448287 0.014879957 0 0.20952381 0
0.017583512 0.012599371 0 0.21904762 0
0.019553058 0.010196373 0 0.22857143 0
0.021353118 0.0076801404 0 0.23809524 0
0.022979893 0.005059868 0 0.24761905 0
0.024429597 0.00234472 0 0.25714287 0
0.025698386 -0.00045610964 0 0.26666668 0
0.07375901 -0.109841965 0 0.07619048 0
-0.062769145 -0.0033299178 0 0.82857144 0
0.026782475 -0.003333442 0 0.2761905 0
-0.06366517 -0.006275207 0 0.81904763 0
0.027678065 -0.0062780976 0 0.2857143 0
-0.06436878 -0.009278677 0 0.8095238 0
0.02838134 -0.00928089 0 0.2952381 0
-0.06487619 -0.012331136 0 0.8 0
0.028888516 -0.012332641 0 0.30476192 0
-0.06518359 -0.01542341 0 0.7904762 0
0.029195763 -0.01542417 0 0.31428573 0
-0.06528716 -0.01854629 0 0.7809524 0
0.029299282 -0.01854629 0 0.32380953 0
-0.06518472 -0.021669969 0 0.7714286 0
0.029196896 -0.021669209 0 0.33333334 0
0.028890662 -0.02476158 0 0.34285715 0
-0.064878345 -0.024763092 0 0.7619048 0
0.028384395 -0.027814232 0 0.35238096 0
-0.06437184 -0.02781646 0 0.75238097 0
0.027681924 -0.030817963 0 0.36190477 0
-0.063669026 -0.030820876 0 0.74285716 0
0.026787005 -0.033763595 0 0.37142858 0
-0.0627737 -0.033767134 0 0.73333335 0
0.025703497 -0.036641926 0 0.3809524 0
-0.06168968 -0.036646053 0 0.72380954 0
0.024435185 -0.03944377 0 0.3904762 0
-0.06042077 -0.039448433 0 0.71428573 0
0.022985853 -0.042159945 0 0.4 0
-0.058970775 -0.04216508 0 0.7047619 0
0.021359317 -0.044781245 0 0.40952381 0
-0.05734351 -0.04478679 0 0.6952381 0
0.019559406 -0.04729849 0 0.41904762 0
-0.055542786 -0.04730437 0 0.6857143 0
0.01758989 -0.0497025 0 0.42857143 0
-0.0535724 -0.049708635 0 0.6761905 0
0.015454605 -0.051984064 0 0.43809524 0
-0.05143617 -0.05199038 0 0.6666667 0
0.013173364 -0.05411977 0 0.44761905 0
-0.04915395 -0.05412616 0 0.6571429 0
0.010769598 -0.056089774 0 0.45714286 0
-0.046749182 -0.056096125 0 0.64761907 0
0.008252494 -0.057890262 0 0.46666667 0
-0.044231065 -0.057896476 0 0.63809526 0
0.005631253 -0.059517436 0 0.47619048 0
-0.041608796 -0.059523392 0 0.62857145 0
0.002915062 -0.06096748 0 0.4857143 0
-0.038891576 -0.060973078 0 0.61904764 0
0.00011309981 -0.062236592 0 0.4952381 0
-0.03608861 -0.062241722 0 0.60952383 0
-0.002765432 -0.063320965 0 0.50476193 0
-0.033209078 -0.06332551 0 0.6 0
-0.0057113394 -0.064216785 0 0.51428574 0
-0.030262187 -0.064220645 0 0.5904762 0
-0.008715443 -0.064920254 0 0.52380955 0
-0.027257137 -0.064923316 0 0.5809524 0
-0.011768557 -0.06542756 0 0.53333336 0
-0.02420313 -0.0654297 0 0.5714286 0
-0.014861472 -0.06573489 0 0.54285717 0
-0.02110935 -0.06573602 0 0.5619048 0
-0.017985001 -0.06583844 0 0.552381 0
3 0 1 2
3 0 3 1
3 3 4 1
3 5 4 3
3 6 7 8
3 7 9 8
3 9 10 8
3 10 11 8
3 11 12 8
3 12 13 8
3 13 14 8
3 14 15 8
3 15 16 8
3 16 17 8
3 17 18 8
3 18 19 8
3 19 20 8
3 20 21 8
3 20 22 21
3 22 23 21
3 23 24 21
3 24 25 21
3 25 26 21
3 26 27 21
3 27 28 21
3 28 29 21
3 29 30 21
3 30 31 21
3 31 32 21
3 32 33 21
3 33 34 21
3 34 35 21
3 35 36 21
3 36 37 21
3 37 38 21
3 38 39 21
3 39 40 21
3 40 41 21
3 41 42 21
3 42 43 21
3 43 44 21
3 44 45 21
3 45 46 21
3 6 47 7
3 48 46 45
3 6 49 47
3 50 46 48
3 6 51 49
3 52 46 50
3 6 53 51
3 54 46 52
3 6 55 53
3 56 46 54
3 6 57 55
3 58 46 56
3 6 59 57
3 60 46 58
3 61 46 60
3 6 62 59
3 63 46 61
3 6 64 62
3 65 46 63
3 6 66 64
3 67 46 65
3 6 68 66
3 69 46 67
3 6 70 68
3 71 46 69
3 6 72 70
3 73 46 71
3 6 74 72
3 75 46 73
3 6 76 74
3 77 46 75
3 6 78 76
3 79 46 77
3 6 80 78
3 81 46 79
3 6 82 80
3 83 46 81
3 6 84 82
3 85 46 83
3 6 86 84
3 87 46 85
3 6 88 86
3 89 46 87
3 6 90 88
3 91 46 89
3 6 92 90
3 93 46 91
3 6 94 92
3 95 46 93
3 6 96 94
3 97 46 95
3 6 98 96
3 99 46 97
3 6 100 98
3 101 46 99
3 6 102 100
3 103 46 101
3 6 104 102
3 105 46 103
3 6 105 104
3 6 46 105
44 changes: 44 additions & 0 deletions rsc/mesh/icon_blend_lighten.ply
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
ply
format ascii 1.0
comment Created in Blender version 4.2.2 LTS
element vertex 17
property float x
property float y
property float z
property float s
property float t
element face 15
property list uchar uint vertex_indices
end_header
-0.07285437 0.09114095 0 0.0625 0
0.10981976 0.109412126 0 0.3125 0
-0.07285437 0.109412126 0 0 0
0.091544725 0.09114095 0 0.125 0
0.10981976 -0.07322149 0 0.25 0
0.091544725 -0.07322149 0 0.1875 0
-0.10948064 -0.109841965 0 0.4375 0
-0.058492586 0.025407545 0 0.625 0
-0.10948064 0.07286977 0 0.375 0
0.07326969 0.07286977 0 0.5625 0
0.028688602 -0.0070309266 0 0.6875 0
0.07326969 -0.109841965 0 0.5 0
-0.058492586 0.0056197196 0 1 0
-0.058492586 -0.04143212 0 0.875 0
0.009610474 -0.017736696 0 0.9375 0
0.028688602 -0.02860304 0 0.75 0
-0.058492586 -0.060863078 0 0.8125 0
3 0 1 2
3 0 3 1
3 3 4 1
3 5 4 3
3 6 7 8
3 7 9 8
3 7 10 9
3 10 11 9
3 6 12 7
3 6 13 12
3 13 14 12
3 15 11 10
3 16 11 15
3 6 16 13
3 6 11 16
Loading

0 comments on commit 6e62ce1

Please sign in to comment.