mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor: rename matrices in rootston

Browse source
This commit is contained in:
emersion 2017-12-01 16:13:24 +01:00
parent acc8f36894
commit d1b29a54b9
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
rootston/output.c
View file

@ -49,38 +49,38 @@ static void render_surface(struct wlr_surface *surface,
lx, ly, lx + render_width, ly + render_height)) { lx, ly, lx + render_width, ly + render_height)) {
float matrix[16]; float matrix[16];
float translate_origin[16]; float translate_center[16];
wlr_matrix_translate(&translate_origin, wlr_matrix_translate(&translate_center,
(int)ox + render_width / 2, (int)oy + render_height / 2, 0); (int)ox + render_width / 2, (int)oy + render_height / 2, 0);
float rotate[16]; float rotate[16];
wlr_matrix_rotate(&rotate, rotation); wlr_matrix_rotate(&rotate, rotation);
float translate_center[16]; float translate_origin[16];
wlr_matrix_translate(&translate_center, -render_width / 2, wlr_matrix_translate(&translate_origin, -render_width / 2,
-render_height / 2, 0); -render_height / 2, 0);
float scale[16]; float scale[16];
wlr_matrix_scale(&scale, render_width, render_height, 1); wlr_matrix_scale(&scale, render_width, render_height, 1);
float translate_mdr[16]; float surface_translate_center[16];
wlr_matrix_translate(&translate_mdr, 0.5, 0.5, 0); wlr_matrix_translate(&surface_translate_center, 0.5, 0.5, 0);
float surface_transform[16]; float surface_transform[16];
wlr_matrix_transform(surface_transform, wlr_matrix_transform(surface_transform,
wlr_output_transform_invert(surface->current->transform)); // TODO wlr_output_transform_invert(surface->current->transform));
float translate_mdr2[16]; float surface_translate_origin[16];
wlr_matrix_translate(&translate_mdr2, -0.5, -0.5, 0); wlr_matrix_translate(&surface_translate_origin, -0.5, -0.5, 0);
float transform[16]; float transform[16];
wlr_matrix_mul(&translate_origin, &rotate, &transform); wlr_matrix_mul(&translate_center, &rotate, &transform);
wlr_matrix_mul(&transform, &translate_center, &transform); wlr_matrix_mul(&transform, &translate_origin, &transform);
wlr_matrix_mul(&transform, &scale, &transform); wlr_matrix_mul(&transform, &scale, &transform);
wlr_matrix_mul(&transform, &translate_mdr, &transform); wlr_matrix_mul(&transform, &surface_translate_center, &transform);
wlr_matrix_mul(&transform, &surface_transform, &transform); wlr_matrix_mul(&transform, &surface_transform, &transform);
wlr_matrix_mul(&transform, &translate_mdr2, &transform); wlr_matrix_mul(&transform, &surface_translate_origin, &transform);
wlr_matrix_mul(&wlr_output->transform_matrix, &transform, &matrix); wlr_matrix_mul(&wlr_output->transform_matrix, &transform, &matrix);