summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp29
1 files changed, 11 insertions, 18 deletions
diff --git a/main.cpp b/main.cpp
index bb780c4..a32598f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -161,6 +161,14 @@ Main_InputTest(project_data *File, project_state *State, memory *Memory, ui *UI,
{
Clipboard_Paste(File, State, Memory, Sorted.CompArray, Sorted.LayerArray, Sorted.PropertyArray);
} break;
+ case hotkey_togglechannels:
+ {
+ Project_ToggleAllChannels(File, State, Memory, Sorted.CompArray, Sorted.LayerArray, Sorted.PropertyInfo, Sorted.PropertyArray);
+ } break;
+ default:
+ {
+ Assert(0);
+ } break;
}
State->HotkeyInput = hotkey_none;
}
@@ -176,15 +184,7 @@ Main_InputTest(project_data *File, project_state *State, memory *Memory, ui *UI,
}
#endif
- // if (State->FocusedWindow == focus_viewport && State->SetFocus) {
- // ImGui::SetNextWindowFocus();
- // State->SetFocus = false;
- // }
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, Sorted.CompArray, Sorted.LayerArray, Sorted.PropertyInfo, Sorted.PropertyArray);
@@ -197,7 +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!
+ ImGui_Popups(File, State, UI, Memory, io);
File_Sort_Pop(Memory, Sorted.Layer_SortSize, Sorted.Property_SortSize, Sorted.Source_SortSize);
@@ -505,15 +505,6 @@ int main(int argc, char *argv[]) {
File->Comp_Count = 1;
-
-#if 0
- {
- uint16 SourceIndex = Source_Generate(File, State, &Memory, (void *)"../asset/a_small.jpg");
- block_source *Source = (block_source *)Memory_Block_AddressAtIndex(&Memory, F_Sources, File->Source_Count - 1);
- Source->IsSelected = true;
- }
-#endif
-
SDL_Init(SDL_INIT_VIDEO);
Semaphore = SDL_CreateSemaphore(0);
@@ -633,11 +624,13 @@ int main(int argc, char *argv[]) {
#endif
#if DEBUG
+#if 1
sprintf(State->DummyName, "test2");
File_Open(File, State, &Memory, State->DummyName);
State->UpdateFrame = true;
State->MostRecentlySelectedLayer = 0;
#endif
+#endif
while (State->IsRunning)
{