From e9869853db52745e163fd5b4d77cec4f2209909d Mon Sep 17 00:00:00 2001 From: BruceLane Date: Tue, 11 Jul 2023 17:57:24 +0200 Subject: [PATCH 01/21] Midi start --- Cool | 2 +- imgui.ini | 230 +++++++++--------- .../register_set_variable_commands.inl | 3 + ...egister_set_variable_metadata_commands.inl | 1 + .../generated2/Command_SetCameraZoom.inl | 6 +- 5 files changed, 125 insertions(+), 117 deletions(-) diff --git a/Cool b/Cool index 1991eb5d..e1482687 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 1991eb5d382e811c099a3fc2bb5d3986d8130805 +Subproject commit e148268743e2694632fddc137f657cb4ef5fae04 diff --git a/imgui.ini b/imgui.ini index 4388beb8..45c1ffb1 100644 --- a/imgui.ini +++ b/imgui.ini @@ -1,6 +1,6 @@ [Window][MyMainDockSpace] Pos=0,30 -Size=1920,971 +Size=1920,979 Collapsed=0 [Window][Debug##Default] @@ -12,13 +12,13 @@ Collapsed=0 Pos=0,19 Size=992,998 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000052,0 [Window][View | Custom Shader] Pos=0,19 Size=1493,240 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000052,0 [Window][is0 Opt] Pos=1888,820 @@ -84,7 +84,7 @@ DockId=0x0000002E,0 Pos=0,24 Size=1517,933 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000052,1 [Window][Export an Image] Pos=322,291 @@ -101,7 +101,7 @@ DockId=0x00000023,0 Pos=0,24 Size=978,232 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000052,1 [Window][Registry of vec3] Pos=0,837 @@ -164,7 +164,7 @@ Collapsed=0 Pos=0,19 Size=746,634 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000052,0 [Window][Nodes] Pos=748,19 @@ -176,7 +176,7 @@ DockId=0x0000000C,0 Pos=0,892 Size=961,55 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000052,0 [Window][Nodes Code] Pos=826,24 @@ -224,7 +224,7 @@ DockId=0x0000001A,0 Pos=0,24 Size=1517,934 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000052,0 [Window][Color Themes: Advanced Config] Pos=0,683 @@ -251,13 +251,13 @@ Collapsed=0 Pos=0,24 Size=1517,933 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000052,1 [Window][Test Message Console] Pos=0,25 Size=1599,908 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000052,1 [Window][Dear ImGui Style Editor] Pos=203,130 @@ -290,7 +290,7 @@ DockId=0x0000002C,0 Pos=0,24 Size=1517,934 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000052,0 [Window][ Nodes] Pos=60,60 @@ -306,7 +306,7 @@ Collapsed=0 Pos=0,25 Size=1226,99 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000052,0 [Window][ Cameras] Pos=1228,25 @@ -358,7 +358,7 @@ DockId=0x00000004,2 Pos=0,25 Size=994,104 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000052,0 [Window][ Cameras] Pos=996,25 @@ -440,26 +440,26 @@ Collapsed=0 DockId=0x00000029,1 [Window][  View] -Pos=1325,469 -Size=595,532 +Pos=1325,473 +Size=595,536 Collapsed=0 DockId=0x00000046,0 [Window][  Nodes] Pos=0,30 -Size=1323,558 +Size=1323,52 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000052,0 [Window][  Time] -Pos=0,956 +Pos=0,964 Size=1323,45 Collapsed=0 DockId=0x00000045,0 [Window][  Cameras] Pos=1325,30 -Size=595,437 +Size=595,441 Collapsed=0 DockId=0x0000003A,1 @@ -483,7 +483,7 @@ DockId=0x00000032,1 Pos=0,30 Size=1334,924 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000052,1 [Window][  Framerate] Pos=1317,30 @@ -501,7 +501,7 @@ DockId=0x0000003B,0 Pos=0,30 Size=1334,924 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000052,1 [Window][  Color Themes: Editor] Pos=0,675 @@ -513,11 +513,11 @@ DockId=0x0000003F,0 Pos=0,30 Size=1288,939 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000052,1 [Window][  Console] -Pos=1325,469 -Size=595,532 +Pos=963,352 +Size=595,536 Collapsed=0 DockId=0x00000046,1 @@ -532,10 +532,10 @@ Size=491,190 Collapsed=0 [Window][  Test all Variable Widgets] -Pos=0,30 -Size=1290,939 +Pos=0,84 +Size=1323,878 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000051,0 [Window][  Style Editor] Pos=0,516 @@ -550,13 +550,13 @@ Collapsed=0 [Window][  Inspector] Pos=1325,30 -Size=595,437 +Size=595,441 Collapsed=0 DockId=0x0000003A,0 [Window][  Nodes Code] -Pos=776,30 -Size=637,484 +Pos=686,30 +Size=637,979 Collapsed=0 DockId=0x0000004C,0 @@ -575,7 +575,7 @@ DockId=0x0000004F,0 Pos=0,30 Size=1413,924 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000052,1 [Window][  Debug Console] Pos=60,60 @@ -594,7 +594,7 @@ Size=1102,703 Collapsed=0 [Window][  Did you know?] -Pos=602,199 +Pos=195,210 Size=736,392 Collapsed=0 @@ -602,7 +602,7 @@ Collapsed=0 Pos=0,30 Size=1323,535 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000052,1 [Window][  Test tips] Pos=0,590 @@ -672,85 +672,87 @@ Column 1 Weight=1.0000 Column 2 Weight=1.0000 [Docking][Data] -DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,59 Size=1920,971 Split=Y - DockNode ID=0x0000004B Parent=0xF3CABE56 SizeRef=1920,489 Split=Y - DockNode ID=0x0000003E Parent=0x0000004B SizeRef=1920,648 Split=Y - DockNode ID=0x00000025 Parent=0x0000003E SizeRef=1920,656 Split=X - DockNode ID=0x0000002A Parent=0x00000025 SizeRef=1226,977 Split=Y - DockNode ID=0x0000000A Parent=0x0000002A SizeRef=1920,934 Split=X - DockNode ID=0x00000006 Parent=0x0000000A SizeRef=1688,982 Split=X - DockNode ID=0x00000011 Parent=0x00000006 SizeRef=1166,567 Split=Y Selected=0xB20B5019 - DockNode ID=0x00000015 Parent=0x00000011 SizeRef=1166,540 Split=X Selected=0xB20B5019 - DockNode ID=0x00000001 Parent=0x00000015 SizeRef=1227,372 Split=X Selected=0x0139E51B - DockNode ID=0x0000000B Parent=0x00000001 SizeRef=746,928 Split=Y Selected=0x0139E51B - DockNode ID=0x0000001D Parent=0x0000000B SizeRef=872,444 Split=X Selected=0x612F12CA - DockNode ID=0x0000001F Parent=0x0000001D SizeRef=683,313 Selected=0xDA0F6C18 - DockNode ID=0x00000020 Parent=0x0000001D SizeRef=832,313 Selected=0x612F12CA - DockNode ID=0x0000001E Parent=0x0000000B SizeRef=872,531 Split=X Selected=0x0139E51B - DockNode ID=0x0000000D Parent=0x0000001E SizeRef=1244,464 Split=X Selected=0x12D5DF45 - DockNode ID=0x00000024 Parent=0x0000000D SizeRef=785,516 Split=Y Selected=0xF8A795D1 - DockNode ID=0x00000030 Parent=0x00000024 SizeRef=1517,472 Split=Y Selected=0xF8A795D1 - DockNode ID=0x00000021 Parent=0x00000030 SizeRef=1517,623 Split=X Selected=0x30F1BB17 - DockNode ID=0x00000031 Parent=0x00000021 SizeRef=994,924 Split=Y Selected=0x30F1BB17 - DockNode ID=0x00000034 Parent=0x00000031 SizeRef=1306,612 Split=Y Selected=0x30F1BB17 - DockNode ID=0x00000036 Parent=0x00000034 SizeRef=1306,104 Split=X Selected=0xE87781F4 - DockNode ID=0x00000039 Parent=0x00000036 SizeRef=650,976 Split=X Selected=0x9161DC35 - DockNode ID=0x00000044 Parent=0x00000039 SizeRef=1323,929 Split=X Selected=0xEB0CD24C - DockNode ID=0x0000004D Parent=0x00000044 SizeRef=774,939 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000050 Parent=0x0000004D SizeRef=1288,505 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000047 Parent=0x00000050 SizeRef=1288,940 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000041 Parent=0x00000047 SizeRef=1334,535 Split=Y Selected=0xEB0CD24C - DockNode ID=0x0000004E Parent=0x00000041 SizeRef=1323,558 CentralNode=1 Selected=0xEB0CD24C - DockNode ID=0x00000049 Parent=0x00000041 SizeRef=1323,364 Selected=0x9C8E2C2E - DockNode ID=0x0000003D Parent=0x00000047 SizeRef=1334,387 Selected=0x83AD6119 - DockNode ID=0x00000045 Parent=0x00000050 SizeRef=1288,45 HiddenTabBar=1 Selected=0x5853D90B - DockNode ID=0x0000004F Parent=0x0000004D SizeRef=1288,432 Selected=0xA7D171DA - DockNode ID=0x0000004C Parent=0x00000044 SizeRef=637,939 Selected=0x854D5944 - DockNode ID=0x00000028 Parent=0x00000039 SizeRef=595,929 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000048 Parent=0x00000028 SizeRef=636,437 Split=Y Selected=0x2D339E0D - DockNode ID=0x00000037 Parent=0x00000048 SizeRef=603,91 Selected=0x08C0CD78 - DockNode ID=0x0000003A Parent=0x00000048 SizeRef=603,330 Selected=0x2D339E0D - DockNode ID=0x00000046 Parent=0x00000028 SizeRef=636,532 Selected=0xFB2E9D5C - DockNode ID=0x00000038 Parent=0x00000036 SizeRef=538,976 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000042 Parent=0x00000038 SizeRef=627,488 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000032 Parent=0x00000042 SizeRef=749,569 Selected=0x38D929D4 - DockNode ID=0x00000043 Parent=0x00000042 SizeRef=749,405 Selected=0xFB2E9D5C - DockNode ID=0x00000040 Parent=0x00000038 SizeRef=627,486 Selected=0xFB2E9D5C - DockNode ID=0x00000035 Parent=0x00000034 SizeRef=1306,826 Selected=0x0D6175D2 - DockNode ID=0x00000033 Parent=0x00000031 SizeRef=1306,42 HiddenTabBar=1 Selected=0x75F17762 - DockNode ID=0x00000029 Parent=0x00000021 SizeRef=924,924 Selected=0x71143AF8 - DockNode ID=0x00000010 Parent=0x00000030 SizeRef=1517,308 Selected=0x88F44F2D - DockNode ID=0x0000002F Parent=0x00000024 SizeRef=1517,47 HiddenTabBar=1 Selected=0x9F8C1213 - DockNode ID=0x00000023 Parent=0x0000000D SizeRef=333,516 Selected=0x49278EEE - DockNode ID=0x0000000E Parent=0x0000001E SizeRef=271,464 Split=Y Selected=0x51A07D0A - DockNode ID=0x0000001B Parent=0x0000000E SizeRef=172,303 Selected=0x0545BD69 - DockNode ID=0x0000001C Parent=0x0000000E SizeRef=172,478 Selected=0x51A07D0A - DockNode ID=0x0000000C Parent=0x00000001 SizeRef=940,928 Selected=0xC8A2CA68 - DockNode ID=0x00000002 Parent=0x00000015 SizeRef=691,372 Selected=0x579B91DF - DockNode ID=0x00000016 Parent=0x00000011 SizeRef=1166,180 Selected=0x3B5C5433 - DockNode ID=0x00000012 Parent=0x00000006 SizeRef=395,567 Split=Y Selected=0xAC9ECCBA - DockNode ID=0x00000017 Parent=0x00000012 SizeRef=395,297 Selected=0xA4891924 - DockNode ID=0x00000018 Parent=0x00000012 SizeRef=395,423 Selected=0xAC9ECCBA - DockNode ID=0x00000007 Parent=0x0000000A SizeRef=230,982 Split=Y Selected=0x0545BD69 - DockNode ID=0x00000008 Parent=0x00000007 SizeRef=150,786 Selected=0x0545BD69 - DockNode ID=0x00000009 Parent=0x00000007 SizeRef=150,194 Split=Y Selected=0x97961354 - DockNode ID=0x00000013 Parent=0x00000009 SizeRef=400,97 Selected=0x97961354 - DockNode ID=0x00000014 Parent=0x00000009 SizeRef=400,95 Selected=0x0757C9E5 - DockNode ID=0x00000005 Parent=0x0000002A SizeRef=1920,41 HiddenTabBar=1 Selected=0xE75A179E - DockNode ID=0x00000027 Parent=0x00000025 SizeRef=692,977 Split=Y Selected=0x818036C6 - DockNode ID=0x0000002C Parent=0x00000027 SizeRef=130,499 Selected=0x818036C6 - DockNode ID=0x0000002B Parent=0x00000027 SizeRef=130,476 Split=Y Selected=0x12D5DF45 - DockNode ID=0x00000019 Parent=0x0000002B SizeRef=401,465 Split=Y Selected=0x148E1A1B - DockNode ID=0x0000002E Parent=0x00000019 SizeRef=401,282 Selected=0x148E1A1B - DockNode ID=0x0000002D Parent=0x00000019 SizeRef=401,238 Split=Y Selected=0x3CF15644 - DockNode ID=0x00000003 Parent=0x0000002D SizeRef=401,258 Selected=0x148E1A1B - DockNode ID=0x00000004 Parent=0x0000002D SizeRef=401,262 Selected=0x3CF15644 - DockNode ID=0x0000001A Parent=0x0000002B SizeRef=401,510 Selected=0x12D5DF45 - DockNode ID=0x0000000F Parent=0x0000003E SizeRef=1920,318 Split=X Selected=0xFB9F4E92 - DockNode ID=0x00000026 Parent=0x0000000F SizeRef=707,453 Selected=0xFB9F4E92 - DockNode ID=0x00000022 Parent=0x0000000F SizeRef=1211,453 Selected=0xCB44F1EA - DockNode ID=0x0000003C Parent=0x0000004B SizeRef=1920,326 Split=X Selected=0x3DE5F12B - DockNode ID=0x0000003B Parent=0x0000003C SizeRef=434,408 Selected=0x6DCF654B - DockNode ID=0x0000003F Parent=0x0000003C SizeRef=1484,408 Selected=0x3DE5F12B - DockNode ID=0x0000004A Parent=0xF3CABE56 SizeRef=1920,485 Selected=0x1CB07D66 +DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,53 Size=1920,979 Split=Y + DockNode ID=0x0000004B Parent=0xF3CABE56 SizeRef=1920,489 Split=Y + DockNode ID=0x0000003E Parent=0x0000004B SizeRef=1920,648 Split=Y + DockNode ID=0x00000025 Parent=0x0000003E SizeRef=1920,656 Split=X + DockNode ID=0x0000002A Parent=0x00000025 SizeRef=1226,977 Split=Y + DockNode ID=0x0000000A Parent=0x0000002A SizeRef=1920,934 Split=X + DockNode ID=0x00000006 Parent=0x0000000A SizeRef=1688,982 Split=X + DockNode ID=0x00000011 Parent=0x00000006 SizeRef=1166,567 Split=Y Selected=0xB20B5019 + DockNode ID=0x00000015 Parent=0x00000011 SizeRef=1166,540 Split=X Selected=0xB20B5019 + DockNode ID=0x00000001 Parent=0x00000015 SizeRef=1227,372 Split=X Selected=0x0139E51B + DockNode ID=0x0000000B Parent=0x00000001 SizeRef=746,928 Split=Y Selected=0x0139E51B + DockNode ID=0x0000001D Parent=0x0000000B SizeRef=872,444 Split=X Selected=0x612F12CA + DockNode ID=0x0000001F Parent=0x0000001D SizeRef=683,313 Selected=0xDA0F6C18 + DockNode ID=0x00000020 Parent=0x0000001D SizeRef=832,313 Selected=0x612F12CA + DockNode ID=0x0000001E Parent=0x0000000B SizeRef=872,531 Split=X Selected=0x0139E51B + DockNode ID=0x0000000D Parent=0x0000001E SizeRef=1244,464 Split=X Selected=0x12D5DF45 + DockNode ID=0x00000024 Parent=0x0000000D SizeRef=785,516 Split=Y Selected=0xF8A795D1 + DockNode ID=0x00000030 Parent=0x00000024 SizeRef=1517,472 Split=Y Selected=0xF8A795D1 + DockNode ID=0x00000021 Parent=0x00000030 SizeRef=1517,623 Split=X Selected=0x30F1BB17 + DockNode ID=0x00000031 Parent=0x00000021 SizeRef=994,924 Split=Y Selected=0x30F1BB17 + DockNode ID=0x00000034 Parent=0x00000031 SizeRef=1306,612 Split=Y Selected=0x30F1BB17 + DockNode ID=0x00000036 Parent=0x00000034 SizeRef=1306,104 Split=X Selected=0xE87781F4 + DockNode ID=0x00000039 Parent=0x00000036 SizeRef=650,976 Split=X Selected=0x9161DC35 + DockNode ID=0x00000044 Parent=0x00000039 SizeRef=1323,929 Split=X Selected=0xEB0CD24C + DockNode ID=0x0000004D Parent=0x00000044 SizeRef=774,939 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000050 Parent=0x0000004D SizeRef=1288,505 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000047 Parent=0x00000050 SizeRef=1288,940 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000041 Parent=0x00000047 SizeRef=1334,535 Split=Y Selected=0xEB0CD24C + DockNode ID=0x0000004E Parent=0x00000041 SizeRef=1323,558 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000052 Parent=0x0000004E SizeRef=1323,52 CentralNode=1 Selected=0xEB0CD24C + DockNode ID=0x00000051 Parent=0x0000004E SizeRef=1323,878 Selected=0x9161DC35 + DockNode ID=0x00000049 Parent=0x00000041 SizeRef=1323,364 Selected=0x9C8E2C2E + DockNode ID=0x0000003D Parent=0x00000047 SizeRef=1334,387 Selected=0x83AD6119 + DockNode ID=0x00000045 Parent=0x00000050 SizeRef=1288,45 HiddenTabBar=1 Selected=0x5853D90B + DockNode ID=0x0000004F Parent=0x0000004D SizeRef=1288,432 Selected=0xA7D171DA + DockNode ID=0x0000004C Parent=0x00000044 SizeRef=637,939 Selected=0x854D5944 + DockNode ID=0x00000028 Parent=0x00000039 SizeRef=595,929 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000048 Parent=0x00000028 SizeRef=636,437 Split=Y Selected=0x2D339E0D + DockNode ID=0x00000037 Parent=0x00000048 SizeRef=603,91 Selected=0x08C0CD78 + DockNode ID=0x0000003A Parent=0x00000048 SizeRef=603,330 Selected=0x2D339E0D + DockNode ID=0x00000046 Parent=0x00000028 SizeRef=636,532 Selected=0xFB2E9D5C + DockNode ID=0x00000038 Parent=0x00000036 SizeRef=538,976 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000042 Parent=0x00000038 SizeRef=627,488 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000032 Parent=0x00000042 SizeRef=749,569 Selected=0x38D929D4 + DockNode ID=0x00000043 Parent=0x00000042 SizeRef=749,405 Selected=0xFB2E9D5C + DockNode ID=0x00000040 Parent=0x00000038 SizeRef=627,486 Selected=0xFB2E9D5C + DockNode ID=0x00000035 Parent=0x00000034 SizeRef=1306,826 Selected=0x0D6175D2 + DockNode ID=0x00000033 Parent=0x00000031 SizeRef=1306,42 HiddenTabBar=1 Selected=0x75F17762 + DockNode ID=0x00000029 Parent=0x00000021 SizeRef=924,924 Selected=0x71143AF8 + DockNode ID=0x00000010 Parent=0x00000030 SizeRef=1517,308 Selected=0x88F44F2D + DockNode ID=0x0000002F Parent=0x00000024 SizeRef=1517,47 HiddenTabBar=1 Selected=0x9F8C1213 + DockNode ID=0x00000023 Parent=0x0000000D SizeRef=333,516 Selected=0x49278EEE + DockNode ID=0x0000000E Parent=0x0000001E SizeRef=271,464 Split=Y Selected=0x51A07D0A + DockNode ID=0x0000001B Parent=0x0000000E SizeRef=172,303 Selected=0x0545BD69 + DockNode ID=0x0000001C Parent=0x0000000E SizeRef=172,478 Selected=0x51A07D0A + DockNode ID=0x0000000C Parent=0x00000001 SizeRef=940,928 Selected=0xC8A2CA68 + DockNode ID=0x00000002 Parent=0x00000015 SizeRef=691,372 Selected=0x579B91DF + DockNode ID=0x00000016 Parent=0x00000011 SizeRef=1166,180 Selected=0x3B5C5433 + DockNode ID=0x00000012 Parent=0x00000006 SizeRef=395,567 Split=Y Selected=0xAC9ECCBA + DockNode ID=0x00000017 Parent=0x00000012 SizeRef=395,297 Selected=0xA4891924 + DockNode ID=0x00000018 Parent=0x00000012 SizeRef=395,423 Selected=0xAC9ECCBA + DockNode ID=0x00000007 Parent=0x0000000A SizeRef=230,982 Split=Y Selected=0x0545BD69 + DockNode ID=0x00000008 Parent=0x00000007 SizeRef=150,786 Selected=0x0545BD69 + DockNode ID=0x00000009 Parent=0x00000007 SizeRef=150,194 Split=Y Selected=0x97961354 + DockNode ID=0x00000013 Parent=0x00000009 SizeRef=400,97 Selected=0x97961354 + DockNode ID=0x00000014 Parent=0x00000009 SizeRef=400,95 Selected=0x0757C9E5 + DockNode ID=0x00000005 Parent=0x0000002A SizeRef=1920,41 HiddenTabBar=1 Selected=0xE75A179E + DockNode ID=0x00000027 Parent=0x00000025 SizeRef=692,977 Split=Y Selected=0x818036C6 + DockNode ID=0x0000002C Parent=0x00000027 SizeRef=130,499 Selected=0x818036C6 + DockNode ID=0x0000002B Parent=0x00000027 SizeRef=130,476 Split=Y Selected=0x12D5DF45 + DockNode ID=0x00000019 Parent=0x0000002B SizeRef=401,465 Split=Y Selected=0x148E1A1B + DockNode ID=0x0000002E Parent=0x00000019 SizeRef=401,282 Selected=0x148E1A1B + DockNode ID=0x0000002D Parent=0x00000019 SizeRef=401,238 Split=Y Selected=0x3CF15644 + DockNode ID=0x00000003 Parent=0x0000002D SizeRef=401,258 Selected=0x148E1A1B + DockNode ID=0x00000004 Parent=0x0000002D SizeRef=401,262 Selected=0x3CF15644 + DockNode ID=0x0000001A Parent=0x0000002B SizeRef=401,510 Selected=0x12D5DF45 + DockNode ID=0x0000000F Parent=0x0000003E SizeRef=1920,318 Split=X Selected=0xFB9F4E92 + DockNode ID=0x00000026 Parent=0x0000000F SizeRef=707,453 Selected=0xFB9F4E92 + DockNode ID=0x00000022 Parent=0x0000000F SizeRef=1211,453 Selected=0xCB44F1EA + DockNode ID=0x0000003C Parent=0x0000004B SizeRef=1920,326 Split=X Selected=0x3DE5F12B + DockNode ID=0x0000003B Parent=0x0000003C SizeRef=434,408 Selected=0x6DCF654B + DockNode ID=0x0000003F Parent=0x0000003C SizeRef=1484,408 Selected=0x3DE5F12B + DockNode ID=0x0000004A Parent=0xF3CABE56 SizeRef=1920,485 Selected=0x1CB07D66 diff --git a/src/Commands/generated/register_set_variable_commands.inl b/src/Commands/generated/register_set_variable_commands.inl index fb1206da..f41c9c3c 100644 --- a/src/Commands/generated/register_set_variable_commands.inl +++ b/src/Commands/generated/register_set_variable_commands.inl @@ -26,6 +26,7 @@ LAB_REGISTER_COMMAND(Lab::Command_SetVariable) LAB_REGISTER_COMMAND(Lab::Command_SetVariable) LAB_REGISTER_COMMAND(Lab::Command_SetVariable) LAB_REGISTER_COMMAND(Lab::Command_SetVariable) +LAB_REGISTER_COMMAND(Lab::Command_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) @@ -48,3 +49,5 @@ LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) +LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) + diff --git a/src/Commands/generated/register_set_variable_metadata_commands.inl b/src/Commands/generated/register_set_variable_metadata_commands.inl index 2730b7e7..d9ce7f38 100644 --- a/src/Commands/generated/register_set_variable_metadata_commands.inl +++ b/src/Commands/generated/register_set_variable_metadata_commands.inl @@ -26,3 +26,4 @@ LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) +LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) diff --git a/src/Commands/generated2/Command_SetCameraZoom.inl b/src/Commands/generated2/Command_SetCameraZoom.inl index e9275d4e..0584f79d 100644 --- a/src/Commands/generated2/Command_SetCameraZoom.inl +++ b/src/Commands/generated2/Command_SetCameraZoom.inl @@ -31,7 +31,7 @@ struct Command_SetCameraZoom { struct ReversibleCommand_SetCameraZoom { Command_SetCameraZoom forward_command{}; - float old_value{}; + float old_value{}; void execute(CommandExecutionContext_Ref& ctx) const { @@ -45,7 +45,8 @@ struct ReversibleCommand_SetCameraZoom { auto to_string() const -> std::string { - return "Set camera zoom from " + Cool::stringify(old_value) + " to " + Cool::stringify(forward_command.value); + return "Set camera zoom from " + Cool::stringify(old_value) + + " to " + Cool::stringify(forward_command.value); } auto merge(const ReversibleCommand_SetCameraZoom& previous) const -> std::optional @@ -86,3 +87,4 @@ void serialize(Archive& archive, Lab::ReversibleCommand_SetCameraZoom& command) } } // namespace cereal + From a3f0a7bee6e0fc86c25ba72b8c3f10954c853939 Mon Sep 17 00:00:00 2001 From: BruceLane Date: Sat, 15 Jul 2023 00:14:13 +0200 Subject: [PATCH 02/21] winmm.lib --- CMakeLists.txt | 6 +- imgui.ini | 202 +++++++++++++++++++++++++------------------------ src/App.cpp | 5 ++ src/App.h | 3 +- 4 files changed, 117 insertions(+), 99 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a09d245..9122f37f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,4 +97,8 @@ list(REMOVE_ITEM COOL_LAB_SOURCES ${CMAKE_SOURCE_DIR}/src/main.cpp) add_executable(Tests-Coollab tests/tests.cpp ${COOL_LAB_SOURCES}) target_compile_definitions(Tests-Coollab PRIVATE LAB_ENABLE_TESTS) target_link_libraries(Tests-Coollab PRIVATE Coollab-Properties) -target_link_libraries(Tests-Coollab PRIVATE doctest::doctest) \ No newline at end of file +target_link_libraries(Tests-Coollab PRIVATE doctest::doctest) + +if(WIN32) + target_link_libraries(Coollab-Properties INTERFACE winmm) +endif() \ No newline at end of file diff --git a/imgui.ini b/imgui.ini index 45c1ffb1..6405d72c 100644 --- a/imgui.ini +++ b/imgui.ini @@ -1,6 +1,6 @@ [Window][MyMainDockSpace] -Pos=0,30 -Size=1920,979 +Pos=0,0 +Size=1920,1009 Collapsed=0 [Window][Debug##Default] @@ -440,26 +440,26 @@ Collapsed=0 DockId=0x00000029,1 [Window][  View] -Pos=1325,473 -Size=595,536 +Pos=0,-23 +Size=32,32 Collapsed=0 DockId=0x00000046,0 [Window][  Nodes] -Pos=0,30 -Size=1323,52 +Pos=0,-23 +Size=1920,1009 Collapsed=0 DockId=0x00000052,0 [Window][  Time] Pos=0,964 -Size=1323,45 +Size=1920,45 Collapsed=0 DockId=0x00000045,0 [Window][  Cameras] -Pos=1325,30 -Size=595,441 +Pos=0,-23 +Size=32,46 Collapsed=0 DockId=0x0000003A,1 @@ -516,7 +516,7 @@ Collapsed=0 DockId=0x00000052,1 [Window][  Console] -Pos=963,352 +Pos=1325,473 Size=595,536 Collapsed=0 DockId=0x00000046,1 @@ -532,8 +532,8 @@ Size=491,190 Collapsed=0 [Window][  Test all Variable Widgets] -Pos=0,84 -Size=1323,878 +Pos=-26832,-3584 +Size=1920,468 Collapsed=0 DockId=0x00000051,0 @@ -549,8 +549,8 @@ Size=517,577 Collapsed=0 [Window][  Inspector] -Pos=1325,30 -Size=595,441 +Pos=-26832,-4160 +Size=32,46 Collapsed=0 DockId=0x0000003A,0 @@ -610,6 +610,12 @@ Size=1323,364 Collapsed=0 DockId=0x00000049,0 +[Window][MIDI] +Pos=0,534 +Size=1323,428 +Collapsed=0 +DockId=0x00000053,0 + [Table][0x4EF0CFBB,2] Column 0 Weight=1.0000 Column 1 Weight=1.0000 @@ -672,87 +678,89 @@ Column 1 Weight=1.0000 Column 2 Weight=1.0000 [Docking][Data] -DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,53 Size=1920,979 Split=Y - DockNode ID=0x0000004B Parent=0xF3CABE56 SizeRef=1920,489 Split=Y - DockNode ID=0x0000003E Parent=0x0000004B SizeRef=1920,648 Split=Y - DockNode ID=0x00000025 Parent=0x0000003E SizeRef=1920,656 Split=X - DockNode ID=0x0000002A Parent=0x00000025 SizeRef=1226,977 Split=Y - DockNode ID=0x0000000A Parent=0x0000002A SizeRef=1920,934 Split=X - DockNode ID=0x00000006 Parent=0x0000000A SizeRef=1688,982 Split=X - DockNode ID=0x00000011 Parent=0x00000006 SizeRef=1166,567 Split=Y Selected=0xB20B5019 - DockNode ID=0x00000015 Parent=0x00000011 SizeRef=1166,540 Split=X Selected=0xB20B5019 - DockNode ID=0x00000001 Parent=0x00000015 SizeRef=1227,372 Split=X Selected=0x0139E51B - DockNode ID=0x0000000B Parent=0x00000001 SizeRef=746,928 Split=Y Selected=0x0139E51B - DockNode ID=0x0000001D Parent=0x0000000B SizeRef=872,444 Split=X Selected=0x612F12CA - DockNode ID=0x0000001F Parent=0x0000001D SizeRef=683,313 Selected=0xDA0F6C18 - DockNode ID=0x00000020 Parent=0x0000001D SizeRef=832,313 Selected=0x612F12CA - DockNode ID=0x0000001E Parent=0x0000000B SizeRef=872,531 Split=X Selected=0x0139E51B - DockNode ID=0x0000000D Parent=0x0000001E SizeRef=1244,464 Split=X Selected=0x12D5DF45 - DockNode ID=0x00000024 Parent=0x0000000D SizeRef=785,516 Split=Y Selected=0xF8A795D1 - DockNode ID=0x00000030 Parent=0x00000024 SizeRef=1517,472 Split=Y Selected=0xF8A795D1 - DockNode ID=0x00000021 Parent=0x00000030 SizeRef=1517,623 Split=X Selected=0x30F1BB17 - DockNode ID=0x00000031 Parent=0x00000021 SizeRef=994,924 Split=Y Selected=0x30F1BB17 - DockNode ID=0x00000034 Parent=0x00000031 SizeRef=1306,612 Split=Y Selected=0x30F1BB17 - DockNode ID=0x00000036 Parent=0x00000034 SizeRef=1306,104 Split=X Selected=0xE87781F4 - DockNode ID=0x00000039 Parent=0x00000036 SizeRef=650,976 Split=X Selected=0x9161DC35 - DockNode ID=0x00000044 Parent=0x00000039 SizeRef=1323,929 Split=X Selected=0xEB0CD24C - DockNode ID=0x0000004D Parent=0x00000044 SizeRef=774,939 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000050 Parent=0x0000004D SizeRef=1288,505 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000047 Parent=0x00000050 SizeRef=1288,940 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000041 Parent=0x00000047 SizeRef=1334,535 Split=Y Selected=0xEB0CD24C - DockNode ID=0x0000004E Parent=0x00000041 SizeRef=1323,558 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000052 Parent=0x0000004E SizeRef=1323,52 CentralNode=1 Selected=0xEB0CD24C - DockNode ID=0x00000051 Parent=0x0000004E SizeRef=1323,878 Selected=0x9161DC35 - DockNode ID=0x00000049 Parent=0x00000041 SizeRef=1323,364 Selected=0x9C8E2C2E - DockNode ID=0x0000003D Parent=0x00000047 SizeRef=1334,387 Selected=0x83AD6119 - DockNode ID=0x00000045 Parent=0x00000050 SizeRef=1288,45 HiddenTabBar=1 Selected=0x5853D90B - DockNode ID=0x0000004F Parent=0x0000004D SizeRef=1288,432 Selected=0xA7D171DA - DockNode ID=0x0000004C Parent=0x00000044 SizeRef=637,939 Selected=0x854D5944 - DockNode ID=0x00000028 Parent=0x00000039 SizeRef=595,929 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000048 Parent=0x00000028 SizeRef=636,437 Split=Y Selected=0x2D339E0D - DockNode ID=0x00000037 Parent=0x00000048 SizeRef=603,91 Selected=0x08C0CD78 - DockNode ID=0x0000003A Parent=0x00000048 SizeRef=603,330 Selected=0x2D339E0D - DockNode ID=0x00000046 Parent=0x00000028 SizeRef=636,532 Selected=0xFB2E9D5C - DockNode ID=0x00000038 Parent=0x00000036 SizeRef=538,976 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000042 Parent=0x00000038 SizeRef=627,488 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000032 Parent=0x00000042 SizeRef=749,569 Selected=0x38D929D4 - DockNode ID=0x00000043 Parent=0x00000042 SizeRef=749,405 Selected=0xFB2E9D5C - DockNode ID=0x00000040 Parent=0x00000038 SizeRef=627,486 Selected=0xFB2E9D5C - DockNode ID=0x00000035 Parent=0x00000034 SizeRef=1306,826 Selected=0x0D6175D2 - DockNode ID=0x00000033 Parent=0x00000031 SizeRef=1306,42 HiddenTabBar=1 Selected=0x75F17762 - DockNode ID=0x00000029 Parent=0x00000021 SizeRef=924,924 Selected=0x71143AF8 - DockNode ID=0x00000010 Parent=0x00000030 SizeRef=1517,308 Selected=0x88F44F2D - DockNode ID=0x0000002F Parent=0x00000024 SizeRef=1517,47 HiddenTabBar=1 Selected=0x9F8C1213 - DockNode ID=0x00000023 Parent=0x0000000D SizeRef=333,516 Selected=0x49278EEE - DockNode ID=0x0000000E Parent=0x0000001E SizeRef=271,464 Split=Y Selected=0x51A07D0A - DockNode ID=0x0000001B Parent=0x0000000E SizeRef=172,303 Selected=0x0545BD69 - DockNode ID=0x0000001C Parent=0x0000000E SizeRef=172,478 Selected=0x51A07D0A - DockNode ID=0x0000000C Parent=0x00000001 SizeRef=940,928 Selected=0xC8A2CA68 - DockNode ID=0x00000002 Parent=0x00000015 SizeRef=691,372 Selected=0x579B91DF - DockNode ID=0x00000016 Parent=0x00000011 SizeRef=1166,180 Selected=0x3B5C5433 - DockNode ID=0x00000012 Parent=0x00000006 SizeRef=395,567 Split=Y Selected=0xAC9ECCBA - DockNode ID=0x00000017 Parent=0x00000012 SizeRef=395,297 Selected=0xA4891924 - DockNode ID=0x00000018 Parent=0x00000012 SizeRef=395,423 Selected=0xAC9ECCBA - DockNode ID=0x00000007 Parent=0x0000000A SizeRef=230,982 Split=Y Selected=0x0545BD69 - DockNode ID=0x00000008 Parent=0x00000007 SizeRef=150,786 Selected=0x0545BD69 - DockNode ID=0x00000009 Parent=0x00000007 SizeRef=150,194 Split=Y Selected=0x97961354 - DockNode ID=0x00000013 Parent=0x00000009 SizeRef=400,97 Selected=0x97961354 - DockNode ID=0x00000014 Parent=0x00000009 SizeRef=400,95 Selected=0x0757C9E5 - DockNode ID=0x00000005 Parent=0x0000002A SizeRef=1920,41 HiddenTabBar=1 Selected=0xE75A179E - DockNode ID=0x00000027 Parent=0x00000025 SizeRef=692,977 Split=Y Selected=0x818036C6 - DockNode ID=0x0000002C Parent=0x00000027 SizeRef=130,499 Selected=0x818036C6 - DockNode ID=0x0000002B Parent=0x00000027 SizeRef=130,476 Split=Y Selected=0x12D5DF45 - DockNode ID=0x00000019 Parent=0x0000002B SizeRef=401,465 Split=Y Selected=0x148E1A1B - DockNode ID=0x0000002E Parent=0x00000019 SizeRef=401,282 Selected=0x148E1A1B - DockNode ID=0x0000002D Parent=0x00000019 SizeRef=401,238 Split=Y Selected=0x3CF15644 - DockNode ID=0x00000003 Parent=0x0000002D SizeRef=401,258 Selected=0x148E1A1B - DockNode ID=0x00000004 Parent=0x0000002D SizeRef=401,262 Selected=0x3CF15644 - DockNode ID=0x0000001A Parent=0x0000002B SizeRef=401,510 Selected=0x12D5DF45 - DockNode ID=0x0000000F Parent=0x0000003E SizeRef=1920,318 Split=X Selected=0xFB9F4E92 - DockNode ID=0x00000026 Parent=0x0000000F SizeRef=707,453 Selected=0xFB9F4E92 - DockNode ID=0x00000022 Parent=0x0000000F SizeRef=1211,453 Selected=0xCB44F1EA - DockNode ID=0x0000003C Parent=0x0000004B SizeRef=1920,326 Split=X Selected=0x3DE5F12B - DockNode ID=0x0000003B Parent=0x0000003C SizeRef=434,408 Selected=0x6DCF654B - DockNode ID=0x0000003F Parent=0x0000003C SizeRef=1484,408 Selected=0x3DE5F12B - DockNode ID=0x0000004A Parent=0xF3CABE56 SizeRef=1920,485 Selected=0x1CB07D66 +DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,23 Size=1920,1009 Split=Y + DockNode ID=0x0000004B Parent=0xF3CABE56 SizeRef=1920,489 Split=Y + DockNode ID=0x0000003E Parent=0x0000004B SizeRef=1920,648 Split=Y + DockNode ID=0x00000025 Parent=0x0000003E SizeRef=1920,656 Split=X + DockNode ID=0x0000002A Parent=0x00000025 SizeRef=1226,977 Split=Y + DockNode ID=0x0000000A Parent=0x0000002A SizeRef=1920,934 Split=X + DockNode ID=0x00000006 Parent=0x0000000A SizeRef=1688,982 Split=X + DockNode ID=0x00000011 Parent=0x00000006 SizeRef=1166,567 Split=Y Selected=0xB20B5019 + DockNode ID=0x00000015 Parent=0x00000011 SizeRef=1166,540 Split=X Selected=0xB20B5019 + DockNode ID=0x00000001 Parent=0x00000015 SizeRef=1227,372 Split=X Selected=0x0139E51B + DockNode ID=0x0000000B Parent=0x00000001 SizeRef=746,928 Split=Y Selected=0x0139E51B + DockNode ID=0x0000001D Parent=0x0000000B SizeRef=872,444 Split=X Selected=0x612F12CA + DockNode ID=0x0000001F Parent=0x0000001D SizeRef=683,313 Selected=0xDA0F6C18 + DockNode ID=0x00000020 Parent=0x0000001D SizeRef=832,313 Selected=0x612F12CA + DockNode ID=0x0000001E Parent=0x0000000B SizeRef=872,531 Split=X Selected=0x0139E51B + DockNode ID=0x0000000D Parent=0x0000001E SizeRef=1244,464 Split=X Selected=0x12D5DF45 + DockNode ID=0x00000024 Parent=0x0000000D SizeRef=785,516 Split=Y Selected=0xF8A795D1 + DockNode ID=0x00000030 Parent=0x00000024 SizeRef=1517,472 Split=Y Selected=0xF8A795D1 + DockNode ID=0x00000021 Parent=0x00000030 SizeRef=1517,623 Split=X Selected=0x30F1BB17 + DockNode ID=0x00000031 Parent=0x00000021 SizeRef=994,924 Split=Y Selected=0x30F1BB17 + DockNode ID=0x00000034 Parent=0x00000031 SizeRef=1306,612 Split=Y Selected=0x30F1BB17 + DockNode ID=0x00000036 Parent=0x00000034 SizeRef=1306,104 Split=X Selected=0xE87781F4 + DockNode ID=0x00000039 Parent=0x00000036 SizeRef=650,976 Split=X Selected=0x9161DC35 + DockNode ID=0x00000044 Parent=0x00000039 SizeRef=1323,929 Split=X Selected=0xEB0CD24C + DockNode ID=0x0000004D Parent=0x00000044 SizeRef=774,939 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000050 Parent=0x0000004D SizeRef=1288,505 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000047 Parent=0x00000050 SizeRef=1288,940 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000041 Parent=0x00000047 SizeRef=1334,535 Split=Y Selected=0xEB0CD24C + DockNode ID=0x0000004E Parent=0x00000041 SizeRef=1323,558 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000054 Parent=0x0000004E SizeRef=1323,502 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000052 Parent=0x00000054 SizeRef=1323,32 CentralNode=1 Selected=0xEB0CD24C + DockNode ID=0x00000051 Parent=0x00000054 SizeRef=1323,468 Selected=0x9161DC35 + DockNode ID=0x00000053 Parent=0x0000004E SizeRef=1323,428 Selected=0x6F8192F9 + DockNode ID=0x00000049 Parent=0x00000041 SizeRef=1323,364 Selected=0x9C8E2C2E + DockNode ID=0x0000003D Parent=0x00000047 SizeRef=1334,387 Selected=0x83AD6119 + DockNode ID=0x00000045 Parent=0x00000050 SizeRef=1288,45 HiddenTabBar=1 Selected=0x5853D90B + DockNode ID=0x0000004F Parent=0x0000004D SizeRef=1288,432 Selected=0xA7D171DA + DockNode ID=0x0000004C Parent=0x00000044 SizeRef=637,939 Selected=0x854D5944 + DockNode ID=0x00000028 Parent=0x00000039 SizeRef=595,929 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000048 Parent=0x00000028 SizeRef=636,437 Split=Y Selected=0x2D339E0D + DockNode ID=0x00000037 Parent=0x00000048 SizeRef=603,91 Selected=0x08C0CD78 + DockNode ID=0x0000003A Parent=0x00000048 SizeRef=603,330 Selected=0x2D339E0D + DockNode ID=0x00000046 Parent=0x00000028 SizeRef=636,532 Selected=0xFB2E9D5C + DockNode ID=0x00000038 Parent=0x00000036 SizeRef=538,976 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000042 Parent=0x00000038 SizeRef=627,488 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000032 Parent=0x00000042 SizeRef=749,569 Selected=0x38D929D4 + DockNode ID=0x00000043 Parent=0x00000042 SizeRef=749,405 Selected=0xFB2E9D5C + DockNode ID=0x00000040 Parent=0x00000038 SizeRef=627,486 Selected=0xFB2E9D5C + DockNode ID=0x00000035 Parent=0x00000034 SizeRef=1306,826 Selected=0x0D6175D2 + DockNode ID=0x00000033 Parent=0x00000031 SizeRef=1306,42 HiddenTabBar=1 Selected=0x75F17762 + DockNode ID=0x00000029 Parent=0x00000021 SizeRef=924,924 Selected=0x71143AF8 + DockNode ID=0x00000010 Parent=0x00000030 SizeRef=1517,308 Selected=0x88F44F2D + DockNode ID=0x0000002F Parent=0x00000024 SizeRef=1517,47 HiddenTabBar=1 Selected=0x9F8C1213 + DockNode ID=0x00000023 Parent=0x0000000D SizeRef=333,516 Selected=0x49278EEE + DockNode ID=0x0000000E Parent=0x0000001E SizeRef=271,464 Split=Y Selected=0x51A07D0A + DockNode ID=0x0000001B Parent=0x0000000E SizeRef=172,303 Selected=0x0545BD69 + DockNode ID=0x0000001C Parent=0x0000000E SizeRef=172,478 Selected=0x51A07D0A + DockNode ID=0x0000000C Parent=0x00000001 SizeRef=940,928 Selected=0xC8A2CA68 + DockNode ID=0x00000002 Parent=0x00000015 SizeRef=691,372 Selected=0x579B91DF + DockNode ID=0x00000016 Parent=0x00000011 SizeRef=1166,180 Selected=0x3B5C5433 + DockNode ID=0x00000012 Parent=0x00000006 SizeRef=395,567 Split=Y Selected=0xAC9ECCBA + DockNode ID=0x00000017 Parent=0x00000012 SizeRef=395,297 Selected=0xA4891924 + DockNode ID=0x00000018 Parent=0x00000012 SizeRef=395,423 Selected=0xAC9ECCBA + DockNode ID=0x00000007 Parent=0x0000000A SizeRef=230,982 Split=Y Selected=0x0545BD69 + DockNode ID=0x00000008 Parent=0x00000007 SizeRef=150,786 Selected=0x0545BD69 + DockNode ID=0x00000009 Parent=0x00000007 SizeRef=150,194 Split=Y Selected=0x97961354 + DockNode ID=0x00000013 Parent=0x00000009 SizeRef=400,97 Selected=0x97961354 + DockNode ID=0x00000014 Parent=0x00000009 SizeRef=400,95 Selected=0x0757C9E5 + DockNode ID=0x00000005 Parent=0x0000002A SizeRef=1920,41 HiddenTabBar=1 Selected=0xE75A179E + DockNode ID=0x00000027 Parent=0x00000025 SizeRef=692,977 Split=Y Selected=0x818036C6 + DockNode ID=0x0000002C Parent=0x00000027 SizeRef=130,499 Selected=0x818036C6 + DockNode ID=0x0000002B Parent=0x00000027 SizeRef=130,476 Split=Y Selected=0x12D5DF45 + DockNode ID=0x00000019 Parent=0x0000002B SizeRef=401,465 Split=Y Selected=0x148E1A1B + DockNode ID=0x0000002E Parent=0x00000019 SizeRef=401,282 Selected=0x148E1A1B + DockNode ID=0x0000002D Parent=0x00000019 SizeRef=401,238 Split=Y Selected=0x3CF15644 + DockNode ID=0x00000003 Parent=0x0000002D SizeRef=401,258 Selected=0x148E1A1B + DockNode ID=0x00000004 Parent=0x0000002D SizeRef=401,262 Selected=0x3CF15644 + DockNode ID=0x0000001A Parent=0x0000002B SizeRef=401,510 Selected=0x12D5DF45 + DockNode ID=0x0000000F Parent=0x0000003E SizeRef=1920,318 Split=X Selected=0xFB9F4E92 + DockNode ID=0x00000026 Parent=0x0000000F SizeRef=707,453 Selected=0xFB9F4E92 + DockNode ID=0x00000022 Parent=0x0000000F SizeRef=1211,453 Selected=0xCB44F1EA + DockNode ID=0x0000003C Parent=0x0000004B SizeRef=1920,326 Split=X Selected=0x3DE5F12B + DockNode ID=0x0000003B Parent=0x0000003C SizeRef=434,408 Selected=0x6DCF654B + DockNode ID=0x0000003F Parent=0x0000003C SizeRef=1484,408 Selected=0x3DE5F12B + DockNode ID=0x0000004A Parent=0xF3CABE56 SizeRef=1920,485 Selected=0x1CB07D66 diff --git a/src/App.cpp b/src/App.cpp index 34333e23..d99098f3 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -353,6 +353,11 @@ void App::imgui_window_view() void App::imgui_windows() { + /* endless loop + ImGui::Begin("MIDI"); + // _midi_manager.imgui(); + ImGui::End();*/ + _midi_manager.connect(); imgui_window_view(); imgui_window_exporter(_exporter, polaroid(), _clock.time()); imgui_window_console(); diff --git a/src/App.h b/src/App.h index 13f9013e..3de6b033 100644 --- a/src/App.h +++ b/src/App.h @@ -27,6 +27,7 @@ #include "Dependencies/UpdateContext_Ref.h" #include "Gallery/GalleryPoster.h" #include "Module_Nodes/Module_Nodes.h" +#include namespace Lab { @@ -120,7 +121,7 @@ class App : public Cool::IApp { bool _view_was_in_fullscreen_last_frame{false}; GalleryPoster _gallery_poster{}; Cool::TipsManager _tips_manager{}; - + Cool::MidiManager _midi_manager{}; private: // Serialization friend class cereal::access; From 7e59fe08d780856cc118748b17164ab847062fef Mon Sep 17 00:00:00 2001 From: BruceLane Date: Sat, 15 Jul 2023 17:28:44 +0200 Subject: [PATCH 03/21] midi connect ok --- Cool | 2 +- imgui.ini | 26 +++++++++++++------------- src/App.cpp | 8 ++++---- src/App.h | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cool b/Cool index e1482687..58505ed5 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit e148268743e2694632fddc137f657cb4ef5fae04 +Subproject commit 58505ed53a8c82eff66abc82bf40d3835da4b7e5 diff --git a/imgui.ini b/imgui.ini index 6405d72c..ccb308b7 100644 --- a/imgui.ini +++ b/imgui.ini @@ -1,6 +1,6 @@ [Window][MyMainDockSpace] -Pos=0,0 -Size=1920,1009 +Pos=0,30 +Size=1920,979 Collapsed=0 [Window][Debug##Default] @@ -440,26 +440,26 @@ Collapsed=0 DockId=0x00000029,1 [Window][  View] -Pos=0,-23 -Size=32,32 +Pos=1325,473 +Size=595,536 Collapsed=0 DockId=0x00000046,0 [Window][  Nodes] -Pos=0,-23 -Size=1920,1009 +Pos=0,30 +Size=1323,502 Collapsed=0 DockId=0x00000052,0 [Window][  Time] Pos=0,964 -Size=1920,45 +Size=1323,45 Collapsed=0 DockId=0x00000045,0 [Window][  Cameras] -Pos=0,-23 -Size=32,46 +Pos=1325,30 +Size=595,441 Collapsed=0 DockId=0x0000003A,1 @@ -532,7 +532,7 @@ Size=491,190 Collapsed=0 [Window][  Test all Variable Widgets] -Pos=-26832,-3584 +Pos=-26832,-3616 Size=1920,468 Collapsed=0 DockId=0x00000051,0 @@ -549,8 +549,8 @@ Size=517,577 Collapsed=0 [Window][  Inspector] -Pos=-26832,-4160 -Size=32,46 +Pos=1325,30 +Size=595,441 Collapsed=0 DockId=0x0000003A,0 @@ -678,7 +678,7 @@ Column 1 Weight=1.0000 Column 2 Weight=1.0000 [Docking][Data] -DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,23 Size=1920,1009 Split=Y +DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,53 Size=1920,979 Split=Y DockNode ID=0x0000004B Parent=0xF3CABE56 SizeRef=1920,489 Split=Y DockNode ID=0x0000003E Parent=0x0000004B SizeRef=1920,648 Split=Y DockNode ID=0x00000025 Parent=0x0000003E SizeRef=1920,656 Split=X diff --git a/src/App.cpp b/src/App.cpp index d99098f3..12333d81 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -33,6 +33,7 @@ #include "UI/imgui_show.h" #include "img/img.hpp" #include "imgui.h" +#include "Cool/Midi/MidiManager.h" namespace Lab { @@ -42,6 +43,7 @@ App::App(Cool::WindowManager& windows, Cool::ViewsManager& views) , _nodes_view{views.make_view(Cool::icon_fmt("View", ICOMOON_IMAGE))} , _nodes_module{std::make_unique(dirty_flag_factory(), input_factory())} { + Cool::midi_manager().connect(); _camera_manager.is_editable_in_view() = false; _camera_manager.hook_events(_nodes_view.mouse_events(), _variable_registries, command_executor(), [this]() { trigger_rerender(); }); hook_camera2D_events( @@ -353,11 +355,9 @@ void App::imgui_window_view() void App::imgui_windows() { - /* endless loop ImGui::Begin("MIDI"); - // _midi_manager.imgui(); - ImGui::End();*/ - _midi_manager.connect(); + Cool::midi_manager().imgui(); + ImGui::End(); imgui_window_view(); imgui_window_exporter(_exporter, polaroid(), _clock.time()); imgui_window_console(); diff --git a/src/App.h b/src/App.h index 3de6b033..a343ef6a 100644 --- a/src/App.h +++ b/src/App.h @@ -121,7 +121,7 @@ class App : public Cool::IApp { bool _view_was_in_fullscreen_last_frame{false}; GalleryPoster _gallery_poster{}; Cool::TipsManager _tips_manager{}; - Cool::MidiManager _midi_manager{}; + // Cool::MidiManager _midi_manager{}; private: // Serialization friend class cereal::access; From e10ea109e6ff5ce1f15a13883d4bd46775407fec Mon Sep 17 00:00:00 2001 From: BruceLane Date: Sat, 15 Jul 2023 19:06:41 +0200 Subject: [PATCH 04/21] midi port name --- Cool | 2 +- imgui.ini | 17 ++++++++++++----- src/App.h | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Cool b/Cool index 58505ed5..7ffbbe48 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 58505ed53a8c82eff66abc82bf40d3835da4b7e5 +Subproject commit 7ffbbe483dc5bdb1d6f31d16928e0356ce8c4977 diff --git a/imgui.ini b/imgui.ini index ccb308b7..b64245e6 100644 --- a/imgui.ini +++ b/imgui.ini @@ -447,7 +447,7 @@ DockId=0x00000046,0 [Window][  Nodes] Pos=0,30 -Size=1323,502 +Size=1323,335 Collapsed=0 DockId=0x00000052,0 @@ -532,8 +532,8 @@ Size=491,190 Collapsed=0 [Window][  Test all Variable Widgets] -Pos=-26832,-3616 -Size=1920,468 +Pos=0,367 +Size=1323,165 Collapsed=0 DockId=0x00000051,0 @@ -616,6 +616,12 @@ Size=1323,428 Collapsed=0 DockId=0x00000053,0 +[Window][ nanoKONTROL2 0##s0] +Pos=162,703 +Size=409,94 +Collapsed=0 +DockId=0x00000055,0 + [Table][0x4EF0CFBB,2] Column 0 Weight=1.0000 Column 1 Weight=1.0000 @@ -678,6 +684,7 @@ Column 1 Weight=1.0000 Column 2 Weight=1.0000 [Docking][Data] +DockNode ID=0x00000055 Pos=162,726 Size=409,94 Selected=0xB89FB451 DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,53 Size=1920,979 Split=Y DockNode ID=0x0000004B Parent=0xF3CABE56 SizeRef=1920,489 Split=Y DockNode ID=0x0000003E Parent=0x0000004B SizeRef=1920,648 Split=Y @@ -708,8 +715,8 @@ DockSpace ID=0xF3CABE56 Wi DockNode ID=0x00000041 Parent=0x00000047 SizeRef=1334,535 Split=Y Selected=0xEB0CD24C DockNode ID=0x0000004E Parent=0x00000041 SizeRef=1323,558 Split=Y Selected=0xEB0CD24C DockNode ID=0x00000054 Parent=0x0000004E SizeRef=1323,502 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000052 Parent=0x00000054 SizeRef=1323,32 CentralNode=1 Selected=0xEB0CD24C - DockNode ID=0x00000051 Parent=0x00000054 SizeRef=1323,468 Selected=0x9161DC35 + DockNode ID=0x00000052 Parent=0x00000054 SizeRef=1323,335 CentralNode=1 Selected=0xEB0CD24C + DockNode ID=0x00000051 Parent=0x00000054 SizeRef=1323,165 Selected=0x9161DC35 DockNode ID=0x00000053 Parent=0x0000004E SizeRef=1323,428 Selected=0x6F8192F9 DockNode ID=0x00000049 Parent=0x00000041 SizeRef=1323,364 Selected=0x9C8E2C2E DockNode ID=0x0000003D Parent=0x00000047 SizeRef=1334,387 Selected=0x83AD6119 diff --git a/src/App.h b/src/App.h index a343ef6a..e397ce8e 100644 --- a/src/App.h +++ b/src/App.h @@ -121,7 +121,7 @@ class App : public Cool::IApp { bool _view_was_in_fullscreen_last_frame{false}; GalleryPoster _gallery_poster{}; Cool::TipsManager _tips_manager{}; - // Cool::MidiManager _midi_manager{}; + private: // Serialization friend class cereal::access; From d43af3ba0fd3dba769e0db98dbb4e0a4897f20c5 Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Sat, 15 Jul 2023 23:31:29 +0200 Subject: [PATCH 05/21] =?UTF-8?q?=F0=9F=9F=A6=20[Midi]=20Added=20Midi=20no?= =?UTF-8?q?de?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- Nodes/60 Input/Midi.clbnode | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 Nodes/60 Input/Midi.clbnode diff --git a/Cool b/Cool index 7ffbbe48..c69713ba 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 7ffbbe483dc5bdb1d6f31d16928e0356ce8c4977 +Subproject commit c69713baeec2cf8c8a7b1cd7a296d8d6d4b7c389 diff --git a/Nodes/60 Input/Midi.clbnode b/Nodes/60 Input/Midi.clbnode new file mode 100644 index 00000000..844a1a54 --- /dev/null +++ b/Nodes/60 Input/Midi.clbnode @@ -0,0 +1,8 @@ +// To learn how to write nodes, see https://coollab-art.com/Tutorials/Writing%20Nodes/Intro + +INPUT Midi `Midi Index`; + +float main() +{ + return `Midi Index`; +} \ No newline at end of file From bf38a8daff611b9f1ebf012f515d67455e45743c Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Sat, 15 Jul 2023 23:53:18 +0200 Subject: [PATCH 06/21] =?UTF-8?q?=E2=9C=A8=20[Midi]=20Added=20a=20DebugOpt?= =?UTF-8?q?ion=20to=20emulate=20a=20Midi=20keyboard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- src/App.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Cool b/Cool index c69713ba..42b1f9bd 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit c69713baeec2cf8c8a7b1cd7a296d8d6d4b7c389 +Subproject commit 42b1f9bd3d09ae6fddfd1c488f3f854cecae592b diff --git a/src/App.cpp b/src/App.cpp index 12333d81..c17aac86 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -22,6 +22,7 @@ #include "Cool/ImGui/ImGuiExtras.h" #include "Cool/Input/MouseCoordinates.h" #include "Cool/Log/Message.h" +#include "Cool/Midi/MidiManager.h" #include "Cool/Tips/test_tips.h" #include "Cool/View/ViewsManager.h" #include "Debug/DebugOptions.h" @@ -33,7 +34,7 @@ #include "UI/imgui_show.h" #include "img/img.hpp" #include "imgui.h" -#include "Cool/Midi/MidiManager.h" + namespace Lab { @@ -43,7 +44,7 @@ App::App(Cool::WindowManager& windows, Cool::ViewsManager& views) , _nodes_view{views.make_view(Cool::icon_fmt("View", ICOMOON_IMAGE))} , _nodes_module{std::make_unique(dirty_flag_factory(), input_factory())} { - Cool::midi_manager().connect(); + Cool::midi_manager().connect(); _camera_manager.is_editable_in_view() = false; _camera_manager.hook_events(_nodes_view.mouse_events(), _variable_registries, command_executor(), [this]() { trigger_rerender(); }); hook_camera2D_events( @@ -438,6 +439,10 @@ void App::imgui_windows_only_when_inputs_are_allowed() Cool::test_markdown_formatting(); }); + Cool::DebugOptions::emulate_midi_keyboard([]() { + Cool::midi_manager().imgui_emulate_midi_keyboard(); + }); + Cool::DebugOptions::test_tips([this]() { test_tips(_tips_manager); }); From 21708d0e0735efaa1e4cd4e17471fc2c89a5a40d Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Sat, 15 Jul 2023 23:58:08 +0200 Subject: [PATCH 07/21] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20clang-format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- src/App.cpp | 1 - src/App.h | 2 +- src/Commands/generated/register_set_variable_commands.inl | 1 - src/Commands/generated2/Command_SetCameraZoom.inl | 6 ++---- src/Module_Nodes/CodeGen.cpp | 2 +- src/Module_Nodes/CodeGen_default_function.cpp | 2 +- 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Cool b/Cool index 42b1f9bd..fcdb2fa3 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 42b1f9bd3d09ae6fddfd1c488f3f854cecae592b +Subproject commit fcdb2fa3d425fcc4b12e866fb332eabb64faaa20 diff --git a/src/App.cpp b/src/App.cpp index c17aac86..f1f391cf 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -35,7 +35,6 @@ #include "img/img.hpp" #include "imgui.h" - namespace Lab { App::App(Cool::WindowManager& windows, Cool::ViewsManager& views) diff --git a/src/App.h b/src/App.h index e397ce8e..830d465e 100644 --- a/src/App.h +++ b/src/App.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -27,7 +28,6 @@ #include "Dependencies/UpdateContext_Ref.h" #include "Gallery/GalleryPoster.h" #include "Module_Nodes/Module_Nodes.h" -#include namespace Lab { diff --git a/src/Commands/generated/register_set_variable_commands.inl b/src/Commands/generated/register_set_variable_commands.inl index f41c9c3c..0badbd99 100644 --- a/src/Commands/generated/register_set_variable_commands.inl +++ b/src/Commands/generated/register_set_variable_commands.inl @@ -50,4 +50,3 @@ LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) - diff --git a/src/Commands/generated2/Command_SetCameraZoom.inl b/src/Commands/generated2/Command_SetCameraZoom.inl index 0584f79d..e9275d4e 100644 --- a/src/Commands/generated2/Command_SetCameraZoom.inl +++ b/src/Commands/generated2/Command_SetCameraZoom.inl @@ -31,7 +31,7 @@ struct Command_SetCameraZoom { struct ReversibleCommand_SetCameraZoom { Command_SetCameraZoom forward_command{}; - float old_value{}; + float old_value{}; void execute(CommandExecutionContext_Ref& ctx) const { @@ -45,8 +45,7 @@ struct ReversibleCommand_SetCameraZoom { auto to_string() const -> std::string { - return "Set camera zoom from " + Cool::stringify(old_value) + - " to " + Cool::stringify(forward_command.value); + return "Set camera zoom from " + Cool::stringify(old_value) + " to " + Cool::stringify(forward_command.value); } auto merge(const ReversibleCommand_SetCameraZoom& previous) const -> std::optional @@ -87,4 +86,3 @@ void serialize(Archive& archive, Lab::ReversibleCommand_SetCameraZoom& command) } } // namespace cereal - diff --git a/src/Module_Nodes/CodeGen.cpp b/src/Module_Nodes/CodeGen.cpp index ee037317..09afc7c6 100644 --- a/src/Module_Nodes/CodeGen.cpp +++ b/src/Module_Nodes/CodeGen.cpp @@ -172,7 +172,7 @@ static auto gen_value_inputs( ) -> tl::expected { using fmt::literals::operator""_a; - Properties res{}; + Properties res{}; size_t property_index{0}; for (auto const& prop : node.value_inputs()) diff --git a/src/Module_Nodes/CodeGen_default_function.cpp b/src/Module_Nodes/CodeGen_default_function.cpp index e8b5b008..e3030819 100644 --- a/src/Module_Nodes/CodeGen_default_function.cpp +++ b/src/Module_Nodes/CodeGen_default_function.cpp @@ -97,7 +97,7 @@ static auto maybe_generate_default(FunctionSignature current_signature, std::str auto gen_default_function(FunctionSignature signature, CodeGenContext& context) -> ExpectedFunctionName { - using fmt::literals::operator""_a; + using fmt::literals:: operator""_a; static constexpr std::string_view signed_to_float = "antialised_step(sd)"; { auto const func = maybe_generate_default( From d0834258b89f8afec430b4b2eee86e2a3d56b996 Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Sun, 16 Jul 2023 00:06:13 +0200 Subject: [PATCH 08/21] =?UTF-8?q?=E2=9C=A8=20[Midi]=20Add=20a=20callback?= =?UTF-8?q?=20that=20is=20called=20when=20a=20value=20of=20a=20MidiCc=20ch?= =?UTF-8?q?anges?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- src/App.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Cool b/Cool index fcdb2fa3..11430408 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit fcdb2fa3d425fcc4b12e866fb332eabb64faaa20 +Subproject commit 1143040861267cc865b43d11a504df476bac8f49 diff --git a/src/App.cpp b/src/App.cpp index f1f391cf..cc3b0fa9 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -44,6 +44,9 @@ App::App(Cool::WindowManager& windows, Cool::ViewsManager& views) , _nodes_module{std::make_unique(dirty_flag_factory(), input_factory())} { Cool::midi_manager().connect(); + Cool::midi_manager().set_additional_midi_callback([&]() { + trigger_rerender(); + }); _camera_manager.is_editable_in_view() = false; _camera_manager.hook_events(_nodes_view.mouse_events(), _variable_registries, command_executor(), [this]() { trigger_rerender(); }); hook_camera2D_events( From cb9a15b293eedaedc348c955c19b3d41f69a5c4d Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Sun, 16 Jul 2023 00:16:07 +0200 Subject: [PATCH 09/21] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20[Cool]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cool b/Cool index 11430408..0fc62886 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 1143040861267cc865b43d11a504df476bac8f49 +Subproject commit 0fc628866ba167fc95b651b5e0302a8704b6bb33 From 7c2650aa86a29c050fe8ef3d21232c0377bfff7d Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Sun, 24 Sep 2023 13:32:02 +0200 Subject: [PATCH 10/21] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20clang-format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- src/CommandCore/ConcreteCommand.h | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cool b/Cool index f4a86559..d856e906 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit f4a86559ac9ade835d0a8d11021a6ea1a82717c7 +Subproject commit d856e9069f677f01415cfd3c7df4caf3745e0fa7 diff --git a/src/CommandCore/ConcreteCommand.h b/src/CommandCore/ConcreteCommand.h index e4c40219..af049278 100644 --- a/src/CommandCore/ConcreteCommand.h +++ b/src/CommandCore/ConcreteCommand.h @@ -7,20 +7,20 @@ class CommandExecutionContext_Ref; template concept ConcreteCommand = requires(const T& a, const T& b, CommandExecutionContext_Ref& command_execution_context, const MakeReversibleCommandContext_Ref& make_reversible_command_context) { - // Has an execute() method - a.execute(command_execution_context); - // Has a to_string() method - { - a.to_string() - } -> std::convertible_to; + // Has an execute() method + a.execute(command_execution_context); + // Has a to_string() method + { + a.to_string() + } -> std::convertible_to; - // TODO require a serialization function -}; + // TODO require a serialization function + }; template concept ConcreteCommandThatCanBeMadeReversible = ConcreteCommand && requires(const T& a, const MakeReversibleCommandContext_Ref& make_reversible_command_context) { - // Has a make_reversible() method - a.make_reversible(make_reversible_command_context); -}; + // Has a make_reversible() method + a.make_reversible(make_reversible_command_context); + }; } // namespace Lab From 79fb1743e807a93b10674474598931123241d52c Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Sun, 24 Sep 2023 15:13:17 +0200 Subject: [PATCH 11/21] =?UTF-8?q?=E2=9C=A8=20[Midi]=20Added=20imgui=5Fvisu?= =?UTF-8?q?alize=5Fchannels()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- src/App.cpp | 11 +++++++++++ src/App.h | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Cool b/Cool index d856e906..389eb6da 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit d856e9069f677f01415cfd3c7df4caf3745e0fa7 +Subproject commit 389eb6dae1ba05f5ff35b9c48d60415bbd20f701 diff --git a/src/App.cpp b/src/App.cpp index 8ac09810..d8cd7966 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -64,6 +64,12 @@ App::App(Cool::WindowManager& windows, Cool::ViewsManager& views) .start_open = true, } )} + , _midi_visualizer_window{ + Cool::icon_fmt("Midi", ICOMOON_EQUALIZER), + Cool::ImGuiWindowConfig{ + .is_modal = false, + .start_open = false, + }} { command_executor().execute(Command_NewProject{}); _project.clock.pause(); // Make sure the new project will be paused. @@ -421,6 +427,9 @@ void App::imgui_windows() { ImGui::Begin("MIDI"); Cool::midi_manager().imgui(); + _midi_visualizer_window.show([&]() { + Cool::midi_manager().imgui_visualize_channels(); + }); ImGui::End(); imgui_window_view(); imgui_window_exporter(); @@ -603,6 +612,8 @@ void App::commands_menu() Cool::WebcamsConfigs::instance().open_imgui_window(); if (ImGui::Selectable("Open output window")) _output_view.open(); + if (ImGui::Selectable("Open MIDI window")) + _midi_visualizer_window.open(); ImGui::EndMenu(); } } diff --git a/src/App.h b/src/App.h index 447660ed..c6df1fb5 100644 --- a/src/App.h +++ b/src/App.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -23,6 +22,7 @@ #include "CommandCore/CommandExecutor_WithoutHistory_Ref.h" #include "CommandCore/ReversibleCommandExecutor_WithoutHistory_Ref.h" #include "Commands/Command_SetCameraZoom.h" // For the serialization functions +#include "Cool/ImGui/ImGuiWindow.h" #include "Cool/StrongTypes/Camera2D.h" #include "Cool/Tips/TipsManager.h" #include "Cool/View/ForwardingOrRenderView.h" @@ -127,6 +127,7 @@ class App : public Cool::IApp { NodesLibraryManager _nodes_library_manager{}; bool _is_first_frame{true}; bool _is_shutting_down{false}; + Cool::ImGuiWindow _midi_visualizer_window; private: // Serialization From ed1631c66522e3fe0f545361486d1ddb0ccda017 Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Sun, 24 Sep 2023 15:47:54 +0200 Subject: [PATCH 12/21] =?UTF-8?q?=F0=9F=A7=BC=20[Midi]=20Cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- src/Commands/generated/register_set_variable_commands.inl | 4 ++-- .../generated/register_set_variable_metadata_commands.inl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cool b/Cool index 389eb6da..d7f4a330 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 389eb6dae1ba05f5ff35b9c48d60415bbd20f701 +Subproject commit d7f4a330cd76d59a0c76d4b8ae16c36da8d531ca diff --git a/src/Commands/generated/register_set_variable_commands.inl b/src/Commands/generated/register_set_variable_commands.inl index 3ee953e2..7f6a9dfe 100644 --- a/src/Commands/generated/register_set_variable_commands.inl +++ b/src/Commands/generated/register_set_variable_commands.inl @@ -27,7 +27,7 @@ LAB_REGISTER_COMMAND(Lab::Command_SetVariable) LAB_REGISTER_COMMAND(Lab::Command_SetVariable) LAB_REGISTER_COMMAND(Lab::Command_SetVariable) LAB_REGISTER_COMMAND(Lab::Command_SetVariable) -LAB_REGISTER_COMMAND(Lab::Command_SetVariable) +LAB_REGISTER_COMMAND(Lab::Command_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) @@ -51,4 +51,4 @@ LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) -LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) +LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable) diff --git a/src/Commands/generated/register_set_variable_metadata_commands.inl b/src/Commands/generated/register_set_variable_metadata_commands.inl index 2d25c618..969a0e7b 100644 --- a/src/Commands/generated/register_set_variable_metadata_commands.inl +++ b/src/Commands/generated/register_set_variable_metadata_commands.inl @@ -27,4 +27,4 @@ LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) -LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) +LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata) From 51e65cdff9dda91e5f3a6154ec2975b4fa0b6f36 Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Wed, 27 Sep 2023 21:58:58 +0200 Subject: [PATCH 13/21] =?UTF-8?q?=F0=9F=A4=8F=20[Midi]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 5 - Cool | 2 +- User data Default/imgui.ini | 232 +++++++++++++++++++----------------- src/App.cpp | 15 ++- src/App.h | 1 + 5 files changed, 135 insertions(+), 120 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ddbe2637..9369b956 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,11 +51,6 @@ target_link_libraries(Coollab-Properties INTERFACE cmd::cmd) target_include_directories(Coollab-Properties INTERFACE lib/range-v3/include) install(FILES "lib/range-v3/LICENSE.txt" DESTINATION "license/range-v3") -# Include RtMidi -if(WIN32) - target_link_libraries(Coollab-Properties INTERFACE winmm) -endif() - set(COOLLAB_REQUIRE_ALL_FEATURES OFF CACHE BOOL "Some features are optional, like making HTTPS requests to post images to the Coollab gallery. If you don't have the necessary dependencies these features will be disabled. If you want to make sure you have all the features of Coollab enabled, set this option to ON.") # ---------------- diff --git a/Cool b/Cool index d7f4a330..0b9332e2 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit d7f4a330cd76d59a0c76d4b8ae16c36da8d531ca +Subproject commit 0b9332e252a1aba1888b0a7dcc12848608605079 diff --git a/User data Default/imgui.ini b/User data Default/imgui.ini index 1a7eea72..f110edc1 100644 --- a/User data Default/imgui.ini +++ b/User data Default/imgui.ini @@ -12,13 +12,13 @@ Collapsed=0 Pos=0,19 Size=992,998 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000054,0 [Window][View | Custom Shader] Pos=0,19 Size=1493,240 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000054,0 [Window][is0 Opt] Pos=1888,820 @@ -84,7 +84,7 @@ DockId=0x0000002E,0 Pos=0,24 Size=1517,933 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][Export an Image] Pos=322,291 @@ -101,7 +101,7 @@ DockId=0x00000023,0 Pos=0,24 Size=978,232 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][Registry of vec3] Pos=0,837 @@ -164,7 +164,7 @@ Collapsed=0 Pos=0,19 Size=746,634 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000054,0 [Window][Nodes] Pos=748,19 @@ -176,7 +176,7 @@ DockId=0x0000000C,0 Pos=0,892 Size=961,55 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000054,0 [Window][Nodes Code] Pos=826,24 @@ -224,7 +224,7 @@ DockId=0x0000001A,0 Pos=0,24 Size=1517,934 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000054,0 [Window][Color Themes: Advanced Config] Pos=0,683 @@ -251,13 +251,13 @@ Collapsed=0 Pos=0,24 Size=1517,933 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][Test Message Console] Pos=0,25 Size=1599,908 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][Dear ImGui Style Editor] Pos=203,130 @@ -290,7 +290,7 @@ DockId=0x0000002C,0 Pos=0,24 Size=1517,934 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000054,0 [Window][ Nodes] Pos=60,60 @@ -306,7 +306,7 @@ Collapsed=0 Pos=0,25 Size=1226,99 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000054,0 [Window][ Cameras] Pos=1228,25 @@ -358,7 +358,7 @@ DockId=0x00000004,2 Pos=0,25 Size=994,104 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000054,0 [Window][ Cameras] Pos=996,25 @@ -447,9 +447,9 @@ DockId=0x00000046,0 [Window][  Nodes] Pos=0,30 -Size=1323,924 +Size=1323,351 Collapsed=0 -DockId=0x0000004E,0 +DockId=0x00000054,0 [Window][  Time] Pos=0,956 @@ -458,8 +458,8 @@ Collapsed=0 DockId=0x00000045,0 [Window][  Cameras] -Pos=1325,30 -Size=595,437 +Pos=1325,126 +Size=595,341 Collapsed=0 DockId=0x0000003A,1 @@ -483,11 +483,11 @@ DockId=0x00000032,1 Pos=0,30 Size=1334,924 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][  Framerate] -Pos=1317,30 -Size=603,91 +Pos=1325,30 +Size=595,94 Collapsed=0 DockId=0x00000037,0 @@ -501,7 +501,7 @@ DockId=0x0000003B,0 Pos=0,30 Size=1334,924 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][  Color Themes: Editor] Pos=0,675 @@ -513,7 +513,7 @@ DockId=0x0000003F,0 Pos=0,30 Size=1288,939 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][  Console] Pos=1325,469 @@ -535,7 +535,7 @@ Collapsed=0 Pos=0,30 Size=1290,939 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][  Style Editor] Pos=0,516 @@ -549,8 +549,8 @@ Size=517,577 Collapsed=0 [Window][  Inspector] -Pos=1325,30 -Size=595,437 +Pos=1325,126 +Size=595,341 Collapsed=0 DockId=0x0000003A,0 @@ -575,7 +575,7 @@ DockId=0x0000004F,0 Pos=0,30 Size=1413,924 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][  Debug Console] Pos=60,60 @@ -602,7 +602,7 @@ Collapsed=0 Pos=0,30 Size=1323,535 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][  Test tips] Pos=0,590 @@ -614,13 +614,25 @@ DockId=0x00000049,0 Pos=0,30 Size=1323,924 Collapsed=0 -DockId=0x0000004E,1 +DockId=0x00000054,1 [Window][  Open Recent] Pos=548,194 Size=727,474 Collapsed=0 +[Window][  Midi] +Pos=0,695 +Size=1323,259 +Collapsed=0 +DockId=0x00000051,0 + +[Window][  Emulate midi keyboard] +Pos=0,383 +Size=1323,310 +Collapsed=0 +DockId=0x00000052,0 + [Table][0x4EF0CFBB,2] Column 0 Weight=1.0000 Column 1 Weight=1.0000 @@ -683,85 +695,89 @@ Column 1 Weight=1.0000 Column 2 Weight=1.0000 [Docking][Data] -DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,59 Size=1920,971 Split=Y - DockNode ID=0x0000004B Parent=0xF3CABE56 SizeRef=1920,489 Split=Y - DockNode ID=0x0000003E Parent=0x0000004B SizeRef=1920,648 Split=Y - DockNode ID=0x00000025 Parent=0x0000003E SizeRef=1920,656 Split=X - DockNode ID=0x0000002A Parent=0x00000025 SizeRef=1226,977 Split=Y - DockNode ID=0x0000000A Parent=0x0000002A SizeRef=1920,934 Split=X - DockNode ID=0x00000006 Parent=0x0000000A SizeRef=1688,982 Split=X - DockNode ID=0x00000011 Parent=0x00000006 SizeRef=1166,567 Split=Y Selected=0xB20B5019 - DockNode ID=0x00000015 Parent=0x00000011 SizeRef=1166,540 Split=X Selected=0xB20B5019 - DockNode ID=0x00000001 Parent=0x00000015 SizeRef=1227,372 Split=X Selected=0x0139E51B - DockNode ID=0x0000000B Parent=0x00000001 SizeRef=746,928 Split=Y Selected=0x0139E51B - DockNode ID=0x0000001D Parent=0x0000000B SizeRef=872,444 Split=X Selected=0x612F12CA - DockNode ID=0x0000001F Parent=0x0000001D SizeRef=683,313 Selected=0xDA0F6C18 - DockNode ID=0x00000020 Parent=0x0000001D SizeRef=832,313 Selected=0x612F12CA - DockNode ID=0x0000001E Parent=0x0000000B SizeRef=872,531 Split=X Selected=0x0139E51B - DockNode ID=0x0000000D Parent=0x0000001E SizeRef=1244,464 Split=X Selected=0x12D5DF45 - DockNode ID=0x00000024 Parent=0x0000000D SizeRef=785,516 Split=Y Selected=0xF8A795D1 - DockNode ID=0x00000030 Parent=0x00000024 SizeRef=1517,472 Split=Y Selected=0xF8A795D1 - DockNode ID=0x00000021 Parent=0x00000030 SizeRef=1517,623 Split=X Selected=0x30F1BB17 - DockNode ID=0x00000031 Parent=0x00000021 SizeRef=994,924 Split=Y Selected=0x30F1BB17 - DockNode ID=0x00000034 Parent=0x00000031 SizeRef=1306,612 Split=Y Selected=0x30F1BB17 - DockNode ID=0x00000036 Parent=0x00000034 SizeRef=1306,104 Split=X Selected=0xE87781F4 - DockNode ID=0x00000039 Parent=0x00000036 SizeRef=650,976 Split=X Selected=0x9161DC35 - DockNode ID=0x00000044 Parent=0x00000039 SizeRef=1323,929 Split=X Selected=0xEB0CD24C - DockNode ID=0x0000004D Parent=0x00000044 SizeRef=774,939 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000050 Parent=0x0000004D SizeRef=1288,505 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000047 Parent=0x00000050 SizeRef=1288,940 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000041 Parent=0x00000047 SizeRef=1334,535 Split=Y Selected=0xEB0CD24C - DockNode ID=0x0000004E Parent=0x00000041 SizeRef=1323,558 CentralNode=1 Selected=0xEB0CD24C - DockNode ID=0x00000049 Parent=0x00000041 SizeRef=1323,364 Selected=0x9C8E2C2E - DockNode ID=0x0000003D Parent=0x00000047 SizeRef=1334,387 Selected=0x83AD6119 - DockNode ID=0x00000045 Parent=0x00000050 SizeRef=1288,45 HiddenTabBar=1 Selected=0x5853D90B - DockNode ID=0x0000004F Parent=0x0000004D SizeRef=1288,432 Selected=0xA7D171DA - DockNode ID=0x0000004C Parent=0x00000044 SizeRef=637,939 Selected=0x854D5944 - DockNode ID=0x00000028 Parent=0x00000039 SizeRef=595,929 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000048 Parent=0x00000028 SizeRef=636,437 Split=Y Selected=0x2D339E0D - DockNode ID=0x00000037 Parent=0x00000048 SizeRef=603,91 Selected=0x08C0CD78 - DockNode ID=0x0000003A Parent=0x00000048 SizeRef=603,330 Selected=0x2D339E0D - DockNode ID=0x00000046 Parent=0x00000028 SizeRef=636,532 Selected=0xFB2E9D5C - DockNode ID=0x00000038 Parent=0x00000036 SizeRef=538,976 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000042 Parent=0x00000038 SizeRef=627,488 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000032 Parent=0x00000042 SizeRef=749,569 Selected=0x38D929D4 - DockNode ID=0x00000043 Parent=0x00000042 SizeRef=749,405 Selected=0xFB2E9D5C - DockNode ID=0x00000040 Parent=0x00000038 SizeRef=627,486 Selected=0xFB2E9D5C - DockNode ID=0x00000035 Parent=0x00000034 SizeRef=1306,826 Selected=0x0D6175D2 - DockNode ID=0x00000033 Parent=0x00000031 SizeRef=1306,42 HiddenTabBar=1 Selected=0x75F17762 - DockNode ID=0x00000029 Parent=0x00000021 SizeRef=924,924 Selected=0x71143AF8 - DockNode ID=0x00000010 Parent=0x00000030 SizeRef=1517,308 Selected=0x88F44F2D - DockNode ID=0x0000002F Parent=0x00000024 SizeRef=1517,47 HiddenTabBar=1 Selected=0x9F8C1213 - DockNode ID=0x00000023 Parent=0x0000000D SizeRef=333,516 Selected=0x49278EEE - DockNode ID=0x0000000E Parent=0x0000001E SizeRef=271,464 Split=Y Selected=0x51A07D0A - DockNode ID=0x0000001B Parent=0x0000000E SizeRef=172,303 Selected=0x0545BD69 - DockNode ID=0x0000001C Parent=0x0000000E SizeRef=172,478 Selected=0x51A07D0A - DockNode ID=0x0000000C Parent=0x00000001 SizeRef=940,928 Selected=0xC8A2CA68 - DockNode ID=0x00000002 Parent=0x00000015 SizeRef=691,372 Selected=0x579B91DF - DockNode ID=0x00000016 Parent=0x00000011 SizeRef=1166,180 Selected=0x3B5C5433 - DockNode ID=0x00000012 Parent=0x00000006 SizeRef=395,567 Split=Y Selected=0xAC9ECCBA - DockNode ID=0x00000017 Parent=0x00000012 SizeRef=395,297 Selected=0xA4891924 - DockNode ID=0x00000018 Parent=0x00000012 SizeRef=395,423 Selected=0xAC9ECCBA - DockNode ID=0x00000007 Parent=0x0000000A SizeRef=230,982 Split=Y Selected=0x0545BD69 - DockNode ID=0x00000008 Parent=0x00000007 SizeRef=150,786 Selected=0x0545BD69 - DockNode ID=0x00000009 Parent=0x00000007 SizeRef=150,194 Split=Y Selected=0x97961354 - DockNode ID=0x00000013 Parent=0x00000009 SizeRef=400,97 Selected=0x97961354 - DockNode ID=0x00000014 Parent=0x00000009 SizeRef=400,95 Selected=0x0757C9E5 - DockNode ID=0x00000005 Parent=0x0000002A SizeRef=1920,41 HiddenTabBar=1 Selected=0xE75A179E - DockNode ID=0x00000027 Parent=0x00000025 SizeRef=692,977 Split=Y Selected=0x818036C6 - DockNode ID=0x0000002C Parent=0x00000027 SizeRef=130,499 Selected=0x818036C6 - DockNode ID=0x0000002B Parent=0x00000027 SizeRef=130,476 Split=Y Selected=0x12D5DF45 - DockNode ID=0x00000019 Parent=0x0000002B SizeRef=401,465 Split=Y Selected=0x148E1A1B - DockNode ID=0x0000002E Parent=0x00000019 SizeRef=401,282 Selected=0x148E1A1B - DockNode ID=0x0000002D Parent=0x00000019 SizeRef=401,238 Split=Y Selected=0x3CF15644 - DockNode ID=0x00000003 Parent=0x0000002D SizeRef=401,258 Selected=0x148E1A1B - DockNode ID=0x00000004 Parent=0x0000002D SizeRef=401,262 Selected=0x3CF15644 - DockNode ID=0x0000001A Parent=0x0000002B SizeRef=401,510 Selected=0x12D5DF45 - DockNode ID=0x0000000F Parent=0x0000003E SizeRef=1920,318 Split=X Selected=0xFB9F4E92 - DockNode ID=0x00000026 Parent=0x0000000F SizeRef=707,453 Selected=0xFB9F4E92 - DockNode ID=0x00000022 Parent=0x0000000F SizeRef=1211,453 Selected=0xCB44F1EA - DockNode ID=0x0000003C Parent=0x0000004B SizeRef=1920,326 Split=X Selected=0x3DE5F12B - DockNode ID=0x0000003B Parent=0x0000003C SizeRef=434,408 Selected=0x6DCF654B - DockNode ID=0x0000003F Parent=0x0000003C SizeRef=1484,408 Selected=0x3DE5F12B - DockNode ID=0x0000004A Parent=0xF3CABE56 SizeRef=1920,485 Selected=0x1CB07D66 +DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,59 Size=1920,971 Split=Y + DockNode ID=0x0000004B Parent=0xF3CABE56 SizeRef=1920,489 Split=Y + DockNode ID=0x0000003E Parent=0x0000004B SizeRef=1920,648 Split=Y + DockNode ID=0x00000025 Parent=0x0000003E SizeRef=1920,656 Split=X + DockNode ID=0x0000002A Parent=0x00000025 SizeRef=1226,977 Split=Y + DockNode ID=0x0000000A Parent=0x0000002A SizeRef=1920,934 Split=X + DockNode ID=0x00000006 Parent=0x0000000A SizeRef=1688,982 Split=X + DockNode ID=0x00000011 Parent=0x00000006 SizeRef=1166,567 Split=Y Selected=0xB20B5019 + DockNode ID=0x00000015 Parent=0x00000011 SizeRef=1166,540 Split=X Selected=0xB20B5019 + DockNode ID=0x00000001 Parent=0x00000015 SizeRef=1227,372 Split=X Selected=0x0139E51B + DockNode ID=0x0000000B Parent=0x00000001 SizeRef=746,928 Split=Y Selected=0x0139E51B + DockNode ID=0x0000001D Parent=0x0000000B SizeRef=872,444 Split=X Selected=0x612F12CA + DockNode ID=0x0000001F Parent=0x0000001D SizeRef=683,313 Selected=0xDA0F6C18 + DockNode ID=0x00000020 Parent=0x0000001D SizeRef=832,313 Selected=0x612F12CA + DockNode ID=0x0000001E Parent=0x0000000B SizeRef=872,531 Split=X Selected=0x0139E51B + DockNode ID=0x0000000D Parent=0x0000001E SizeRef=1244,464 Split=X Selected=0x12D5DF45 + DockNode ID=0x00000024 Parent=0x0000000D SizeRef=785,516 Split=Y Selected=0xF8A795D1 + DockNode ID=0x00000030 Parent=0x00000024 SizeRef=1517,472 Split=Y Selected=0xF8A795D1 + DockNode ID=0x00000021 Parent=0x00000030 SizeRef=1517,623 Split=X Selected=0x30F1BB17 + DockNode ID=0x00000031 Parent=0x00000021 SizeRef=994,924 Split=Y Selected=0x30F1BB17 + DockNode ID=0x00000034 Parent=0x00000031 SizeRef=1306,612 Split=Y Selected=0x30F1BB17 + DockNode ID=0x00000036 Parent=0x00000034 SizeRef=1306,104 Split=X Selected=0xE87781F4 + DockNode ID=0x00000039 Parent=0x00000036 SizeRef=650,976 Split=X Selected=0x9161DC35 + DockNode ID=0x00000044 Parent=0x00000039 SizeRef=1323,929 Split=X Selected=0xEB0CD24C + DockNode ID=0x0000004D Parent=0x00000044 SizeRef=774,939 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000050 Parent=0x0000004D SizeRef=1288,505 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000047 Parent=0x00000050 SizeRef=1288,940 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000041 Parent=0x00000047 SizeRef=1334,535 Split=Y Selected=0xEB0CD24C + DockNode ID=0x0000004E Parent=0x00000041 SizeRef=1323,558 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000053 Parent=0x0000004E SizeRef=1323,663 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000054 Parent=0x00000053 SizeRef=1323,351 CentralNode=1 Selected=0xEB0CD24C + DockNode ID=0x00000052 Parent=0x00000053 SizeRef=1323,310 Selected=0x69DA1CCA + DockNode ID=0x00000051 Parent=0x0000004E SizeRef=1323,259 Selected=0xAF7842FD + DockNode ID=0x00000049 Parent=0x00000041 SizeRef=1323,364 Selected=0x9C8E2C2E + DockNode ID=0x0000003D Parent=0x00000047 SizeRef=1334,387 Selected=0x83AD6119 + DockNode ID=0x00000045 Parent=0x00000050 SizeRef=1288,45 HiddenTabBar=1 Selected=0x5853D90B + DockNode ID=0x0000004F Parent=0x0000004D SizeRef=1288,432 Selected=0xA7D171DA + DockNode ID=0x0000004C Parent=0x00000044 SizeRef=637,939 Selected=0x854D5944 + DockNode ID=0x00000028 Parent=0x00000039 SizeRef=595,929 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000048 Parent=0x00000028 SizeRef=636,437 Split=Y Selected=0x2D339E0D + DockNode ID=0x00000037 Parent=0x00000048 SizeRef=603,91 Selected=0x08C0CD78 + DockNode ID=0x0000003A Parent=0x00000048 SizeRef=603,330 Selected=0x2D339E0D + DockNode ID=0x00000046 Parent=0x00000028 SizeRef=636,532 Selected=0xFB2E9D5C + DockNode ID=0x00000038 Parent=0x00000036 SizeRef=538,976 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000042 Parent=0x00000038 SizeRef=627,488 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000032 Parent=0x00000042 SizeRef=749,569 Selected=0x38D929D4 + DockNode ID=0x00000043 Parent=0x00000042 SizeRef=749,405 Selected=0xFB2E9D5C + DockNode ID=0x00000040 Parent=0x00000038 SizeRef=627,486 Selected=0xFB2E9D5C + DockNode ID=0x00000035 Parent=0x00000034 SizeRef=1306,826 Selected=0x0D6175D2 + DockNode ID=0x00000033 Parent=0x00000031 SizeRef=1306,42 HiddenTabBar=1 Selected=0x75F17762 + DockNode ID=0x00000029 Parent=0x00000021 SizeRef=924,924 Selected=0x71143AF8 + DockNode ID=0x00000010 Parent=0x00000030 SizeRef=1517,308 Selected=0x88F44F2D + DockNode ID=0x0000002F Parent=0x00000024 SizeRef=1517,47 HiddenTabBar=1 Selected=0x9F8C1213 + DockNode ID=0x00000023 Parent=0x0000000D SizeRef=333,516 Selected=0x49278EEE + DockNode ID=0x0000000E Parent=0x0000001E SizeRef=271,464 Split=Y Selected=0x51A07D0A + DockNode ID=0x0000001B Parent=0x0000000E SizeRef=172,303 Selected=0x0545BD69 + DockNode ID=0x0000001C Parent=0x0000000E SizeRef=172,478 Selected=0x51A07D0A + DockNode ID=0x0000000C Parent=0x00000001 SizeRef=940,928 Selected=0xC8A2CA68 + DockNode ID=0x00000002 Parent=0x00000015 SizeRef=691,372 Selected=0x579B91DF + DockNode ID=0x00000016 Parent=0x00000011 SizeRef=1166,180 Selected=0x3B5C5433 + DockNode ID=0x00000012 Parent=0x00000006 SizeRef=395,567 Split=Y Selected=0xAC9ECCBA + DockNode ID=0x00000017 Parent=0x00000012 SizeRef=395,297 Selected=0xA4891924 + DockNode ID=0x00000018 Parent=0x00000012 SizeRef=395,423 Selected=0xAC9ECCBA + DockNode ID=0x00000007 Parent=0x0000000A SizeRef=230,982 Split=Y Selected=0x0545BD69 + DockNode ID=0x00000008 Parent=0x00000007 SizeRef=150,786 Selected=0x0545BD69 + DockNode ID=0x00000009 Parent=0x00000007 SizeRef=150,194 Split=Y Selected=0x97961354 + DockNode ID=0x00000013 Parent=0x00000009 SizeRef=400,97 Selected=0x97961354 + DockNode ID=0x00000014 Parent=0x00000009 SizeRef=400,95 Selected=0x0757C9E5 + DockNode ID=0x00000005 Parent=0x0000002A SizeRef=1920,41 HiddenTabBar=1 Selected=0xE75A179E + DockNode ID=0x00000027 Parent=0x00000025 SizeRef=692,977 Split=Y Selected=0x818036C6 + DockNode ID=0x0000002C Parent=0x00000027 SizeRef=130,499 Selected=0x818036C6 + DockNode ID=0x0000002B Parent=0x00000027 SizeRef=130,476 Split=Y Selected=0x12D5DF45 + DockNode ID=0x00000019 Parent=0x0000002B SizeRef=401,465 Split=Y Selected=0x148E1A1B + DockNode ID=0x0000002E Parent=0x00000019 SizeRef=401,282 Selected=0x148E1A1B + DockNode ID=0x0000002D Parent=0x00000019 SizeRef=401,238 Split=Y Selected=0x3CF15644 + DockNode ID=0x00000003 Parent=0x0000002D SizeRef=401,258 Selected=0x148E1A1B + DockNode ID=0x00000004 Parent=0x0000002D SizeRef=401,262 Selected=0x3CF15644 + DockNode ID=0x0000001A Parent=0x0000002B SizeRef=401,510 Selected=0x12D5DF45 + DockNode ID=0x0000000F Parent=0x0000003E SizeRef=1920,318 Split=X Selected=0xFB9F4E92 + DockNode ID=0x00000026 Parent=0x0000000F SizeRef=707,453 Selected=0xFB9F4E92 + DockNode ID=0x00000022 Parent=0x0000000F SizeRef=1211,453 Selected=0xCB44F1EA + DockNode ID=0x0000003C Parent=0x0000004B SizeRef=1920,326 Split=X Selected=0x3DE5F12B + DockNode ID=0x0000003B Parent=0x0000003C SizeRef=434,408 Selected=0x6DCF654B + DockNode ID=0x0000003F Parent=0x0000003C SizeRef=1484,408 Selected=0x3DE5F12B + DockNode ID=0x0000004A Parent=0xF3CABE56 SizeRef=1920,485 Selected=0x1CB07D66 diff --git a/src/App.cpp b/src/App.cpp index d8cd7966..e60d04ea 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -65,7 +65,7 @@ App::App(Cool::WindowManager& windows, Cool::ViewsManager& views) } )} , _midi_visualizer_window{ - Cool::icon_fmt("Midi", ICOMOON_EQUALIZER), + Cool::icon_fmt("Midi", ICOMOON_EQUALIZER2), Cool::ImGuiWindowConfig{ .is_modal = false, .start_open = false, @@ -75,7 +75,6 @@ App::App(Cool::WindowManager& windows, Cool::ViewsManager& views) _project.clock.pause(); // Make sure the new project will be paused. _project.camera_manager.hook_events(_nodes_view.mouse_events(), _project.variable_registries, command_executor(), [this]() { trigger_rerender(); }); - Cool::midi_manager().connect(); Cool::midi_manager().set_additional_midi_callback([&]() { trigger_rerender(); }); @@ -423,14 +422,16 @@ void App::imgui_window_exporter() }); } -void App::imgui_windows() +void App::imgui_window_midi() { - ImGui::Begin("MIDI"); - Cool::midi_manager().imgui(); _midi_visualizer_window.show([&]() { Cool::midi_manager().imgui_visualize_channels(); + Cool::midi_manager().imgui_controllers_dropdown(); }); - ImGui::End(); +} + +void App::imgui_windows() +{ imgui_window_view(); imgui_window_exporter(); imgui_window_console(); @@ -452,6 +453,8 @@ void App::imgui_windows_only_when_inputs_are_allowed() ImGui::End(); // Webcams Cool::WebcamsConfigs::instance().imgui_window(); + // Midi + imgui_window_midi(); // Tips _tips_manager.imgui_windows(all_tips()); // Nodes diff --git a/src/App.h b/src/App.h index c6df1fb5..b8db4fb5 100644 --- a/src/App.h +++ b/src/App.h @@ -106,6 +106,7 @@ class App : public Cool::IApp { void imgui_window_cameras(); void imgui_window_view(); void imgui_window_exporter(); + void imgui_window_midi(); void imgui_commands_and_registries_debug_windows(); From ec9f3c05fb1f3bac32bce3991d9b2ef0354a9f3c Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Thu, 28 Sep 2023 13:57:09 +0200 Subject: [PATCH 14/21] =?UTF-8?q?=F0=9F=93=9D=20[changelog]=20Midi!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- changelog.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cool b/Cool index 0b9332e2..51876b0b 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 0b9332e252a1aba1888b0a7dcc12848608605079 +Subproject commit 51876b0bcdf5fbb93d061c67ec7ccc1cca9389ae diff --git a/changelog.md b/changelog.md index 8b9cf202..623f1767 100644 --- a/changelog.md +++ b/changelog.md @@ -13,6 +13,7 @@ ## 🐣beta-9 WIP +- ✨ Added Midi support! - ✨ Added an Output window that you can project during live shows, while still having your View window on your screen to move the camera and the widgets. To open this window, go in the `Commands` menu and select `Open output window`. - ✨ Added "Load Backup" in case you accidentally refused to save your unsaved changes. - 🐛 Fix: the transparency information was sometimes getting lost between nodes. From 818593691b812cee97e3e9bc2f46c4ab3612d329 Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Fri, 29 Sep 2023 12:42:11 +0200 Subject: [PATCH 15/21] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[Midi]=20Config=20wi?= =?UTF-8?q?ndow=20is=20now=20handled=20by=20Coollab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So that Channel widgets can ask to open it --- Cool | 2 +- src/App.cpp | 18 ++---------------- src/App.h | 2 -- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Cool b/Cool index 51876b0b..6c2cdb1b 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 51876b0bcdf5fbb93d061c67ec7ccc1cca9389ae +Subproject commit 6c2cdb1b1fcc1c6d62fb0c04eff844e389fb6f95 diff --git a/src/App.cpp b/src/App.cpp index e60d04ea..13a1cd57 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -64,12 +64,6 @@ App::App(Cool::WindowManager& windows, Cool::ViewsManager& views) .start_open = true, } )} - , _midi_visualizer_window{ - Cool::icon_fmt("Midi", ICOMOON_EQUALIZER2), - Cool::ImGuiWindowConfig{ - .is_modal = false, - .start_open = false, - }} { command_executor().execute(Command_NewProject{}); _project.clock.pause(); // Make sure the new project will be paused. @@ -422,14 +416,6 @@ void App::imgui_window_exporter() }); } -void App::imgui_window_midi() -{ - _midi_visualizer_window.show([&]() { - Cool::midi_manager().imgui_visualize_channels(); - Cool::midi_manager().imgui_controllers_dropdown(); - }); -} - void App::imgui_windows() { imgui_window_view(); @@ -454,7 +440,7 @@ void App::imgui_windows_only_when_inputs_are_allowed() // Webcams Cool::WebcamsConfigs::instance().imgui_window(); // Midi - imgui_window_midi(); + Cool::midi_manager().imgui_window_config(); // Tips _tips_manager.imgui_windows(all_tips()); // Nodes @@ -616,7 +602,7 @@ void App::commands_menu() if (ImGui::Selectable("Open output window")) _output_view.open(); if (ImGui::Selectable("Open MIDI window")) - _midi_visualizer_window.open(); + Cool::midi_manager().open_config_window(); ImGui::EndMenu(); } } diff --git a/src/App.h b/src/App.h index b8db4fb5..17d5fc90 100644 --- a/src/App.h +++ b/src/App.h @@ -106,7 +106,6 @@ class App : public Cool::IApp { void imgui_window_cameras(); void imgui_window_view(); void imgui_window_exporter(); - void imgui_window_midi(); void imgui_commands_and_registries_debug_windows(); @@ -128,7 +127,6 @@ class App : public Cool::IApp { NodesLibraryManager _nodes_library_manager{}; bool _is_first_frame{true}; bool _is_shutting_down{false}; - Cool::ImGuiWindow _midi_visualizer_window; private: // Serialization From ac558d00ade555138064a212d216a029cc02cd88 Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Fri, 29 Sep 2023 13:35:36 +0200 Subject: [PATCH 16/21] =?UTF-8?q?=F0=9F=94=A8=20[CI]=20Install=20libs=20fo?= =?UTF-8?q?r=20MIDI=20on=20Linux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/create_release_executables.yml | 3 +++ Cool | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_release_executables.yml b/.github/workflows/create_release_executables.yml index f9657cdd..83650c08 100644 --- a/.github/workflows/create_release_executables.yml +++ b/.github/workflows/create_release_executables.yml @@ -49,6 +49,9 @@ jobs: - name: Install OpenSSL run: sudo apt-get install libssl-dev + - name: Install MIDI dependencies + run: sudo apt install libasound2-dev + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -D CMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER=clang -D CMAKE_CXX_COMPILER=clang++ -D COOLLAB_REQUIRE_ALL_FEATURES=ON -D CPACK_GENERATOR=STGZ diff --git a/Cool b/Cool index 6c2cdb1b..27b5dd7f 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 6c2cdb1b1fcc1c6d62fb0c04eff844e389fb6f95 +Subproject commit 27b5dd7f08cded71a39862c47ce24b4c1b8f070a From 43af10a3339519ccff1bf28020da73e551b001f1 Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Fri, 29 Sep 2023 13:47:04 +0200 Subject: [PATCH 17/21] =?UTF-8?q?=F0=9F=94=A7=20[imgui.ini]=20Midi=20Confi?= =?UTF-8?q?g=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- User data Default/imgui.ini | 194 ++++++++++++++++++------------------ 1 file changed, 96 insertions(+), 98 deletions(-) diff --git a/User data Default/imgui.ini b/User data Default/imgui.ini index f110edc1..fa9e55c2 100644 --- a/User data Default/imgui.ini +++ b/User data Default/imgui.ini @@ -1,6 +1,6 @@ [Window][MyMainDockSpace] Pos=0,30 -Size=1920,971 +Size=1920,987 Collapsed=0 [Window][Debug##Default] @@ -440,26 +440,26 @@ Collapsed=0 DockId=0x00000029,1 [Window][  View] -Pos=1325,469 -Size=595,532 +Pos=1325,476 +Size=595,541 Collapsed=0 DockId=0x00000046,0 [Window][  Nodes] Pos=0,30 -Size=1323,351 +Size=1323,940 Collapsed=0 DockId=0x00000054,0 [Window][  Time] -Pos=0,956 +Pos=0,972 Size=1323,45 Collapsed=0 DockId=0x00000045,0 [Window][  Cameras] -Pos=1325,126 -Size=595,341 +Pos=1325,30 +Size=595,444 Collapsed=0 DockId=0x0000003A,1 @@ -549,8 +549,8 @@ Size=517,577 Collapsed=0 [Window][  Inspector] -Pos=1325,126 -Size=595,341 +Pos=1325,30 +Size=595,444 Collapsed=0 DockId=0x0000003A,0 @@ -622,13 +622,13 @@ Size=727,474 Collapsed=0 [Window][  Midi] -Pos=0,695 -Size=1323,259 +Pos=0,30 +Size=1323,940 Collapsed=0 -DockId=0x00000051,0 +DockId=0x00000054,1 [Window][  Emulate midi keyboard] -Pos=0,383 +Pos=0,399 Size=1323,310 Collapsed=0 DockId=0x00000052,0 @@ -695,89 +695,87 @@ Column 1 Weight=1.0000 Column 2 Weight=1.0000 [Docking][Data] -DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,59 Size=1920,971 Split=Y - DockNode ID=0x0000004B Parent=0xF3CABE56 SizeRef=1920,489 Split=Y - DockNode ID=0x0000003E Parent=0x0000004B SizeRef=1920,648 Split=Y - DockNode ID=0x00000025 Parent=0x0000003E SizeRef=1920,656 Split=X - DockNode ID=0x0000002A Parent=0x00000025 SizeRef=1226,977 Split=Y - DockNode ID=0x0000000A Parent=0x0000002A SizeRef=1920,934 Split=X - DockNode ID=0x00000006 Parent=0x0000000A SizeRef=1688,982 Split=X - DockNode ID=0x00000011 Parent=0x00000006 SizeRef=1166,567 Split=Y Selected=0xB20B5019 - DockNode ID=0x00000015 Parent=0x00000011 SizeRef=1166,540 Split=X Selected=0xB20B5019 - DockNode ID=0x00000001 Parent=0x00000015 SizeRef=1227,372 Split=X Selected=0x0139E51B - DockNode ID=0x0000000B Parent=0x00000001 SizeRef=746,928 Split=Y Selected=0x0139E51B - DockNode ID=0x0000001D Parent=0x0000000B SizeRef=872,444 Split=X Selected=0x612F12CA - DockNode ID=0x0000001F Parent=0x0000001D SizeRef=683,313 Selected=0xDA0F6C18 - DockNode ID=0x00000020 Parent=0x0000001D SizeRef=832,313 Selected=0x612F12CA - DockNode ID=0x0000001E Parent=0x0000000B SizeRef=872,531 Split=X Selected=0x0139E51B - DockNode ID=0x0000000D Parent=0x0000001E SizeRef=1244,464 Split=X Selected=0x12D5DF45 - DockNode ID=0x00000024 Parent=0x0000000D SizeRef=785,516 Split=Y Selected=0xF8A795D1 - DockNode ID=0x00000030 Parent=0x00000024 SizeRef=1517,472 Split=Y Selected=0xF8A795D1 - DockNode ID=0x00000021 Parent=0x00000030 SizeRef=1517,623 Split=X Selected=0x30F1BB17 - DockNode ID=0x00000031 Parent=0x00000021 SizeRef=994,924 Split=Y Selected=0x30F1BB17 - DockNode ID=0x00000034 Parent=0x00000031 SizeRef=1306,612 Split=Y Selected=0x30F1BB17 - DockNode ID=0x00000036 Parent=0x00000034 SizeRef=1306,104 Split=X Selected=0xE87781F4 - DockNode ID=0x00000039 Parent=0x00000036 SizeRef=650,976 Split=X Selected=0x9161DC35 - DockNode ID=0x00000044 Parent=0x00000039 SizeRef=1323,929 Split=X Selected=0xEB0CD24C - DockNode ID=0x0000004D Parent=0x00000044 SizeRef=774,939 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000050 Parent=0x0000004D SizeRef=1288,505 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000047 Parent=0x00000050 SizeRef=1288,940 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000041 Parent=0x00000047 SizeRef=1334,535 Split=Y Selected=0xEB0CD24C - DockNode ID=0x0000004E Parent=0x00000041 SizeRef=1323,558 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000053 Parent=0x0000004E SizeRef=1323,663 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000054 Parent=0x00000053 SizeRef=1323,351 CentralNode=1 Selected=0xEB0CD24C - DockNode ID=0x00000052 Parent=0x00000053 SizeRef=1323,310 Selected=0x69DA1CCA - DockNode ID=0x00000051 Parent=0x0000004E SizeRef=1323,259 Selected=0xAF7842FD - DockNode ID=0x00000049 Parent=0x00000041 SizeRef=1323,364 Selected=0x9C8E2C2E - DockNode ID=0x0000003D Parent=0x00000047 SizeRef=1334,387 Selected=0x83AD6119 - DockNode ID=0x00000045 Parent=0x00000050 SizeRef=1288,45 HiddenTabBar=1 Selected=0x5853D90B - DockNode ID=0x0000004F Parent=0x0000004D SizeRef=1288,432 Selected=0xA7D171DA - DockNode ID=0x0000004C Parent=0x00000044 SizeRef=637,939 Selected=0x854D5944 - DockNode ID=0x00000028 Parent=0x00000039 SizeRef=595,929 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000048 Parent=0x00000028 SizeRef=636,437 Split=Y Selected=0x2D339E0D - DockNode ID=0x00000037 Parent=0x00000048 SizeRef=603,91 Selected=0x08C0CD78 - DockNode ID=0x0000003A Parent=0x00000048 SizeRef=603,330 Selected=0x2D339E0D - DockNode ID=0x00000046 Parent=0x00000028 SizeRef=636,532 Selected=0xFB2E9D5C - DockNode ID=0x00000038 Parent=0x00000036 SizeRef=538,976 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000042 Parent=0x00000038 SizeRef=627,488 Split=Y Selected=0x38D929D4 - DockNode ID=0x00000032 Parent=0x00000042 SizeRef=749,569 Selected=0x38D929D4 - DockNode ID=0x00000043 Parent=0x00000042 SizeRef=749,405 Selected=0xFB2E9D5C - DockNode ID=0x00000040 Parent=0x00000038 SizeRef=627,486 Selected=0xFB2E9D5C - DockNode ID=0x00000035 Parent=0x00000034 SizeRef=1306,826 Selected=0x0D6175D2 - DockNode ID=0x00000033 Parent=0x00000031 SizeRef=1306,42 HiddenTabBar=1 Selected=0x75F17762 - DockNode ID=0x00000029 Parent=0x00000021 SizeRef=924,924 Selected=0x71143AF8 - DockNode ID=0x00000010 Parent=0x00000030 SizeRef=1517,308 Selected=0x88F44F2D - DockNode ID=0x0000002F Parent=0x00000024 SizeRef=1517,47 HiddenTabBar=1 Selected=0x9F8C1213 - DockNode ID=0x00000023 Parent=0x0000000D SizeRef=333,516 Selected=0x49278EEE - DockNode ID=0x0000000E Parent=0x0000001E SizeRef=271,464 Split=Y Selected=0x51A07D0A - DockNode ID=0x0000001B Parent=0x0000000E SizeRef=172,303 Selected=0x0545BD69 - DockNode ID=0x0000001C Parent=0x0000000E SizeRef=172,478 Selected=0x51A07D0A - DockNode ID=0x0000000C Parent=0x00000001 SizeRef=940,928 Selected=0xC8A2CA68 - DockNode ID=0x00000002 Parent=0x00000015 SizeRef=691,372 Selected=0x579B91DF - DockNode ID=0x00000016 Parent=0x00000011 SizeRef=1166,180 Selected=0x3B5C5433 - DockNode ID=0x00000012 Parent=0x00000006 SizeRef=395,567 Split=Y Selected=0xAC9ECCBA - DockNode ID=0x00000017 Parent=0x00000012 SizeRef=395,297 Selected=0xA4891924 - DockNode ID=0x00000018 Parent=0x00000012 SizeRef=395,423 Selected=0xAC9ECCBA - DockNode ID=0x00000007 Parent=0x0000000A SizeRef=230,982 Split=Y Selected=0x0545BD69 - DockNode ID=0x00000008 Parent=0x00000007 SizeRef=150,786 Selected=0x0545BD69 - DockNode ID=0x00000009 Parent=0x00000007 SizeRef=150,194 Split=Y Selected=0x97961354 - DockNode ID=0x00000013 Parent=0x00000009 SizeRef=400,97 Selected=0x97961354 - DockNode ID=0x00000014 Parent=0x00000009 SizeRef=400,95 Selected=0x0757C9E5 - DockNode ID=0x00000005 Parent=0x0000002A SizeRef=1920,41 HiddenTabBar=1 Selected=0xE75A179E - DockNode ID=0x00000027 Parent=0x00000025 SizeRef=692,977 Split=Y Selected=0x818036C6 - DockNode ID=0x0000002C Parent=0x00000027 SizeRef=130,499 Selected=0x818036C6 - DockNode ID=0x0000002B Parent=0x00000027 SizeRef=130,476 Split=Y Selected=0x12D5DF45 - DockNode ID=0x00000019 Parent=0x0000002B SizeRef=401,465 Split=Y Selected=0x148E1A1B - DockNode ID=0x0000002E Parent=0x00000019 SizeRef=401,282 Selected=0x148E1A1B - DockNode ID=0x0000002D Parent=0x00000019 SizeRef=401,238 Split=Y Selected=0x3CF15644 - DockNode ID=0x00000003 Parent=0x0000002D SizeRef=401,258 Selected=0x148E1A1B - DockNode ID=0x00000004 Parent=0x0000002D SizeRef=401,262 Selected=0x3CF15644 - DockNode ID=0x0000001A Parent=0x0000002B SizeRef=401,510 Selected=0x12D5DF45 - DockNode ID=0x0000000F Parent=0x0000003E SizeRef=1920,318 Split=X Selected=0xFB9F4E92 - DockNode ID=0x00000026 Parent=0x0000000F SizeRef=707,453 Selected=0xFB9F4E92 - DockNode ID=0x00000022 Parent=0x0000000F SizeRef=1211,453 Selected=0xCB44F1EA - DockNode ID=0x0000003C Parent=0x0000004B SizeRef=1920,326 Split=X Selected=0x3DE5F12B - DockNode ID=0x0000003B Parent=0x0000003C SizeRef=434,408 Selected=0x6DCF654B - DockNode ID=0x0000003F Parent=0x0000003C SizeRef=1484,408 Selected=0x3DE5F12B - DockNode ID=0x0000004A Parent=0xF3CABE56 SizeRef=1920,485 Selected=0x1CB07D66 +DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,53 Size=1920,987 Split=Y + DockNode ID=0x0000004B Parent=0xF3CABE56 SizeRef=1920,489 Split=Y + DockNode ID=0x0000003E Parent=0x0000004B SizeRef=1920,648 Split=Y + DockNode ID=0x00000025 Parent=0x0000003E SizeRef=1920,656 Split=X + DockNode ID=0x0000002A Parent=0x00000025 SizeRef=1226,977 Split=Y + DockNode ID=0x0000000A Parent=0x0000002A SizeRef=1920,934 Split=X + DockNode ID=0x00000006 Parent=0x0000000A SizeRef=1688,982 Split=X + DockNode ID=0x00000011 Parent=0x00000006 SizeRef=1166,567 Split=Y Selected=0xB20B5019 + DockNode ID=0x00000015 Parent=0x00000011 SizeRef=1166,540 Split=X Selected=0xB20B5019 + DockNode ID=0x00000001 Parent=0x00000015 SizeRef=1227,372 Split=X Selected=0x0139E51B + DockNode ID=0x0000000B Parent=0x00000001 SizeRef=746,928 Split=Y Selected=0x0139E51B + DockNode ID=0x0000001D Parent=0x0000000B SizeRef=872,444 Split=X Selected=0x612F12CA + DockNode ID=0x0000001F Parent=0x0000001D SizeRef=683,313 Selected=0xDA0F6C18 + DockNode ID=0x00000020 Parent=0x0000001D SizeRef=832,313 Selected=0x612F12CA + DockNode ID=0x0000001E Parent=0x0000000B SizeRef=872,531 Split=X Selected=0x0139E51B + DockNode ID=0x0000000D Parent=0x0000001E SizeRef=1244,464 Split=X Selected=0x12D5DF45 + DockNode ID=0x00000024 Parent=0x0000000D SizeRef=785,516 Split=Y Selected=0xF8A795D1 + DockNode ID=0x00000030 Parent=0x00000024 SizeRef=1517,472 Split=Y Selected=0xF8A795D1 + DockNode ID=0x00000021 Parent=0x00000030 SizeRef=1517,623 Split=X Selected=0x30F1BB17 + DockNode ID=0x00000031 Parent=0x00000021 SizeRef=994,924 Split=Y Selected=0x30F1BB17 + DockNode ID=0x00000034 Parent=0x00000031 SizeRef=1306,612 Split=Y Selected=0x30F1BB17 + DockNode ID=0x00000036 Parent=0x00000034 SizeRef=1306,104 Split=X Selected=0xE87781F4 + DockNode ID=0x00000039 Parent=0x00000036 SizeRef=650,976 Split=X Selected=0x9161DC35 + DockNode ID=0x00000044 Parent=0x00000039 SizeRef=1323,929 Split=X Selected=0xEB0CD24C + DockNode ID=0x0000004D Parent=0x00000044 SizeRef=774,939 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000050 Parent=0x0000004D SizeRef=1288,505 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000047 Parent=0x00000050 SizeRef=1288,940 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000041 Parent=0x00000047 SizeRef=1334,535 Split=Y Selected=0xEB0CD24C + DockNode ID=0x0000004E Parent=0x00000041 SizeRef=1323,558 Split=Y Selected=0xEB0CD24C + DockNode ID=0x00000054 Parent=0x0000004E SizeRef=1323,351 CentralNode=1 Selected=0xAF7842FD + DockNode ID=0x00000052 Parent=0x0000004E SizeRef=1323,310 Selected=0x69DA1CCA + DockNode ID=0x00000049 Parent=0x00000041 SizeRef=1323,364 Selected=0x9C8E2C2E + DockNode ID=0x0000003D Parent=0x00000047 SizeRef=1334,387 Selected=0x83AD6119 + DockNode ID=0x00000045 Parent=0x00000050 SizeRef=1288,45 HiddenTabBar=1 Selected=0x5853D90B + DockNode ID=0x0000004F Parent=0x0000004D SizeRef=1288,432 Selected=0xA7D171DA + DockNode ID=0x0000004C Parent=0x00000044 SizeRef=637,939 Selected=0x854D5944 + DockNode ID=0x00000028 Parent=0x00000039 SizeRef=595,929 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000048 Parent=0x00000028 SizeRef=636,437 Split=Y Selected=0x2D339E0D + DockNode ID=0x00000037 Parent=0x00000048 SizeRef=603,91 Selected=0x08C0CD78 + DockNode ID=0x0000003A Parent=0x00000048 SizeRef=603,330 Selected=0x2D339E0D + DockNode ID=0x00000046 Parent=0x00000028 SizeRef=636,532 Selected=0xFB2E9D5C + DockNode ID=0x00000038 Parent=0x00000036 SizeRef=538,976 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000042 Parent=0x00000038 SizeRef=627,488 Split=Y Selected=0x38D929D4 + DockNode ID=0x00000032 Parent=0x00000042 SizeRef=749,569 Selected=0x38D929D4 + DockNode ID=0x00000043 Parent=0x00000042 SizeRef=749,405 Selected=0xFB2E9D5C + DockNode ID=0x00000040 Parent=0x00000038 SizeRef=627,486 Selected=0xFB2E9D5C + DockNode ID=0x00000035 Parent=0x00000034 SizeRef=1306,826 Selected=0x0D6175D2 + DockNode ID=0x00000033 Parent=0x00000031 SizeRef=1306,42 HiddenTabBar=1 Selected=0x75F17762 + DockNode ID=0x00000029 Parent=0x00000021 SizeRef=924,924 Selected=0x71143AF8 + DockNode ID=0x00000010 Parent=0x00000030 SizeRef=1517,308 Selected=0x88F44F2D + DockNode ID=0x0000002F Parent=0x00000024 SizeRef=1517,47 HiddenTabBar=1 Selected=0x9F8C1213 + DockNode ID=0x00000023 Parent=0x0000000D SizeRef=333,516 Selected=0x49278EEE + DockNode ID=0x0000000E Parent=0x0000001E SizeRef=271,464 Split=Y Selected=0x51A07D0A + DockNode ID=0x0000001B Parent=0x0000000E SizeRef=172,303 Selected=0x0545BD69 + DockNode ID=0x0000001C Parent=0x0000000E SizeRef=172,478 Selected=0x51A07D0A + DockNode ID=0x0000000C Parent=0x00000001 SizeRef=940,928 Selected=0xC8A2CA68 + DockNode ID=0x00000002 Parent=0x00000015 SizeRef=691,372 Selected=0x579B91DF + DockNode ID=0x00000016 Parent=0x00000011 SizeRef=1166,180 Selected=0x3B5C5433 + DockNode ID=0x00000012 Parent=0x00000006 SizeRef=395,567 Split=Y Selected=0xAC9ECCBA + DockNode ID=0x00000017 Parent=0x00000012 SizeRef=395,297 Selected=0xA4891924 + DockNode ID=0x00000018 Parent=0x00000012 SizeRef=395,423 Selected=0xAC9ECCBA + DockNode ID=0x00000007 Parent=0x0000000A SizeRef=230,982 Split=Y Selected=0x0545BD69 + DockNode ID=0x00000008 Parent=0x00000007 SizeRef=150,786 Selected=0x0545BD69 + DockNode ID=0x00000009 Parent=0x00000007 SizeRef=150,194 Split=Y Selected=0x97961354 + DockNode ID=0x00000013 Parent=0x00000009 SizeRef=400,97 Selected=0x97961354 + DockNode ID=0x00000014 Parent=0x00000009 SizeRef=400,95 Selected=0x0757C9E5 + DockNode ID=0x00000005 Parent=0x0000002A SizeRef=1920,41 HiddenTabBar=1 Selected=0xE75A179E + DockNode ID=0x00000027 Parent=0x00000025 SizeRef=692,977 Split=Y Selected=0x818036C6 + DockNode ID=0x0000002C Parent=0x00000027 SizeRef=130,499 Selected=0x818036C6 + DockNode ID=0x0000002B Parent=0x00000027 SizeRef=130,476 Split=Y Selected=0x12D5DF45 + DockNode ID=0x00000019 Parent=0x0000002B SizeRef=401,465 Split=Y Selected=0x148E1A1B + DockNode ID=0x0000002E Parent=0x00000019 SizeRef=401,282 Selected=0x148E1A1B + DockNode ID=0x0000002D Parent=0x00000019 SizeRef=401,238 Split=Y Selected=0x3CF15644 + DockNode ID=0x00000003 Parent=0x0000002D SizeRef=401,258 Selected=0x148E1A1B + DockNode ID=0x00000004 Parent=0x0000002D SizeRef=401,262 Selected=0x3CF15644 + DockNode ID=0x0000001A Parent=0x0000002B SizeRef=401,510 Selected=0x12D5DF45 + DockNode ID=0x0000000F Parent=0x0000003E SizeRef=1920,318 Split=X Selected=0xFB9F4E92 + DockNode ID=0x00000026 Parent=0x0000000F SizeRef=707,453 Selected=0xFB9F4E92 + DockNode ID=0x00000022 Parent=0x0000000F SizeRef=1211,453 Selected=0xCB44F1EA + DockNode ID=0x0000003C Parent=0x0000004B SizeRef=1920,326 Split=X Selected=0x3DE5F12B + DockNode ID=0x0000003B Parent=0x0000003C SizeRef=434,408 Selected=0x6DCF654B + DockNode ID=0x0000003F Parent=0x0000003C SizeRef=1484,408 Selected=0x3DE5F12B + DockNode ID=0x0000004A Parent=0xF3CABE56 SizeRef=1920,485 Selected=0x1CB07D66 From 170a57ce2d23b271e9e563ff7a2af58854fe3eeb Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Fri, 29 Sep 2023 13:48:43 +0200 Subject: [PATCH 18/21] =?UTF-8?q?=F0=9F=A7=BC=20Cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/App.h b/src/App.h index 17d5fc90..39eda495 100644 --- a/src/App.h +++ b/src/App.h @@ -22,7 +22,6 @@ #include "CommandCore/CommandExecutor_WithoutHistory_Ref.h" #include "CommandCore/ReversibleCommandExecutor_WithoutHistory_Ref.h" #include "Commands/Command_SetCameraZoom.h" // For the serialization functions -#include "Cool/ImGui/ImGuiWindow.h" #include "Cool/StrongTypes/Camera2D.h" #include "Cool/Tips/TipsManager.h" #include "Cool/View/ForwardingOrRenderView.h" From 8a16c98d7d3a33848f71b23b7db4443ffca81bce Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Fri, 29 Sep 2023 13:49:37 +0200 Subject: [PATCH 19/21] =?UTF-8?q?=F0=9F=8E=A8=20Formatting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CommandCore/ConcreteCommand.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/CommandCore/ConcreteCommand.h b/src/CommandCore/ConcreteCommand.h index af049278..e4c40219 100644 --- a/src/CommandCore/ConcreteCommand.h +++ b/src/CommandCore/ConcreteCommand.h @@ -7,20 +7,20 @@ class CommandExecutionContext_Ref; template concept ConcreteCommand = requires(const T& a, const T& b, CommandExecutionContext_Ref& command_execution_context, const MakeReversibleCommandContext_Ref& make_reversible_command_context) { - // Has an execute() method - a.execute(command_execution_context); - // Has a to_string() method - { - a.to_string() - } -> std::convertible_to; + // Has an execute() method + a.execute(command_execution_context); + // Has a to_string() method + { + a.to_string() + } -> std::convertible_to; - // TODO require a serialization function - }; + // TODO require a serialization function +}; template concept ConcreteCommandThatCanBeMadeReversible = ConcreteCommand && requires(const T& a, const MakeReversibleCommandContext_Ref& make_reversible_command_context) { - // Has a make_reversible() method - a.make_reversible(make_reversible_command_context); - }; + // Has a make_reversible() method + a.make_reversible(make_reversible_command_context); +}; } // namespace Lab From b2c09b1bccf70342f56f97d701ad77332e5959dc Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Fri, 29 Sep 2023 13:57:37 +0200 Subject: [PATCH 20/21] =?UTF-8?q?=F0=9F=A4=8F=20[Midi]=20Tweak=20displayed?= =?UTF-8?q?=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- User data Default/imgui.ini | 9 ++++++++- src/App.cpp | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Cool b/Cool index 27b5dd7f..c1e83b17 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 27b5dd7f08cded71a39862c47ce24b4c1b8f070a +Subproject commit c1e83b1761daa256ed3c1ed50a076a27e8f50435 diff --git a/User data Default/imgui.ini b/User data Default/imgui.ini index fa9e55c2..e1b1a680 100644 --- a/User data Default/imgui.ini +++ b/User data Default/imgui.ini @@ -633,6 +633,13 @@ Size=1323,310 Collapsed=0 DockId=0x00000052,0 + +[Window][  MIDI] +Pos=0,30 +Size=1323,940 +Collapsed=0 +DockId=0x00000054,1 + [Table][0x4EF0CFBB,2] Column 0 Weight=1.0000 Column 1 Weight=1.0000 @@ -724,7 +731,7 @@ DockSpace ID=0xF3CABE56 Wind DockNode ID=0x00000047 Parent=0x00000050 SizeRef=1288,940 Split=Y Selected=0xEB0CD24C DockNode ID=0x00000041 Parent=0x00000047 SizeRef=1334,535 Split=Y Selected=0xEB0CD24C DockNode ID=0x0000004E Parent=0x00000041 SizeRef=1323,558 Split=Y Selected=0xEB0CD24C - DockNode ID=0x00000054 Parent=0x0000004E SizeRef=1323,351 CentralNode=1 Selected=0xAF7842FD + DockNode ID=0x00000054 Parent=0x0000004E SizeRef=1323,351 CentralNode=1 Selected=0xA6A85153 DockNode ID=0x00000052 Parent=0x0000004E SizeRef=1323,310 Selected=0x69DA1CCA DockNode ID=0x00000049 Parent=0x00000041 SizeRef=1323,364 Selected=0x9C8E2C2E DockNode ID=0x0000003D Parent=0x00000047 SizeRef=1334,387 Selected=0x83AD6119 diff --git a/src/App.cpp b/src/App.cpp index 13a1cd57..8321c757 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -599,10 +599,10 @@ void App::commands_menu() _tips_manager.open_all_tips_window(); if (ImGui::Selectable("Open webcams config")) Cool::WebcamsConfigs::instance().open_imgui_window(); + if (ImGui::Selectable("Open MIDI config")) + Cool::midi_manager().open_config_window(); if (ImGui::Selectable("Open output window")) _output_view.open(); - if (ImGui::Selectable("Open MIDI window")) - Cool::midi_manager().open_config_window(); ImGui::EndMenu(); } } From 040de0e1a4661c9b70baa6f12b127ebbc135c5a5 Mon Sep 17 00:00:00 2001 From: Jules Fouchy Date: Fri, 29 Sep 2023 14:02:45 +0200 Subject: [PATCH 21/21] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20[Cool]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cool b/Cool index c1e83b17..32210e8f 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit c1e83b1761daa256ed3c1ed50a076a27e8f50435 +Subproject commit 32210e8fe898cc01d87c41343c0f394ab8aee10a