diff options
author | Fox Caminiti <fox@foxcam.net> | 2022-12-22 13:29:02 -0500 |
---|---|---|
committer | Fox Caminiti <fox@foxcam.net> | 2022-12-22 13:29:02 -0500 |
commit | 375c120d30456738897c4bd775e38aa1db7d239c (patch) | |
tree | 5b365a6233cf736db15fa52fcfac4ba80a986217 /src/include | |
parent | 4854647d659f75ac6cf4575b61d1dcfd25865791 (diff) |
v3.1
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/imgui_internal_widgets.h | 1 | ||||
-rw-r--r-- | src/include/main.h | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/include/imgui_internal_widgets.h b/src/include/imgui_internal_widgets.h index 52fdc74..863e934 100644 --- a/src/include/imgui_internal_widgets.h +++ b/src/include/imgui_internal_widgets.h @@ -6,6 +6,7 @@ // NOTE(fox): Appending to the standard ImGui namespace so I don't have to convert all the functions to ImGui::Function() namespace ImGui { + IMGUI_API void MyWindowSetup(ImGuiID id); IMGUI_API bool SliderLevels(const char* label, const char* label2, const char* label3, void* p_data, void* p_min, void* p_max); IMGUI_API bool TestLine(ImVec2 P1, ImVec2 P2); IMGUI_API bool BezierInteractive(ImVec2 p0, ImVec2 p1, ImVec2 p2, ImVec2 p3); diff --git a/src/include/main.h b/src/include/main.h index af92e31..fd295cf 100644 --- a/src/include/main.h +++ b/src/include/main.h @@ -325,7 +325,10 @@ struct project_state bool32 UpdateKeyframes = 0; bool32 UpdateFrame = 1; // only refreshes frame; set UpdateKeyframes to update animation bool32 DebugDisableCache = 1; + + // bad uint32 CachedFrameCount; + int32 LastCachedFrame = -10000; uint64 HotFramePerf = 0; @@ -562,8 +565,10 @@ struct block_layer { bool32 IsPrecomp; bool32 Precomp_Toggled; - uint16 Block_Source_Index; // also used for precomp + // NOTE(fox): References a precomp index if IsPrecomp is true, not a source index. + uint16 Block_Source_Index; uint16 Block_String_Index; + // References the precomp that the layer belongs to. uint16 Block_Composition_Index; uint16 Block_Mask_Index[MAX_MASKS]; @@ -594,8 +599,13 @@ struct block_layer { bool32 IsVisible; bool32 IsAdjustment; + // NOTE(fox): I use these in some places without calling + // Interact_Evaluate_Layer(), because I'm assuming it's impossible for + // layer dragging to happen in those contexts. Check for this if weird bugs appear. int32 Frame_Start; int32 Frame_End; + // This is what changes when the layer is dragged. It also marks the starting frame for video footage. + int32 Frame_Offset; real32 Vertical_Offset; real32 Vertical_Height = 1; |