From bbefa65d98c689c9e08b4a43da83292cf5d66824 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Thu, 22 Aug 2019 08:00:17 +0700 Subject: [PATCH] premult alpha for sprites and bitmap fonts, bm font outline support, optional vertex snapping --- samples/bin/library/arial_bm.fnt | 1223 ++++++++++------- samples/bin/library/arial_bm.png | 4 +- samples/bin/library/font_bm_material.json | 2 +- samples/bin/library/font_bm_shader.frag | 22 +- samples/bin/library/font_bm_shader.vert | 30 +- samples/bin/library/font_sdf_shader.frag | 17 +- samples/bin/library/font_sdf_shader.vert | 30 +- samples/bin/library/model_shader.frag | 3 +- samples/bin/library/model_shader.vert | 10 +- samples/bin/library/scene_prefab.json | 11 +- samples/bin/library/sprite_material.json | 2 +- samples/bin/library/sprite_shader.frag | 9 +- samples/bin/library/sprite_shader.vert | 36 +- .../enduro2d/high/systems/render_system.cpp | 2 +- .../render_system_impl/render_system_base.hpp | 4 +- .../render_system_drawer.cpp | 8 +- .../render_system_drawer.hpp | 6 +- 17 files changed, 866 insertions(+), 553 deletions(-) diff --git a/samples/bin/library/arial_bm.fnt b/samples/bin/library/arial_bm.fnt index 6375f656..26dc80ec 100644 --- a/samples/bin/library/arial_bm.fnt +++ b/samples/bin/library/arial_bm.fnt @@ -1,510 +1,713 @@ -info face="Arial" size=50 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=0,0 -common lineHeight=58 base=49 scaleW=512 scaleH=512 pages=1 packed=0 -page id=0 file="arial_bm.png" -chars count=162 -char id=32 x=342 y=38 width=0 height=0 xoffset=0 yoffset=46 xadvance=14 page=0 chnl=0 -char id=33 x=448 y=386 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0 -char id=34 x=394 y=306 width=18 height=18 xoffset=3 yoffset=8 xadvance=18 page=0 chnl=0 -char id=35 x=178 y=180 width=32 height=42 xoffset=1 yoffset=8 xadvance=28 page=0 chnl=0 -char id=36 x=278 y=444 width=28 height=50 xoffset=2 yoffset=5 xadvance=28 page=0 chnl=0 -char id=37 x=4 y=204 width=44 height=42 xoffset=3 yoffset=9 xadvance=45 page=0 chnl=0 -char id=38 x=102 y=364 width=36 height=42 xoffset=3 yoffset=8 xadvance=34 page=0 chnl=0 -char id=39 x=416 y=306 width=10 height=18 xoffset=3 yoffset=8 xadvance=10 page=0 chnl=0 -char id=40 x=392 y=442 width=16 height=52 xoffset=4 yoffset=8 xadvance=17 page=0 chnl=0 -char id=41 x=392 y=386 width=16 height=52 xoffset=4 yoffset=8 xadvance=17 page=0 chnl=0 -char id=42 x=368 y=306 width=22 height=20 xoffset=2 yoffset=8 xadvance=20 page=0 chnl=0 -char id=43 x=178 y=476 width=28 height=28 xoffset=3 yoffset=16 xadvance=30 page=0 chnl=0 -char id=44 x=492 y=226 width=10 height=18 xoffset=5 yoffset=39 xadvance=14 page=0 chnl=0 -char id=45 x=4 y=492 width=18 height=10 xoffset=2 yoffset=29 xadvance=17 page=0 chnl=0 -char id=46 x=26 y=492 width=10 height=10 xoffset=5 yoffset=40 xadvance=14 page=0 chnl=0 -char id=47 x=436 y=340 width=18 height=42 xoffset=0 yoffset=8 xadvance=14 page=0 chnl=0 -char id=48 x=278 y=398 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0 -char id=49 x=414 y=340 width=18 height=40 xoffset=6 yoffset=10 xadvance=28 page=0 chnl=0 -char id=50 x=342 y=262 width=28 height=40 xoffset=2 yoffset=10 xadvance=28 page=0 chnl=0 -char id=51 x=278 y=352 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0 -char id=52 x=178 y=432 width=30 height=40 xoffset=1 yoffset=10 xadvance=28 page=0 chnl=0 -char id=53 x=310 y=262 width=28 height=40 xoffset=3 yoffset=10 xadvance=28 page=0 chnl=0 -char id=54 x=278 y=306 width=28 height=42 xoffset=2 yoffset=8 xadvance=28 page=0 chnl=0 -char id=55 x=278 y=262 width=28 height=40 xoffset=3 yoffset=10 xadvance=28 page=0 chnl=0 -char id=56 x=246 y=444 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0 -char id=57 x=246 y=398 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0 -char id=58 x=46 y=444 width=10 height=30 xoffset=5 yoffset=20 xadvance=14 page=0 chnl=0 -char id=59 x=486 y=340 width=10 height=38 xoffset=5 yoffset=19 xadvance=14 page=0 chnl=0 -char id=60 x=310 y=226 width=28 height=30 xoffset=3 yoffset=14 xadvance=30 page=0 chnl=0 -char id=61 x=452 y=48 width=28 height=20 xoffset=3 yoffset=19 xadvance=30 page=0 chnl=0 -char id=62 x=420 y=48 width=28 height=30 xoffset=3 yoffset=14 xadvance=30 page=0 chnl=0 -char id=63 x=246 y=352 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0 -char id=64 x=4 y=48 width=52 height=52 xoffset=3 yoffset=8 xadvance=51 page=0 chnl=0 -char id=65 x=60 y=448 width=38 height=40 xoffset=0 yoffset=10 xadvance=34 page=0 chnl=0 -char id=66 x=142 y=452 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0 -char id=67 x=102 y=318 width=36 height=42 xoffset=3 yoffset=8 xadvance=37 page=0 chnl=0 -char id=68 x=256 y=126 width=34 height=40 xoffset=4 yoffset=10 xadvance=37 page=0 chnl=0 -char id=69 x=142 y=408 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0 -char id=70 x=178 y=388 width=30 height=40 xoffset=5 yoffset=10 xadvance=31 page=0 chnl=0 -char id=71 x=60 y=402 width=38 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0 -char id=72 x=218 y=126 width=34 height=40 xoffset=5 yoffset=10 xadvance=37 page=0 chnl=0 -char id=73 x=472 y=340 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0 -char id=74 x=340 y=376 width=24 height=42 xoffset=2 yoffset=8 xadvance=25 page=0 chnl=0 -char id=75 x=448 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0 -char id=76 x=246 y=308 width=28 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0 -char id=77 x=430 y=4 width=40 height=40 xoffset=4 yoffset=10 xadvance=42 page=0 chnl=0 -char id=78 x=410 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=37 page=0 chnl=0 -char id=79 x=4 y=398 width=40 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0 -char id=80 x=142 y=364 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0 -char id=81 x=4 y=350 width=40 height=44 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0 -char id=82 x=142 y=82 width=36 height=40 xoffset=4 yoffset=10 xadvance=37 page=0 chnl=0 -char id=83 x=180 y=126 width=34 height=42 xoffset=3 yoffset=8 xadvance=34 page=0 chnl=0 -char id=84 x=372 y=82 width=34 height=40 xoffset=2 yoffset=10 xadvance=31 page=0 chnl=0 -char id=85 x=102 y=456 width=34 height=42 xoffset=4 yoffset=8 xadvance=37 page=0 chnl=0 -char id=86 x=60 y=358 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0 -char id=87 x=4 y=4 width=52 height=40 xoffset=1 yoffset=10 xadvance=48 page=0 chnl=0 -char id=88 x=60 y=314 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0 -char id=89 x=60 y=270 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0 -char id=90 x=334 y=82 width=34 height=40 xoffset=2 yoffset=10 xadvance=31 page=0 chnl=0 -char id=91 x=430 y=386 width=14 height=50 xoffset=4 yoffset=9 xadvance=14 page=0 chnl=0 -char id=92 x=392 y=340 width=18 height=42 xoffset=0 yoffset=8 xadvance=14 page=0 chnl=0 -char id=93 x=412 y=442 width=14 height=50 xoffset=1 yoffset=9 xadvance=14 page=0 chnl=0 -char id=94 x=310 y=466 width=26 height=24 xoffset=2 yoffset=9 xadvance=24 page=0 chnl=0 -char id=95 x=4 y=480 width=34 height=8 xoffset=0 yoffset=51 xadvance=28 page=0 chnl=0 -char id=96 x=42 y=480 width=14 height=12 xoffset=3 yoffset=8 xadvance=17 page=0 chnl=0 -char id=97 x=278 y=226 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0 -char id=98 x=246 y=262 width=28 height=42 xoffset=4 yoffset=8 xadvance=28 page=0 chnl=0 -char id=99 x=246 y=226 width=28 height=32 xoffset=2 yoffset=18 xadvance=25 page=0 chnl=0 -char id=100 x=214 y=446 width=28 height=42 xoffset=2 yoffset=8 xadvance=28 page=0 chnl=0 -char id=101 x=214 y=410 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0 -char id=102 x=368 y=432 width=20 height=42 xoffset=1 yoffset=8 xadvance=14 page=0 chnl=0 -char id=103 x=214 y=364 width=28 height=42 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0 -char id=104 x=310 y=422 width=26 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0 -char id=105 x=458 y=340 width=10 height=40 xoffset=4 yoffset=10 xadvance=12 page=0 chnl=0 -char id=106 x=412 y=386 width=14 height=52 xoffset=-2 yoffset=8 xadvance=12 page=0 chnl=0 -char id=107 x=310 y=378 width=26 height=40 xoffset=4 yoffset=10 xadvance=25 page=0 chnl=0 -char id=108 x=494 y=262 width=10 height=40 xoffset=4 yoffset=10 xadvance=12 page=0 chnl=0 -char id=109 x=386 y=4 width=40 height=32 xoffset=4 yoffset=18 xadvance=42 page=0 chnl=0 -char id=110 x=310 y=342 width=26 height=32 xoffset=4 yoffset=18 xadvance=28 page=0 chnl=0 -char id=111 x=178 y=352 width=30 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0 -char id=112 x=214 y=318 width=28 height=42 xoffset=4 yoffset=17 xadvance=28 page=0 chnl=0 -char id=113 x=214 y=272 width=28 height=42 xoffset=2 yoffset=17 xadvance=28 page=0 chnl=0 -char id=114 x=368 y=396 width=20 height=32 xoffset=4 yoffset=18 xadvance=17 page=0 chnl=0 -char id=115 x=310 y=306 width=26 height=32 xoffset=2 yoffset=18 xadvance=25 page=0 chnl=0 -char id=116 x=486 y=82 width=18 height=40 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0 -char id=117 x=464 y=262 width=26 height=32 xoffset=4 yoffset=18 xadvance=28 page=0 chnl=0 -char id=118 x=388 y=48 width=28 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0 -char id=119 x=342 y=4 width=40 height=30 xoffset=1 yoffset=20 xadvance=37 page=0 chnl=0 -char id=120 x=290 y=48 width=30 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0 -char id=121 x=214 y=226 width=28 height=42 xoffset=1 yoffset=18 xadvance=25 page=0 chnl=0 -char id=122 x=356 y=48 width=28 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0 -char id=123 x=368 y=340 width=20 height=52 xoffset=2 yoffset=8 xadvance=17 page=0 chnl=0 -char id=124 x=430 y=440 width=8 height=52 xoffset=5 yoffset=8 xadvance=13 page=0 chnl=0 -char id=125 x=340 y=422 width=20 height=52 xoffset=2 yoffset=8 xadvance=17 page=0 chnl=0 -char id=126 x=256 y=48 width=30 height=14 xoffset=3 yoffset=22 xadvance=30 page=0 chnl=0 -char id=127 x=350 y=38 width=0 height=0 xoffset=0 yoffset=0 xadvance=0 page=0 chnl=0 -char id=1025 x=142 y=312 width=32 height=48 xoffset=4 yoffset=2 xadvance=34 page=0 chnl=0 -char id=1040 x=60 y=226 width=38 height=40 xoffset=0 yoffset=10 xadvance=34 page=0 chnl=0 -char id=1041 x=142 y=268 width=32 height=40 xoffset=5 yoffset=10 xadvance=33 page=0 chnl=0 -char id=1042 x=142 y=224 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0 -char id=1043 x=470 y=180 width=28 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0 -char id=1044 x=60 y=172 width=38 height=50 xoffset=0 yoffset=8 xadvance=34 page=0 chnl=0 -char id=1045 x=142 y=180 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0 -char id=1046 x=60 y=4 width=50 height=40 xoffset=1 yoffset=10 xadvance=47 page=0 chnl=0 -char id=1047 x=438 y=126 width=32 height=42 xoffset=2 yoffset=8 xadvance=31 page=0 chnl=0 -char id=1048 x=296 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=36 page=0 chnl=0 -char id=1049 x=142 y=126 width=34 height=50 xoffset=4 yoffset=0 xadvance=36 page=0 chnl=0 -char id=1050 x=178 y=308 width=30 height=40 xoffset=4 yoffset=10 xadvance=30 page=0 chnl=0 -char id=1051 x=102 y=410 width=34 height=42 xoffset=1 yoffset=8 xadvance=33 page=0 chnl=0 -char id=1052 x=298 y=4 width=40 height=40 xoffset=4 yoffset=10 xadvance=42 page=0 chnl=0 -char id=1053 x=258 y=82 width=34 height=40 xoffset=5 yoffset=10 xadvance=37 page=0 chnl=0 -char id=1054 x=4 y=304 width=40 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0 -char id=1055 x=220 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=36 page=0 chnl=0 -char id=1056 x=402 y=126 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0 -char id=1057 x=102 y=272 width=36 height=42 xoffset=3 yoffset=8 xadvance=37 page=0 chnl=0 -char id=1058 x=182 y=82 width=34 height=40 xoffset=2 yoffset=10 xadvance=31 page=0 chnl=0 -char id=1059 x=102 y=226 width=36 height=42 xoffset=1 yoffset=8 xadvance=32 page=0 chnl=0 -char id=1060 x=60 y=126 width=38 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0 -char id=1061 x=60 y=82 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0 -char id=1062 x=102 y=172 width=36 height=50 xoffset=4 yoffset=9 xadvance=37 page=0 chnl=0 -char id=1063 x=366 y=126 width=32 height=40 xoffset=3 yoffset=10 xadvance=34 page=0 chnl=0 -char id=1064 x=252 y=4 width=42 height=40 xoffset=4 yoffset=10 xadvance=46 page=0 chnl=0 -char id=1065 x=4 y=150 width=46 height=50 xoffset=4 yoffset=9 xadvance=47 page=0 chnl=0 -char id=1066 x=206 y=4 width=42 height=40 xoffset=0 yoffset=10 xadvance=40 page=0 chnl=0 -char id=1067 x=160 y=4 width=42 height=40 xoffset=5 yoffset=10 xadvance=45 page=0 chnl=0 -char id=1068 x=330 y=126 width=32 height=40 xoffset=5 yoffset=10 xadvance=33 page=0 chnl=0 -char id=1069 x=102 y=126 width=36 height=42 xoffset=3 yoffset=8 xadvance=36 page=0 chnl=0 -char id=1070 x=4 y=104 width=48 height=42 xoffset=5 yoffset=8 xadvance=51 page=0 chnl=0 -char id=1071 x=102 y=82 width=36 height=40 xoffset=1 yoffset=10 xadvance=37 page=0 chnl=0 -char id=1072 x=438 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0 -char id=1073 x=178 y=262 width=30 height=42 xoffset=3 yoffset=8 xadvance=29 page=0 chnl=0 -char id=1074 x=434 y=262 width=26 height=30 xoffset=4 yoffset=20 xadvance=27 page=0 chnl=0 -char id=1075 x=484 y=48 width=20 height=30 xoffset=4 yoffset=20 xadvance=19 page=0 chnl=0 -char id=1076 x=294 y=126 width=32 height=38 xoffset=0 yoffset=19 xadvance=30 page=0 chnl=0 -char id=1077 x=406 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0 -char id=1078 x=102 y=48 width=38 height=30 xoffset=0 yoffset=20 xadvance=34 page=0 chnl=0 -char id=1079 x=340 y=340 width=24 height=32 xoffset=2 yoffset=18 xadvance=23 page=0 chnl=0 -char id=1080 x=404 y=262 width=26 height=30 xoffset=4 yoffset=20 xadvance=28 page=0 chnl=0 -char id=1081 x=374 y=262 width=26 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0 -char id=1082 x=340 y=306 width=24 height=30 xoffset=4 yoffset=20 xadvance=22 page=0 chnl=0 -char id=1083 x=178 y=226 width=30 height=32 xoffset=1 yoffset=18 xadvance=30 page=0 chnl=0 -char id=1084 x=220 y=48 width=32 height=30 xoffset=4 yoffset=20 xadvance=35 page=0 chnl=0 -char id=1085 x=462 y=226 width=26 height=30 xoffset=4 yoffset=20 xadvance=28 page=0 chnl=0 -char id=1086 x=474 y=126 width=30 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0 -char id=1087 x=432 y=226 width=26 height=30 xoffset=4 yoffset=20 xadvance=28 page=0 chnl=0 -char id=1088 x=374 y=180 width=28 height=42 xoffset=4 yoffset=17 xadvance=28 page=0 chnl=0 -char id=1089 x=342 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=25 page=0 chnl=0 -char id=1090 x=402 y=226 width=26 height=30 xoffset=1 yoffset=20 xadvance=23 page=0 chnl=0 -char id=1091 x=310 y=180 width=28 height=42 xoffset=1 yoffset=18 xadvance=25 page=0 chnl=0 -char id=1092 x=4 y=250 width=42 height=50 xoffset=2 yoffset=9 xadvance=42 page=0 chnl=0 -char id=1093 x=474 y=4 width=30 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0 -char id=1094 x=278 y=180 width=28 height=38 xoffset=4 yoffset=19 xadvance=29 page=0 chnl=0 -char id=1095 x=372 y=226 width=26 height=30 xoffset=2 yoffset=20 xadvance=27 page=0 chnl=0 -char id=1096 x=60 y=48 width=38 height=30 xoffset=4 yoffset=20 xadvance=41 page=0 chnl=0 -char id=1097 x=114 y=4 width=42 height=38 xoffset=4 yoffset=19 xadvance=42 page=0 chnl=0 -char id=1098 x=182 y=48 width=34 height=30 xoffset=1 yoffset=20 xadvance=32 page=0 chnl=0 -char id=1099 x=144 y=48 width=34 height=30 xoffset=4 yoffset=20 xadvance=36 page=0 chnl=0 -char id=1100 x=342 y=226 width=26 height=30 xoffset=4 yoffset=20 xadvance=27 page=0 chnl=0 -char id=1101 x=246 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=26 page=0 chnl=0 -char id=1102 x=4 y=444 width=38 height=32 xoffset=4 yoffset=18 xadvance=38 page=0 chnl=0 -char id=1103 x=324 y=48 width=28 height=30 xoffset=1 yoffset=20 xadvance=28 page=0 chnl=0 -char id=1105 x=214 y=180 width=28 height=42 xoffset=2 yoffset=8 xadvance=28 page=0 chnl=0 -kernings count=343 -kerning first=1059 second=1081 amount=-1 -kerning first=1043 second=1071 amount=-1 -kerning first=86 second=117 amount=-1 -kerning first=1059 second=44 amount=-6 -kerning first=84 second=97 amount=-5 -kerning first=1047 second=1063 amount=-1 -kerning first=1059 second=1096 amount=-2 -kerning first=1070 second=1046 amount=-1 -kerning first=1042 second=1090 amount=-1 -kerning first=1043 second=1086 amount=-3 -kerning first=1100 second=1090 amount=-3 -kerning first=1041 second=1061 amount=-1 -kerning first=1042 second=1057 amount=-1 -kerning first=1058 second=1100 amount=-2 -kerning first=1075 second=1072 amount=-1 -kerning first=1060 second=1058 amount=-2 -kerning first=1043 second=1091 amount=-3 -kerning first=1070 second=1051 amount=-2 -kerning first=1074 second=1091 amount=-1 -kerning first=1086 second=1076 amount=-1 -kerning first=84 second=99 amount=-5 -kerning first=87 second=65 amount=-1 -kerning first=1058 second=1072 amount=-2 -kerning first=1078 second=1098 amount=1 -kerning first=1069 second=1061 amount=-1 -kerning first=1046 second=1054 amount=-1 -kerning first=1058 second=1087 amount=-2 -kerning first=1069 second=1076 amount=-1 -kerning first=1060 second=1063 amount=-1 -kerning first=1056 second=58 amount=-1 -kerning first=1057 second=1058 amount=-1 -kerning first=1056 second=1077 amount=-2 -kerning first=80 second=65 amount=-3 -kerning first=1059 second=1073 amount=-1 -kerning first=1050 second=1060 amount=-1 -kerning first=86 second=101 amount=-2 -kerning first=1059 second=1088 amount=-2 -kerning first=1058 second=1044 amount=-1 -kerning first=1075 second=44 amount=-6 -kerning first=1057 second=1063 amount=-1 -kerning first=1091 second=1083 amount=-1 -kerning first=1060 second=1083 amount=-1 -kerning first=1068 second=1052 amount=-1 -kerning first=1057 second=1078 amount=1 -kerning first=1059 second=1093 amount=-2 -kerning first=1074 second=1083 amount=-1 -kerning first=1043 second=1083 amount=-2 -kerning first=1044 second=1079 amount=1 -kerning first=1101 second=1083 amount=-1 -kerning first=1070 second=1058 amount=-2 -kerning first=1074 second=1098 amount=-1 -kerning first=1042 second=1054 amount=-1 -kerning first=1088 second=1083 amount=-1 -kerning first=1060 second=1040 amount=-1 -kerning first=1056 second=1054 amount=-1 -kerning first=1040 second=1044 amount=1 -kerning first=1079 second=1076 amount=-1 -kerning first=1043 second=1040 amount=-3 -kerning first=1070 second=1063 amount=-1 -kerning first=1040 second=1059 amount=-2 -kerning first=1059 second=46 amount=-6 -kerning first=1054 second=1044 amount=-1 -kerning first=1058 second=1084 amount=-2 -kerning first=89 second=111 amount=-4 -kerning first=1057 second=1040 amount=-1 -kerning first=1043 second=1103 amount=-3 -kerning first=1046 second=1066 amount=1 -kerning first=1054 second=1059 amount=-1 -kerning first=1058 second=1099 amount=-2 -kerning first=1068 second=1044 amount=-1 -kerning first=1058 second=44 amount=-5 -kerning first=87 second=44 amount=-2 -kerning first=1091 second=44 amount=-5 -kerning first=1070 second=1083 amount=-2 -kerning first=84 second=111 amount=-5 -kerning first=1059 second=1085 amount=-2 -kerning first=89 second=112 amount=-3 -kerning first=84 second=65 amount=-3 -kerning first=1092 second=1076 amount=-1 -kerning first=1042 second=1046 amount=-1 -kerning first=80 second=44 amount=-6 -kerning first=87 second=46 amount=-2 -kerning first=1070 second=1040 amount=-1 -kerning first=1075 second=1076 amount=-2 -kerning first=1043 second=1080 amount=-2 -kerning first=1082 second=1073 amount=1 -kerning first=1102 second=1076 amount=-1 -kerning first=1074 second=1095 amount=-2 -kerning first=1043 second=1047 amount=-1 -kerning first=89 second=113 amount=-4 -kerning first=1042 second=1066 amount=-2 -kerning first=1088 second=1095 amount=-1 -kerning first=1075 second=46 amount=-6 -kerning first=76 second=84 amount=-3 -kerning first=80 second=46 amount=-6 -kerning first=1056 second=1051 amount=-2 -kerning first=1043 second=1052 amount=-1 -kerning first=1059 second=1077 amount=-3 -kerning first=1042 second=1071 amount=-1 -kerning first=1043 second=1100 amount=-2 -kerning first=76 second=121 amount=-1 -kerning first=1072 second=1090 amount=-1 -kerning first=76 second=86 amount=-3 -kerning first=1056 second=1071 amount=-1 -kerning first=1086 second=1090 amount=-1 -kerning first=1056 second=1086 amount=-2 -kerning first=1059 second=1082 amount=-2 -kerning first=1043 second=1072 amount=-2 -kerning first=84 second=114 amount=-1 -kerning first=1054 second=1061 amount=-2 -kerning first=76 second=87 amount=-3 -kerning first=1059 second=1097 amount=-2 -kerning first=1062 second=1054 amount=-1 -kerning first=1073 second=1091 amount=-1 -kerning first=1077 second=1083 amount=-1 -kerning first=1054 second=1076 amount=-1 -kerning first=1042 second=1058 amount=-3 -kerning first=1068 second=1061 amount=-2 -kerning first=1060 second=1044 amount=-1 -kerning first=1058 second=46 amount=-5 -kerning first=1060 second=1059 amount=-2 -kerning first=1056 second=1058 amount=-2 -kerning first=1090 second=1078 amount=1 -kerning first=84 second=58 amount=-5 -kerning first=84 second=44 amount=-5 -kerning first=1091 second=46 amount=-5 -kerning first=1043 second=44 amount=-6 -kerning first=84 second=115 amount=-5 -kerning first=1043 second=1044 amount=-3 -kerning first=1059 second=1054 amount=-1 -kerning first=76 second=89 amount=-3 -kerning first=1059 second=1069 amount=-1 -kerning first=1042 second=1063 amount=-2 -kerning first=1059 second=1102 amount=-2 -kerning first=1058 second=1088 amount=-2 -kerning first=1057 second=1044 amount=-1 -kerning first=1090 second=44 amount=-5 -kerning first=1057 second=1059 amount=-1 -kerning first=1090 second=1083 amount=-1 -kerning first=1059 second=1074 amount=-2 -kerning first=84 second=46 amount=-5 -kerning first=1040 second=1101 amount=1 -kerning first=1066 second=1071 amount=-1 -kerning first=1058 second=1093 amount=-2 -kerning first=1059 second=1089 amount=-3 -kerning first=1073 second=1083 amount=-2 -kerning first=89 second=117 amount=-2 -kerning first=1073 second=1098 amount=-1 -kerning first=1070 second=1044 amount=-2 -kerning first=1059 second=1094 amount=-2 -kerning first=89 second=97 amount=-3 -kerning first=1043 second=1084 amount=-2 -kerning first=119 second=44 amount=-2 -kerning first=84 second=117 amount=-1 -kerning first=1042 second=1040 amount=-1 -kerning first=1043 second=1099 amount=-2 -kerning first=1077 second=1095 amount=-1 -kerning first=89 second=118 amount=-2 -kerning first=114 second=44 amount=-2 -kerning first=1056 second=1040 amount=-3 -kerning first=1073 second=1103 amount=-1 -kerning first=1059 second=1051 amount=-1 -kerning first=1056 second=1103 amount=-1 -kerning first=1092 second=1090 amount=-1 -kerning first=1042 second=1060 amount=-1 -kerning first=1061 second=1057 amount=-1 -kerning first=89 second=101 amount=-4 -kerning first=1091 second=1076 amount=-1 -kerning first=49 second=49 amount=-3 -kerning first=86 second=121 amount=-1 -kerning first=1102 second=1090 amount=-1 -kerning first=1059 second=1071 amount=-1 -kerning first=1059 second=1086 amount=-3 -kerning first=1043 second=46 amount=-6 -kerning first=119 second=46 amount=-2 -kerning first=1043 second=1076 amount=-3 -kerning first=84 second=119 amount=-2 -kerning first=1101 second=1076 amount=-1 -kerning first=84 second=101 amount=-5 -kerning first=1073 second=1095 amount=-1 -kerning first=1042 second=1095 amount=-1 -kerning first=1057 second=1061 amount=-2 -kerning first=1100 second=1095 amount=-3 -kerning first=1042 second=1047 amount=-1 -kerning first=1088 second=1076 amount=-1 -kerning first=114 second=46 amount=-2 -kerning first=1090 second=46 amount=-5 -kerning first=1041 second=1066 amount=-1 -kerning first=1056 second=1047 amount=-1 -kerning first=1075 second=1077 amount=-1 -kerning first=1056 second=44 amount=-9 -kerning first=1069 second=1051 amount=-1 -kerning first=1058 second=1077 amount=-2 -kerning first=1046 second=1059 amount=1 -kerning first=1040 second=1090 amount=-1 -kerning first=1059 second=58 amount=-1 -kerning first=1070 second=1061 amount=-2 -kerning first=1040 second=1057 amount=-1 -kerning first=1070 second=1076 amount=-2 -kerning first=1058 second=1082 amount=-2 -kerning first=1059 second=1078 amount=-1 -kerning first=1073 second=1072 amount=-1 -kerning first=86 second=97 amount=-3 -kerning first=1069 second=1071 amount=-1 -kerning first=1061 second=1054 amount=-1 -kerning first=1058 second=1097 amount=-2 -kerning first=1041 second=1091 amount=-1 -kerning first=1077 second=1079 amount=-1 -kerning first=1061 second=1069 amount=-1 -kerning first=1056 second=1072 amount=-1 -kerning first=1076 second=1098 amount=-1 -kerning first=1083 second=1095 amount=-1 -kerning first=1041 second=1058 amount=-2 -kerning first=1068 second=1057 amount=-1 -kerning first=1059 second=1083 amount=-3 -kerning first=1043 second=1088 amount=-2 -kerning first=1058 second=1054 amount=-2 -kerning first=89 second=65 amount=-3 -kerning first=1042 second=1044 amount=-1 -kerning first=1041 second=1063 amount=-2 -kerning first=1042 second=1059 amount=-1 -kerning first=89 second=105 amount=-1 -kerning first=118 second=44 amount=-3 -kerning first=1058 second=1102 amount=-2 -kerning first=65 second=84 amount=-3 -kerning first=1056 second=1044 amount=-3 -kerning first=1059 second=1040 amount=-3 -kerning first=1056 second=1059 amount=-1 -kerning first=1075 second=1089 amount=-1 -kerning first=1058 second=1074 amount=-2 -kerning first=84 second=105 amount=-1 -kerning first=1059 second=1103 amount=-3 -kerning first=1058 second=1089 amount=-2 -kerning first=1073 second=1079 amount=-1 -kerning first=65 second=86 amount=-3 -kerning first=1040 second=1054 amount=-1 -kerning first=1059 second=1060 amount=-1 -kerning first=1086 second=1083 amount=-1 -kerning first=1040 second=1069 amount=-1 -kerning first=1056 second=46 amount=-9 -kerning first=1059 second=1075 amount=-2 -kerning first=1093 second=1095 amount=-1 -kerning first=1065 second=1091 amount=1 -kerning first=1073 second=1084 amount=-1 -kerning first=65 second=87 amount=-1 -kerning first=1041 second=1040 amount=-1 -kerning first=1069 second=1083 amount=-1 -kerning first=1077 second=1076 amount=-1 -kerning first=118 second=46 amount=-3 -kerning first=1068 second=1054 amount=-1 -kerning first=1045 second=1047 amount=-1 -kerning first=1059 second=1080 amount=-2 -kerning first=1043 second=1085 amount=-2 -kerning first=1058 second=1051 amount=-1 -kerning first=1059 second=1047 amount=-1 -kerning first=65 second=89 amount=-3 -kerning first=70 second=65 amount=-2 -kerning first=1074 second=1090 amount=-1 -kerning first=1075 second=1086 amount=-1 -kerning first=1090 second=1076 amount=-1 -kerning first=1101 second=1090 amount=-1 -kerning first=89 second=58 amount=-2 -kerning first=89 second=44 amount=-6 -kerning first=1062 second=1072 amount=1 -kerning first=1058 second=1071 amount=-1 -kerning first=1042 second=1061 amount=-2 -kerning first=1043 second=1057 amount=-2 -kerning first=1061 second=1091 amount=-1 -kerning first=1088 second=1090 amount=-1 -kerning first=1054 second=1046 amount=-1 -kerning first=1058 second=1086 amount=-3 -kerning first=1073 second=1076 amount=-2 -kerning first=86 second=65 amount=-3 -kerning first=1072 second=1095 amount=-1 -kerning first=1056 second=1061 amount=-2 -kerning first=1040 second=1051 amount=1 -kerning first=1044 second=1091 amount=1 -kerning first=1068 second=1046 amount=-1 -kerning first=1056 second=1076 amount=-3 -kerning first=86 second=111 amount=-2 -kerning first=1079 second=1098 amount=-1 -kerning first=1086 second=1095 amount=-1 -kerning first=89 second=46 amount=-6 -kerning first=1043 second=1077 amount=-3 -kerning first=1058 second=1091 amount=-2 -kerning first=1059 second=1087 amount=-2 -kerning first=1068 second=1051 amount=-1 -kerning first=1044 second=1063 amount=-1 -kerning first=1059 second=1044 amount=-2 -kerning first=1054 second=1071 amount=-1 -kerning first=1077 second=1093 amount=-1 -kerning first=1092 second=1083 amount=-1 -kerning first=121 second=44 amount=-3 -kerning first=1068 second=1071 amount=-2 -kerning first=1075 second=1083 amount=-1 -kerning first=1102 second=1083 amount=-1 -kerning first=87 second=97 amount=-1 -kerning first=1040 second=1058 amount=-3 -kerning first=1056 second=1101 amount=-1 -kerning first=1043 second=1054 amount=-2 -kerning first=1058 second=1083 amount=-2 -kerning first=1059 second=1079 amount=-2 -kerning first=70 second=44 amount=-5 -kerning first=1043 second=1102 amount=-2 -kerning first=1057 second=1054 amount=-1 -kerning first=1040 second=1063 amount=-3 -kerning first=1041 second=1059 amount=-1 -kerning first=84 second=121 amount=-2 -kerning first=1068 second=1058 amount=-5 -kerning first=1079 second=1095 amount=-1 -kerning first=86 second=114 amount=-1 -kerning first=1059 second=1084 amount=-2 -kerning first=1043 second=1074 amount=-2 -kerning first=1058 second=1040 amount=-1 -kerning first=86 second=58 amount=-1 -kerning first=86 second=44 amount=-4 -kerning first=1054 second=1063 amount=-1 -kerning first=1061 second=1060 amount=-1 -kerning first=1073 second=1093 amount=-1 -kerning first=70 second=46 amount=-5 -kerning first=121 second=46 amount=-3 -kerning first=1069 second=1044 amount=-1 -kerning first=1058 second=1103 amount=-2 -kerning first=1068 second=1063 amount=-3 -kerning first=1044 second=1060 amount=-1 -kerning first=1082 second=1072 amount=1 -kerning first=1058 second=1060 amount=-1 -kerning first=1077 second=1090 amount=-1 -kerning first=86 second=46 amount=-4 -kerning first=1092 second=1095 amount=-1 -kerning first=1060 second=1051 amount=-1 -kerning first=1061 second=1047 amount=-1 -kerning first=1102 second=1095 amount=-1 -kerning first=1043 second=1051 amount=-2 -kerning first=1054 second=1040 amount=-1 -kerning first=1058 second=1080 amount=-2 -kerning first=1059 second=1076 amount=-3 -kerning first=1047 second=1058 amount=-1 -kerning first=1057 second=1051 amount=-1 -kerning first=1060 second=1071 amount=-1 -kerning first=1068 second=1040 amount=-1 -kerning first=1057 second=1066 amount=-1 -kerning first=1040 second=1060 amount=-1 +info face="Arial" size=50 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=1,1,1,1 spacing=1,1 outline=3 +common lineHeight=50 base=40 scaleW=512 scaleH=512 pages=1 packed=0 alphaChnl=0 redChnl=1 greenChnl=3 blueChnl=3 +page id=0 file="arial_bm.png" +chars count=161 +char id=32 x=0 y=395 width=11 height=9 xoffset=-5 yoffset=45 xadvance=12 page=0 chnl=15 +char id=33 x=350 y=255 width=14 height=40 xoffset=0 yoffset=4 xadvance=14 page=0 chnl=15 +char id=34 x=343 y=361 width=21 height=19 xoffset=-3 yoffset=4 xadvance=16 page=0 chnl=15 +char id=35 x=68 y=216 width=33 height=40 xoffset=-5 yoffset=4 xadvance=24 page=0 chnl=15 +char id=36 x=446 y=0 width=30 height=46 xoffset=-3 yoffset=2 xadvance=24 page=0 chnl=15 +char id=37 x=347 y=49 width=43 height=40 xoffset=-2 yoffset=4 xadvance=39 page=0 chnl=15 +char id=38 x=229 y=132 width=36 height=40 xoffset=-3 yoffset=4 xadvance=29 page=0 chnl=15 +char id=39 x=494 y=323 width=14 height=19 xoffset=-3 yoffset=4 xadvance=8 page=0 chnl=15 +char id=40 x=225 y=0 width=20 height=49 xoffset=-2 yoffset=4 xadvance=15 page=0 chnl=15 +char id=41 x=246 y=0 width=20 height=49 xoffset=-2 yoffset=4 xadvance=15 page=0 chnl=15 +char id=42 x=319 y=361 width=23 height=21 xoffset=-3 yoffset=4 xadvance=17 page=0 chnl=15 +char id=43 x=167 y=363 width=30 height=30 xoffset=-2 yoffset=10 xadvance=26 page=0 chnl=15 +char id=44 x=365 y=361 width=14 height=19 xoffset=-1 yoffset=32 xadvance=12 page=0 chnl=15 +char id=45 x=466 y=358 width=21 height=12 xoffset=-3 yoffset=23 xadvance=15 page=0 chnl=15 +char id=46 x=488 y=358 width=14 height=12 xoffset=-1 yoffset=32 xadvance=12 page=0 chnl=15 +char id=47 x=267 y=255 width=22 height=40 xoffset=-5 yoffset=4 xadvance=12 page=0 chnl=15 +char id=48 x=326 y=214 width=30 height=40 xoffset=-3 yoffset=4 xadvance=24 page=0 chnl=15 +char id=49 x=313 y=255 width=21 height=40 xoffset=0 yoffset=4 xadvance=24 page=0 chnl=15 +char id=50 x=93 y=257 width=29 height=40 xoffset=-3 yoffset=4 xadvance=24 page=0 chnl=15 +char id=51 x=295 y=214 width=30 height=40 xoffset=-3 yoffset=4 xadvance=24 page=0 chnl=15 +char id=52 x=168 y=215 width=31 height=40 xoffset=-4 yoffset=4 xadvance=24 page=0 chnl=15 +char id=53 x=357 y=214 width=30 height=40 xoffset=-3 yoffset=4 xadvance=24 page=0 chnl=15 +char id=54 x=419 y=212 width=30 height=40 xoffset=-3 yoffset=4 xadvance=24 page=0 chnl=15 +char id=55 x=450 y=212 width=30 height=40 xoffset=-3 yoffset=4 xadvance=24 page=0 chnl=15 +char id=56 x=481 y=211 width=30 height=40 xoffset=-3 yoffset=4 xadvance=24 page=0 chnl=15 +char id=57 x=0 y=257 width=30 height=40 xoffset=-3 yoffset=4 xadvance=24 page=0 chnl=15 +char id=58 x=497 y=252 width=14 height=31 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=15 +char id=59 x=447 y=253 width=14 height=38 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=15 +char id=60 x=198 y=362 width=30 height=29 xoffset=-2 yoffset=10 xadvance=26 page=0 chnl=15 +char id=61 x=288 y=361 width=30 height=21 xoffset=-2 yoffset=14 xadvance=26 page=0 chnl=15 +char id=62 x=229 y=362 width=30 height=29 xoffset=-2 yoffset=10 xadvance=26 page=0 chnl=15 +char id=63 x=388 y=213 width=30 height=40 xoffset=-3 yoffset=4 xadvance=24 page=0 chnl=15 +char id=64 x=0 y=0 width=50 height=49 xoffset=-2 yoffset=4 xadvance=45 page=0 chnl=15 +char id=65 x=286 y=91 width=39 height=40 xoffset=-5 yoffset=4 xadvance=29 page=0 chnl=15 +char id=66 x=315 y=173 width=33 height=40 xoffset=-2 yoffset=4 xadvance=29 page=0 chnl=15 +char id=67 x=444 y=88 width=38 height=40 xoffset=-3 yoffset=4 xadvance=32 page=0 chnl=15 +char id=68 x=376 y=131 width=35 height=40 xoffset=-1 yoffset=4 xadvance=32 page=0 chnl=15 +char id=69 x=102 y=216 width=32 height=40 xoffset=-1 yoffset=4 xadvance=29 page=0 chnl=15 +char id=70 x=232 y=215 width=31 height=40 xoffset=-1 yoffset=4 xadvance=27 page=0 chnl=15 +char id=71 x=405 y=89 width=38 height=40 xoffset=-2 yoffset=4 xadvance=34 page=0 chnl=15 +char id=72 x=245 y=173 width=34 height=40 xoffset=-1 yoffset=4 xadvance=32 page=0 chnl=15 +char id=73 x=335 y=255 width=14 height=40 xoffset=-1 yoffset=4 xadvance=12 page=0 chnl=15 +char id=74 x=485 y=165 width=26 height=40 xoffset=-3 yoffset=4 xadvance=22 page=0 chnl=15 +char id=75 x=340 y=132 width=35 height=40 xoffset=-2 yoffset=4 xadvance=29 page=0 chnl=15 +char id=76 x=123 y=257 width=29 height=40 xoffset=-2 yoffset=4 xadvance=24 page=0 chnl=15 +char id=77 x=166 y=92 width=39 height=40 xoffset=-1 yoffset=4 xadvance=37 page=0 chnl=15 +char id=78 x=140 y=174 width=34 height=40 xoffset=-1 yoffset=4 xadvance=32 page=0 chnl=15 +char id=79 x=84 y=92 width=40 height=40 xoffset=-3 yoffset=4 xadvance=34 page=0 chnl=15 +char id=80 x=0 y=216 width=33 height=40 xoffset=-1 yoffset=4 xadvance=29 page=0 chnl=15 +char id=81 x=0 y=50 width=40 height=42 xoffset=-3 yoffset=4 xadvance=34 page=0 chnl=15 +char id=82 x=115 y=133 width=37 height=40 xoffset=-1 yoffset=4 xadvance=32 page=0 chnl=15 +char id=83 x=448 y=129 width=34 height=40 xoffset=-3 yoffset=4 xadvance=29 page=0 chnl=15 +char id=84 x=0 y=175 width=34 height=40 xoffset=-4 yoffset=4 xadvance=26 page=0 chnl=15 +char id=85 x=35 y=175 width=34 height=40 xoffset=-1 yoffset=4 xadvance=32 page=0 chnl=15 +char id=86 x=0 y=134 width=38 height=40 xoffset=-4 yoffset=4 xadvance=29 page=0 chnl=15 +char id=87 x=194 y=50 width=52 height=40 xoffset=-4 yoffset=4 xadvance=44 page=0 chnl=15 +char id=88 x=39 y=134 width=37 height=40 xoffset=-4 yoffset=4 xadvance=29 page=0 chnl=15 +char id=89 x=303 y=132 width=36 height=40 xoffset=-4 yoffset=4 xadvance=28 page=0 chnl=15 +char id=90 x=412 y=130 width=35 height=40 xoffset=-4 yoffset=4 xadvance=27 page=0 chnl=15 +char id=91 x=306 y=0 width=18 height=49 xoffset=-2 yoffset=4 xadvance=12 page=0 chnl=15 +char id=92 x=290 y=255 width=22 height=40 xoffset=-5 yoffset=4 xadvance=12 page=0 chnl=15 +char id=93 x=287 y=0 width=18 height=49 xoffset=-4 yoffset=4 xadvance=12 page=0 chnl=15 +char id=94 x=260 y=362 width=27 height=25 xoffset=-4 yoffset=4 xadvance=19 page=0 chnl=15 +char id=95 x=431 y=361 width=34 height=12 xoffset=-5 yoffset=41 xadvance=24 page=0 chnl=15 +char id=96 x=413 y=361 width=17 height=14 xoffset=-2 yoffset=4 xadvance=15 page=0 chnl=15 +char id=97 x=144 y=298 width=30 height=32 xoffset=-3 yoffset=12 xadvance=24 page=0 chnl=15 +char id=98 x=264 y=214 width=30 height=40 xoffset=-2 yoffset=4 xadvance=25 page=0 chnl=15 +char id=99 x=268 y=296 width=29 height=32 xoffset=-3 yoffset=12 xadvance=22 page=0 chnl=15 +char id=100 x=213 y=256 width=29 height=40 xoffset=-3 yoffset=4 xadvance=24 page=0 chnl=15 +char id=101 x=82 y=298 width=30 height=32 xoffset=-3 yoffset=12 xadvance=24 page=0 chnl=15 +char id=102 x=243 y=256 width=23 height=40 xoffset=-4 yoffset=4 xadvance=13 page=0 chnl=15 +char id=103 x=134 y=50 width=29 height=41 xoffset=-3 yoffset=12 xadvance=25 page=0 chnl=15 +char id=104 x=483 y=83 width=28 height=40 xoffset=-2 yoffset=4 xadvance=24 page=0 chnl=15 +char id=105 x=380 y=255 width=14 height=40 xoffset=-2 yoffset=4 xadvance=10 page=0 chnl=15 +char id=106 x=267 y=0 width=19 height=49 xoffset=-7 yoffset=4 xadvance=10 page=0 chnl=15 +char id=107 x=483 y=124 width=28 height=40 xoffset=-2 yoffset=4 xadvance=22 page=0 chnl=15 +char id=108 x=365 y=255 width=14 height=40 xoffset=-2 yoffset=4 xadvance=10 page=0 chnl=15 +char id=109 x=0 y=298 width=42 height=32 xoffset=-2 yoffset=12 xadvance=38 page=0 chnl=15 +char id=110 x=387 y=296 width=28 height=32 xoffset=-2 yoffset=12 xadvance=24 page=0 chnl=15 +char id=111 x=206 y=297 width=30 height=32 xoffset=-3 yoffset=12 xadvance=24 page=0 chnl=15 +char id=112 x=72 y=50 width=30 height=41 xoffset=-2 yoffset=12 xadvance=25 page=0 chnl=15 +char id=113 x=41 y=50 width=30 height=41 xoffset=-3 yoffset=12 xadvance=25 page=0 chnl=15 +char id=114 x=443 y=293 width=22 height=32 xoffset=-2 yoffset=12 xadvance=15 page=0 chnl=15 +char id=115 x=358 y=296 width=28 height=32 xoffset=-3 yoffset=12 xadvance=22 page=0 chnl=15 +char id=116 x=426 y=253 width=20 height=39 xoffset=-4 yoffset=5 xadvance=12 page=0 chnl=15 +char id=117 x=29 y=363 width=28 height=31 xoffset=-2 yoffset=13 xadvance=24 page=0 chnl=15 +char id=118 x=221 y=330 width=31 height=31 xoffset=-4 yoffset=13 xadvance=23 page=0 chnl=15 +char id=119 x=466 y=291 width=41 height=31 xoffset=-4 yoffset=13 xadvance=33 page=0 chnl=15 +char id=120 x=284 y=329 width=30 height=31 xoffset=-4 yoffset=13 xadvance=22 page=0 chnl=15 +char id=121 x=153 y=256 width=29 height=40 xoffset=-4 yoffset=13 xadvance=21 page=0 chnl=15 +char id=122 x=315 y=329 width=30 height=31 xoffset=-4 yoffset=13 xadvance=22 page=0 chnl=15 +char id=123 x=178 y=0 width=23 height=49 xoffset=-4 yoffset=4 xadvance=15 page=0 chnl=15 +char id=124 x=325 y=0 width=13 height=49 xoffset=-1 yoffset=4 xadvance=11 page=0 chnl=15 +char id=125 x=202 y=0 width=22 height=49 xoffset=-4 yoffset=4 xadvance=15 page=0 chnl=15 +char id=126 x=380 y=361 width=32 height=16 xoffset=-3 yoffset=17 xadvance=26 page=0 chnl=15 +char id=1025 x=413 y=0 width=32 height=46 xoffset=-1 yoffset=-2 xadvance=29 page=0 chnl=15 +char id=1040 x=326 y=91 width=39 height=40 xoffset=-5 yoffset=4 xadvance=29 page=0 chnl=15 +char id=1041 x=34 y=216 width=33 height=40 xoffset=-1 yoffset=4 xadvance=29 page=0 chnl=15 +char id=1042 x=451 y=170 width=33 height=40 xoffset=-2 yoffset=4 xadvance=29 page=0 chnl=15 +char id=1043 x=31 y=257 width=30 height=40 xoffset=-1 yoffset=4 xadvance=24 page=0 chnl=15 +char id=1044 x=374 y=0 width=38 height=47 xoffset=-5 yoffset=4 xadvance=30 page=0 chnl=15 +char id=1045 x=135 y=215 width=32 height=40 xoffset=-1 yoffset=4 xadvance=29 page=0 chnl=15 +char id=1046 x=247 y=50 width=50 height=40 xoffset=-4 yoffset=4 xadvance=41 page=0 chnl=15 +char id=1047 x=383 y=172 width=33 height=40 xoffset=-3 yoffset=4 xadvance=27 page=0 chnl=15 +char id=1048 x=210 y=174 width=34 height=40 xoffset=-1 yoffset=4 xadvance=32 page=0 chnl=15 +char id=1049 x=339 y=0 width=34 height=48 xoffset=-1 yoffset=-4 xadvance=32 page=0 chnl=15 +char id=1050 x=200 y=215 width=31 height=40 xoffset=-1 yoffset=4 xadvance=26 page=0 chnl=15 +char id=1051 x=70 y=175 width=34 height=40 xoffset=-4 yoffset=4 xadvance=29 page=0 chnl=15 +char id=1052 x=206 y=91 width=39 height=40 xoffset=-1 yoffset=4 xadvance=37 page=0 chnl=15 +char id=1053 x=105 y=174 width=34 height=40 xoffset=-1 yoffset=4 xadvance=32 page=0 chnl=15 +char id=1054 x=125 y=92 width=40 height=40 xoffset=-3 yoffset=4 xadvance=34 page=0 chnl=15 +char id=1055 x=175 y=174 width=34 height=40 xoffset=-1 yoffset=4 xadvance=32 page=0 chnl=15 +char id=1056 x=478 y=42 width=33 height=40 xoffset=-1 yoffset=4 xadvance=29 page=0 chnl=15 +char id=1057 x=366 y=90 width=38 height=40 xoffset=-3 yoffset=4 xadvance=32 page=0 chnl=15 +char id=1058 x=280 y=173 width=34 height=40 xoffset=-4 yoffset=4 xadvance=26 page=0 chnl=15 +char id=1059 x=266 y=132 width=36 height=40 xoffset=-4 yoffset=4 xadvance=28 page=0 chnl=15 +char id=1060 x=246 y=91 width=39 height=40 xoffset=-3 yoffset=4 xadvance=33 page=0 chnl=15 +char id=1061 x=77 y=133 width=37 height=40 xoffset=-4 yoffset=4 xadvance=29 page=0 chnl=15 +char id=1062 x=140 y=0 width=37 height=49 xoffset=-1 yoffset=4 xadvance=33 page=0 chnl=15 +char id=1063 x=349 y=173 width=33 height=40 xoffset=-3 yoffset=4 xadvance=29 page=0 chnl=15 +char id=1064 x=435 y=47 width=42 height=40 xoffset=-1 yoffset=4 xadvance=40 page=0 chnl=15 +char id=1065 x=51 y=0 width=45 height=49 xoffset=-1 yoffset=4 xadvance=41 page=0 chnl=15 +char id=1066 x=391 y=48 width=43 height=40 xoffset=-5 yoffset=4 xadvance=35 page=0 chnl=15 +char id=1067 x=42 y=92 width=41 height=40 xoffset=-1 yoffset=4 xadvance=39 page=0 chnl=15 +char id=1068 x=417 y=171 width=33 height=40 xoffset=-1 yoffset=4 xadvance=29 page=0 chnl=15 +char id=1069 x=153 y=133 width=37 height=40 xoffset=-3 yoffset=4 xadvance=32 page=0 chnl=15 +char id=1070 x=298 y=50 width=48 height=40 xoffset=-1 yoffset=4 xadvance=44 page=0 chnl=15 +char id=1071 x=191 y=133 width=37 height=40 xoffset=-4 yoffset=4 xadvance=32 page=0 chnl=15 +char id=1072 x=237 y=297 width=30 height=32 xoffset=-3 yoffset=12 xadvance=24 page=0 chnl=15 +char id=1073 x=477 y=0 width=31 height=41 xoffset=-3 yoffset=3 xadvance=25 page=0 chnl=15 +char id=1074 x=465 y=326 width=28 height=31 xoffset=-2 yoffset=13 xadvance=23 page=0 chnl=15 +char id=1075 x=143 y=363 width=23 height=31 xoffset=-2 yoffset=13 xadvance=16 page=0 chnl=15 +char id=1076 x=462 y=253 width=34 height=37 xoffset=-5 yoffset=13 xadvance=26 page=0 chnl=15 +char id=1077 x=175 y=297 width=30 height=32 xoffset=-3 yoffset=12 xadvance=24 page=0 chnl=15 +char id=1078 x=40 y=331 width=39 height=31 xoffset=-5 yoffset=13 xadvance=29 page=0 chnl=15 +char id=1079 x=416 y=294 width=26 height=32 xoffset=-3 yoffset=12 xadvance=20 page=0 chnl=15 +char id=1080 x=377 y=329 width=29 height=31 xoffset=-2 yoffset=13 xadvance=25 page=0 chnl=15 +char id=1081 x=164 y=50 width=29 height=41 xoffset=-2 yoffset=3 xadvance=25 page=0 chnl=15 +char id=1082 x=116 y=363 width=26 height=31 xoffset=-2 yoffset=13 xadvance=19 page=0 chnl=15 +char id=1083 x=188 y=330 width=32 height=31 xoffset=-4 yoffset=13 xadvance=26 page=0 chnl=15 +char id=1084 x=153 y=331 width=34 height=31 xoffset=-2 yoffset=13 xadvance=30 page=0 chnl=15 +char id=1085 x=58 y=363 width=28 height=31 xoffset=-2 yoffset=13 xadvance=24 page=0 chnl=15 +char id=1086 x=113 y=298 width=30 height=32 xoffset=-3 yoffset=12 xadvance=24 page=0 chnl=15 +char id=1087 x=87 y=363 width=28 height=31 xoffset=-2 yoffset=13 xadvance=24 page=0 chnl=15 +char id=1088 x=103 y=50 width=30 height=41 xoffset=-2 yoffset=12 xadvance=25 page=0 chnl=15 +char id=1089 x=298 y=296 width=29 height=32 xoffset=-3 yoffset=12 xadvance=22 page=0 chnl=15 +char id=1090 x=436 y=327 width=28 height=31 xoffset=-4 yoffset=13 xadvance=20 page=0 chnl=15 +char id=1091 x=183 y=256 width=29 height=40 xoffset=-4 yoffset=13 xadvance=21 page=0 chnl=15 +char id=1092 x=97 y=0 width=42 height=49 xoffset=-3 yoffset=4 xadvance=36 page=0 chnl=15 +char id=1093 x=253 y=330 width=30 height=31 xoffset=-4 yoffset=13 xadvance=22 page=0 chnl=15 +char id=1094 x=62 y=257 width=30 height=40 xoffset=-2 yoffset=13 xadvance=25 page=0 chnl=15 +char id=1095 x=407 y=329 width=28 height=31 xoffset=-3 yoffset=13 xadvance=23 page=0 chnl=15 +char id=1096 x=0 y=331 width=39 height=31 xoffset=-2 yoffset=13 xadvance=35 page=0 chnl=15 +char id=1097 x=0 y=93 width=41 height=40 xoffset=-2 yoffset=13 xadvance=36 page=0 chnl=15 +char id=1098 x=117 y=331 width=35 height=31 xoffset=-4 yoffset=13 xadvance=28 page=0 chnl=15 +char id=1099 x=80 y=331 width=36 height=31 xoffset=-2 yoffset=13 xadvance=32 page=0 chnl=15 +char id=1100 x=0 y=363 width=28 height=31 xoffset=-2 yoffset=13 xadvance=23 page=0 chnl=15 +char id=1101 x=328 y=296 width=29 height=32 xoffset=-4 yoffset=12 xadvance=22 page=0 chnl=15 +char id=1102 x=43 y=298 width=38 height=32 xoffset=-2 yoffset=12 xadvance=33 page=0 chnl=15 +char id=1103 x=346 y=329 width=30 height=31 xoffset=-4 yoffset=13 xadvance=24 page=0 chnl=15 +char id=1105 x=395 y=254 width=30 height=39 xoffset=-3 yoffset=5 xadvance=24 page=0 chnl=15 +kernings count=547 +kerning first=32 second=65 amount=-2 +kerning first=32 second=84 amount=-1 +kerning first=32 second=89 amount=-1 +kerning first=1102 second=1095 amount=-1 +kerning first=1102 second=1093 amount=-1 +kerning first=1102 second=1090 amount=-1 +kerning first=1102 second=1084 amount=-1 +kerning first=1102 second=1083 amount=-1 +kerning first=1102 second=1078 amount=-1 +kerning first=1102 second=1076 amount=-1 +kerning first=49 second=49 amount=-3 +kerning first=65 second=32 amount=-2 +kerning first=65 second=84 amount=-3 +kerning first=65 second=86 amount=-3 +kerning first=65 second=87 amount=-2 +kerning first=65 second=89 amount=-3 +kerning first=65 second=118 amount=-1 +kerning first=65 second=119 amount=-1 +kerning first=65 second=121 amount=-1 +kerning first=1101 second=1103 amount=-1 +kerning first=70 second=44 amount=-5 +kerning first=70 second=46 amount=-5 +kerning first=70 second=65 amount=-2 +kerning first=76 second=32 amount=-2 +kerning first=76 second=84 amount=-3 +kerning first=76 second=86 amount=-3 +kerning first=76 second=87 amount=-3 +kerning first=76 second=89 amount=-3 +kerning first=76 second=121 amount=-2 +kerning first=1101 second=1093 amount=-1 +kerning first=80 second=32 amount=-1 +kerning first=80 second=44 amount=-6 +kerning first=80 second=46 amount=-6 +kerning first=80 second=65 amount=-3 +kerning first=82 second=84 amount=-1 +kerning first=82 second=86 amount=-1 +kerning first=82 second=87 amount=-1 +kerning first=82 second=89 amount=-1 +kerning first=84 second=32 amount=-1 +kerning first=84 second=44 amount=-5 +kerning first=84 second=45 amount=-2 +kerning first=84 second=46 amount=-5 +kerning first=84 second=58 amount=-5 +kerning first=1101 second=1090 amount=-1 +kerning first=84 second=65 amount=-3 +kerning first=84 second=79 amount=-1 +kerning first=84 second=97 amount=-5 +kerning first=84 second=99 amount=-5 +kerning first=84 second=101 amount=-5 +kerning first=84 second=105 amount=-2 +kerning first=84 second=111 amount=-5 +kerning first=84 second=114 amount=-2 +kerning first=84 second=115 amount=-5 +kerning first=84 second=117 amount=-2 +kerning first=84 second=119 amount=-2 +kerning first=84 second=121 amount=-2 +kerning first=86 second=44 amount=-4 +kerning first=86 second=45 amount=-2 +kerning first=86 second=46 amount=-4 +kerning first=86 second=58 amount=-2 +kerning first=1101 second=1086 amount=1 +kerning first=86 second=65 amount=-3 +kerning first=86 second=97 amount=-3 +kerning first=86 second=101 amount=-2 +kerning first=86 second=105 amount=-1 +kerning first=86 second=111 amount=-2 +kerning first=86 second=114 amount=-2 +kerning first=86 second=117 amount=-2 +kerning first=86 second=121 amount=-2 +kerning first=87 second=44 amount=-2 +kerning first=87 second=45 amount=-1 +kerning first=87 second=46 amount=-2 +kerning first=87 second=58 amount=-1 +kerning first=1101 second=1083 amount=-1 +kerning first=87 second=65 amount=-2 +kerning first=87 second=97 amount=-2 +kerning first=87 second=101 amount=-1 +kerning first=1101 second=1079 amount=-1 +kerning first=87 second=111 amount=-1 +kerning first=87 second=114 amount=-1 +kerning first=87 second=117 amount=-1 +kerning first=1101 second=1077 amount=1 +kerning first=89 second=32 amount=-1 +kerning first=89 second=44 amount=-6 +kerning first=89 second=45 amount=-4 +kerning first=89 second=46 amount=-6 +kerning first=89 second=58 amount=-2 +kerning first=1101 second=1076 amount=-1 +kerning first=89 second=65 amount=-3 +kerning first=89 second=97 amount=-3 +kerning first=89 second=101 amount=-4 +kerning first=89 second=105 amount=-2 +kerning first=89 second=111 amount=-4 +kerning first=89 second=112 amount=-3 +kerning first=89 second=113 amount=-4 +kerning first=89 second=117 amount=-2 +kerning first=89 second=118 amount=-2 +kerning first=102 second=102 amount=-1 +kerning first=1100 second=1095 amount=-3 +kerning first=114 second=44 amount=-2 +kerning first=114 second=46 amount=-2 +kerning first=1100 second=1090 amount=-3 +kerning first=118 second=44 amount=-3 +kerning first=118 second=46 amount=-3 +kerning first=119 second=44 amount=-2 +kerning first=119 second=46 amount=-2 +kerning first=121 second=44 amount=-3 +kerning first=121 second=46 amount=-3 +kerning first=1097 second=1091 amount=1 +kerning first=1097 second=1086 amount=-1 +kerning first=1097 second=1077 amount=-1 +kerning first=1094 second=1089 amount=-1 +kerning first=1094 second=1086 amount=-1 +kerning first=1094 second=1079 amount=-1 +kerning first=1094 second=1077 amount=-1 +kerning first=1093 second=1095 amount=-1 +kerning first=1093 second=1092 amount=-1 +kerning first=1093 second=1090 amount=-1 +kerning first=1093 second=1089 amount=-1 +kerning first=1093 second=1086 amount=-1 +kerning first=1093 second=1079 amount=-1 +kerning first=1093 second=1077 amount=-1 +kerning first=1093 second=1073 amount=-1 +kerning first=1093 second=1072 amount=-1 +kerning first=1092 second=1103 amount=-1 +kerning first=1092 second=1095 amount=-1 +kerning first=1092 second=1091 amount=-1 +kerning first=1092 second=1090 amount=-1 +kerning first=1092 second=1083 amount=-1 +kerning first=1092 second=1076 amount=-1 +kerning first=1092 second=1073 amount=-1 +kerning first=1091 second=1103 amount=-1 +kerning first=1091 second=1101 amount=-1 +kerning first=1091 second=1092 amount=-1 +kerning first=1091 second=1089 amount=-1 +kerning first=1091 second=1088 amount=-1 +kerning first=1091 second=1086 amount=-1 +kerning first=1091 second=1084 amount=-1 +kerning first=1091 second=1083 amount=-1 +kerning first=1091 second=1078 amount=1 +kerning first=1091 second=1077 amount=-1 +kerning first=1091 second=1076 amount=-1 +kerning first=1091 second=1073 amount=1 +kerning first=1091 second=1072 amount=-1 +kerning first=1091 second=46 amount=-4 +kerning first=1091 second=44 amount=-4 +kerning first=1090 second=1091 amount=1 +kerning first=1090 second=1089 amount=-1 +kerning first=1090 second=1086 amount=-1 +kerning first=1090 second=1083 amount=-1 +kerning first=1090 second=1078 amount=1 +kerning first=1090 second=1077 amount=-1 +kerning first=1090 second=1076 amount=-1 +kerning first=1090 second=1072 amount=-1 +kerning first=1090 second=46 amount=-5 +kerning first=1090 second=44 amount=-5 +kerning first=1089 second=1101 amount=1 +kerning first=1089 second=1095 amount=-1 +kerning first=1089 second=1086 amount=1 +kerning first=1089 second=1078 amount=1 +kerning first=1088 second=1103 amount=-1 +kerning first=1088 second=1095 amount=-1 +kerning first=1088 second=1093 amount=-1 +kerning first=1088 second=1091 amount=-1 +kerning first=1088 second=1090 amount=-1 +kerning first=1088 second=1083 amount=-2 +kerning first=1088 second=1079 amount=-1 +kerning first=1088 second=1076 amount=-1 +kerning first=1086 second=1095 amount=-1 +kerning first=1086 second=1093 amount=-1 +kerning first=1086 second=1091 amount=-1 +kerning first=1086 second=1090 amount=-1 +kerning first=1086 second=1083 amount=-1 +kerning first=1086 second=1079 amount=-1 +kerning first=1086 second=1078 amount=-1 +kerning first=1086 second=1076 amount=-1 +kerning first=1084 second=1091 amount=1 +kerning first=1084 second=1079 amount=-1 +kerning first=1084 second=1073 amount=-1 +kerning first=1083 second=1095 amount=-1 +kerning first=1083 second=1086 amount=1 +kerning first=1082 second=1101 amount=1 +kerning first=1082 second=1091 amount=1 +kerning first=1082 second=1090 amount=1 +kerning first=1082 second=1089 amount=1 +kerning first=1082 second=1086 amount=1 +kerning first=1082 second=1083 amount=1 +kerning first=1082 second=1079 amount=1 +kerning first=1082 second=1077 amount=1 +kerning first=1082 second=1073 amount=1 +kerning first=1082 second=1072 amount=1 +kerning first=1079 second=1098 amount=-1 +kerning first=1079 second=1095 amount=-1 +kerning first=1079 second=1092 amount=-1 +kerning first=1079 second=1091 amount=-1 +kerning first=1079 second=1089 amount=-1 +kerning first=1079 second=1086 amount=-1 +kerning first=1079 second=1083 amount=-1 +kerning first=1079 second=1079 amount=-1 +kerning first=1079 second=1077 amount=-1 +kerning first=1079 second=1076 amount=-1 +kerning first=1079 second=1073 amount=-1 +kerning first=1078 second=1098 amount=1 +kerning first=1078 second=1095 amount=-1 +kerning first=1078 second=1091 amount=1 +kerning first=1078 second=1073 amount=1 +kerning first=1077 second=1095 amount=-1 +kerning first=1077 second=1093 amount=-1 +kerning first=1077 second=1091 amount=-1 +kerning first=1077 second=1090 amount=-1 +kerning first=1077 second=1083 amount=-1 +kerning first=1077 second=1079 amount=-1 +kerning first=1077 second=1078 amount=-1 +kerning first=1077 second=1076 amount=-1 +kerning first=1077 second=1073 amount=-1 +kerning first=1076 second=1101 amount=1 +kerning first=1076 second=1098 amount=-1 +kerning first=1075 second=1103 amount=-1 +kerning first=1075 second=1089 amount=-1 +kerning first=1075 second=1086 amount=-1 +kerning first=1075 second=1083 amount=-1 +kerning first=1075 second=1079 amount=-1 +kerning first=1075 second=1077 amount=-1 +kerning first=1075 second=1076 amount=-2 +kerning first=1075 second=1072 amount=-1 +kerning first=1075 second=46 amount=-5 +kerning first=1075 second=44 amount=-5 +kerning first=1074 second=1103 amount=-1 +kerning first=1074 second=1098 amount=-1 +kerning first=1074 second=1095 amount=-2 +kerning first=1074 second=1092 amount=-1 +kerning first=1074 second=1091 amount=-1 +kerning first=1074 second=1090 amount=-1 +kerning first=1074 second=1089 amount=-1 +kerning first=1074 second=1086 amount=-1 +kerning first=1074 second=1084 amount=-1 +kerning first=1074 second=1083 amount=-1 +kerning first=1074 second=1079 amount=-1 +kerning first=1074 second=1078 amount=-1 +kerning first=1074 second=1077 amount=-1 +kerning first=1074 second=1076 amount=-1 +kerning first=1074 second=1073 amount=-1 +kerning first=1074 second=1072 amount=-1 +kerning first=1073 second=1103 amount=-1 +kerning first=1073 second=1101 amount=-1 +kerning first=1073 second=1098 amount=-1 +kerning first=1073 second=1095 amount=-1 +kerning first=1073 second=1093 amount=-1 +kerning first=1073 second=1092 amount=-1 +kerning first=1073 second=1091 amount=-1 +kerning first=1073 second=1089 amount=-1 +kerning first=1073 second=1084 amount=-1 +kerning first=1073 second=1083 amount=-2 +kerning first=1073 second=1079 amount=-1 +kerning first=1073 second=1078 amount=-1 +kerning first=1073 second=1077 amount=-1 +kerning first=1073 second=1076 amount=-2 +kerning first=1073 second=1072 amount=-1 +kerning first=1072 second=1095 amount=-1 +kerning first=1072 second=1091 amount=-1 +kerning first=1072 second=1090 amount=-1 +kerning first=1072 second=1079 amount=-1 +kerning first=1070 second=1084 amount=-1 +kerning first=1070 second=1083 amount=-2 +kerning first=1070 second=1076 amount=-2 +kerning first=1070 second=1063 amount=-1 +kerning first=1070 second=1061 amount=-2 +kerning first=1070 second=1058 amount=-3 +kerning first=1070 second=1057 amount=-1 +kerning first=1070 second=1054 amount=-1 +kerning first=1070 second=1051 amount=-2 +kerning first=1070 second=1046 amount=-1 +kerning first=1070 second=1044 amount=-2 +kerning first=1070 second=1040 amount=-1 +kerning first=1069 second=1103 amount=-1 +kerning first=1069 second=1084 amount=-1 +kerning first=1069 second=1083 amount=-1 +kerning first=1069 second=1078 amount=1 +kerning first=1069 second=1076 amount=-1 +kerning first=1069 second=1071 amount=-1 +kerning first=1069 second=1061 amount=-2 +kerning first=1069 second=1051 amount=-1 +kerning first=1069 second=1047 amount=-1 +kerning first=1069 second=1046 amount=-1 +kerning first=1069 second=1044 amount=-1 +kerning first=1068 second=1071 amount=-2 +kerning first=1068 second=1069 amount=-1 +kerning first=1068 second=1063 amount=-3 +kerning first=1068 second=1061 amount=-2 +kerning first=1068 second=1058 amount=-4 +kerning first=1068 second=1057 amount=-1 +kerning first=1068 second=1054 amount=-1 +kerning first=1068 second=1052 amount=-1 +kerning first=1068 second=1051 amount=-2 +kerning first=1068 second=1047 amount=-1 +kerning first=1068 second=1046 amount=-1 +kerning first=1068 second=1044 amount=-1 +kerning first=1068 second=1040 amount=-1 +kerning first=1066 second=1071 amount=-1 +kerning first=1065 second=1091 amount=1 +kerning first=1065 second=1072 amount=1 +kerning first=1062 second=1072 amount=1 +kerning first=1062 second=1054 amount=-1 +kerning first=1061 second=1091 amount=-1 +kerning first=1061 second=1086 amount=-1 +kerning first=1061 second=1069 amount=-2 +kerning first=1061 second=1060 amount=-1 +kerning first=1061 second=1057 amount=-1 +kerning first=1061 second=1054 amount=-1 +kerning first=1061 second=1047 amount=-1 +kerning first=1060 second=1083 amount=-1 +kerning first=1060 second=1071 amount=-2 +kerning first=1060 second=1063 amount=-1 +kerning first=1060 second=1059 amount=-2 +kerning first=1060 second=1058 amount=-3 +kerning first=1060 second=1051 amount=-1 +kerning first=1060 second=1044 amount=-1 +kerning first=1060 second=1040 amount=-1 +kerning first=1059 second=1103 amount=-3 +kerning first=1059 second=1102 amount=-2 +kerning first=1059 second=1097 amount=-2 +kerning first=1059 second=1096 amount=-2 +kerning first=1059 second=1094 amount=-2 +kerning first=1059 second=1093 amount=-2 +kerning first=1059 second=1089 amount=-3 +kerning first=1059 second=1088 amount=-2 +kerning first=1059 second=1087 amount=-2 +kerning first=1059 second=1086 amount=-3 +kerning first=1059 second=1085 amount=-2 +kerning first=1059 second=1084 amount=-2 +kerning first=1059 second=1083 amount=-3 +kerning first=1059 second=1082 amount=-2 +kerning first=1059 second=1081 amount=-1 +kerning first=1059 second=1080 amount=-2 +kerning first=1059 second=1079 amount=-3 +kerning first=1059 second=1078 amount=-1 +kerning first=1059 second=1077 amount=-3 +kerning first=1059 second=1076 amount=-3 +kerning first=1059 second=1075 amount=-2 +kerning first=1059 second=1074 amount=-3 +kerning first=1059 second=1073 amount=-1 +kerning first=1059 second=1071 amount=-1 +kerning first=1059 second=1069 amount=-1 +kerning first=1059 second=1060 amount=-1 +kerning first=1059 second=1054 amount=-1 +kerning first=1059 second=1051 amount=-1 +kerning first=1059 second=1047 amount=-1 +kerning first=1059 second=1044 amount=-2 +kerning first=1059 second=1040 amount=-3 +kerning first=1059 second=58 amount=-1 +kerning first=1059 second=46 amount=-6 +kerning first=1059 second=44 amount=-6 +kerning first=1058 second=1103 amount=-3 +kerning first=1058 second=1102 amount=-2 +kerning first=1058 second=1100 amount=-2 +kerning first=1058 second=1099 amount=-2 +kerning first=1058 second=1097 amount=-2 +kerning first=1058 second=1093 amount=-2 +kerning first=1058 second=1091 amount=-3 +kerning first=1058 second=1089 amount=-3 +kerning first=1058 second=1088 amount=-3 +kerning first=1058 second=1087 amount=-2 +kerning first=1058 second=1086 amount=-3 +kerning first=1058 second=1084 amount=-2 +kerning first=1058 second=1083 amount=-2 +kerning first=1058 second=1082 amount=-2 +kerning first=1058 second=1080 amount=-2 +kerning first=1058 second=1077 amount=-3 +kerning first=1058 second=1074 amount=-2 +kerning first=1058 second=1072 amount=-2 +kerning first=1058 second=1071 amount=-1 +kerning first=1058 second=1060 amount=-1 +kerning first=1058 second=1054 amount=-2 +kerning first=1058 second=1051 amount=-1 +kerning first=1058 second=1047 amount=-1 +kerning first=1058 second=1046 amount=1 +kerning first=1058 second=1044 amount=-1 +kerning first=1058 second=1040 amount=-1 +kerning first=1058 second=46 amount=-5 +kerning first=1058 second=44 amount=-5 +kerning first=1057 second=1095 amount=-1 +kerning first=1057 second=1078 amount=1 +kerning first=1057 second=1072 amount=1 +kerning first=1057 second=1069 amount=-1 +kerning first=1057 second=1066 amount=-2 +kerning first=1057 second=1063 amount=-1 +kerning first=1057 second=1061 amount=-3 +kerning first=1057 second=1059 amount=-1 +kerning first=1057 second=1058 amount=-1 +kerning first=1057 second=1054 amount=-1 +kerning first=1057 second=1052 amount=-1 +kerning first=1057 second=1051 amount=-1 +kerning first=1057 second=1047 amount=-1 +kerning first=1057 second=1044 amount=-1 +kerning first=1057 second=1040 amount=-1 +kerning first=1056 second=1103 amount=-1 +kerning first=1056 second=1101 amount=-1 +kerning first=1056 second=1086 amount=-2 +kerning first=1056 second=1077 amount=-2 +kerning first=1056 second=1076 amount=-3 +kerning first=1056 second=1072 amount=-1 +kerning first=1056 second=1071 amount=-1 +kerning first=1056 second=1061 amount=-2 +kerning first=1056 second=1060 amount=-1 +kerning first=1056 second=1059 amount=-1 +kerning first=1056 second=1058 amount=-2 +kerning first=1056 second=1057 amount=-1 +kerning first=1056 second=1054 amount=-1 +kerning first=1056 second=1052 amount=-1 +kerning first=1056 second=1051 amount=-3 +kerning first=1056 second=1047 amount=-1 +kerning first=1056 second=1046 amount=-1 +kerning first=1056 second=1044 amount=-3 +kerning first=1056 second=1040 amount=-3 +kerning first=1056 second=58 amount=-1 +kerning first=1056 second=46 amount=-8 +kerning first=1056 second=44 amount=-8 +kerning first=1054 second=1093 amount=-1 +kerning first=1054 second=1083 amount=-1 +kerning first=1054 second=1076 amount=-1 +kerning first=1040 second=1044 amount=1 +kerning first=1040 second=1047 amount=-1 +kerning first=1040 second=1051 amount=1 +kerning first=1040 second=1054 amount=-1 +kerning first=1040 second=1055 amount=-1 +kerning first=1040 second=1057 amount=-1 +kerning first=1040 second=1058 amount=-3 +kerning first=1040 second=1059 amount=-2 +kerning first=1040 second=1060 amount=-1 +kerning first=1040 second=1063 amount=-3 +kerning first=1040 second=1069 amount=-1 +kerning first=1040 second=1072 amount=1 +kerning first=1040 second=1090 amount=-1 +kerning first=1040 second=1091 amount=-1 +kerning first=1040 second=1092 amount=1 +kerning first=1040 second=1101 amount=1 +kerning first=1041 second=1040 amount=-1 +kerning first=1041 second=1047 amount=-1 +kerning first=1041 second=1054 amount=-1 +kerning first=1041 second=1057 amount=-1 +kerning first=1041 second=1058 amount=-2 +kerning first=1041 second=1059 amount=-1 +kerning first=1041 second=1060 amount=-1 +kerning first=1041 second=1061 amount=-1 +kerning first=1041 second=1063 amount=-2 +kerning first=1041 second=1066 amount=-1 +kerning first=1041 second=1069 amount=-1 +kerning first=1041 second=1071 amount=-1 +kerning first=1041 second=1083 amount=-1 +kerning first=1041 second=1091 amount=-1 +kerning first=1042 second=1040 amount=-1 +kerning first=1042 second=1044 amount=-1 +kerning first=1042 second=1046 amount=-1 +kerning first=1042 second=1047 amount=-1 +kerning first=1042 second=1051 amount=-1 +kerning first=1042 second=1054 amount=-1 +kerning first=1042 second=1057 amount=-1 +kerning first=1042 second=1058 amount=-3 +kerning first=1042 second=1059 amount=-1 +kerning first=1042 second=1060 amount=-1 +kerning first=1042 second=1061 amount=-2 +kerning first=1042 second=1063 amount=-2 +kerning first=1042 second=1066 amount=-3 +kerning first=1042 second=1071 amount=-1 +kerning first=1042 second=1076 amount=-1 +kerning first=1042 second=1084 amount=-1 +kerning first=1042 second=1090 amount=-1 +kerning first=1042 second=1091 amount=-1 +kerning first=1042 second=1093 amount=-1 +kerning first=1042 second=1095 amount=-1 +kerning first=1042 second=1103 amount=-1 +kerning first=1043 second=44 amount=-5 +kerning first=1043 second=46 amount=-5 +kerning first=1054 second=1071 amount=-1 +kerning first=1054 second=1063 amount=-1 +kerning first=1054 second=1061 amount=-2 +kerning first=1043 second=1040 amount=-3 +kerning first=1043 second=1044 amount=-3 +kerning first=1043 second=1047 amount=-1 +kerning first=1043 second=1051 amount=-3 +kerning first=1043 second=1052 amount=-1 +kerning first=1043 second=1054 amount=-3 +kerning first=1043 second=1057 amount=-2 +kerning first=1043 second=1071 amount=-1 +kerning first=1043 second=1072 amount=-3 +kerning first=1043 second=1074 amount=-3 +kerning first=1043 second=1076 amount=-3 +kerning first=1043 second=1077 amount=-3 +kerning first=1043 second=1080 amount=-3 +kerning first=1043 second=1083 amount=-3 +kerning first=1043 second=1084 amount=-3 +kerning first=1043 second=1085 amount=-3 +kerning first=1043 second=1086 amount=-3 +kerning first=1043 second=1088 amount=-3 +kerning first=1043 second=1091 amount=-3 +kerning first=1043 second=1099 amount=-3 +kerning first=1043 second=1100 amount=-3 +kerning first=1043 second=1102 amount=-3 +kerning first=1043 second=1103 amount=-3 +kerning first=1044 second=1059 amount=1 +kerning first=1044 second=1060 amount=-1 +kerning first=1044 second=1063 amount=-2 +kerning first=1044 second=1079 amount=1 +kerning first=1044 second=1086 amount=1 +kerning first=1044 second=1091 amount=1 +kerning first=1045 second=1047 amount=-1 +kerning first=1045 second=1089 amount=-1 +kerning first=1046 second=1047 amount=-1 +kerning first=1046 second=1054 amount=-1 +kerning first=1046 second=1057 amount=-1 +kerning first=1046 second=1058 amount=1 +kerning first=1046 second=1059 amount=1 +kerning first=1046 second=1066 amount=1 +kerning first=1046 second=1072 amount=1 +kerning first=1046 second=1077 amount=-1 +kerning first=1046 second=1086 amount=-1 +kerning first=1046 second=1091 amount=-1 +kerning first=1047 second=1051 amount=-1 +kerning first=1047 second=1054 amount=-1 +kerning first=1047 second=1057 amount=-1 +kerning first=1047 second=1058 amount=-1 +kerning first=1047 second=1059 amount=-1 +kerning first=1047 second=1060 amount=-1 +kerning first=1047 second=1063 amount=-1 +kerning first=1047 second=1071 amount=-1 +kerning first=1050 second=1047 amount=-1 +kerning first=1050 second=1054 amount=-1 +kerning first=1050 second=1057 amount=-1 +kerning first=1050 second=1059 amount=1 +kerning first=1050 second=1060 amount=-2 +kerning first=1051 second=1060 amount=-1 +kerning first=1051 second=1073 amount=1 +kerning first=1051 second=1091 amount=1 +kerning first=1052 second=1060 amount=-1 +kerning first=1052 second=1063 amount=-1 +kerning first=1052 second=1072 amount=1 +kerning first=1052 second=1077 amount=1 +kerning first=1052 second=1086 amount=1 +kerning first=1052 second=1089 amount=1 +kerning first=1052 second=1091 amount=1 +kerning first=1052 second=1095 amount=-1 +kerning first=1052 second=1101 amount=1 +kerning first=1054 second=1040 amount=-1 +kerning first=1054 second=1044 amount=-1 +kerning first=1054 second=1046 amount=-1 +kerning first=1054 second=1051 amount=-1 +kerning first=1054 second=1059 amount=-1 diff --git a/samples/bin/library/arial_bm.png b/samples/bin/library/arial_bm.png index 692e7e72..51356b05 100644 --- a/samples/bin/library/arial_bm.png +++ b/samples/bin/library/arial_bm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f1044cd99d8bd2b0576b06928493cf7cdad421bae5d71c56a436cc33f59c30a -size 217444 +oid sha256:cdd1e2d175c5109ec5840ea37093e7f745fbf618b709ee334b7459ef1567960a +size 61729 diff --git a/samples/bin/library/font_bm_material.json b/samples/bin/library/font_bm_material.json index fccdf859..044249a8 100644 --- a/samples/bin/library/font_bm_material.json +++ b/samples/bin/library/font_bm_material.json @@ -3,7 +3,7 @@ "shader" : "font_bm_shader.json", "state_block" : { "blending_state" : { - "src_factor" : "src_alpha", + "src_factor" : "one", "dst_factor" : "one_minus_src_alpha" }, "capabilities_state" : { diff --git a/samples/bin/library/font_bm_shader.frag b/samples/bin/library/font_bm_shader.frag index 659abd18..0ce58914 100644 --- a/samples/bin/library/font_bm_shader.frag +++ b/samples/bin/library/font_bm_shader.frag @@ -1,8 +1,26 @@ uniform sampler2D u_texture; +uniform float u_glyph_dilate; +uniform float u_outline_width; +uniform vec4 u_outline_color; + varying vec2 v_st0; -varying vec4 v_color; +varying vec4 v_color0; void main() { - gl_FragColor = texture2D(u_texture, v_st0) * v_color; + vec4 t = texture2D(u_texture, v_st0); + + float glyph_alpha = t.a; + float outline_alpha = t.r; + + vec4 glyph_color = vec4(v_color0.rgb * v_color0.a, v_color0.a); + vec4 outline_color = vec4(u_outline_color.rgb * u_outline_color.a, u_outline_color.a); + + vec2 layers_mask = vec2( + step(0.0001, v_color0.a), + step(0.0001, u_outline_color.a * u_outline_width)); + + gl_FragColor = + layers_mask.x * glyph_alpha * glyph_color + + layers_mask.y * outline_alpha * outline_color * (1.0 - glyph_alpha); } diff --git a/samples/bin/library/font_bm_shader.vert b/samples/bin/library/font_bm_shader.vert index 87daabca..ec285d22 100644 --- a/samples/bin/library/font_bm_shader.vert +++ b/samples/bin/library/font_bm_shader.vert @@ -1,3 +1,4 @@ +uniform vec2 u_screen_s; uniform mat4 u_matrix_m; uniform mat4 u_matrix_vp; @@ -6,10 +7,33 @@ attribute vec2 a_st0; attribute vec4 a_color0; varying vec2 v_st0; -varying vec4 v_color; +varying vec4 v_color0; + +#define VERTEX_SNAPPING_ON + +vec2 round(vec2 v) { + return vec2( + floor(v.x + 0.5), + floor(v.y + 0.5)); +} + +vec4 pixel_snap(vec4 pos) { + vec2 hpc = u_screen_s * 0.5; + vec2 pixel_pos = round((pos.xy / pos.w) * hpc); + pos.xy = pixel_pos / hpc * pos.w; + return pos; +} + +vec4 vertex_to_homo(vec3 pos) { + return vec4(pos, 1.0) * u_matrix_m * u_matrix_vp; +} void main() { v_st0 = vec2(a_st0.s, 1.0 - a_st0.t); - v_color = a_color0; - gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp; + v_color0 = a_color0; +#ifndef VERTEX_SNAPPING_ON + gl_Position = vertex_to_homo(a_vertex); +#else + gl_Position = pixel_snap(vertex_to_homo(a_vertex)); +#endif } diff --git a/samples/bin/library/font_sdf_shader.frag b/samples/bin/library/font_sdf_shader.frag index 2fb8e219..1b1ab26d 100644 --- a/samples/bin/library/font_sdf_shader.frag +++ b/samples/bin/library/font_sdf_shader.frag @@ -1,3 +1,7 @@ +#ifdef GL_OES_standard_derivatives +# extension GL_OES_standard_derivatives : require +#endif + uniform sampler2D u_texture; uniform float u_glyph_dilate; @@ -5,7 +9,7 @@ uniform float u_outline_width; uniform vec4 u_outline_color; varying vec2 v_st0; -varying vec4 v_color; +varying vec4 v_color0; void main() { float distance = texture2D(u_texture, v_st0).a; @@ -17,13 +21,14 @@ void main() { float glyph_alpha = smoothstep(glyph_center - width, glyph_center + width, distance); float outline_alpha = smoothstep(outline_center - width, outline_center + width, distance); - vec4 glyph_color = vec4(v_color.rgb * v_color.a, v_color.a); + vec4 glyph_color = vec4(v_color0.rgb * v_color0.a, v_color0.a); vec4 outline_color = vec4(u_outline_color.rgb * u_outline_color.a, u_outline_color.a); vec2 layers_mask = vec2( - step(0.01, v_color.a), - step(0.01, u_outline_color.a * u_outline_width)); + step(0.0001, v_color0.a), + step(0.0001, u_outline_color.a * u_outline_width)); - gl_FragColor = glyph_alpha * glyph_color * layers_mask.x + - outline_alpha * outline_color * layers_mask.y * (1.0 - glyph_alpha); + gl_FragColor = + layers_mask.x * glyph_alpha * glyph_color + + layers_mask.y * outline_alpha * outline_color * (1.0 - glyph_alpha); } diff --git a/samples/bin/library/font_sdf_shader.vert b/samples/bin/library/font_sdf_shader.vert index 87daabca..ec285d22 100644 --- a/samples/bin/library/font_sdf_shader.vert +++ b/samples/bin/library/font_sdf_shader.vert @@ -1,3 +1,4 @@ +uniform vec2 u_screen_s; uniform mat4 u_matrix_m; uniform mat4 u_matrix_vp; @@ -6,10 +7,33 @@ attribute vec2 a_st0; attribute vec4 a_color0; varying vec2 v_st0; -varying vec4 v_color; +varying vec4 v_color0; + +#define VERTEX_SNAPPING_ON + +vec2 round(vec2 v) { + return vec2( + floor(v.x + 0.5), + floor(v.y + 0.5)); +} + +vec4 pixel_snap(vec4 pos) { + vec2 hpc = u_screen_s * 0.5; + vec2 pixel_pos = round((pos.xy / pos.w) * hpc); + pos.xy = pixel_pos / hpc * pos.w; + return pos; +} + +vec4 vertex_to_homo(vec3 pos) { + return vec4(pos, 1.0) * u_matrix_m * u_matrix_vp; +} void main() { v_st0 = vec2(a_st0.s, 1.0 - a_st0.t); - v_color = a_color0; - gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp; + v_color0 = a_color0; +#ifndef VERTEX_SNAPPING_ON + gl_Position = vertex_to_homo(a_vertex); +#else + gl_Position = pixel_snap(vertex_to_homo(a_vertex)); +#endif } diff --git a/samples/bin/library/model_shader.frag b/samples/bin/library/model_shader.frag index 64fab438..3fa39a3e 100644 --- a/samples/bin/library/model_shader.frag +++ b/samples/bin/library/model_shader.frag @@ -3,6 +3,5 @@ uniform sampler2D u_texture; varying vec2 v_st0; void main() { - vec2 st = vec2(v_st0.s, 1.0 - v_st0.t); - gl_FragColor = texture2D(u_texture, st); + gl_FragColor = texture2D(u_texture, v_st0); } diff --git a/samples/bin/library/model_shader.vert b/samples/bin/library/model_shader.vert index 0e1f4a33..e1e64ba6 100644 --- a/samples/bin/library/model_shader.vert +++ b/samples/bin/library/model_shader.vert @@ -6,7 +6,11 @@ attribute vec2 a_st0; varying vec2 v_st0; -void main() { - v_st0 = a_st0; - gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp; +vec4 vertex_to_homo(vec3 pos) { + return vec4(pos, 1.0) * u_matrix_m * u_matrix_vp; +} + +void main() { + v_st0 = vec2(a_st0.s, 1.0 - a_st0.t); + gl_Position = vertex_to_homo(a_vertex); } diff --git a/samples/bin/library/scene_prefab.json b/samples/bin/library/scene_prefab.json index 898d737a..8f79ef67 100644 --- a/samples/bin/library/scene_prefab.json +++ b/samples/bin/library/scene_prefab.json @@ -22,6 +22,9 @@ }, { "prototype" : "ship_prefab.json", "components" : { + "sprite_renderer" : { + "tint" : [255,0,0,255] + }, "actor" : { "translation" : [50,-50,0] } @@ -31,7 +34,9 @@ "components" : { "label" : { "text" : "bm font", - "valign" : "center" + "valign" : "center", + "outline_width" : 0.5, + "outline_color" : [0,0,0,255] }, "actor" : { "translation" : [0,180,0], @@ -44,11 +49,11 @@ "label" : { "text" : "sdf font", "valign" : "center", - "outline_width" : 0.2, + "outline_width" : 0.5, "outline_color" : [0,0,0,255] }, "actor" : { - "translation" : [0,-180,0], + "translation" : [0.5,-180.5,0], "scale" : 3 } } diff --git a/samples/bin/library/sprite_material.json b/samples/bin/library/sprite_material.json index e2f9770f..58a6a793 100644 --- a/samples/bin/library/sprite_material.json +++ b/samples/bin/library/sprite_material.json @@ -3,7 +3,7 @@ "shader" : "sprite_shader.json", "state_block" : { "blending_state" : { - "src_factor" : "src_alpha", + "src_factor" : "one", "dst_factor" : "one_minus_src_alpha" }, "capabilities_state" : { diff --git a/samples/bin/library/sprite_shader.frag b/samples/bin/library/sprite_shader.frag index 7efd0b8b..7ea012bd 100644 --- a/samples/bin/library/sprite_shader.frag +++ b/samples/bin/library/sprite_shader.frag @@ -1,9 +1,10 @@ uniform sampler2D u_texture; -varying vec4 v_tint; -varying vec2 v_st; +varying vec2 v_st0; +varying vec4 v_color0; void main() { - vec2 st = vec2(v_st.s, 1.0 - v_st.t); - gl_FragColor = texture2D(u_texture, st) * v_tint; + vec4 c = texture2D(u_texture, v_st0) * v_color0; + c.rgb *= c.a; + gl_FragColor = c; } diff --git a/samples/bin/library/sprite_shader.vert b/samples/bin/library/sprite_shader.vert index 193f5f04..72a7ae2f 100644 --- a/samples/bin/library/sprite_shader.vert +++ b/samples/bin/library/sprite_shader.vert @@ -1,14 +1,36 @@ +uniform vec2 u_screen_s; uniform mat4 u_matrix_vp; attribute vec3 a_vertex; -attribute vec4 a_tint; -attribute vec2 a_st; +attribute vec2 a_st0; +attribute vec4 a_color0; -varying vec4 v_tint; -varying vec2 v_st; +varying vec2 v_st0; +varying vec4 v_color0; + +vec2 round(vec2 v) { + return vec2( + floor(v.x + 0.5), + floor(v.y + 0.5)); +} + +vec4 pixel_snap(vec4 pos) { + vec2 hpc = u_screen_s * 0.5; + vec2 pixel_pos = round((pos.xy / pos.w) * hpc); + pos.xy = pixel_pos / hpc * pos.w; + return pos; +} + +vec4 vertex_to_homo(vec3 pos) { + return vec4(pos, 1.0) * u_matrix_vp; +} void main() { - v_st = a_st; - v_tint = a_tint; - gl_Position = vec4(a_vertex, 1.0) * u_matrix_vp; + v_st0 = vec2(a_st0.s, 1.0 - a_st0.t); + v_color0 = a_color0; +#ifndef VERTEX_SNAPPING_ON + gl_Position = vertex_to_homo(a_vertex); +#else + gl_Position = pixel_snap(vertex_to_homo(a_vertex)); +#endif } diff --git a/sources/enduro2d/high/systems/render_system.cpp b/sources/enduro2d/high/systems/render_system.cpp index f7ddfac4..9be52781 100644 --- a/sources/enduro2d/high/systems/render_system.cpp +++ b/sources/enduro2d/high/systems/render_system.cpp @@ -99,7 +99,7 @@ namespace e2d class render_system::internal_state final : private noncopyable { public: internal_state() - : drawer_(the(), the(), the()) {} + : drawer_(the(), the(), the(), the()) {} ~internal_state() noexcept = default; void process(ecs::registry& owner) { diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_base.hpp b/sources/enduro2d/high/systems/render_system_impl/render_system_base.hpp index 81900f63..27bcfd3b 100644 --- a/sources/enduro2d/high/systems/render_system_impl/render_system_base.hpp +++ b/sources/enduro2d/high/systems/render_system_impl/render_system_base.hpp @@ -40,8 +40,8 @@ namespace e2d::render_system_impl static vertex_declaration decl() noexcept { return vertex_declaration() .add_attribute("a_vertex") - .add_attribute("a_st") - .add_attribute("a_tint").normalized(); + .add_attribute("a_st0") + .add_attribute("a_color0").normalized(); } }; } diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp index 751ec273..42f75ad6 100644 --- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp +++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp @@ -14,6 +14,7 @@ namespace { using namespace e2d; + const str_hash screen_s_property_hash = "u_screen_s"; const str_hash matrix_v_property_hash = "u_matrix_v"; const str_hash matrix_p_property_hash = "u_matrix_p"; const str_hash matrix_vp_property_hash = "u_matrix_vp"; @@ -32,6 +33,7 @@ namespace e2d::render_system_impl const const_node_iptr& cam_n, engine& engine, render& render, + window& window, batcher_type& batcher) : render_(render) , batcher_(batcher) @@ -47,6 +49,9 @@ namespace e2d::render_system_impl const m4f& m_p = cam.projection(); batcher_.flush() + .property(screen_s_property_hash, cam.target() + ? cam.target()->size().cast_to() + : window.framebuffer_size().cast_to()) .property(matrix_v_property_hash, m_v) .property(matrix_p_property_hash, m_p) .property(matrix_vp_property_hash, m_v * m_p) @@ -219,8 +224,9 @@ namespace e2d::render_system_impl // drawer // - drawer::drawer(engine& e, debug& d, render& r) + drawer::drawer(engine& e, debug& d, render& r, window& w) : engine_(e) , render_(r) + , window_(w) , batcher_(d, r) {} } diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp index 641e8136..036a47ca 100644 --- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp +++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp @@ -36,6 +36,7 @@ namespace e2d::render_system_impl const const_node_iptr& cam_n, engine& engine, render& render, + window& window, batcher_type& batcher); ~context() noexcept; @@ -59,13 +60,14 @@ namespace e2d::render_system_impl render::property_block property_cache_; }; public: - drawer(engine& e, debug& d, render& r); + drawer(engine& e, debug& d, render& r, window& w); template < typename F > void with(const camera& cam, const const_node_iptr& cam_n, F&& f); private: engine& engine_; render& render_; + window& window_; batcher_type batcher_; }; } @@ -74,7 +76,7 @@ namespace e2d::render_system_impl { template < typename F > void drawer::with(const camera& cam, const const_node_iptr& cam_n, F&& f) { - context ctx{cam, cam_n, engine_, render_, batcher_}; + context ctx{cam, cam_n, engine_, render_, window_, batcher_}; std::forward(f)(ctx); ctx.flush(); }