diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/all.h | 8 | ||||
| -rw-r--r-- | src/include/main.h | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/include/all.h b/src/include/all.h index b5b1d77..8117437 100644 --- a/src/include/all.h +++ b/src/include/all.h @@ -374,10 +374,6 @@ static bool32 Transform_TestBox(block_layer *Layer, uint32 Width, uint32 Height, v2 Min, v2 Max); static void -Interact_Transform_Begin(project_data *File, memory *Memory, project_state *State, ImVec2 OGPos, - sorted_comp_array *SortedCompArray, sorted_layer_array *SortedLayerArray); - -static void Layer_RecursiveDeselect(memory *Memory, sorted_comp_array *SortedCompArray, sorted_layer_array *SortedLayerArray, uint16 TargetIndex, uint16 PrincipalIndex); static bool32 @@ -472,7 +468,7 @@ Data_Decompress(memory *Memory, void *CompressedLocation, uint64 CompressedSize, static uint32 NVG_FlattenPath(memory *Memory, shape_layer *Shape, shape_options ShapeOpt, nvg_point *PointData, project_state *State, layer_transforms T, int Width, int Height, - int CompWidth, int CompHeight, bool32 Interact, v2 *Min, v2 *Max); + int CompWidth, int CompHeight, bool32 Interact, v2 *Min, v2 *Max, bool32 IsConcave); static real32 * NVG_Point(real32 *StrokeData, real32 x, real32 y, real32 u, real32 v); @@ -532,7 +528,7 @@ inline void ImGui_DrawCenteredRect(ImDrawList *draw_list, ImVec2 Point, real32 Width, uint32 col); static bool32 -Layer_TestForPoint(memory *Memory, project_state *State, ui *UI, sorted_comp_array *SortedCompArray, sorted_layer_array *SortedLayerArray, uint16 PrincipalIndex, v2 CompUV); +Layer_TestForPoint(memory *Memory, project_state *State, ui *UI, sorted_comp_array *SortedCompArray, sorted_layer_array *SortedLayerArray, uint16 CompIndex, v2 CompPos, layer_transforms ExtraT); static v2 TransformPoint(layer_transforms T, real32 Width, real32 Height, v2 Point); diff --git a/src/include/main.h b/src/include/main.h index 3b4843e..da037dc 100644 --- a/src/include/main.h +++ b/src/include/main.h @@ -478,6 +478,8 @@ struct project_state bool32 UpdateScreen = 1; // refreshes entire UI; influenced by raw key/mouse input bool32 DebugDisableCache = 1; + bool32 ShapeMode = 0; + bool32 ViewportEnabled = 0; bool32 SelectionMode = 1; @@ -625,7 +627,7 @@ struct ui 0xff8b1f1f, 0xffc25909, 0xff57c20a, - 0xff8ee6da, + 0xff203d6a, 0xffa48fb7, 0xffd14061, 0xff38b683, |