From 0047b9ffc06d65f53d8101c5393f4943c1011c03 Mon Sep 17 00:00:00 2001 From: Fox Caminiti Date: Mon, 28 Nov 2022 00:18:06 -0500 Subject: fancy hotkey ui aside --- main.cpp | 178 +++------------------------------------------------------------ 1 file changed, 6 insertions(+), 172 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index a7788ad..e880d8c 100644 --- a/main.cpp +++ b/main.cpp @@ -159,7 +159,7 @@ Main_InputTest(project_data *File, project_state *State, memory *Memory, ui *UI, } break; case hotkey_paste: { - Clipboard_Paste(File, State, Memory, Sorted.CompArray, Sorted.LayerArray); + Clipboard_Paste(File, State, Memory, Sorted.CompArray, Sorted.LayerArray, Sorted.PropertyArray); } break; } State->HotkeyInput = hotkey_none; @@ -176,21 +176,20 @@ Main_InputTest(project_data *File, project_state *State, memory *Memory, ui *UI, } #endif - ImGui_Popups(File, State, UI, Memory, io); if (State->FocusedWindow == focus_viewport && State->SetFocus) { ImGui::SetNextWindowFocus(); State->SetFocus = false; } - ImGui_Viewport(File, State, UI, Memory, io, textureID, Sorted.CompArray, Sorted.LayerArray); + ImGui_Viewport(File, State, UI, Memory, io, textureID, Sorted.CompArray, Sorted.LayerArray, Sorted.PropertyArray); if (State->FocusedWindow == focus_timeline && State->SetFocus) { ImGui::SetNextWindowFocus(); State->SetFocus = false; } ImGui_Timeline(File, State, Memory, UI, io, Sorted.CompArray, Sorted.LayerArray, Sorted.PropertyInfo, Sorted.PropertyArray); ImGui_File(File, State, Memory, io, Sorted.CompArray, Sorted.LayerArray); - ImGui_PropertiesPanel(File, State, UI, Memory, io); + ImGui_PropertiesPanel(File, State, UI, Memory, io, Sorted.PropertyArray); ImGui_ColorPanel(File, State, UI, Memory, io); - // ImGui_EffectsPanel(File, State, Memory, UI, io); + ImGui_EffectsPanel(File, State, Memory, UI, io); #if STABLE if (UI->StableEnabled) { ImGui_SD_Prompt(File, State, UI, Memory, io, Sorted.CompArray, Sorted.LayerArray); @@ -198,6 +197,7 @@ Main_InputTest(project_data *File, project_state *State, memory *Memory, ui *UI, } #endif ImGui_Menu(File, State, UI, Memory, io); + ImGui_Popups(File, State, UI, Memory, io); // NOTE(fox): If popup disappears unexpectedly it means something else took its focus! File_Sort_Pop(Memory, Sorted.Layer_SortSize, Sorted.Property_SortSize, Sorted.Source_SortSize); @@ -382,173 +382,6 @@ Render_Comp(project_data *File, project_state *State, memory *Memory, ImGuiIO io return CompBuffer; } -static char ImGuiPrefs[] = "[Window][DockSpaceViewport_11111111]\n" -"Pos=0,0\n" -"Size=2133,1333\n" -"Collapsed=0\n" -"\n" -"[Window][Debug##Default]\n" -"Pos=122,442\n" -"Size=400,400\n" -"Collapsed=0\n" -"\n" -"[Window][Viewport]\n" -"Pos=443,34\n" -"Size=1165,738\n" -"Collapsed=0\n" -"DockId=0x00000010,0\n" -"\n" -"[Window][###Properties]\n" -"Pos=0,34\n" -"Size=441,738\n" -"Collapsed=0\n" -"DockId=0x0000000B,0\n" -"\n" -"[Window][Timeline]\n" -"Pos=0,774\n" -"Size=2133,559\n" -"Collapsed=0\n" -"DockId=0x0000000A,0\n" -"\n" -"[Window][Dear ImGui Demo]\n" -"Pos=1610,34\n" -"Size=523,267\n" -"Collapsed=0\n" -"DockId=0x00000011,1\n" -"\n" -"[Window][Files]\n" -"Pos=1610,303\n" -"Size=523,469\n" -"Collapsed=0\n" -"DockId=0x00000007,0\n" -"\n" -"[Window][Effects list]\n" -"Pos=2677,1047\n" -"Size=523,192\n" -"Collapsed=0\n" -"DockId=0x00000008,0\n" -"\n" -"[Window][Graph editor]\n" -"Pos=0,949\n" -"Size=3200,526\n" -"Collapsed=0\n" -"DockId=0x00000009,0\n" -"\n" -"[Window][undotree]\n" -"Pos=2114,80\n" -"Size=256,565\n" -"Collapsed=0\n" -"\n" -"[Window][memoryviewer]\n" -"Pos=50,273\n" -"Size=800,200\n" -"Collapsed=0\n" -"\n" -"[Window][Example: Custom rendering]\n" -"Pos=758,789\n" -"Size=485,414\n" -"Collapsed=0\n" -"\n" -"[Window][Memory viewer]\n" -"Pos=1610,303\n" -"Size=523,469\n" -"Collapsed=0\n" -"DockId=0x00000007,1\n" -"\n" -"[Window][Graph info]\n" -"Pos=2838,1265\n" -"Size=235,353\n" -"Collapsed=0\n" -"\n" -"[Window][Properties]\n" -"Pos=0,34\n" -"Size=495,1056\n" -"Collapsed=0\n" -"DockId=0x0000000F,0\n" -"\n" -"[Window][Colors]\n" -"Pos=1610,34\n" -"Size=523,267\n" -"Collapsed=0\n" -"DockId=0x00000011,0\n" -"\n" -"[Window][Menu]\n" -"Pos=0,0\n" -"Size=2133,32\n" -"Collapsed=0\n" -"DockId=0x0000000D,0\n" -"\n" -"[Window][Stable Diffusion]\n" -"Pos=2206,684\n" -"Size=421,462\n" -"Collapsed=0\n" -"\n" -"[Window][SD prompt input]\n" -"Pos=2677,473\n" -"Size=523,541\n" -"Collapsed=0\n" -"DockId=0x00000007,2\n" -"\n" -"[Window][Example: Console]\n" -"Pos=747,851\n" -"Size=520,600\n" -"Collapsed=0\n" -"\n" -"[Window][SD gallery]\n" -"Pos=0,718\n" -"Size=441,557\n" -"Collapsed=0\n" -"DockId=0x0000000C,0\n" -"\n" -"[Window][Save as]\n" -"Pos=300,800\n" -"Size=300,300\n" -"Collapsed=0\n" -"\n" -"[Table][0x861D378E,3]\n" -"Column 0 Weight=1.0000\n" -"Column 1 Weight=1.0000\n" -"Column 2 Weight=1.0000\n" -"\n" -"[Table][0x1F146634,3]\n" -"RefScale=13\n" -"Column 0 Width=63\n" -"Column 1 Width=63\n" -"Column 2 Width=63\n" -"\n" -"[Table][0x64418101,3]\n" -"RefScale=13\n" -"Column 0 Width=63\n" -"Column 1 Width=63\n" -"Column 2 Width=63\n" -"\n" -"[Table][0xC9935533,3]\n" -"Column 0 Weight=1.0000\n" -"Column 1 Weight=1.0000\n" -"Column 2 Weight=1.0000\n" -"\n" -"[Docking][Data]\n" -"DockSpace ID=0x8B93E3BD Window=0xA787BDB4 Pos=0,0 Size=2133,1333 Split=Y Selected=0x13926F0B\n" -" DockNode ID=0x0000000D Parent=0x8B93E3BD SizeRef=3200,32 HiddenTabBar=1 Selected=0xA57AB2C6\n" -" DockNode ID=0x0000000E Parent=0x8B93E3BD SizeRef=3200,1299 Split=Y\n" -" DockNode ID=0x00000001 Parent=0x0000000E SizeRef=3200,1205 Split=X Selected=0x13926F0B\n" -" DockNode ID=0x00000003 Parent=0x00000001 SizeRef=441,1171 Split=Y Selected=0xDBB8CEFA\n" -" DockNode ID=0x0000000B Parent=0x00000003 SizeRef=521,425 Selected=0xDBB8CEFA\n" -" DockNode ID=0x0000000C Parent=0x00000003 SizeRef=521,347 Selected=0x56290987\n" -" DockNode ID=0x00000004 Parent=0x00000001 SizeRef=1690,1171 Split=X Selected=0x13926F0B\n" -" DockNode ID=0x00000005 Parent=0x00000004 SizeRef=1165,1171 Split=X Selected=0x13926F0B\n" -" DockNode ID=0x0000000F Parent=0x00000005 SizeRef=495,856 Selected=0x199AB496\n" -" DockNode ID=0x00000010 Parent=0x00000005 SizeRef=2199,856 CentralNode=1 Selected=0x13926F0B\n" -" DockNode ID=0x00000006 Parent=0x00000004 SizeRef=523,1171 Split=Y Selected=0x86FA2F90\n" -" DockNode ID=0x00000011 Parent=0x00000006 SizeRef=483,437 Selected=0xBF7DFDC9\n" -" DockNode ID=0x00000012 Parent=0x00000006 SizeRef=483,766 Split=Y Selected=0x59A2A092\n" -" DockNode ID=0x00000007 Parent=0x00000012 SizeRef=523,572 Selected=0x86FA2F90\n" -" DockNode ID=0x00000008 Parent=0x00000012 SizeRef=523,192 Selected=0x812F222D\n" -" DockNode ID=0x00000002 Parent=0x0000000E SizeRef=3200,559 Split=Y Selected=0x0F18B61B\n" -" DockNode ID=0x00000009 Parent=0x00000002 SizeRef=3250,526 Selected=0xA1F22F4D\n" -" DockNode ID=0x0000000A Parent=0x00000002 SizeRef=3250,323 HiddenTabBar=1 Selected=0x0F18B61B\n" -"\n"; - static void Main_Renderer(project_data *File, project_state *State, memory *Memory, SDL_Window *window, GLuint textureID, ImGuiIO io) { @@ -716,6 +549,7 @@ int main(int argc, char *argv[]) { SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); + // SDL_RenderSetScale(renderer, 2, 2) #if DEBUG #if ARM uint32 ScreenSize[2] = {(uint32)(2560/1.2), (uint32)(1600/1.2)}; -- cgit v1.2.3