Clean source icons

This commit is contained in:
brunoherbelin
2020-09-30 23:38:38 +02:00
parent e0d44d4db1
commit 00ebacc9db
7 changed files with 2318 additions and 780 deletions

View File

@@ -311,6 +311,7 @@ set(VMIX_RSC_FILES
./rsc/mesh/icon_image.ply
./rsc/mesh/icon_render.ply
./rsc/mesh/icon_gear.ply
./rsc/mesh/icon_camera.ply
./rsc/mesh/icon_clone.ply
./rsc/mesh/icon_vimix.ply
./rsc/mesh/icon_circles.ply

View File

@@ -311,6 +311,7 @@ Symbol::Symbol(Type t, glm::vec3 pos) : Node(), type_(t)
icons[CLONE] = new Mesh("mesh/icon_clone.ply");
icons[RENDER] = new Mesh("mesh/icon_render.ply");
icons[PATTERN] = new Mesh("mesh/icon_gear.ply");
icons[CAMERA] = new Mesh("mesh/icon_camera.ply");
icons[DOTS] = new Mesh("mesh/icon_dots.ply");
icons[BUSY] = new Mesh("mesh/icon_circles.ply");
icons[LOCK] = new Mesh("mesh/icon_lock.ply");

View File

@@ -60,7 +60,7 @@ protected:
class Symbol : public Node
{
public:
typedef enum { CIRCLE_POINT = 0, SQUARE_POINT, IMAGE, VIDEO, SESSION, CLONE, RENDER, PATTERN,
typedef enum { CIRCLE_POINT = 0, SQUARE_POINT, IMAGE, VIDEO, SESSION, CLONE, RENDER, PATTERN, CAMERA,
DOTS, BUSY, LOCK, UNLOCK, CIRCLE, SQUARE, CLOCK, CLOCK_H, GRID, CROSS, EMPTY } Type;
Symbol(Type t = CIRCLE_POINT, glm::vec3 pos = glm::vec3(0.f));
~Symbol();

View File

@@ -297,9 +297,9 @@ DeviceSource::DeviceSource() : StreamSource()
// create stream
stream_ = new Stream;
// set icons TODO
overlays_[View::MIXING]->attach( new Symbol(Symbol::EMPTY, glm::vec3(0.8f, 0.8f, 0.01f)) );
overlays_[View::LAYER]->attach( new Symbol(Symbol::EMPTY, glm::vec3(0.8f, 0.8f, 0.01f)) );
// set icons
overlays_[View::MIXING]->attach( new Symbol(Symbol::CAMERA, glm::vec3(0.8f, 0.8f, 0.01f)) );
overlays_[View::LAYER]->attach( new Symbol(Symbol::CAMERA, glm::vec3(0.8f, 0.8f, 0.01f)) );
}
void DeviceSource::setDevice(const std::string &devicename)

258
rsc/mesh/icon_camera.ply Normal file
View File

@@ -0,0 +1,258 @@
ply
format ascii 1.0
comment Created by Blender 2.90.1 - www.blender.org
element vertex 124
property float x
property float y
property float z
property uchar red
property uchar green
property uchar blue
property uchar alpha
element face 120
property list uchar uint vertex_indices
end_header
-0.100832 0.075636 0.000000 255 255 255 255
0.019538 0.075814 0.000000 255 255 255 255
-0.098185 0.075814 0.000000 255 255 255 255
0.022186 0.075636 0.000000 255 255 255 255
-0.103372 0.075118 0.000000 255 255 255 255
0.024725 0.075118 0.000000 255 255 255 255
-0.105780 0.074281 0.000000 255 255 255 255
0.027133 0.074281 0.000000 255 255 255 255
-0.108033 0.073151 0.000000 255 255 255 255
0.029386 0.073151 0.000000 255 255 255 255
-0.110108 0.071750 0.000000 255 255 255 255
0.031461 0.071750 0.000000 255 255 255 255
-0.111982 0.070101 0.000000 255 255 255 255
0.033335 0.070101 0.000000 255 255 255 255
-0.113631 0.068227 0.000000 255 255 255 255
0.034984 0.068227 0.000000 255 255 255 255
-0.115032 0.066153 0.000000 255 255 255 255
0.036386 0.066153 0.000000 255 255 255 255
-0.116163 0.063900 0.000000 255 255 255 255
0.037517 0.063900 0.000000 255 255 255 255
-0.116999 0.061493 0.000000 255 255 255 255
0.038353 0.061493 0.000000 255 255 255 255
-0.117518 0.058954 0.000000 255 255 255 255
0.038872 0.058954 0.000000 255 255 255 255
-0.117696 0.056307 0.000000 255 255 255 255
0.039050 0.056307 0.000000 255 255 255 255
-0.117696 0.053991 0.000000 255 255 255 255
0.039050 0.053991 0.000000 255 255 255 255
-0.117696 0.047589 0.000000 255 255 255 255
0.039050 0.047588 0.000000 255 255 255 255
-0.117696 0.037917 0.000000 255 255 255 255
0.039050 0.037917 0.000000 255 255 255 255
-0.117696 0.025793 0.000000 255 255 255 255
0.039050 0.025793 0.000000 255 255 255 255
-0.117696 0.012034 0.000000 255 255 255 255
0.039050 0.012034 0.000000 255 255 255 255
-0.117696 -0.002542 0.000000 255 255 255 255
0.039050 -0.002542 0.000000 255 255 255 255
-0.117696 -0.017118 0.000000 255 255 255 255
0.039050 -0.017118 0.000000 255 255 255 255
-0.117696 -0.030877 0.000000 255 255 255 255
0.039050 -0.030877 0.000000 255 255 255 255
-0.117696 -0.043001 0.000000 255 255 255 255
0.039050 -0.043001 0.000000 255 255 255 255
-0.117696 -0.052673 0.000000 255 255 255 255
0.039050 -0.052673 0.000000 255 255 255 255
-0.117696 -0.059075 0.000000 255 255 255 255
0.039050 -0.059075 0.000000 255 255 255 255
-0.117696 -0.061391 0.000000 255 255 255 255
0.039050 -0.061391 0.000000 255 255 255 255
-0.117518 -0.064038 0.000000 255 255 255 255
0.038872 -0.064038 0.000000 255 255 255 255
-0.116999 -0.066577 0.000000 255 255 255 255
0.038353 -0.066577 0.000000 255 255 255 255
-0.116163 -0.068985 0.000000 255 255 255 255
0.037517 -0.068985 0.000000 255 255 255 255
-0.115033 -0.071237 0.000000 255 255 255 255
0.036386 -0.071237 0.000000 255 255 255 255
-0.113631 -0.073312 0.000000 255 255 255 255
0.034984 -0.073312 0.000000 255 255 255 255
-0.111982 -0.075185 0.000000 255 255 255 255
0.033335 -0.075185 0.000000 255 255 255 255
-0.110108 -0.076834 0.000000 255 255 255 255
0.031461 -0.076834 0.000000 255 255 255 255
-0.108033 -0.078235 0.000000 255 255 255 255
0.029386 -0.078235 0.000000 255 255 255 255
-0.105780 -0.079366 0.000000 255 255 255 255
0.027133 -0.079366 0.000000 255 255 255 255
-0.103372 -0.080202 0.000000 255 255 255 255
0.024725 -0.080202 0.000000 255 255 255 255
-0.100832 -0.080721 0.000000 255 255 255 255
0.022186 -0.080721 0.000000 255 255 255 255
-0.098185 -0.080899 0.000000 255 255 255 255
0.019538 -0.080899 0.000000 255 255 255 255
-0.095868 -0.080899 0.000000 255 255 255 255
-0.089465 -0.080899 0.000000 255 255 255 255
-0.079791 -0.080899 0.000000 255 255 255 255
-0.067664 -0.080899 0.000000 255 255 255 255
-0.053902 -0.080899 0.000000 255 255 255 255
-0.039323 -0.080899 0.000000 255 255 255 255
-0.024744 -0.080899 0.000000 255 255 255 255
-0.010983 -0.080899 0.000000 255 255 255 255
0.001144 -0.080899 0.000000 255 255 255 255
0.010818 -0.080899 0.000000 255 255 255 255
0.017222 -0.080899 0.000000 255 255 255 255
0.101393 0.062438 0.000000 255 255 255 255
0.106048 0.062651 0.000000 255 255 255 255
0.103733 0.062755 0.000000 255 255 255 255
0.108287 0.062152 0.000000 255 255 255 255
0.099081 0.061671 0.000000 255 255 255 255
0.110397 0.061286 0.000000 255 255 255 255
0.096850 0.060429 0.000000 255 255 255 255
0.112326 0.060080 0.000000 255 255 255 255
0.052112 0.029576 0.000000 255 255 255 255
0.114021 0.058561 0.000000 255 255 255 255
0.115431 0.056756 0.000000 255 255 255 255
0.116503 0.054693 0.000000 255 255 255 255
0.117184 0.052398 0.000000 255 255 255 255
0.117423 0.049900 0.000000 255 255 255 255
0.117423 0.047837 0.000000 255 255 255 255
0.117423 0.042133 0.000000 255 255 255 255
0.117423 0.033518 0.000000 255 255 255 255
0.117423 0.022718 0.000000 255 255 255 255
0.052112 -0.034660 0.000000 255 255 255 255
0.117423 0.010462 0.000000 255 255 255 255
0.117423 -0.002522 0.000000 255 255 255 255
0.117423 -0.015506 0.000000 255 255 255 255
0.117423 -0.027762 0.000000 255 255 255 255
0.117423 -0.038561 0.000000 255 255 255 255
0.096850 -0.065472 0.000000 255 255 255 255
0.117423 -0.047177 0.000000 255 255 255 255
0.117423 -0.052880 0.000000 255 255 255 255
0.117423 -0.054943 0.000000 255 255 255 255
0.117183 -0.057450 0.000000 255 255 255 255
0.116500 -0.059750 0.000000 255 255 255 255
0.115425 -0.061816 0.000000 255 255 255 255
0.114012 -0.063622 0.000000 255 255 255 255
0.112313 -0.065140 0.000000 255 255 255 255
0.110382 -0.066345 0.000000 255 255 255 255
0.099073 -0.066715 0.000000 255 255 255 255
0.108269 -0.067208 0.000000 255 255 255 255
0.101379 -0.067484 0.000000 255 255 255 255
0.106030 -0.067703 0.000000 255 255 255 255
0.103715 -0.067804 0.000000 255 255 255 255
3 0 1 2
3 0 3 1
3 4 3 0
3 4 5 3
3 6 5 4
3 6 7 5
3 8 7 6
3 8 9 7
3 10 9 8
3 10 11 9
3 12 11 10
3 12 13 11
3 14 13 12
3 14 15 13
3 16 15 14
3 16 17 15
3 18 17 16
3 18 19 17
3 20 19 18
3 20 21 19
3 22 21 20
3 22 23 21
3 24 23 22
3 24 25 23
3 26 25 24
3 26 27 25
3 28 27 26
3 28 29 27
3 30 29 28
3 30 31 29
3 32 31 30
3 32 33 31
3 34 33 32
3 34 35 33
3 36 35 34
3 36 37 35
3 38 37 36
3 38 39 37
3 40 39 38
3 40 41 39
3 42 41 40
3 42 43 41
3 44 43 42
3 44 45 43
3 46 45 44
3 46 47 45
3 48 47 46
3 48 49 47
3 50 49 48
3 50 51 49
3 52 51 50
3 52 53 51
3 54 53 52
3 54 55 53
3 56 55 54
3 56 57 55
3 58 57 56
3 58 59 57
3 60 59 58
3 60 61 59
3 62 61 60
3 62 63 61
3 64 63 62
3 64 65 63
3 66 65 64
3 66 67 65
3 68 67 66
3 68 69 67
3 70 69 68
3 70 71 69
3 72 71 70
3 72 73 71
3 74 73 72
3 75 73 74
3 76 73 75
3 77 73 76
3 78 73 77
3 79 73 78
3 80 73 79
3 81 73 80
3 82 73 81
3 83 73 82
3 84 73 83
3 85 86 87
3 85 88 86
3 89 88 85
3 89 90 88
3 91 90 89
3 91 92 90
3 93 92 91
3 93 94 92
3 93 95 94
3 93 96 95
3 93 97 96
3 93 98 97
3 93 99 98
3 93 100 99
3 93 101 100
3 93 102 101
3 103 102 93
3 103 104 102
3 103 105 104
3 103 106 105
3 103 107 106
3 103 108 107
3 109 108 103
3 109 110 108
3 109 111 110
3 109 112 111
3 109 113 112
3 109 114 113
3 109 115 114
3 109 116 115
3 109 117 116
3 109 118 117
3 119 118 109
3 119 120 118
3 121 120 119
3 121 122 120
3 123 122 121

File diff suppressed because it is too large Load Diff

View File

@@ -1,11 +1,11 @@
ply
format ascii 1.0
comment Created by Blender 2.82 (sub 7) - www.blender.org, source file: 'icons.blend'
element vertex 16
comment Created by Blender 2.90.1 - www.blender.org
element vertex 12
property float x
property float y
property float z
element face 12
element face 10
property list uchar uint vertex_indices
end_header
-0.120212 -0.072047 0.000000
@@ -16,10 +16,6 @@ end_header
0.119230 -0.072047 0.000000
-0.101239 -0.053078 0.000000
0.100257 -0.053078 0.000000
-0.089216 -0.041762 0.000000
0.088234 0.077875 0.000000
-0.089216 0.077875 0.000000
0.088234 -0.041762 0.000000
-0.057945 -0.110557 0.000000
0.031238 -0.082104 0.000000
-0.033289 -0.082104 0.000000
@@ -30,9 +26,7 @@ end_header
3 4 5 3
3 0 6 1
3 7 5 4
3 8 9 10
3 8 11 9
3 0 7 6
3 0 5 7
3 12 13 14
3 12 15 13
3 8 9 10
3 8 11 9