Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Expand rotated coordinate bounds to handle rounding / truncation errors

Browse Source
This commit is contained in:
K. Lange 2021-08-12 10:55:30 +09:00
parent 77435a0b57
commit dac240b3c9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/compositor.c
View File

@ -240,8 +240,8 @@ void yutani_window_to_device(yutani_server_window_t * window, int32_t x, int32_t
double t_x = x - (window->width / 2);
double t_y = y - (window->height / 2);
double s = sin(M_PI * (window->rotation/ 180.0));
double c = cos(M_PI * (window->rotation/ 180.0));
double s = sin((double)window->rotation * M_PI / 180.0);
double c = cos((double)window->rotation * M_PI / 180.0);
double n_x = t_x * c - t_y * s;
double n_y = t_x * s + t_y * c;
@ -1245,8 +1245,8 @@ static void mark_window_relative(yutani_globals_t * yg, yutani_server_window_t *
int32_t left_bound = min(min(ul_x, ll_x), min(ur_x, lr_x));
int32_t top_bound = min(min(ul_y, ll_y), min(ur_y, lr_y));
int32_t right_bound = max(max(ul_x, ll_x), max(ur_x, lr_x));
int32_t bottom_bound = max(max(ul_y, ll_y), max(ur_y, lr_y));
int32_t right_bound = max(max(ul_x+1, ll_x+1), max(ur_x+1, lr_x+1));
int32_t bottom_bound = max(max(ul_y+1, ll_y+1), max(ur_y+1, lr_y+1));
rect->x = left_bound;
rect->y = top_bound;

4
lib/graphics.c
View File

@ -940,8 +940,8 @@ void draw_sprite_transform(gfx_context_t * ctx, const sprite_t * sprite, gfx_mat
/* Use the corners to calculate bounds within the target context. */
int32_t _left = clamp(fmin(fmin(ul_x, ll_x), fmin(ur_x, lr_x)), 0, ctx->width);
int32_t _top = clamp(fmin(fmin(ul_y, ll_y), fmin(ur_y, lr_y)), 0, ctx->height);
int32_t _right = clamp(fmax(fmax(ul_x, ll_x), fmax(ur_x, lr_x)), 0, ctx->width);
int32_t _bottom = clamp(fmax(fmax(ul_y, ll_y), fmax(ur_y, lr_y)), 0, ctx->height);
int32_t _right = clamp(fmax(fmax(ul_x+1, ll_x+1), fmax(ur_x+1, lr_x+1)), 0, ctx->width);
int32_t _bottom = clamp(fmax(fmax(ul_y+1, ll_y+1), fmax(ur_y+1, lr_y+1)), 0, ctx->height);
for (int32_t _y = _top; _y < _bottom; ++_y) {
if (!_is_in_clip(ctx, _y)) continue;