diff --git a/SakuraVNE/src/main.cpp b/SakuraVNE/src/main.cpp index 7f54ed4..077a6bc 100644 --- a/SakuraVNE/src/main.cpp +++ b/SakuraVNE/src/main.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { SakuraVNE::AppData appData; appData.name = "Sakura Visual Novel Creator"; - appData.windowdata.windowFlags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY; + appData.windowdata.windowFlags = (SDL_WindowFlags)(SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY); appData.windowdata.title = appData.name; appData.windowdata.width = 1280; appData.windowdata.height = 720; diff --git a/imgui.ini b/imgui.ini index 741a384..f413389 100644 --- a/imgui.ini +++ b/imgui.ini @@ -1,148 +1,40 @@ -[Window][Debug##Default] -Pos=60,60 -Size=400,400 -Collapsed=0 - -[Window][Hello World!] -Pos=147,38 -Size=311,180 -Collapsed=0 - -[Window][Dear ImGui Demo] -Pos=584,0 -Size=696,720 -Collapsed=0 -DockId=0x00000006,0 - -[Window][Test window] -Size=618,101 -Collapsed=0 -DockId=0x00000001,0 - -[Window][Delta time] -Pos=60,60 -Size=178,67 -Collapsed=0 - -[Window][Calculated Delta time] -Size=1280,101 -Collapsed=0 -DockId=0x00000002,0 - [Window][WindowOverViewport_11111111] Pos=0,0 Size=1280,720 Collapsed=0 +[Window][Debug##Default] +Pos=60,60 +Size=400,400 +Collapsed=0 + [Window][Framerate] Pos=0,0 -Size=582,364 +Size=728,458 Collapsed=0 -DockId=0x00000009,0 +DockId=0x00000001,0 -[Window][Layer Transition] -Pos=0,362 -Size=590,358 -Collapsed=0 -DockId=0x00000008,0 - -[Window][Overlay Transition] -Pos=447,274 -Size=310,354 +[Window][Dear ImGui Demo] +Pos=730,0 +Size=550,720 Collapsed=0 +DockId=0x00000004,0 [Window][To TestLayer Transition] -Pos=0,366 -Size=582,354 +Pos=0,460 +Size=728,260 Collapsed=0 -DockId=0x0000000A,0 +DockId=0x00000002,0 -[Window][To AppLayer Transition] -Pos=0,0 -Size=1280,720 +[Window][Overlay Transition] +Pos=543,330 +Size=301,164 Collapsed=0 -DockId=0x00000009,0 - -[Table][0x51D6F5EA,3] -Column 0 Weight=1.0000 -Column 1 Weight=1.0000 -Column 2 Weight=1.0000 - -[Table][0xE102187A,3] -RefScale=13 -Column 0 Width=63 -Column 1 Width=63 -Column 2 Width=63 - -[Table][0xF1421304,3] -RefScale=13 -Column 0 Width=63 -Column 1 Width=63 -Column 2 Weight=1.0000 - -[Table][0xE212E0F0,6] -RefScale=13 -Column 0 Width=63 -Column 1 Width=63 -Column 2 Width=-1 -Column 3 Weight=1.0000 -Column 4 Weight=1.0000 -Column 5 Weight=-1.0000 - -[Table][0x86C9FC97,3] -Column 0 Weight=1.0000 -Column 1 Weight=1.0000 -Column 2 Weight=1.0000 - -[Table][0x95990F63,3] -RefScale=13 -Column 0 Width=63 -Column 1 Width=63 -Column 2 Width=63 - -[Table][0x603C335E,2] -Column 0 Weight=1.0000 -Column 1 Weight=1.0000 - -[Table][0xA6C6558A,2] -Column 0 Weight=1.0000 -Column 1 Weight=1.0000 - -[Table][0x3A20F3F3,3] -RefScale=13 -Column 0 Width=56 -Column 1 Width=56 -Column 2 Width=56 - -[Table][0xEA44DE71,3] -RefScale=13 -Column 0 Weight=1.0000 -Column 1 Width=84 -Column 2 Width=126 - -[Table][0x29CD9FF7,3] - -[Table][0x369EB90F,3] -Column 0 Weight=1.0000 -Column 1 Weight=1.0000 -Column 2 Weight=1.0000 - -[Table][0x2ACCE68A,3] -RefScale=13 -Column 0 Width=86 -Column 1 Width=86 -Column 2 Width=86 [Docking][Data] -DockSpace ID=0x08BD597D Window=0x1BBC0F80 Pos=0,0 Size=1280,720 Split=Y - DockNode ID=0x00000003 Parent=0x08BD597D SizeRef=1280,101 Split=X Selected=0xAA1D0058 - DockNode ID=0x00000001 Parent=0x00000003 SizeRef=618,101 Selected=0xAA1D0058 - DockNode ID=0x00000002 Parent=0x00000003 SizeRef=660,101 Selected=0x561EDE67 - DockNode ID=0x00000004 Parent=0x08BD597D SizeRef=1280,617 Split=X - DockNode ID=0x00000005 Parent=0x00000004 SizeRef=582,724 Split=Y Selected=0x0FC82981 - DockNode ID=0x00000007 Parent=0x00000005 SizeRef=590,360 Split=Y Selected=0x0FC82981 - DockNode ID=0x00000009 Parent=0x00000007 SizeRef=590,364 CentralNode=1 Selected=0x0FC82981 - DockNode ID=0x0000000A Parent=0x00000007 SizeRef=590,354 Selected=0x4443B0A2 - DockNode ID=0x00000008 Parent=0x00000005 SizeRef=590,358 Selected=0x5259B841 - DockNode ID=0x00000006 Parent=0x00000004 SizeRef=696,724 Selected=0x5E5F7166 +DockSpace ID=0x08BD597D Window=0x1BBC0F80 Pos=0,0 Size=1280,720 Split=X + DockNode ID=0x00000003 Parent=0x08BD597D SizeRef=728,720 Split=Y + DockNode ID=0x00000001 Parent=0x00000003 SizeRef=1280,458 CentralNode=1 Selected=0x0FC82981 + DockNode ID=0x00000002 Parent=0x00000003 SizeRef=1280,260 Selected=0x4443B0A2 + DockNode ID=0x00000004 Parent=0x08BD597D SizeRef=550,720 Selected=0x5E5F7166 diff --git a/libs/SakuraCore b/libs/SakuraCore index 4b89548..685fb55 160000 --- a/libs/SakuraCore +++ b/libs/SakuraCore @@ -1 +1 @@ -Subproject commit 4b895481022b37ba94b0e07f4604c9007b5f8011 +Subproject commit 685fb55b431ed973186a4ef1eb4d33168243ced3