diff options
| author | Fox Caminiti <fox@foxcam.net> | 2023-01-20 23:24:37 -0500 |
|---|---|---|
| committer | Fox Caminiti <fox@foxcam.net> | 2023-01-20 23:24:37 -0500 |
| commit | 6298837d4b5fbff561e3d7e6a3361bd64e432960 (patch) | |
| tree | 00fac3f57aaaa6bb9476f9ba108a8a13d1a67a46 /src/include | |
| parent | 2f164ae23bcd8a857081529189b484a1515f2834 (diff) | |
box selection working
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/all.h | 10 | ||||
| -rw-r--r-- | src/include/main.h | 3 | ||||
| -rw-r--r-- | src/include/my_math.h | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/include/all.h b/src/include/all.h index 8bafd30..a0368d8 100644 --- a/src/include/all.h +++ b/src/include/all.h @@ -444,6 +444,11 @@ void Arbitrary_Zero(uint8 *Address_Write, uint64 Size); void Arbitrary_SwapData(memory *Memory, uint8 *Address_0, uint8 *Address_1, uint64 Size); +static void * +Memory_PushScratch(memory *Memory, uint64 Size); + +static void +Memory_PopScratch(memory *Memory, uint64 Size); static void Arbitrary_ShiftData(uint8 *Address_Start, uint8 *Address_End, uint64 ShiftAmount, int32 Direction); @@ -454,6 +459,11 @@ Data_Compress(memory *Memory, void *DataSource, uint64 DataSize, void *DataBuffe static void Data_Decompress(memory *Memory, void *CompressedLocation, uint64 CompressedSize, void *BitmapLocation, uint64 ExpectedSize); +static uint32 +NVG_FlattenPath(memory *Memory, shape_layer *Shape, nvg_point *PointData, + project_state *State, layer_transforms T, int Width, int Height, + int CompWidth, int CompHeight, bool32 Interact, v2 *Min, v2 *Max); + static real32 * NVG_Point(real32 *StrokeData, real32 x, real32 y, real32 u, real32 v); diff --git a/src/include/main.h b/src/include/main.h index 6c9caca..3129c5d 100644 --- a/src/include/main.h +++ b/src/include/main.h @@ -299,6 +299,7 @@ enum interact_type interact_type_slider_scrub, interact_type_layer_move, interact_type_layer_timeadjust, + interact_type_viewport_selection, interact_type_viewport_transform, interact_type_viewport_duplicate, interact_type_viewport_slide, @@ -310,6 +311,7 @@ enum interact_type char *ToolName[] { "Move", + "Point move", "Crop", "Brush", "Slide", @@ -319,6 +321,7 @@ char *ToolName[] { enum tool { tool_default, + tool_default_pointmove, tool_crop, tool_brush, tool_slide, diff --git a/src/include/my_math.h b/src/include/my_math.h index 2a54f4d..938ed3c 100644 --- a/src/include/my_math.h +++ b/src/include/my_math.h @@ -67,7 +67,7 @@ inline v2 V2(ImVec2 A) return(Result); } -inline ImVec2 ImVec2_(v2 f) { +inline ImVec2 IV2(v2 f) { return { f.x, f.y }; } |