Better terminology and icons for SessionGroup

This commit is contained in:
Bruno
2021-02-22 14:06:10 +01:00
parent 8019f4ea25
commit ef7722bb5c
9 changed files with 683 additions and 32 deletions

View File

@@ -372,6 +372,7 @@ set(VMIX_RSC_FILES
./rsc/mesh/icon_share.ply
./rsc/mesh/icon_clone.ply
./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

View File

@@ -412,12 +412,14 @@ Symbol::Symbol(Type t, glm::vec3 pos) : Node(), type_(t)
shadows[CLONE] = shadow;
icons[RENDER] = new Mesh("mesh/icon_render.ply");
shadows[RENDER] = shadow;
icons[GROUP] = new Mesh("mesh/icon_cube.ply");
icons[GROUP] = new Mesh("mesh/icon_group_vimix.ply");
shadows[GROUP] = shadow;
icons[PATTERN] = new Mesh("mesh/icon_gear.ply");
shadows[PATTERN]= shadow;
icons[CAMERA] = new Mesh("mesh/icon_camera.ply");
shadows[CAMERA] = shadow;
icons[CUBE] = new Mesh("mesh/icon_cube.ply");
shadows[CUBE] = shadow;
icons[SHARE] = new Mesh("mesh/icon_share.ply");
shadows[SHARE] = shadow;
icons[DOTS] = new Mesh("mesh/icon_dots.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, GROUP, PATTERN, CAMERA, SHARE,
typedef enum { CIRCLE_POINT = 0, SQUARE_POINT, IMAGE, VIDEO, SESSION, CLONE, RENDER, GROUP, PATTERN, CAMERA, CUBE, SHARE,
DOTS, BUSY, LOCK, UNLOCK, EYE, EYESLASH, VECTORSLASH, ARROWS, CROP, CIRCLE, SQUARE, CLOCK, CLOCK_H, GRID, CROSS, EMPTY } Type;
Symbol(Type t = CIRCLE_POINT, glm::vec3 pos = glm::vec3(0.f));
~Symbol();

View File

@@ -499,9 +499,9 @@ void ImGuiVisitor::visit (SessionFileSource& s)
Action::manager().store(oss.str(), s.id());
}
if ( ImGui::Button( ICON_FA_FILE_UPLOAD " Open Session", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
if ( ImGui::Button( ICON_FA_FILE_UPLOAD " Open File", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
Mixer::manager().set( s.detach() );
if ( ImGui::Button( ICON_FA_FILE_EXPORT " Import Session", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
if ( ImGui::Button( ICON_FA_FILE_EXPORT " Import sources", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
Mixer::manager().import( &s );
ImGuiToolkit::ButtonOpenUrl( SystemToolkit::path_filename(s.path()).c_str(), ImVec2(IMGUI_RIGHT_ALIGN, 0) );
@@ -514,9 +514,9 @@ void ImGuiVisitor::visit (SessionGroupSource& s)
ImGuiToolkit::Icon(s.icon().x, s.icon().y);
ImGui::SameLine(0, 10);
ImGui::Text("Group");
ImGui::Text("Flat Session");
if ( ImGui::Button( ICON_FA_FILE_EXPORT " Ungroup", ImVec2(IMGUI_RIGHT_ALIGN, 0)) ){
if ( ImGui::Button( ICON_FA_UPLOAD " Expand sources", ImVec2(IMGUI_RIGHT_ALIGN, 0)) ){
Mixer::manager().import( &s );
}

View File

@@ -238,31 +238,31 @@ void SessionFileSource::accept(Visitor& v)
SessionGroupSource::SessionGroupSource() : SessionSource(), resolution_(glm::vec3(0.f))
{
// redo frame for layers view
frames_[View::LAYER]->clear();
// // redo frame for layers view
// frames_[View::LAYER]->clear();
// Groups in LAYER have an additional border
Group *group = new Group;
Frame *frame = new Frame(Frame::ROUND, Frame::THIN, Frame::PERSPECTIVE);
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f);
group->attach(frame);
Frame *persp = new Frame(Frame::GROUP, Frame::THIN, Frame::NONE);
persp->translation_.z = 0.1;
persp->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f);
group->attach(persp);
frames_[View::LAYER]->attach(group);
// // Groups in LAYER have an additional border
// Group *group = new Group;
// Frame *frame = new Frame(Frame::ROUND, Frame::THIN, Frame::PERSPECTIVE);
// frame->translation_.z = 0.1;
// frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f);
// group->attach(frame);
// Frame *persp = new Frame(Frame::GROUP, Frame::THIN, Frame::NONE);
// persp->translation_.z = 0.1;
// persp->color = glm::vec4( COLOR_DEFAULT_SOURCE, 0.95f);
// group->attach(persp);
// frames_[View::LAYER]->attach(group);
group = new Group;
frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::PERSPECTIVE);
frame->translation_.z = 0.1;
frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
group->attach(frame);
persp = new Frame(Frame::GROUP, Frame::LARGE, Frame::NONE);
persp->translation_.z = 0.1;
persp->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
group->attach(persp);
frames_[View::LAYER]->attach(group);
// group = new Group;
// frame = new Frame(Frame::ROUND, Frame::LARGE, Frame::PERSPECTIVE);
// frame->translation_.z = 0.1;
// frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
// group->attach(frame);
// persp = new Frame(Frame::GROUP, Frame::LARGE, Frame::NONE);
// persp->translation_.z = 0.1;
// persp->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f);
// group->attach(persp);
// frames_[View::LAYER]->attach(group);
// set symbol
symbol_ = new Symbol(Symbol::GROUP, glm::vec3(0.75f, 0.75f, 0.01f));

View File

@@ -38,7 +38,7 @@ public:
void load(const std::string &p = "", uint recursion = 0);
inline std::string path() const { return path_; }
glm::ivec2 icon() const override { return glm::ivec2(2, 16); }
glm::ivec2 icon() const override { return glm::ivec2(19, 6); }
protected:
@@ -65,7 +65,7 @@ public:
// TODO import session entirely : bool import();
glm::ivec2 icon() const override { return glm::ivec2(4, 3); }
glm::ivec2 icon() const override { return glm::ivec2(10, 6); }
protected:

View File

@@ -1577,7 +1577,7 @@ void showContextMenuLayer(const char* label)
{
if (ImGui::BeginPopup(label)) {
if (ImGui::Selectable( ICON_FA_CUBE " Create group" )){
if (ImGui::Selectable( ICON_FA_DOWNLOAD " Flatten" )){
Mixer::manager().groupSelection();
}

Binary file not shown.

View File

@@ -0,0 +1,648 @@
ply
format ascii 1.0
comment Created by Blender 2.91.2 - www.blender.org
element vertex 320
property float x
property float y
property float z
element face 318
property list uchar uint vertex_indices
end_header
-0.075364 0.080724 0.001667
0.096283 0.097068 0.001667
-0.075364 0.097068 0.001667
0.079936 0.080724 0.001667
0.096283 -0.074543 0.001667
0.079936 -0.074543 0.001667
-0.099885 -0.099059 0.001667
-0.083538 0.048037 0.001667
-0.099885 0.064381 0.001667
0.063589 0.064381 0.001667
0.047241 0.048037 0.001667
0.063589 -0.099059 0.001667
-0.083538 -0.082715 0.001667
0.047241 -0.082715 0.001667
0.002248 0.021272 0.001667
0.005256 0.021354 0.001667
0.004134 0.021399 0.001667
0.006351 0.021220 0.001667
0.000438 0.020903 0.001667
0.007418 0.021002 0.001667
0.008452 0.020704 0.001667
-0.001277 0.020307 0.001667
0.009452 0.020328 0.001667
0.010412 0.019878 0.001667
-0.002882 0.019501 0.001667
0.011331 0.019358 0.001667
-0.004361 0.018503 0.001667
0.012206 0.018773 0.001667
0.013032 0.018124 0.001667
-0.005696 0.017328 0.001667
0.013808 0.017417 0.001667
0.014529 0.016654 0.001667
-0.006871 0.015993 0.001667
0.015193 0.015839 0.001667
-0.007870 0.014515 0.001667
0.018036 0.015840 0.001667
0.020300 0.015738 0.001667
0.018036 0.015840 0.001667
0.018036 0.015840 0.001667
0.018036 0.015840 0.001667
0.018036 0.015840 0.001667
0.018036 0.015840 0.001667
0.018036 0.015840 0.001667
0.018036 0.015840 0.001667
0.018036 0.015839 0.001667
0.018036 0.015839 0.001667
0.018036 0.015839 0.001667
0.018036 0.015839 0.001667
0.018036 0.015839 0.001667
0.022471 0.015443 0.001667
0.024530 0.014966 0.001667
0.026456 0.014322 0.001667
-0.008676 0.012910 0.001667
0.028230 0.013523 0.001667
0.029832 0.012583 0.001667
-0.009271 0.011195 0.001667
0.004134 0.011670 0.001667
0.031243 0.011515 0.001667
0.003568 0.011632 0.001667
0.004700 0.011632 0.001667
0.003026 0.011521 0.001667
0.005242 0.011521 0.001667
0.002511 0.011342 0.001667
0.005757 0.011342 0.001667
0.032441 0.010333 0.001667
0.002029 0.011101 0.001667
0.006239 0.011101 0.001667
-0.009641 0.009386 0.001667
0.001586 0.010801 0.001667
0.006682 0.010801 0.001667
0.001185 0.010449 0.001667
0.007083 0.010449 0.001667
0.000833 0.010048 0.001667
0.007435 0.010048 0.001667
0.033408 0.009049 0.001667
0.000533 0.009605 0.001667
0.007735 0.009605 0.001667
0.000291 0.009123 0.001667
0.007977 0.009123 0.001667
-0.009768 0.007500 0.001667
0.000112 0.008609 0.001667
0.008156 0.008609 0.001667
0.034123 0.007677 0.001667
0.000001 0.008066 0.001667
0.008267 0.008066 0.001667
-0.000037 0.007500 0.001667
0.008305 0.007500 0.001667
0.034566 0.006229 0.001667
-0.009768 0.007428 0.001667
0.000001 0.006934 0.001667
0.008267 0.006934 0.001667
-0.009768 0.007230 0.001667
-0.009768 0.006930 0.001667
0.008156 0.006392 0.001667
0.000112 0.006392 0.001667
-0.009768 0.006555 0.001667
-0.009768 0.006129 0.001667
0.007977 0.005877 0.001667
0.000291 0.005877 0.001667
0.034719 0.004720 0.001667
-0.009768 0.005677 0.001667
0.007735 0.005396 0.001667
0.000533 0.005396 0.001667
-0.009768 0.005226 0.001667
0.007435 0.004952 0.001667
0.000833 0.004952 0.001667
-0.009768 0.004800 0.001667
0.007083 0.004552 0.001667
0.001185 0.004552 0.001667
-0.009768 0.004424 0.001667
0.018036 0.001941 0.001667
0.006682 0.004199 0.001667
0.001586 0.004199 0.001667
-0.009768 0.004125 0.001667
0.006239 0.003900 0.001667
0.002029 0.003900 0.001667
-0.009768 0.003927 0.001667
-0.009768 0.003855 0.001667
0.005757 0.003658 0.001667
0.002511 0.003658 0.001667
-0.074397 -0.046979 0.001667
0.005242 0.003479 0.001667
0.003026 0.003479 0.001667
0.004700 0.003368 0.001667
0.003568 0.003368 0.001667
0.004134 0.003330 0.001667
0.018036 0.001667 0.001667
0.018036 0.000911 0.001667
0.018036 -0.000231 0.001667
0.018036 -0.001663 0.001667
0.018036 -0.003288 0.001667
0.018036 -0.005009 0.001667
0.018036 -0.006730 0.001667
0.018036 -0.008355 0.001667
0.018036 -0.009787 0.001667
0.018036 -0.010929 0.001667
0.018036 -0.011685 0.001667
0.018036 -0.011959 0.001667
0.017829 -0.015695 0.001667
0.017222 -0.019311 0.001667
0.016238 -0.022783 0.001667
0.014898 -0.026090 0.001667
0.013226 -0.029209 0.001667
0.011243 -0.032119 0.001667
0.008971 -0.034798 0.001667
0.006432 -0.037223 0.001667
0.003650 -0.039373 0.001667
0.000646 -0.041226 0.001667
-0.047778 -0.045317 0.001667
-0.002558 -0.042759 0.001667
-0.005940 -0.043951 0.001667
-0.005799 -0.044332 0.001667
-0.014345 -0.045266 0.001667
-0.005409 -0.045386 0.001667
-0.014428 -0.045269 0.001667
-0.014193 -0.045678 0.001667
-0.014510 -0.045274 0.001667
-0.014592 -0.045279 0.001667
-0.014673 -0.045284 0.001667
-0.014755 -0.045290 0.001667
-0.014836 -0.045295 0.001667
-0.014918 -0.045301 0.001667
-0.015000 -0.045306 0.001667
-0.015082 -0.045310 0.001667
-0.015164 -0.045314 0.001667
-0.015246 -0.045316 0.001667
-0.015329 -0.045317 0.001667
-0.048194 -0.045525 0.001667
-0.031010 -0.045317 0.001667
-0.023293 -0.066183 0.001667
-0.022117 -0.045317 0.001667
-0.021986 -0.045671 0.001667
-0.004820 -0.046979 0.001667
-0.049343 -0.046099 0.001667
-0.021623 -0.046651 0.001667
-0.013772 -0.046815 0.001667
-0.051078 -0.046967 0.001667
-0.021076 -0.048131 0.001667
-0.013137 -0.048534 0.001667
-0.053254 -0.048054 0.001667
-0.004082 -0.048975 0.001667
-0.074558 -0.047105 0.001667
-0.074713 -0.047236 0.001667
-0.074863 -0.047373 0.001667
-0.075007 -0.047515 0.001667
-0.075145 -0.047663 0.001667
-0.075278 -0.047815 0.001667
-0.075405 -0.047973 0.001667
-0.075525 -0.048136 0.001667
-0.055723 -0.049288 0.001667
-0.020390 -0.049987 0.001667
-0.075640 -0.048303 0.001667
-0.075747 -0.048475 0.001667
-0.075849 -0.048651 0.001667
-0.012340 -0.050688 0.001667
-0.075943 -0.048831 0.001667
-0.076031 -0.049015 0.001667
-0.003244 -0.051240 0.001667
-0.076111 -0.049202 0.001667
-0.076184 -0.049391 0.001667
-0.058338 -0.050596 0.001667
-0.076249 -0.049583 0.001667
-0.076307 -0.049777 0.001667
-0.076357 -0.049973 0.001667
-0.076400 -0.050171 0.001667
-0.019611 -0.052093 0.001667
-0.076435 -0.050370 0.001667
-0.076463 -0.050571 0.001667
-0.076482 -0.050773 0.001667
-0.060954 -0.051903 0.001667
-0.011436 -0.053133 0.001667
-0.076494 -0.050975 0.001667
-0.076498 -0.051179 0.001667
-0.076415 -0.052124 0.001667
-0.002357 -0.053640 0.001667
-0.063423 -0.053138 0.001667
-0.018786 -0.054323 0.001667
-0.076178 -0.053003 0.001667
-0.075802 -0.053804 0.001667
-0.010478 -0.055724 0.001667
-0.065599 -0.054225 0.001667
-0.001469 -0.056039 0.001667
-0.075304 -0.054518 0.001667
-0.067334 -0.055093 0.001667
-0.017961 -0.056554 0.001667
-0.074700 -0.055135 0.001667
-0.068483 -0.055667 0.001667
-0.074008 -0.055644 0.001667
-0.073242 -0.056036 0.001667
-0.068899 -0.055875 0.001667
-0.009520 -0.058314 0.001667
-0.069782 -0.056223 0.001667
-0.072421 -0.056300 0.001667
-0.000631 -0.058304 0.001667
-0.070674 -0.056404 0.001667
-0.071559 -0.056426 0.001667
-0.017183 -0.058660 0.001667
0.000107 -0.060300 0.001667
-0.008616 -0.060759 0.001667
-0.016497 -0.060516 0.001667
0.000696 -0.061893 0.001667
-0.015949 -0.061996 0.001667
-0.007819 -0.062913 0.001667
0.001086 -0.062947 0.001667
-0.015587 -0.062976 0.001667
-0.007184 -0.064632 0.001667
0.001227 -0.063328 0.001667
-0.015456 -0.063330 0.001667
0.001306 -0.063600 0.001667
-0.015377 -0.063602 0.001667
0.001347 -0.063874 0.001667
-0.015336 -0.063876 0.001667
0.001351 -0.064147 0.001667
-0.015332 -0.064149 0.001667
0.001320 -0.064414 0.001667
-0.015363 -0.064416 0.001667
0.001255 -0.064674 0.001667
-0.015428 -0.064676 0.001667
-0.006763 -0.065769 0.001667
0.001158 -0.064922 0.001667
-0.015525 -0.064924 0.001667
0.001030 -0.065156 0.001667
-0.015653 -0.065158 0.001667
0.000873 -0.065373 0.001667
-0.015810 -0.065375 0.001667
0.000688 -0.065568 0.001667
-0.015995 -0.065571 0.001667
0.000476 -0.065740 0.001667
-0.016206 -0.065742 0.001667
0.000240 -0.065885 0.001667
-0.016442 -0.065887 0.001667
-0.006611 -0.066181 0.001667
-0.000019 -0.066000 0.001667
-0.016702 -0.066002 0.001667
-0.000096 -0.066028 0.001667
-0.016779 -0.066030 0.001667
-0.000310 -0.066106 0.001667
-0.016992 -0.066108 0.001667
-0.000632 -0.066223 0.001667
-0.017314 -0.066225 0.001667
-0.006496 -0.066440 0.001667
-0.023178 -0.066442 0.001667
-0.001035 -0.066370 0.001667
-0.017718 -0.066372 0.001667
-0.001493 -0.066537 0.001667
-0.018176 -0.066539 0.001667
-0.006351 -0.066676 0.001667
-0.023033 -0.066678 0.001667
-0.001979 -0.066713 0.001667
-0.018661 -0.066715 0.001667
-0.006179 -0.066888 0.001667
-0.022861 -0.066890 0.001667
-0.002464 -0.066890 0.001667
-0.019146 -0.066892 0.001667
-0.005983 -0.067073 0.001667
-0.022665 -0.067075 0.001667
-0.002922 -0.067057 0.001667
-0.019604 -0.067059 0.001667
-0.003326 -0.067204 0.001667
-0.020008 -0.067206 0.001667
-0.005766 -0.067230 0.001667
-0.022449 -0.067232 0.001667
-0.003648 -0.067321 0.001667
-0.020330 -0.067323 0.001667
-0.005532 -0.067358 0.001667
-0.022215 -0.067360 0.001667
-0.003861 -0.067399 0.001667
-0.020543 -0.067401 0.001667
-0.005284 -0.067455 0.001667
-0.021966 -0.067457 0.001667
-0.003938 -0.067427 0.001667
-0.020620 -0.067429 0.001667
-0.004210 -0.067506 0.001667
-0.020893 -0.067508 0.001667
-0.005024 -0.067519 0.001667
-0.021707 -0.067521 0.001667
-0.004484 -0.067546 0.001667
-0.021167 -0.067548 0.001667
-0.004757 -0.067551 0.001667
-0.021439 -0.067553 0.001667
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 13 11 10
3 6 13 12
3 6 11 13
3 14 15 16
3 14 17 15
3 18 17 14
3 18 19 17
3 18 20 19
3 21 20 18
3 21 22 20
3 21 23 22
3 24 23 21
3 24 25 23
3 26 25 24
3 26 27 25
3 26 28 27
3 29 28 26
3 29 30 28
3 29 31 30
3 32 31 29
3 32 33 31
3 34 33 32
3 35 36 37
3 38 36 35
3 39 36 38
3 40 36 39
3 41 36 40
3 42 36 41
3 43 36 42
3 44 36 43
3 45 36 44
3 46 36 45
3 47 36 46
3 48 36 47
3 34 48 33
3 34 36 48
3 34 49 36
3 34 50 49
3 34 51 50
3 52 51 34
3 52 53 51
3 52 54 53
3 55 54 52
3 55 56 54
3 56 57 54
3 55 58 56
3 59 57 56
3 55 60 58
3 61 57 59
3 55 62 60
3 63 57 61
3 63 64 57
3 55 65 62
3 66 64 63
3 67 65 55
3 67 68 65
3 69 64 66
3 67 70 68
3 71 64 69
3 67 72 70
3 73 64 71
3 73 74 64
3 67 75 72
3 76 74 73
3 67 77 75
3 78 74 76
3 79 77 67
3 79 80 77
3 81 74 78
3 81 82 74
3 79 83 80
3 84 82 81
3 79 85 83
3 86 82 84
3 86 87 82
3 88 85 79
3 88 89 85
3 90 87 86
3 91 89 88
3 92 89 91
3 93 87 90
3 92 94 89
3 95 94 92
3 96 94 95
3 97 87 93
3 96 98 94
3 97 99 87
3 100 98 96
3 101 99 97
3 100 102 98
3 103 102 100
3 104 99 101
3 103 105 102
3 106 105 103
3 107 99 104
3 106 108 105
3 109 108 106
3 107 110 99
3 111 110 107
3 109 112 108
3 113 112 109
3 114 110 111
3 113 115 112
3 116 115 113
3 117 115 116
3 118 110 114
3 117 119 115
3 120 119 117
3 121 110 118
3 120 122 119
3 123 110 121
3 120 124 122
3 125 110 123
3 120 125 124
3 120 110 125
3 120 126 110
3 120 127 126
3 120 128 127
3 120 129 128
3 120 130 129
3 120 131 130
3 120 132 131
3 120 133 132
3 120 134 133
3 120 135 134
3 120 136 135
3 120 137 136
3 120 138 137
3 120 139 138
3 120 140 139
3 120 141 140
3 120 142 141
3 120 143 142
3 120 144 143
3 120 145 144
3 120 146 145
3 120 147 146
3 120 148 147
3 148 149 147
3 148 150 149
3 148 151 150
3 148 152 151
3 152 153 151
3 148 154 152
3 155 153 152
3 148 156 154
3 148 157 156
3 148 158 157
3 148 159 158
3 148 160 159
3 148 161 160
3 148 162 161
3 148 163 162
3 148 164 163
3 148 165 164
3 148 166 165
3 120 167 148
3 168 166 148
3 169 170 168
3 170 166 168
3 169 171 170
3 155 172 153
3 120 173 167
3 169 174 171
3 175 172 155
3 120 176 173
3 169 177 174
3 178 172 175
3 120 179 176
3 178 180 172
3 181 179 120
3 182 179 181
3 183 179 182
3 184 179 183
3 185 179 184
3 186 179 185
3 187 179 186
3 188 179 187
3 188 189 179
3 169 190 177
3 191 189 188
3 192 189 191
3 193 189 192
3 194 180 178
3 195 189 193
3 196 189 195
3 194 197 180
3 198 189 196
3 199 189 198
3 199 200 189
3 201 200 199
3 202 200 201
3 203 200 202
3 204 200 203
3 169 205 190
3 206 200 204
3 207 200 206
3 208 200 207
3 208 209 200
3 210 197 194
3 211 209 208
3 212 209 211
3 213 209 212
3 210 214 197
3 213 215 209
3 169 216 205
3 217 215 213
3 218 215 217
3 219 214 210
3 218 220 215
3 219 221 214
3 222 220 218
3 222 223 220
3 169 224 216
3 225 223 222
3 225 226 223
3 227 226 225
3 228 226 227
3 228 229 226
3 230 221 219
3 228 231 229
3 232 231 228
3 230 233 221
3 232 234 231
3 235 234 232
3 169 236 224
3 230 237 233
3 238 237 230
3 169 239 236
3 238 240 237
3 169 241 239
3 242 240 238
3 242 243 240
3 169 244 241
3 245 243 242
3 245 246 243
3 169 247 244
3 245 248 246
3 169 249 247
3 245 250 248
3 169 251 249
3 245 252 250
3 169 253 251
3 245 254 252
3 169 255 253
3 245 256 254
3 169 257 255
3 258 256 245
3 258 259 256
3 169 260 257
3 258 261 259
3 169 262 260
3 258 263 261
3 169 264 262
3 258 265 263
3 169 266 264
3 258 267 265
3 169 268 266
3 258 269 267
3 169 270 268
3 271 269 258
3 271 272 269
3 169 273 270
3 271 274 272
3 169 275 273
3 271 276 274
3 169 277 275
3 271 278 276
3 169 279 277
3 280 278 271
3 281 279 169
3 280 282 278
3 281 283 279
3 280 284 282
3 281 285 283
3 286 284 280
3 287 285 281
3 286 288 284
3 287 289 285
3 290 288 286
3 291 289 287
3 290 292 288
3 291 293 289
3 294 292 290
3 295 293 291
3 294 296 292
3 295 297 293
3 294 298 296
3 295 299 297
3 300 298 294
3 301 299 295
3 300 302 298
3 301 303 299
3 304 302 300
3 305 303 301
3 304 306 302
3 305 307 303
3 308 306 304
3 309 307 305
3 308 310 306
3 309 311 307
3 308 312 310
3 309 313 311
3 314 312 308
3 315 313 309
3 314 316 312
3 315 317 313
3 318 316 314
3 319 317 315