hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

[canvas, mtl backend] Handle image rotation

This commit is contained in:
Martin Fouilleul 2023-02-24 20:39:41 +01:00
parent bb106b717f
commit 1b62ec568c
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/image/main.c
View File

@ -75,7 +75,13 @@ int main()
mg_clear(); mg_clear();
mg_set_color_rgba(1, 0, 1, 1); mg_set_color_rgba(1, 0, 1, 1);
mg_image_draw(image, (mp_rect){100, 100, imageSize.x/8, imageSize.y/8});
mg_matrix_push((mg_mat2x3){0.707, -0.707, 200,
0.707, 0.707, 100});
mg_image_draw(image, (mp_rect){0, 0, imageSize.x/8, imageSize.y/8});
mg_matrix_pop();
mg_flush(); mg_flush();
mg_surface_present(surface); mg_surface_present(surface);

22
src/graphics.c
View File

@ -545,6 +545,18 @@ mg_mat2x3 mg_mat2x3_mul_m(mg_mat2x3 lhs, mg_mat2x3 rhs)
return(res); return(res);
} }
mg_mat2x3 mg_mat2x3_inv(mg_mat2x3 x)
{
mg_mat2x3 res;
res.m[0] = x.m[4]/(x.m[0]*x.m[4] - x.m[1]*x.m[3]);
res.m[1] = x.m[1]/(x.m[1]*x.m[3] - x.m[0]*x.m[4]);
res.m[3] = x.m[3]/(x.m[1]*x.m[3] - x.m[0]*x.m[4]);
res.m[4] = x.m[0]/(x.m[0]*x.m[4] - x.m[1]*x.m[3]);
res.m[2] = -(x.m[2]*res.m[0] + x.m[5]*res.m[1]);
res.m[5] = -(x.m[2]*res.m[3] + x.m[5]*res.m[4]);
return(res);
}
vec2 mg_mat2x3_mul(mg_mat2x3 m, vec2 p) vec2 mg_mat2x3_mul(mg_mat2x3 m, vec2 p)
{ {
f32 x = p.x*m.m[0] + p.y*m.m[1] + m.m[2]; f32 x = p.x*m.m[0] + p.y*m.m[1] + m.m[2];
@ -613,8 +625,7 @@ u32 mg_next_shape_textured(mg_canvas_data* canvas, vec2 uv, mg_color color)
0, srcRegion.h/destRegion.h, 0}; 0, srcRegion.h/destRegion.h, 0};
mg_mat2x3 userToDestRegion = {1, 0, -destRegion.x, mg_mat2x3 userToDestRegion = {1, 0, -destRegion.x,
0, 1, -destRegion.y}; 0, 1, -destRegion.y};
mg_mat2x3 screenToUser = {1, 0, 0, mg_mat2x3 screenToUser = mg_mat2x3_inv(canvas->transform);
0, 1, 0};
mg_mat2x3 uvTransform = srcRegionToTexture; mg_mat2x3 uvTransform = srcRegionToTexture;
uvTransform = mg_mat2x3_mul_m(uvTransform, destRegionToSrcRegion); uvTransform = mg_mat2x3_mul_m(uvTransform, destRegionToSrcRegion);
@ -2188,6 +2199,7 @@ void mg_render_ellipse_stroke(mg_canvas_data* canvas, mp_rect rect, mg_attribute
void mg_render_image(mg_canvas_data* canvas, mg_image image, mp_rect srcRegion, mp_rect dstRegion, mg_attributes* attributes) void mg_render_image(mg_canvas_data* canvas, mg_image image, mp_rect srcRegion, mp_rect dstRegion, mg_attributes* attributes)
{ {
mg_image_data* imageData = mg_image_data_from_handle(canvas, image); mg_image_data* imageData = mg_image_data_from_handle(canvas, image);
if(imageData) if(imageData)
{ {
@ -2214,9 +2226,11 @@ void mg_render_image(mg_canvas_data* canvas, mg_image image, mp_rect srcRegion,
indices[4] = baseIndex + 2; indices[4] = baseIndex + 2;
indices[5] = baseIndex + 3; indices[5] = baseIndex + 3;
} }
//mg_render_rectangle_fill(canvas, dstRegion, attributes);
} }
void mg_render_rounded_image(mg_canvas_data* canvas, mg_image image, mp_rect srcRegion, mg_rounded_rect dstRegion, mg_attributes* attributes) void mg_render_image_rounded(mg_canvas_data* canvas, mg_image image, mp_rect srcRegion, mg_rounded_rect dstRegion, mg_attributes* attributes)
{ {
//TODO //TODO
/* /*
@ -3069,7 +3083,7 @@ void mg_flush_commands(int primitiveCount, mg_primitive* primitives, mg_path_elt
case MG_CMD_ROUNDED_IMAGE_DRAW: case MG_CMD_ROUNDED_IMAGE_DRAW:
{ {
mg_render_rounded_image(canvas, primitive->attributes.image, primitive->srcRegion, primitive->roundedRect, &primitive->attributes); mg_render_image_rounded(canvas, primitive->attributes.image, primitive->srcRegion, primitive->roundedRect, &primitive->attributes);
} break; } break;
} }