From 7438b257aecb049ea55f2f3cdc06f4f574f227f6 Mon Sep 17 00:00:00 2001 From: brunoherbelin Date: Sun, 25 Oct 2020 23:26:04 +0100 Subject: [PATCH] Added icon for NetworkSource (sharing logo) --- CMakeLists.txt | 1 + Decorations.cpp | 1 + Decorations.h | 2 +- NetworkSource.cpp | 4 +- NetworkSource.h | 2 +- UserInterfaceManager.cpp | 4 +- rsc/mesh/icon_share.ply | 442 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 450 insertions(+), 6 deletions(-) create mode 100644 rsc/mesh/icon_share.ply diff --git a/CMakeLists.txt b/CMakeLists.txt index 05d2465..d627048 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,6 +339,7 @@ set(VMIX_RSC_FILES ./rsc/mesh/icon_render.ply ./rsc/mesh/icon_gear.ply ./rsc/mesh/icon_camera.ply + ./rsc/mesh/icon_share.ply ./rsc/mesh/icon_clone.ply ./rsc/mesh/icon_vimix.ply ./rsc/mesh/icon_circles.ply diff --git a/Decorations.cpp b/Decorations.cpp index 58c16fe..270f803 100644 --- a/Decorations.cpp +++ b/Decorations.cpp @@ -312,6 +312,7 @@ Symbol::Symbol(Type t, glm::vec3 pos) : Node(), type_(t) 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[SHARE] = new Mesh("mesh/icon_share.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"); diff --git a/Decorations.h b/Decorations.h index 03ed265..b20ebac 100644 --- a/Decorations.h +++ b/Decorations.h @@ -60,7 +60,7 @@ protected: class Symbol : public Node { public: - typedef enum { CIRCLE_POINT = 0, SQUARE_POINT, IMAGE, VIDEO, SESSION, CLONE, RENDER, PATTERN, CAMERA, + typedef enum { CIRCLE_POINT = 0, SQUARE_POINT, IMAGE, VIDEO, SESSION, CLONE, RENDER, PATTERN, CAMERA, SHARE, 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(); diff --git a/NetworkSource.cpp b/NetworkSource.cpp index 2613d9b..bf3d20f 100644 --- a/NetworkSource.cpp +++ b/NetworkSource.cpp @@ -264,8 +264,8 @@ NetworkSource::NetworkSource() : StreamSource() stream_ = (Stream *) new NetworkStream; // set icons - 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)) ); + overlays_[View::MIXING]->attach( new Symbol(Symbol::SHARE, glm::vec3(0.8f, 0.8f, 0.01f)) ); + overlays_[View::LAYER]->attach( new Symbol(Symbol::SHARE, glm::vec3(0.8f, 0.8f, 0.01f)) ); } diff --git a/NetworkSource.h b/NetworkSource.h index 3ca12b3..7a5bff0 100644 --- a/NetworkSource.h +++ b/NetworkSource.h @@ -71,7 +71,7 @@ public: void setConnection(const std::string &nameconnection); std::string connection() const; - glm::ivec2 icon() const override { return glm::ivec2(11, 8); } + glm::ivec2 icon() const override { return glm::ivec2(18, 11); } }; diff --git a/UserInterfaceManager.cpp b/UserInterfaceManager.cpp index 5979839..93d0b13 100644 --- a/UserInterfaceManager.cpp +++ b/UserInterfaceManager.cpp @@ -1205,7 +1205,7 @@ void UserInterface::RenderPreview() if (ImGui::BeginMenu("Stream")) { ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.05, 1.0, 0.05, 0.8f)); - if ( ImGui::MenuItem( ICON_FA_PODCAST " Accept connections", NULL, &Settings::application.accept_connections) ) { + if ( ImGui::MenuItem( ICON_FA_SHARE_ALT " Accept connections", NULL, &Settings::application.accept_connections) ) { Streaming::manager().enable(Settings::application.accept_connections); } ImGui::PopStyleColor(1); @@ -1266,7 +1266,7 @@ void UserInterface::RenderPreview() ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.05, 1.0, 0.05, 0.8f)); else ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.05, 1.0, 0.05, 0.2f)); - ImGui::Text(ICON_FA_PODCAST); + ImGui::Text(ICON_FA_SHARE_ALT_SQUARE); ImGui::PopStyleColor(1); ImGui::PopFont(); } diff --git a/rsc/mesh/icon_share.ply b/rsc/mesh/icon_share.ply new file mode 100644 index 0000000..2f106f0 --- /dev/null +++ b/rsc/mesh/icon_share.ply @@ -0,0 +1,442 @@ +ply +format ascii 1.0 +comment Created by Blender 2.90.1 - www.blender.org +element vertex 217 +property float x +property float y +property float z +element face 215 +property list uchar uint vertex_indices +end_header +0.031205 0.089869 0.000000 +0.039943 0.089869 0.000000 +0.035574 0.090163 0.000000 +0.027015 0.089014 0.000000 +0.044133 0.089014 0.000000 +0.023043 0.087634 0.000000 +0.048105 0.087634 0.000000 +0.019326 0.085769 0.000000 +0.051822 0.085769 0.000000 +0.015903 0.083458 0.000000 +0.055245 0.083458 0.000000 +0.012812 0.080738 0.000000 +0.058336 0.080738 0.000000 +0.010092 0.077647 0.000000 +0.061056 0.077647 0.000000 +0.007780 0.074225 0.000000 +0.063368 0.074225 0.000000 +0.005916 0.070509 0.000000 +0.065232 0.070509 0.000000 +0.004537 0.066538 0.000000 +0.066612 0.066538 0.000000 +0.003681 0.062350 0.000000 +0.067467 0.062350 0.000000 +0.003387 0.057983 0.000000 +0.067761 0.057983 0.000000 +0.003389 0.057651 0.000000 +0.067467 0.053617 0.000000 +0.003395 0.057320 0.000000 +0.003404 0.056990 0.000000 +0.003416 0.056662 0.000000 +0.003432 0.056334 0.000000 +0.003451 0.056007 0.000000 +0.003473 0.055682 0.000000 +0.003499 0.055357 0.000000 +0.003528 0.055033 0.000000 +0.003559 0.054710 0.000000 +0.003594 0.054387 0.000000 +0.003631 0.054065 0.000000 +0.002492 0.053467 0.000000 +0.066612 0.049429 0.000000 +-0.000656 0.051814 0.000000 +-0.005413 0.049316 0.000000 +0.065232 0.045459 0.000000 +-0.011375 0.046186 0.000000 +-0.018141 0.042633 0.000000 +0.063368 0.041743 0.000000 +-0.025309 0.038870 0.000000 +0.061057 0.038321 0.000000 +-0.032478 0.035106 0.000000 +0.058337 0.035232 0.000000 +0.014220 0.033913 0.000000 +0.055247 0.032512 0.000000 +-0.039244 0.031553 0.000000 +0.013047 0.033297 0.000000 +0.015678 0.032694 0.000000 +-0.081881 0.033338 0.000000 +-0.075243 0.033553 0.000000 +-0.077512 0.033632 0.000000 +-0.073018 0.033320 0.000000 +-0.086071 0.032482 0.000000 +-0.070840 0.032938 0.000000 +0.009806 0.031596 0.000000 +-0.068716 0.032412 0.000000 +0.017207 0.031562 0.000000 +0.051825 0.030200 0.000000 +-0.090044 0.031103 0.000000 +-0.066650 0.031748 0.000000 +-0.064647 0.030951 0.000000 +0.004910 0.029026 0.000000 +0.018803 0.030519 0.000000 +-0.045206 0.028423 0.000000 +-0.093760 0.029238 0.000000 +-0.062713 0.030027 0.000000 +0.020463 0.029570 0.000000 +0.048109 0.028335 0.000000 +-0.060853 0.028980 0.000000 +0.022182 0.028718 0.000000 +-0.097183 0.026927 0.000000 +-0.001227 0.025804 0.000000 +-0.059071 0.027815 0.000000 +0.023958 0.027967 0.000000 +-0.049963 0.025925 0.000000 +0.044137 0.026955 0.000000 +0.025786 0.027322 0.000000 +-0.057374 0.026540 0.000000 +0.027662 0.026785 0.000000 +0.039949 0.026099 0.000000 +-0.100274 0.024206 0.000000 +0.029584 0.026361 0.000000 +-0.055765 0.025157 0.000000 +0.031547 0.026054 0.000000 +0.035581 0.025803 0.000000 +0.033547 0.025866 0.000000 +-0.053111 0.024272 0.000000 +-0.008192 0.022147 0.000000 +-0.054250 0.023674 0.000000 +-0.102994 0.021116 0.000000 +-0.015571 0.018274 0.000000 +-0.105306 0.017693 0.000000 +-0.022950 0.014400 0.000000 +-0.107170 0.013978 0.000000 +-0.029915 0.010744 0.000000 +-0.108550 0.010006 0.000000 +-0.036053 0.007522 0.000000 +-0.109405 0.005818 0.000000 +-0.040949 0.004952 0.000000 +-0.109699 0.001452 0.000000 +-0.044190 0.003250 0.000000 +-0.045362 0.002635 0.000000 +-0.045345 0.002077 0.000000 +-0.045336 0.001520 0.000000 +-0.045338 0.000961 0.000000 +-0.109405 -0.002915 0.000000 +-0.045349 0.000401 0.000000 +-0.045372 -0.000164 0.000000 +-0.045405 -0.000733 0.000000 +-0.045449 -0.001309 0.000000 +-0.045506 -0.001893 0.000000 +-0.045574 -0.002485 0.000000 +-0.045656 -0.003088 0.000000 +-0.108550 -0.007102 0.000000 +-0.045750 -0.003702 0.000000 +-0.045858 -0.004329 0.000000 +-0.044725 -0.004888 0.000000 +-0.041592 -0.006435 0.000000 +-0.036860 -0.008772 0.000000 +-0.107170 -0.011074 0.000000 +-0.030928 -0.011700 0.000000 +-0.105306 -0.014790 0.000000 +-0.024196 -0.015024 0.000000 +-0.102994 -0.018212 0.000000 +-0.017065 -0.018545 0.000000 +-0.100274 -0.021302 0.000000 +-0.009933 -0.022066 0.000000 +-0.097183 -0.024023 0.000000 +-0.057666 -0.023875 0.000000 +-0.003202 -0.025390 0.000000 +0.033232 -0.022281 0.000000 +0.039943 -0.022491 0.000000 +0.035574 -0.022197 0.000000 +0.030935 -0.022529 0.000000 +0.044133 -0.023346 0.000000 +0.028689 -0.022935 0.000000 +0.026500 -0.023493 0.000000 +0.048105 -0.024725 0.000000 +0.024373 -0.024199 0.000000 +-0.059065 -0.024911 0.000000 +-0.056465 -0.024468 0.000000 +-0.093760 -0.026334 0.000000 +0.022315 -0.025045 0.000000 +-0.053142 -0.026108 0.000000 +0.051822 -0.026589 0.000000 +-0.060519 -0.025871 0.000000 +0.020330 -0.026026 0.000000 +0.002730 -0.028318 0.000000 +-0.062025 -0.026755 0.000000 +0.018426 -0.027137 0.000000 +-0.048123 -0.028586 0.000000 +-0.090043 -0.028199 0.000000 +0.055245 -0.028899 0.000000 +-0.063582 -0.027557 0.000000 +0.016608 -0.028372 0.000000 +-0.065186 -0.028277 0.000000 +-0.086071 -0.029578 0.000000 +-0.066835 -0.028909 0.000000 +0.007462 -0.030655 0.000000 +0.014882 -0.029725 0.000000 +-0.041832 -0.031691 0.000000 +0.058336 -0.031619 0.000000 +-0.068526 -0.029453 0.000000 +-0.070255 -0.029904 0.000000 +-0.081881 -0.030434 0.000000 +0.013253 -0.031190 0.000000 +-0.072022 -0.030260 0.000000 +-0.073822 -0.030518 0.000000 +-0.077512 -0.030728 0.000000 +-0.075653 -0.030675 0.000000 +0.010595 -0.032202 0.000000 +0.011728 -0.032761 0.000000 +0.061056 -0.034708 0.000000 +-0.034692 -0.035215 0.000000 +0.063368 -0.038130 0.000000 +-0.027128 -0.038949 0.000000 +0.065232 -0.041845 0.000000 +-0.019565 -0.042682 0.000000 +0.066612 -0.045816 0.000000 +-0.012425 -0.046206 0.000000 +0.067467 -0.050003 0.000000 +-0.006134 -0.049312 0.000000 +-0.001115 -0.051789 0.000000 +0.067761 -0.054370 0.000000 +0.002208 -0.053429 0.000000 +0.003410 -0.054022 0.000000 +0.003402 -0.054370 0.000000 +0.003696 -0.058736 0.000000 +0.067467 -0.058736 0.000000 +0.066613 -0.062924 0.000000 +0.004551 -0.062924 0.000000 +0.065235 -0.066895 0.000000 +0.005931 -0.066895 0.000000 +0.063372 -0.070611 0.000000 +0.007795 -0.070611 0.000000 +0.061062 -0.074033 0.000000 +0.010107 -0.074033 0.000000 +0.058343 -0.077124 0.000000 +0.012827 -0.077124 0.000000 +0.055255 -0.079844 0.000000 +0.015918 -0.079844 0.000000 +0.051833 -0.082156 0.000000 +0.019341 -0.082156 0.000000 +0.048118 -0.084021 0.000000 +0.023057 -0.084021 0.000000 +0.044147 -0.085400 0.000000 +0.027030 -0.085400 0.000000 +0.039958 -0.086256 0.000000 +0.031220 -0.086256 0.000000 +0.035589 -0.086549 0.000000 +3 0 1 2 +3 3 1 0 +3 3 4 1 +3 5 4 3 +3 5 6 4 +3 7 6 5 +3 7 8 6 +3 9 8 7 +3 9 10 8 +3 11 10 9 +3 11 12 10 +3 13 12 11 +3 13 14 12 +3 15 14 13 +3 15 16 14 +3 17 16 15 +3 17 18 16 +3 19 18 17 +3 19 20 18 +3 21 20 19 +3 21 22 20 +3 23 22 21 +3 23 24 22 +3 25 24 23 +3 25 26 24 +3 27 26 25 +3 28 26 27 +3 29 26 28 +3 30 26 29 +3 31 26 30 +3 32 26 31 +3 33 26 32 +3 34 26 33 +3 35 26 34 +3 36 26 35 +3 37 26 36 +3 38 26 37 +3 38 39 26 +3 40 39 38 +3 41 39 40 +3 41 42 39 +3 43 42 41 +3 44 42 43 +3 44 45 42 +3 46 45 44 +3 46 47 45 +3 48 47 46 +3 48 49 47 +3 48 50 49 +3 50 51 49 +3 52 50 48 +3 52 53 50 +3 54 51 50 +3 55 56 57 +3 55 58 56 +3 59 58 55 +3 59 60 58 +3 52 61 53 +3 59 62 60 +3 63 51 54 +3 63 64 51 +3 65 62 59 +3 65 66 62 +3 65 67 66 +3 52 68 61 +3 69 64 63 +3 70 68 52 +3 71 67 65 +3 71 72 67 +3 73 64 69 +3 73 74 64 +3 71 75 72 +3 76 74 73 +3 77 75 71 +3 70 78 68 +3 77 79 75 +3 80 74 76 +3 81 78 70 +3 80 82 74 +3 83 82 80 +3 77 84 79 +3 85 82 83 +3 85 86 82 +3 87 84 77 +3 88 86 85 +3 87 89 84 +3 90 86 88 +3 90 91 86 +3 92 91 90 +3 93 78 81 +3 93 94 78 +3 87 95 89 +3 95 94 93 +3 96 95 87 +3 96 94 95 +3 96 97 94 +3 98 97 96 +3 98 99 97 +3 100 99 98 +3 100 101 99 +3 102 101 100 +3 102 103 101 +3 104 103 102 +3 104 105 103 +3 106 105 104 +3 106 107 105 +3 106 108 107 +3 106 109 108 +3 106 110 109 +3 106 111 110 +3 112 111 106 +3 112 113 111 +3 112 114 113 +3 112 115 114 +3 112 116 115 +3 112 117 116 +3 112 118 117 +3 112 119 118 +3 120 119 112 +3 120 121 119 +3 120 122 121 +3 120 123 122 +3 120 124 123 +3 120 125 124 +3 126 125 120 +3 126 127 125 +3 128 127 126 +3 128 129 127 +3 130 129 128 +3 130 131 129 +3 132 131 130 +3 132 133 131 +3 134 133 132 +3 134 135 133 +3 135 136 133 +3 137 138 139 +3 140 138 137 +3 140 141 138 +3 142 141 140 +3 143 141 142 +3 143 144 141 +3 145 144 143 +3 134 146 135 +3 147 136 135 +3 148 146 134 +3 149 144 145 +3 150 136 147 +3 149 151 144 +3 148 152 146 +3 153 151 149 +3 150 154 136 +3 148 155 152 +3 156 151 153 +3 157 154 150 +3 158 155 148 +3 156 159 151 +3 158 160 155 +3 161 159 156 +3 158 162 160 +3 163 162 158 +3 163 164 162 +3 157 165 154 +3 166 159 161 +3 167 165 157 +3 166 168 159 +3 163 169 164 +3 163 170 169 +3 171 170 163 +3 172 168 166 +3 171 173 170 +3 171 174 173 +3 175 174 171 +3 175 176 174 +3 167 177 165 +3 178 168 172 +3 178 179 168 +3 180 177 167 +3 180 178 177 +3 180 179 178 +3 180 181 179 +3 182 181 180 +3 182 183 181 +3 184 183 182 +3 184 185 183 +3 186 185 184 +3 186 187 185 +3 188 187 186 +3 189 187 188 +3 189 190 187 +3 191 190 189 +3 192 190 191 +3 193 190 192 +3 194 190 193 +3 194 195 190 +3 194 196 195 +3 197 196 194 +3 197 198 196 +3 199 198 197 +3 199 200 198 +3 201 200 199 +3 201 202 200 +3 203 202 201 +3 203 204 202 +3 205 204 203 +3 205 206 204 +3 207 206 205 +3 207 208 206 +3 209 208 207 +3 209 210 208 +3 211 210 209 +3 211 212 210 +3 213 212 211 +3 213 214 212 +3 215 214 213 +3 215 216 214