From c5a60e71f9ed869467e2090f4b343641b021386a Mon Sep 17 00:00:00 2001 From: Fox Caminiti Date: Sat, 26 Nov 2022 23:52:57 -0500 Subject: keybind refinement --- main.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 83d3dcb..61bdd03 100644 --- a/main.cpp +++ b/main.cpp @@ -121,9 +121,9 @@ Main_InputTest(project_data *File, project_state *State, memory *Memory, ui *UI, State->IsRunning = false; } - if (UI->Warp_WantSetPos) { + if (State->Warp_WantSetPos) { ImGui::GetIO().WantSetMousePos = true; - io.MousePos = UI->Warp_PositionToSet; + io.MousePos = State->Warp_PositionToSet; } ImGui_ImplOpenGL3_NewFrame(); @@ -131,10 +131,10 @@ Main_InputTest(project_data *File, project_state *State, memory *Memory, ui *UI, ImGui::NewFrame(); - if (UI->Warp_WantSetPos) { - ImGui_WarpMouseFinish(UI, io.MousePos); + if (State->Warp_WantSetPos) { + ImGui_WarpMouseFinish(State, io.MousePos); io.MouseDelta = {}; - UI->Warp_WantSetPos = false; + State->Warp_WantSetPos = false; } if (!io.WantCaptureKeyboard) @@ -184,7 +184,7 @@ Main_InputTest(project_data *File, project_state *State, memory *Memory, ui *UI, ImGui_ColorPanel(File, State, UI, Memory, io); // ImGui_EffectsPanel(File, State, Memory, UI, io); #if STABLE - if (State->StableEnabled) { + if (UI->StableEnabled) { ImGui_SD_Prompt(File, State, UI, Memory, io, Sorted.CompArray, Sorted.LayerArray); ImGui_SD_Thumbnail(File, State, UI, Memory, io, Sorted.CompArray, Sorted.LayerArray, Sorted.SourceArray, Sorted.TempSourceCount); } @@ -645,8 +645,7 @@ int main(int argc, char *argv[]) { State->ClipboardSize = 1024*1024; Memory.ScratchPos += State->ClipboardSize; - ui UI = {}; - UI.Test = ImDrawListSplitter(); + State->Test = ImDrawListSplitter(); block_composition *MainComp = (block_composition *)Memory_Block_AllocateAddress(&Memory, F_Precomps); @@ -794,7 +793,7 @@ int main(int argc, char *argv[]) { } #endif - Main_InputTest(File, State, &Memory, &UI, window, textureID); + Main_InputTest(File, State, &Memory, &File->UI, window, textureID); if (State->IsPlaying) { block_composition *MainComp = (block_composition *)Memory_Block_AddressAtIndex(&Memory, F_Precomps, File->PrincipalCompIndex); -- cgit v1.2.3