diff options
| author | Fox Caminiti <fox@foxcam.net> | 2023-02-08 23:58:05 -0500 |
|---|---|---|
| committer | Fox Caminiti <fox@foxcam.net> | 2023-02-08 23:58:05 -0500 |
| commit | 3d2e5b594b1872f866a698014c97ee4e98de6259 (patch) | |
| tree | a66540c6d0b87a286da793ef8371c2be9e7fb77f /src/include | |
| parent | b9d111d0136f32d1c43b12eb6e5595fcead9c025 (diff) | |
dumb ui changes
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/all.h | 4 | ||||
| -rw-r--r-- | src/include/layer.h | 2 | ||||
| -rw-r--r-- | src/include/main.h | 16 |
3 files changed, 21 insertions, 1 deletions
diff --git a/src/include/all.h b/src/include/all.h index cdd14a8..b5b1d77 100644 --- a/src/include/all.h +++ b/src/include/all.h @@ -224,6 +224,10 @@ static void Layer_TestBoxSelect(memory *Memory, project_state *State, ui *UI, sorted_comp_array *SortedCompArray, sorted_layer_array *SortedLayerArray, uint16 PrincipalIndex, layer_transforms ExtraT, v2 MinPos, v2 MaxPos); +static void +Sort_OffsetDupes(memory *Memory, sorted_layer_array *SortedLayerStart, block_layer *StartLayer, sorted_layer_array *StartSortEntry, + int i, int FauxIncrement, int LayerCount, int Mode); + void AV_IsFileSupported(char *filename, bool32 *IsVideo, bool32 *HasAudio); void AV_Dealloc(av_info *AV); diff --git a/src/include/layer.h b/src/include/layer.h index 074a274..bbea0e6 100644 --- a/src/include/layer.h +++ b/src/include/layer.h @@ -24,7 +24,7 @@ static void Layer_Select_RecurseUp(memory *Memory, project_state *State, int32 i, int16 RecursionIdx[MAX_PRECOMP_RECURSIONS], uint32 Recursions); static void -Layer_DeselectAll(project_data *File, project_state *State, memory *Memory, bool32 AllowComp = 0); +Layer_DeselectAll(project_data *File, project_state *State, memory *Memory, bool32 AllowComp = 0, bool32 RecordSelection = 0); static bool32 Layer_LoopChannels(project_state *State, memory *Memory, sorted_property_array **SortedProperty, uint16 **SortedKeyframe, block_layer *Layer, diff --git a/src/include/main.h b/src/include/main.h index 9c1da89..3b4843e 100644 --- a/src/include/main.h +++ b/src/include/main.h @@ -398,6 +398,13 @@ struct gl_effect_layer { uint32 Stencil_Renderbuffer; }; +enum gl_shape_renderflags +{ + gl_renderflag_fill = 1 << 0, + gl_renderflag_stroke = 1 << 1, + gl_renderflag_concave = 1 << 2 +}; + struct gl_data { int Type; @@ -415,7 +422,10 @@ struct gl_data struct gl_viewport_data { + ImVec2 ViewportMin; + ImVec2 ViewportMax; ImVec2 ViewportSize; + int ViewportDisplay; int Width; int Height; int BytesPerPixel; @@ -468,6 +478,12 @@ struct project_state bool32 UpdateScreen = 1; // refreshes entire UI; influenced by raw key/mouse input bool32 DebugDisableCache = 1; + bool32 ViewportEnabled = 0; + bool32 SelectionMode = 1; + + uint16 PreviousSelection[MAX_LAYERS]; + uint16 PreviousSelectionCount = 0; + // bad uint32 CachedFrameCount; int32 LastCachedFrame = -10000; |