diff --git a/Cool b/Cool index 6ba77419..32c83acc 160000 --- a/Cool +++ b/Cool @@ -1 +1 @@ -Subproject commit 6ba7741989f2d1793f5942568ad4a5b6a268b97a +Subproject commit 32c83acc2cf943a17141aeeef3608ece4a1fc52d diff --git a/User data Default/imgui.ini b/User data Default/imgui.ini index e1b1a680..b3bc265b 100644 --- a/User data Default/imgui.ini +++ b/User data Default/imgui.ini @@ -1,6 +1,6 @@ [Window][MyMainDockSpace] Pos=0,30 -Size=1920,987 +Size=1920,971 Collapsed=0 [Window][Debug##Default] @@ -440,26 +440,26 @@ Collapsed=0 DockId=0x00000029,1 [Window][  View] -Pos=1325,476 -Size=595,541 +Pos=1325,469 +Size=595,532 Collapsed=0 DockId=0x00000046,0 [Window][  Nodes] Pos=0,30 -Size=1323,940 +Size=1323,924 Collapsed=0 DockId=0x00000054,0 [Window][  Time] -Pos=0,972 +Pos=0,956 Size=1323,45 Collapsed=0 DockId=0x00000045,0 [Window][  Cameras] Pos=1325,30 -Size=595,444 +Size=595,437 Collapsed=0 DockId=0x0000003A,1 @@ -550,7 +550,7 @@ Collapsed=0 [Window][  Inspector] Pos=1325,30 -Size=595,444 +Size=595,437 Collapsed=0 DockId=0x0000003A,0 @@ -633,12 +633,17 @@ Size=1323,310 Collapsed=0 DockId=0x00000052,0 - [Window][  MIDI] Pos=0,30 -Size=1323,940 +Size=1323,924 Collapsed=0 -DockId=0x00000054,1 +DockId=0x00000054,2 + +[Window][  Output] +Pos=189,129 +Size=1100,681 +Collapsed=0 +DockId=0x00000051,0 [Table][0x4EF0CFBB,2] Column 0 Weight=1.0000 @@ -702,7 +707,8 @@ Column 1 Weight=1.0000 Column 2 Weight=1.0000 [Docking][Data] -DockSpace ID=0xF3CABE56 Window=0x74B75B81 Pos=0,53 Size=1920,987 Split=Y +DockNode ID=0x00000051 Pos=189,158 Size=1100,681 Selected=0xDEB27A50 +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 @@ -731,7 +737,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=0xA6A85153 + DockNode ID=0x00000054 Parent=0x0000004E SizeRef=1323,351 CentralNode=1 Selected=0xEB0CD24C 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.h b/src/App.h index 39eda495..99ddce8a 100644 --- a/src/App.h +++ b/src/App.h @@ -22,9 +22,12 @@ #include "CommandCore/CommandExecutor_WithoutHistory_Ref.h" #include "CommandCore/ReversibleCommandExecutor_WithoutHistory_Ref.h" #include "Commands/Command_SetCameraZoom.h" // For the serialization functions +#include "Cool/Midi/MidiChannel.h" +#include "Cool/Midi/MidiManager.h" #include "Cool/StrongTypes/Camera2D.h" #include "Cool/Tips/TipsManager.h" #include "Cool/View/ForwardingOrRenderView.h" +#include "Cool/Webcam/WebcamsConfigs.h" #include "Debug/DebugOptions.h" #include "Dependencies/CameraManager.h" #include "Dependencies/History.h" @@ -136,7 +139,10 @@ class App : public Cool::IApp { archive( cereal::make_nvp("Recently opened projects", app._recently_opened_projects), cereal::make_nvp("Gallery Poster", app._gallery_poster), - cereal::make_nvp("Tips", app._tips_manager) + cereal::make_nvp("Tips", app._tips_manager), + cereal::make_nvp("Output view", app._output_view), + cereal::make_nvp("Webcams config", Cool::WebcamsConfigs::instance()), + cereal::make_nvp("MIDI config", Cool::midi_manager()) ); } template