From 612b726da0dc6da7868a51fc72250b2364983bd2 Mon Sep 17 00:00:00 2001 From: Danielku15 Date: Sun, 24 Dec 2023 13:19:02 +0100 Subject: [PATCH] Corrected length calculation for music notes --- test/native/src/AlphaTabGeneratedTest.cpp | 116 ++++++++++----------- test/test-generator/AlphaSkiaTestCanvas.cs | 2 +- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/test/native/src/AlphaTabGeneratedTest.cpp b/test/native/src/AlphaTabGeneratedTest.cpp index 869afd2..3a94dad 100644 --- a/test/native/src/AlphaTabGeneratedTest.cpp +++ b/test/native/src/AlphaTabGeneratedTest.cpp @@ -57,7 +57,7 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) { text_align = alphaskia_text_align_left; typeface = alphaskia_get_typeface("PT Serif", true, false); font_size = static_cast(14); - alphaskia_canvas_fill_text(canvas, u"\uE1D5", 9, music_typeface, static_cast(music_font_size * 0.75), static_cast(156.6767578125), static_cast(40), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE1D5", 1, music_typeface, static_cast(music_font_size * 0.75), static_cast(156.6767578125), static_cast(40), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_fill_text(canvas, u"= 120", 5, typeface, font_size, static_cast(169.1767578125), static_cast(27), text_align, text_baseline); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(165), static_cast(165), static_cast(165), static_cast(255))); alphaskia_canvas_fill_rect(canvas, static_cast(92), static_cast(130), static_cast(254), static_cast(1.04)); @@ -66,47 +66,47 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) { alphaskia_canvas_fill_rect(canvas, static_cast(92), static_cast(157), static_cast(254), static_cast(1.04)); alphaskia_canvas_fill_rect(canvas, static_cast(92), static_cast(166), static_cast(254), static_cast(1.04)); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(0), static_cast(0), static_cast(0), static_cast(255))); - alphaskia_canvas_fill_text(canvas, u"\uE050", 9, music_typeface, static_cast(music_font_size * 1), static_cast(94), static_cast(157.52), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE084", 9, music_typeface, static_cast(music_font_size * 1), static_cast(127), static_cast(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE084", 9, music_typeface, static_cast(music_font_size * 1), static_cast(127), static_cast(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE050", 1, music_typeface, static_cast(music_font_size * 1), static_cast(94), static_cast(157.52), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE084", 1, music_typeface, static_cast(music_font_size * 1), static_cast(127), static_cast(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE084", 1, music_typeface, static_cast(music_font_size * 1), static_cast(127), static_cast(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(200), static_cast(0), static_cast(0), static_cast(255))); typeface = alphaskia_get_typeface("Roboto", false, false); font_size = static_cast(11); alphaskia_canvas_fill_text(canvas, u"1", 1, typeface, font_size, static_cast(141), static_cast(118.75), text_align, text_baseline); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(0), static_cast(0), static_cast(0), static_cast(255))); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(152.1767578125), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE272", 9, music_typeface, static_cast(music_font_size * 0.75), static_cast(172.86069962449085), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 0.75), static_cast(180.86069962449085), static_cast(149), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(152.1767578125), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE272", 1, music_typeface, static_cast(music_font_size * 0.75), static_cast(172.86069962449085), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 0.75), static_cast(180.86069962449085), static_cast(149), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_begin_path(canvas); alphaskia_canvas_move_to(canvas, static_cast(156.6767578125), static_cast(144)); alphaskia_canvas_line_to(canvas, static_cast(170.855110706305), static_cast(133.50723450810483)); alphaskia_canvas_line_to(canvas, static_cast(184.23569962449085), static_cast(145)); alphaskia_canvas_stroke(canvas); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(192.23569962449085), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 0.75), static_cast(220.91964143648167), static_cast(144.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(192.23569962449085), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 0.75), static_cast(220.91964143648167), static_cast(144.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_begin_path(canvas); alphaskia_canvas_move_to(canvas, static_cast(196.73569962449085), static_cast(144)); alphaskia_canvas_line_to(canvas, static_cast(209.12929655256082), static_cast(131.33765133817155)); alphaskia_canvas_line_to(canvas, static_cast(224.29464143648167), static_cast(140.5)); alphaskia_canvas_stroke(canvas); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(232.29464143648167), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE262", 9, music_typeface, static_cast(music_font_size * 0.75), static_cast(252.9785832484725), static_cast(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 0.75), static_cast(260.9785832484725), static_cast(144.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(232.29464143648167), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE262", 1, music_typeface, static_cast(music_font_size * 0.75), static_cast(252.9785832484725), static_cast(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 0.75), static_cast(260.9785832484725), static_cast(144.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_begin_path(canvas); alphaskia_canvas_move_to(canvas, static_cast(236.79464143648167), static_cast(144)); alphaskia_canvas_line_to(canvas, static_cast(249.1882383645516), static_cast(131.33765133817155)); alphaskia_canvas_line_to(canvas, static_cast(264.3535832484725), static_cast(140.5)); alphaskia_canvas_stroke(canvas); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(272.3535832484725), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 0.75), static_cast(294.5517916242362), static_cast(140), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(272.3535832484725), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 0.75), static_cast(294.5517916242362), static_cast(140), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_begin_path(canvas); alphaskia_canvas_move_to(canvas, static_cast(276.8535832484725), static_cast(152)); alphaskia_canvas_line_to(canvas, static_cast(292.1060513036615), static_cast(156.93783819474976)); alphaskia_canvas_line_to(canvas, static_cast(297.9267916242362), static_cast(142)); alphaskia_canvas_stroke(canvas); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(305.9267916242362), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE262", 9, music_typeface, static_cast(music_font_size * 0.75), static_cast(324.625), static_cast(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 0.75), static_cast(332.625), static_cast(140), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(305.9267916242362), static_cast(148), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE262", 1, music_typeface, static_cast(music_font_size * 0.75), static_cast(324.625), static_cast(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 0.75), static_cast(332.625), static_cast(140), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_begin_path(canvas); alphaskia_canvas_move_to(canvas, static_cast(310.4267916242362), static_cast(152)); alphaskia_canvas_line_to(canvas, static_cast(327.2193887931866), static_cast(157.24460932567123)); @@ -163,10 +163,10 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) { font_size = static_cast(11); alphaskia_canvas_fill_text(canvas, u"2", 1, typeface, font_size, static_cast(346), static_cast(118.75), text_align, text_baseline); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(0), static_cast(0), static_cast(0), static_cast(255))); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(357.1767578125), static_cast(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(378.359547484596), static_cast(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(399.542337156692), static_cast(161.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A3", 9, music_typeface, static_cast(music_font_size * 1), static_cast(426.623147703567), static_cast(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(357.1767578125), static_cast(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(378.359547484596), static_cast(139), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(399.542337156692), static_cast(161.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A3", 1, music_typeface, static_cast(music_font_size * 1), static_cast(426.623147703567), static_cast(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_fill_rect(canvas, static_cast(471), static_cast(130.1), static_cast(1), static_cast(36)); alphaskia_canvas_set_line_width(canvas, static_cast(0.96)); alphaskia_canvas_begin_path(canvas); @@ -244,14 +244,14 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) { font_size = static_cast(11); alphaskia_canvas_fill_text(canvas, u"3", 1, typeface, font_size, static_cast(472), static_cast(118.75), text_align, text_baseline); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(0), static_cast(0), static_cast(0), static_cast(255))); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(496.32666015625), static_cast(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(496.32666015625), static_cast(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(496.32666015625), static_cast(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(496.32666015625), static_cast(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(496.32666015625), static_cast(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(496.32666015625), static_cast(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_begin_rotate(canvas, static_cast(527.8699951171875), static_cast(172), static_cast(-90)); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(0), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(10.799999999999999), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(21.599999999999998), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(32.4), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(0), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(10.799999999999999), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(21.599999999999998), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(32.4), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_end_rotate(canvas); alphaskia_canvas_begin_path(canvas); alphaskia_canvas_move_to(canvas, static_cast(527.8699951171875), static_cast(180)); @@ -262,24 +262,24 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) { alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(165), static_cast(165), static_cast(165), static_cast(255))); alphaskia_canvas_fill_rect(canvas, static_cast(533.8699951171875), static_cast(175), static_cast(15), static_cast(1)); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(0), static_cast(0), static_cast(0), static_cast(255))); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(536.8699951171875), static_cast(175), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(536.8699951171875), static_cast(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(536.8699951171875), static_cast(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(536.8699951171875), static_cast(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(536.8699951171875), static_cast(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(536.8699951171875), static_cast(175), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(536.8699951171875), static_cast(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(536.8699951171875), static_cast(157), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(536.8699951171875), static_cast(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(536.8699951171875), static_cast(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(165), static_cast(165), static_cast(165), static_cast(255))); alphaskia_canvas_fill_rect(canvas, static_cast(574.413330078125), static_cast(175), static_cast(15), static_cast(1)); alphaskia_canvas_fill_rect(canvas, static_cast(574.413330078125), static_cast(184), static_cast(15), static_cast(1)); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(0), static_cast(0), static_cast(0), static_cast(255))); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(577.413330078125), static_cast(184), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(577.413330078125), static_cast(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(577.413330078125), static_cast(152.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(577.413330078125), static_cast(184), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(577.413330078125), static_cast(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(577.413330078125), static_cast(152.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_begin_rotate(canvas, static_cast(596.9566650390625), static_cast(137.5), static_cast(90)); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(0), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(10.799999999999999), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(21.599999999999998), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(32.4), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(43.199999999999996), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(0), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(10.799999999999999), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(21.599999999999998), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(32.4), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(43.199999999999996), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_end_rotate(canvas); alphaskia_canvas_begin_path(canvas); alphaskia_canvas_move_to(canvas, static_cast(596.9566650390625), static_cast(129.5)); @@ -287,16 +287,16 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) { alphaskia_canvas_line_to(canvas, static_cast(592.9566650390625), static_cast(137.5)); alphaskia_canvas_close_path(canvas); alphaskia_canvas_fill(canvas); - alphaskia_canvas_fill_text(canvas, u"\uE262", 9, music_typeface, static_cast(music_font_size * 1), static_cast(607.9566650390625), static_cast(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE262", 1, music_typeface, static_cast(music_font_size * 1), static_cast(607.9566650390625), static_cast(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(165), static_cast(165), static_cast(165), static_cast(255))); alphaskia_canvas_fill_rect(canvas, static_cast(614.9566650390625), static_cast(175), static_cast(15), static_cast(1)); alphaskia_canvas_fill_rect(canvas, static_cast(614.9566650390625), static_cast(184), static_cast(15), static_cast(1)); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(0), static_cast(0), static_cast(0), static_cast(255))); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(617.9566650390625), static_cast(184), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(617.9566650390625), static_cast(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(617.9566650390625), static_cast(152.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(617.9566650390625), static_cast(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uE0A4", 9, music_typeface, static_cast(music_font_size * 1), static_cast(617.9566650390625), static_cast(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(617.9566650390625), static_cast(184), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(617.9566650390625), static_cast(166), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(617.9566650390625), static_cast(152.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(617.9566650390625), static_cast(143.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE0A4", 1, music_typeface, static_cast(music_font_size * 1), static_cast(617.9566650390625), static_cast(134.5), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_fill_rect(canvas, static_cast(670), static_cast(130.1), static_cast(1), static_cast(36)); alphaskia_canvas_fill_rect(canvas, static_cast(674), static_cast(130.1), static_cast(4), static_cast(36)); alphaskia_canvas_set_line_width(canvas, static_cast(0.96)); @@ -337,7 +337,7 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) { alphaskia_canvas_fill_rect(canvas, static_cast(92), static_cast(328), static_cast(254), static_cast(1.04)); alphaskia_canvas_fill_rect(canvas, static_cast(92), static_cast(339), static_cast(254), static_cast(1.04)); alphaskia_canvas_set_color(canvas, alphaskia_rgba_to_color(static_cast(0), static_cast(0), static_cast(0), static_cast(255))); - alphaskia_canvas_fill_text(canvas, u"\uE06D", 9, music_typeface, static_cast(music_font_size * 0.9230769230769231), static_cast(97), static_cast(311.8), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uE06D", 1, music_typeface, static_cast(music_font_size * 0.9230769230769231), static_cast(97), static_cast(311.8), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); text_baseline = alphaskia_text_baseline_middle; typeface = alphaskia_get_typeface("Roboto", false, false); font_size = static_cast(13); @@ -569,11 +569,11 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) { alphaskia_canvas_fill_text(canvas, u"0", 1, typeface, font_size, static_cast(497.1767578125), static_cast(306.3), text_align, text_baseline); text_baseline = alphaskia_text_baseline_top; alphaskia_canvas_begin_rotate(canvas, static_cast(527.7200927734375), static_cast(326.8), static_cast(-90)); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(0), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(10.799999999999999), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(21.599999999999998), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(32.4), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(43.199999999999996), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(0), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(10.799999999999999), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(21.599999999999998), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(32.4), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(43.199999999999996), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_end_rotate(canvas); alphaskia_canvas_begin_path(canvas); alphaskia_canvas_move_to(canvas, static_cast(528), static_cast(334.8)); @@ -648,11 +648,11 @@ alphaskia_image_t draw_music_sheet_part_4(alphaskia_canvas_t canvas) { alphaskia_canvas_fill_text(canvas, u"0", 1, typeface, font_size, static_cast(578.263427734375), static_cast(328.3), text_align, text_baseline); text_baseline = alphaskia_text_baseline_top; alphaskia_canvas_begin_rotate(canvas, static_cast(596.8067626953125), static_cast(283.8), static_cast(90)); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(0), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(10.799999999999999), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(21.599999999999998), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(32.4), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); - alphaskia_canvas_fill_text(canvas, u"\uEAA4", 9, music_typeface, static_cast(music_font_size * 1.2), static_cast(43.199999999999996), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(0), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(10.799999999999999), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(21.599999999999998), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(32.4), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); + alphaskia_canvas_fill_text(canvas, u"\uEAA4", 1, music_typeface, static_cast(music_font_size * 1.2), static_cast(43.199999999999996), static_cast(10.799999999999999), alphaskia_text_align_left, alphaskia_text_baseline_alphabetic); alphaskia_canvas_end_rotate(canvas); alphaskia_canvas_begin_path(canvas); alphaskia_canvas_move_to(canvas, static_cast(597), static_cast(275.8)); diff --git a/test/test-generator/AlphaSkiaTestCanvas.cs b/test/test-generator/AlphaSkiaTestCanvas.cs index 1cfb721..c1374ac 100644 --- a/test/test-generator/AlphaSkiaTestCanvas.cs +++ b/test/test-generator/AlphaSkiaTestCanvas.cs @@ -147,7 +147,7 @@ public void FillMusicFontSymbols(double x, double y, double scale, IList