diff --git a/assets/fonts/arial.fnt b/assets/fonts/arial.fnt index bfdb14e..91d3145 100644 --- a/assets/fonts/arial.fnt +++ b/assets/fonts/arial.fnt @@ -1,198 +1,291 @@ -info face="Arial" size=82 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=3,3,3,3 spacing=-2,-2 -common lineHeight=100 base=75 scaleW=512 scaleH=512 pages=1 packed=0 +info face="Arial" size=30 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=8,8,8,8 spacing=-2,-2 +common lineHeight=50 base=28 scaleW=512 scaleH=512 pages=1 packed=0 page id=0 file="arial.png" -chars count=97 -char id=0 x=344 y=346 width=48 height=58 xoffset=7 yoffset=20 xadvance=66 page=0 chnl=0 -char id=10 x=0 y=0 width=0 height=0 xoffset=-3 yoffset=0 xadvance=4 page=0 chnl=0 -char id=32 x=0 y=0 width=0 height=0 xoffset=-3 yoffset=0 xadvance=27 page=0 chnl=0 -char id=33 x=118 y=346 width=13 height=65 xoffset=6 yoffset=13 xadvance=29 page=0 chnl=0 -char id=34 x=250 y=462 width=28 height=27 xoffset=0 yoffset=13 xadvance=33 page=0 chnl=0 -char id=35 x=191 y=346 width=49 height=65 xoffset=-2 yoffset=13 xadvance=50 page=0 chnl=0 -char id=36 x=269 y=0 width=44 height=76 xoffset=0 yoffset=10 xadvance=50 page=0 chnl=0 -char id=37 x=158 y=83 width=69 height=67 xoffset=2 yoffset=12 xadvance=77 page=0 chnl=0 -char id=38 x=227 y=83 width=55 height=67 xoffset=1 yoffset=12 xadvance=59 page=0 chnl=0 -char id=39 x=489 y=411 width=13 height=27 xoffset=1 yoffset=13 xadvance=20 page=0 chnl=0 -char id=40 x=177 y=0 width=25 height=81 xoffset=2 yoffset=13 xadvance=31 page=0 chnl=0 -char id=41 x=202 y=0 width=25 height=81 xoffset=0 yoffset=13 xadvance=31 page=0 chnl=0 -char id=42 x=216 y=462 width=34 height=31 xoffset=0 yoffset=13 xadvance=36 page=0 chnl=0 -char id=43 x=88 y=462 width=45 height=45 xoffset=1 yoffset=24 xadvance=52 page=0 chnl=0 -char id=44 x=278 y=462 width=13 height=26 xoffset=4 yoffset=65 xadvance=27 page=0 chnl=0 -char id=45 x=371 y=462 width=28 height=13 xoffset=0 yoffset=47 xadvance=31 page=0 chnl=0 -char id=46 x=358 y=462 width=13 height=13 xoffset=4 yoffset=65 xadvance=27 page=0 chnl=0 -char id=47 x=131 y=346 width=30 height=65 xoffset=-3 yoffset=13 xadvance=27 page=0 chnl=0 -char id=48 x=309 y=150 width=44 height=66 xoffset=1 yoffset=13 xadvance=50 page=0 chnl=0 -char id=49 x=0 y=346 width=28 height=65 xoffset=6 yoffset=13 xadvance=50 page=0 chnl=0 -char id=50 x=28 y=346 width=46 height=65 xoffset=-2 yoffset=13 xadvance=50 page=0 chnl=0 -char id=51 x=131 y=150 width=44 height=66 xoffset=1 yoffset=13 xadvance=50 page=0 chnl=0 -char id=52 x=240 y=346 width=47 height=64 xoffset=-2 yoffset=14 xadvance=50 page=0 chnl=0 -char id=53 x=74 y=346 width=44 height=65 xoffset=1 yoffset=14 xadvance=50 page=0 chnl=0 -char id=54 x=175 y=150 width=46 height=66 xoffset=-1 yoffset=13 xadvance=50 page=0 chnl=0 -char id=55 x=287 y=346 width=44 height=64 xoffset=1 yoffset=14 xadvance=50 page=0 chnl=0 -char id=56 x=221 y=150 width=44 height=66 xoffset=1 yoffset=13 xadvance=50 page=0 chnl=0 -char id=57 x=265 y=150 width=44 height=66 xoffset=1 yoffset=13 xadvance=50 page=0 chnl=0 -char id=58 x=476 y=411 width=13 height=49 xoffset=4 yoffset=29 xadvance=27 page=0 chnl=0 -char id=59 x=331 y=346 width=13 height=62 xoffset=4 yoffset=29 xadvance=27 page=0 chnl=0 -char id=60 x=0 y=462 width=44 height=45 xoffset=2 yoffset=24 xadvance=52 page=0 chnl=0 -char id=61 x=171 y=462 width=45 height=31 xoffset=1 yoffset=30 xadvance=52 page=0 chnl=0 -char id=62 x=44 y=462 width=44 height=45 xoffset=2 yoffset=24 xadvance=52 page=0 chnl=0 -char id=63 x=353 y=150 width=44 height=66 xoffset=1 yoffset=12 xadvance=50 page=0 chnl=0 -char id=64 x=70 y=0 width=82 height=83 xoffset=1 yoffset=12 xadvance=87 page=0 chnl=0 -char id=65 x=397 y=150 width=63 height=65 xoffset=-5 yoffset=13 xadvance=59 page=0 chnl=0 -char id=66 x=460 y=150 width=50 height=65 xoffset=4 yoffset=13 xadvance=59 page=0 chnl=0 -char id=67 x=375 y=0 width=57 height=67 xoffset=1 yoffset=12 xadvance=63 page=0 chnl=0 -char id=68 x=0 y=216 width=54 height=65 xoffset=4 yoffset=13 xadvance=63 page=0 chnl=0 -char id=69 x=54 y=216 width=50 height=65 xoffset=4 yoffset=13 xadvance=59 page=0 chnl=0 -char id=70 x=104 y=216 width=45 height=65 xoffset=4 yoffset=13 xadvance=54 page=0 chnl=0 -char id=71 x=432 y=0 width=61 height=67 xoffset=1 yoffset=12 xadvance=68 page=0 chnl=0 -char id=72 x=149 y=216 width=51 height=65 xoffset=4 yoffset=13 xadvance=63 page=0 chnl=0 -char id=73 x=489 y=83 width=14 height=65 xoffset=4 yoffset=13 xadvance=27 page=0 chnl=0 -char id=74 x=282 y=83 width=38 height=66 xoffset=-1 yoffset=13 xadvance=45 page=0 chnl=0 -char id=75 x=200 y=216 width=55 height=65 xoffset=4 yoffset=13 xadvance=59 page=0 chnl=0 -char id=76 x=255 y=216 width=42 height=65 xoffset=4 yoffset=13 xadvance=50 page=0 chnl=0 -char id=77 x=297 y=216 width=63 height=65 xoffset=2 yoffset=13 xadvance=71 page=0 chnl=0 -char id=78 x=360 y=216 width=51 height=65 xoffset=4 yoffset=13 xadvance=63 page=0 chnl=0 -char id=79 x=0 y=83 width=62 height=67 xoffset=1 yoffset=12 xadvance=68 page=0 chnl=0 -char id=80 x=411 y=216 width=50 height=65 xoffset=4 yoffset=13 xadvance=59 page=0 chnl=0 -char id=81 x=313 y=0 width=62 height=71 xoffset=1 yoffset=12 xadvance=68 page=0 chnl=0 -char id=82 x=0 y=281 width=56 height=65 xoffset=4 yoffset=13 xadvance=63 page=0 chnl=0 -char id=83 x=62 y=83 width=53 height=67 xoffset=1 yoffset=12 xadvance=59 page=0 chnl=0 -char id=84 x=56 y=281 width=52 height=65 xoffset=-1 yoffset=13 xadvance=54 page=0 chnl=0 -char id=85 x=320 y=83 width=51 height=66 xoffset=4 yoffset=13 xadvance=63 page=0 chnl=0 -char id=86 x=108 y=281 width=63 height=65 xoffset=-4 yoffset=13 xadvance=59 page=0 chnl=0 -char id=87 x=171 y=281 width=85 height=65 xoffset=-2 yoffset=13 xadvance=85 page=0 chnl=0 -char id=88 x=256 y=281 width=59 height=65 xoffset=-3 yoffset=13 xadvance=58 page=0 chnl=0 -char id=89 x=315 y=281 width=60 height=65 xoffset=-3 yoffset=13 xadvance=58 page=0 chnl=0 -char id=90 x=375 y=281 width=52 height=65 xoffset=-1 yoffset=13 xadvance=54 page=0 chnl=0 -char id=91 x=227 y=0 width=21 height=81 xoffset=2 yoffset=13 xadvance=27 page=0 chnl=0 -char id=92 x=161 y=346 width=30 height=65 xoffset=-3 yoffset=13 xadvance=27 page=0 chnl=0 -char id=93 x=248 y=0 width=21 height=81 xoffset=0 yoffset=13 xadvance=27 page=0 chnl=0 -char id=94 x=133 y=462 width=38 height=38 xoffset=-1 yoffset=12 xadvance=40 page=0 chnl=0 -char id=95 x=399 y=462 width=55 height=13 xoffset=-4 yoffset=81 xadvance=50 page=0 chnl=0 -char id=96 x=338 y=462 width=20 height=17 xoffset=0 yoffset=13 xadvance=31 page=0 chnl=0 -char id=97 x=392 y=346 width=46 height=51 xoffset=0 yoffset=28 xadvance=50 page=0 chnl=0 -char id=98 x=371 y=83 width=43 height=66 xoffset=2 yoffset=13 xadvance=50 page=0 chnl=0 -char id=99 x=438 y=346 width=43 height=51 xoffset=0 yoffset=28 xadvance=45 page=0 chnl=0 -char id=100 x=414 y=83 width=43 height=66 xoffset=0 yoffset=13 xadvance=50 page=0 chnl=0 -char id=101 x=0 y=411 width=46 height=51 xoffset=0 yoffset=28 xadvance=50 page=0 chnl=0 -char id=102 x=457 y=83 width=32 height=66 xoffset=-1 yoffset=12 xadvance=28 page=0 chnl=0 -char id=103 x=115 y=83 width=43 height=67 xoffset=0 yoffset=28 xadvance=49 page=0 chnl=0 -char id=104 x=461 y=216 width=40 height=65 xoffset=3 yoffset=13 xadvance=50 page=0 chnl=0 -char id=105 x=493 y=0 width=13 height=65 xoffset=3 yoffset=13 xadvance=22 page=0 chnl=0 -char id=106 x=152 y=0 width=25 height=82 xoffset=-7 yoffset=13 xadvance=21 page=0 chnl=0 -char id=107 x=427 y=281 width=41 height=65 xoffset=2 yoffset=13 xadvance=45 page=0 chnl=0 -char id=108 x=468 y=281 width=13 height=65 xoffset=3 yoffset=13 xadvance=22 page=0 chnl=0 -char id=109 x=133 y=411 width=63 height=50 xoffset=2 yoffset=28 xadvance=71 page=0 chnl=0 -char id=110 x=196 y=411 width=40 height=50 xoffset=3 yoffset=28 xadvance=50 page=0 chnl=0 -char id=111 x=46 y=411 width=46 height=51 xoffset=0 yoffset=28 xadvance=50 page=0 chnl=0 -char id=112 x=0 y=150 width=43 height=66 xoffset=2 yoffset=28 xadvance=50 page=0 chnl=0 -char id=113 x=43 y=150 width=43 height=66 xoffset=0 yoffset=28 xadvance=49 page=0 chnl=0 -char id=114 x=481 y=346 width=29 height=50 xoffset=3 yoffset=28 xadvance=31 page=0 chnl=0 -char id=115 x=92 y=411 width=41 height=51 xoffset=0 yoffset=28 xadvance=45 page=0 chnl=0 -char id=116 x=481 y=281 width=26 height=65 xoffset=-1 yoffset=14 xadvance=27 page=0 chnl=0 -char id=117 x=236 y=411 width=40 height=50 xoffset=3 yoffset=29 xadvance=50 page=0 chnl=0 -char id=118 x=276 y=411 width=45 height=49 xoffset=-2 yoffset=29 xadvance=45 page=0 chnl=0 -char id=119 x=321 y=411 width=66 height=49 xoffset=-4 yoffset=29 xadvance=61 page=0 chnl=0 -char id=120 x=387 y=411 width=46 height=49 xoffset=-2 yoffset=29 xadvance=45 page=0 chnl=0 -char id=121 x=86 y=150 width=45 height=66 xoffset=-2 yoffset=29 xadvance=43 page=0 chnl=0 -char id=122 x=433 y=411 width=43 height=49 xoffset=-2 yoffset=29 xadvance=44 page=0 chnl=0 -char id=123 x=0 y=0 width=29 height=83 xoffset=-1 yoffset=12 xadvance=31 page=0 chnl=0 -char id=124 x=58 y=0 width=12 height=83 xoffset=4 yoffset=13 xadvance=24 page=0 chnl=0 -char id=125 x=29 y=0 width=29 height=83 xoffset=-1 yoffset=12 xadvance=31 page=0 chnl=0 -char id=126 x=291 y=462 width=47 height=21 xoffset=0 yoffset=37 xadvance=52 page=0 chnl=0 -kernings count=96 -kerning first=121 second=46 amount=-6 -kerning first=84 second=45 amount=-5 -kerning first=86 second=44 amount=-8 -kerning first=114 second=46 amount=-5 -kerning first=114 second=44 amount=-5 -kerning first=49 second=49 amount=-6 -kerning first=89 second=65 amount=-6 +chars count=191 +char id=0 x=340 y=324 width=32 height=35 xoffset=-5 yoffset=1 xadvance=37 page=0 chnl=0 +char id=10 x=0 y=0 width=0 height=0 xoffset=-8 yoffset=0 xadvance=14 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=-8 yoffset=0 xadvance=22 page=0 chnl=0 +char id=33 x=418 y=210 width=19 height=38 xoffset=-5 yoffset=-2 xadvance=23 page=0 chnl=0 +char id=34 x=366 y=393 width=24 height=24 xoffset=-7 yoffset=-2 xadvance=25 page=0 chnl=0 +char id=35 x=64 y=248 width=32 height=38 xoffset=-8 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=36 x=235 y=90 width=30 height=42 xoffset=-7 yoffset=-3 xadvance=31 page=0 chnl=0 +char id=37 x=25 y=248 width=39 height=38 xoffset=-6 yoffset=-2 xadvance=41 page=0 chnl=0 +char id=38 x=96 y=248 width=34 height=38 xoffset=-7 yoffset=-2 xadvance=34 page=0 chnl=0 +char id=39 x=390 y=393 width=19 height=24 xoffset=-7 yoffset=-2 xadvance=20 page=0 chnl=0 +char id=40 x=90 y=0 width=24 height=44 xoffset=-6 yoffset=-2 xadvance=24 page=0 chnl=0 +char id=41 x=114 y=0 width=24 height=44 xoffset=-8 yoffset=-2 xadvance=24 page=0 chnl=0 +char id=42 x=309 y=393 width=26 height=25 xoffset=-7 yoffset=-2 xadvance=26 page=0 chnl=0 +char id=43 x=458 y=361 width=31 height=31 xoffset=-7 yoffset=2 xadvance=32 page=0 chnl=0 +char id=44 x=433 y=393 width=19 height=23 xoffset=-5 yoffset=17 xadvance=22 page=0 chnl=0 +char id=45 x=61 y=423 width=24 height=19 xoffset=-7 yoffset=11 xadvance=24 page=0 chnl=0 +char id=46 x=42 y=423 width=19 height=19 xoffset=-5 yoffset=17 xadvance=22 page=0 chnl=0 +char id=47 x=468 y=210 width=25 height=38 xoffset=-8 yoffset=-2 xadvance=22 page=0 chnl=0 +char id=48 x=387 y=210 width=31 height=38 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=49 x=116 y=210 width=24 height=38 xoffset=-5 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=50 x=140 y=210 width=31 height=38 xoffset=-8 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=51 x=171 y=210 width=31 height=38 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=52 x=202 y=210 width=31 height=38 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=53 x=233 y=210 width=31 height=38 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=54 x=264 y=210 width=31 height=38 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=55 x=295 y=210 width=30 height=38 xoffset=-6 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=56 x=325 y=210 width=31 height=38 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=57 x=356 y=210 width=31 height=38 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=58 x=339 y=361 width=19 height=32 xoffset=-5 yoffset=4 xadvance=22 page=0 chnl=0 +char id=59 x=177 y=324 width=19 height=36 xoffset=-5 yoffset=4 xadvance=22 page=0 chnl=0 +char id=60 x=398 y=361 width=30 height=31 xoffset=-6 yoffset=2 xadvance=32 page=0 chnl=0 +char id=61 x=278 y=393 width=31 height=25 xoffset=-7 yoffset=5 xadvance=32 page=0 chnl=0 +char id=62 x=428 y=361 width=30 height=31 xoffset=-6 yoffset=2 xadvance=32 page=0 chnl=0 +char id=63 x=437 y=210 width=31 height=38 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=64 x=250 y=0 width=44 height=44 xoffset=-6 yoffset=-2 xadvance=44 page=0 chnl=0 +char id=65 x=439 y=90 width=38 height=38 xoffset=-9 yoffset=-2 xadvance=33 page=0 chnl=0 +char id=66 x=477 y=90 width=33 height=38 xoffset=-6 yoffset=-2 xadvance=34 page=0 chnl=0 +char id=67 x=0 y=134 width=36 height=38 xoffset=-7 yoffset=-2 xadvance=36 page=0 chnl=0 +char id=68 x=36 y=134 width=35 height=38 xoffset=-6 yoffset=-2 xadvance=36 page=0 chnl=0 +char id=69 x=71 y=134 width=32 height=38 xoffset=-6 yoffset=-2 xadvance=34 page=0 chnl=0 +char id=70 x=103 y=134 width=31 height=38 xoffset=-6 yoffset=-2 xadvance=32 page=0 chnl=0 +char id=71 x=134 y=134 width=36 height=38 xoffset=-7 yoffset=-2 xadvance=37 page=0 chnl=0 +char id=72 x=170 y=134 width=34 height=38 xoffset=-6 yoffset=-2 xadvance=36 page=0 chnl=0 +char id=73 x=204 y=134 width=19 height=38 xoffset=-6 yoffset=-2 xadvance=21 page=0 chnl=0 +char id=74 x=223 y=134 width=29 height=38 xoffset=-8 yoffset=-2 xadvance=29 page=0 chnl=0 +char id=75 x=252 y=134 width=34 height=38 xoffset=-6 yoffset=-2 xadvance=34 page=0 chnl=0 +char id=76 x=286 y=134 width=30 height=38 xoffset=-6 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=77 x=316 y=134 width=37 height=38 xoffset=-6 yoffset=-2 xadvance=39 page=0 chnl=0 +char id=78 x=353 y=134 width=34 height=38 xoffset=-6 yoffset=-2 xadvance=36 page=0 chnl=0 +char id=79 x=387 y=134 width=37 height=38 xoffset=-7 yoffset=-2 xadvance=37 page=0 chnl=0 +char id=80 x=424 y=134 width=33 height=38 xoffset=-6 yoffset=-2 xadvance=34 page=0 chnl=0 +char id=81 x=335 y=90 width=37 height=40 xoffset=-7 yoffset=-2 xadvance=37 page=0 chnl=0 +char id=82 x=457 y=134 width=36 height=38 xoffset=-6 yoffset=-2 xadvance=36 page=0 chnl=0 +char id=83 x=0 y=172 width=33 height=38 xoffset=-7 yoffset=-2 xadvance=34 page=0 chnl=0 +char id=84 x=33 y=172 width=33 height=38 xoffset=-7 yoffset=-2 xadvance=33 page=0 chnl=0 +char id=85 x=66 y=172 width=34 height=38 xoffset=-6 yoffset=-2 xadvance=36 page=0 chnl=0 +char id=86 x=100 y=172 width=37 height=38 xoffset=-9 yoffset=-2 xadvance=33 page=0 chnl=0 +char id=87 x=137 y=172 width=45 height=38 xoffset=-8 yoffset=-2 xadvance=44 page=0 chnl=0 +char id=88 x=182 y=172 width=35 height=38 xoffset=-8 yoffset=-2 xadvance=33 page=0 chnl=0 +char id=89 x=217 y=172 width=35 height=38 xoffset=-8 yoffset=-2 xadvance=33 page=0 chnl=0 +char id=90 x=252 y=172 width=33 height=38 xoffset=-8 yoffset=-2 xadvance=32 page=0 chnl=0 +char id=91 x=138 y=0 width=22 height=44 xoffset=-6 yoffset=-2 xadvance=22 page=0 chnl=0 +char id=92 x=0 y=248 width=25 height=38 xoffset=-8 yoffset=-2 xadvance=22 page=0 chnl=0 +char id=93 x=160 y=0 width=22 height=44 xoffset=-8 yoffset=-2 xadvance=22 page=0 chnl=0 +char id=94 x=150 y=393 width=28 height=28 xoffset=-7 yoffset=-2 xadvance=28 page=0 chnl=0 +char id=95 x=85 y=423 width=34 height=19 xoffset=-9 yoffset=23 xadvance=31 page=0 chnl=0 +char id=96 x=0 y=423 width=21 height=20 xoffset=-7 yoffset=-2 xadvance=24 page=0 chnl=0 +char id=97 x=434 y=324 width=30 height=32 xoffset=-7 yoffset=4 xadvance=30 page=0 chnl=0 +char id=98 x=285 y=172 width=30 height=38 xoffset=-6 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=99 x=464 y=324 width=29 height=32 xoffset=-7 yoffset=4 xadvance=29 page=0 chnl=0 +char id=100 x=315 y=172 width=30 height=38 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=101 x=0 y=361 width=30 height=32 xoffset=-7 yoffset=4 xadvance=30 page=0 chnl=0 +char id=102 x=345 y=172 width=27 height=38 xoffset=-8 yoffset=-2 xadvance=22 page=0 chnl=0 +char id=103 x=372 y=172 width=31 height=38 xoffset=-8 yoffset=4 xadvance=31 page=0 chnl=0 +char id=104 x=403 y=172 width=29 height=38 xoffset=-6 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=105 x=432 y=172 width=19 height=38 xoffset=-6 yoffset=-2 xadvance=21 page=0 chnl=0 +char id=106 x=66 y=0 width=24 height=44 xoffset=-10 yoffset=-2 xadvance=21 page=0 chnl=0 +char id=107 x=451 y=172 width=29 height=38 xoffset=-6 yoffset=-2 xadvance=29 page=0 chnl=0 +char id=108 x=480 y=172 width=19 height=38 xoffset=-6 yoffset=-2 xadvance=21 page=0 chnl=0 +char id=109 x=30 y=361 width=37 height=32 xoffset=-6 yoffset=4 xadvance=39 page=0 chnl=0 +char id=110 x=67 y=361 width=29 height=32 xoffset=-6 yoffset=4 xadvance=31 page=0 chnl=0 +char id=111 x=96 y=361 width=30 height=32 xoffset=-7 yoffset=4 xadvance=30 page=0 chnl=0 +char id=112 x=0 y=210 width=30 height=38 xoffset=-6 yoffset=4 xadvance=31 page=0 chnl=0 +char id=113 x=30 y=210 width=30 height=38 xoffset=-7 yoffset=4 xadvance=31 page=0 chnl=0 +char id=114 x=126 y=361 width=24 height=32 xoffset=-6 yoffset=4 xadvance=24 page=0 chnl=0 +char id=115 x=150 y=361 width=29 height=32 xoffset=-7 yoffset=4 xadvance=29 page=0 chnl=0 +char id=116 x=60 y=210 width=24 height=38 xoffset=-8 yoffset=-2 xadvance=22 page=0 chnl=0 +char id=117 x=179 y=361 width=29 height=32 xoffset=-6 yoffset=4 xadvance=31 page=0 chnl=0 +char id=118 x=208 y=361 width=31 height=32 xoffset=-8 yoffset=4 xadvance=29 page=0 chnl=0 +char id=119 x=239 y=361 width=39 height=32 xoffset=-9 yoffset=4 xadvance=35 page=0 chnl=0 +char id=120 x=278 y=361 width=31 height=32 xoffset=-8 yoffset=4 xadvance=28 page=0 chnl=0 +char id=121 x=84 y=210 width=32 height=38 xoffset=-8 yoffset=4 xadvance=29 page=0 chnl=0 +char id=122 x=309 y=361 width=30 height=32 xoffset=-8 yoffset=4 xadvance=29 page=0 chnl=0 +char id=123 x=182 y=0 width=25 height=44 xoffset=-7 yoffset=-2 xadvance=24 page=0 chnl=0 +char id=124 x=232 y=0 width=18 height=44 xoffset=-5 yoffset=-2 xadvance=22 page=0 chnl=0 +char id=125 x=207 y=0 width=25 height=44 xoffset=-8 yoffset=-2 xadvance=24 page=0 chnl=0 +char id=126 x=474 y=393 width=32 height=22 xoffset=-7 yoffset=7 xadvance=32 page=0 chnl=0 +char id=161 x=130 y=248 width=19 height=38 xoffset=-5 yoffset=4 xadvance=23 page=0 chnl=0 +char id=162 x=0 y=0 width=30 height=46 xoffset=-7 yoffset=-3 xadvance=31 page=0 chnl=0 +char id=163 x=149 y=248 width=32 height=38 xoffset=-8 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=164 x=0 y=393 width=30 height=30 xoffset=-7 yoffset=3 xadvance=31 page=0 chnl=0 +char id=165 x=181 y=248 width=33 height=38 xoffset=-8 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=166 x=294 y=0 width=18 height=44 xoffset=-5 yoffset=-2 xadvance=22 page=0 chnl=0 +char id=167 x=312 y=0 width=30 height=44 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=168 x=119 y=423 width=25 height=19 xoffset=-7 yoffset=-2 xadvance=24 page=0 chnl=0 +char id=169 x=214 y=248 width=38 height=38 xoffset=-8 yoffset=-2 xadvance=36 page=0 chnl=0 +char id=170 x=178 y=393 width=25 height=27 xoffset=-7 yoffset=-2 xadvance=25 page=0 chnl=0 +char id=171 x=30 y=393 width=30 height=29 xoffset=-6 yoffset=6 xadvance=31 page=0 chnl=0 +char id=172 x=335 y=393 width=31 height=25 xoffset=-7 yoffset=5 xadvance=32 page=0 chnl=0 +char id=174 x=252 y=248 width=38 height=38 xoffset=-8 yoffset=-2 xadvance=36 page=0 chnl=0 +char id=175 x=144 y=423 width=34 height=19 xoffset=-9 yoffset=-6 xadvance=31 page=0 chnl=0 +char id=176 x=409 y=393 width=24 height=24 xoffset=-6 yoffset=-2 xadvance=26 page=0 chnl=0 +char id=177 x=403 y=324 width=31 height=34 xoffset=-7 yoffset=2 xadvance=30 page=0 chnl=0 +char id=178 x=203 y=393 width=25 height=27 xoffset=-8 yoffset=-2 xadvance=24 page=0 chnl=0 +char id=179 x=228 y=393 width=25 height=27 xoffset=-8 yoffset=-2 xadvance=24 page=0 chnl=0 +char id=180 x=21 y=423 width=21 height=20 xoffset=-5 yoffset=-2 xadvance=24 page=0 chnl=0 +char id=181 x=290 y=248 width=29 height=38 xoffset=-6 yoffset=4 xadvance=31 page=0 chnl=0 +char id=182 x=30 y=90 width=32 height=43 xoffset=-8 yoffset=-2 xadvance=30 page=0 chnl=0 +char id=183 x=178 y=423 width=19 height=19 xoffset=-5 yoffset=8 xadvance=24 page=0 chnl=0 +char id=184 x=452 y=393 width=22 height=23 xoffset=-6 yoffset=20 xadvance=24 page=0 chnl=0 +char id=185 x=489 y=361 width=22 height=27 xoffset=-6 yoffset=-2 xadvance=24 page=0 chnl=0 +char id=186 x=253 y=393 width=25 height=27 xoffset=-7 yoffset=-2 xadvance=25 page=0 chnl=0 +char id=187 x=60 y=393 width=30 height=29 xoffset=-7 yoffset=6 xadvance=31 page=0 chnl=0 +char id=188 x=319 y=248 width=39 height=38 xoffset=-6 yoffset=-2 xadvance=39 page=0 chnl=0 +char id=189 x=358 y=248 width=38 height=38 xoffset=-6 yoffset=-2 xadvance=39 page=0 chnl=0 +char id=190 x=396 y=248 width=41 height=38 xoffset=-8 yoffset=-2 xadvance=39 page=0 chnl=0 +char id=191 x=437 y=248 width=30 height=38 xoffset=-6 yoffset=4 xadvance=32 page=0 chnl=0 +char id=192 x=342 y=0 width=38 height=44 xoffset=-9 yoffset=-8 xadvance=33 page=0 chnl=0 +char id=193 x=380 y=0 width=38 height=44 xoffset=-9 yoffset=-8 xadvance=33 page=0 chnl=0 +char id=194 x=418 y=0 width=38 height=44 xoffset=-9 yoffset=-8 xadvance=33 page=0 chnl=0 +char id=195 x=456 y=0 width=38 height=44 xoffset=-9 yoffset=-8 xadvance=33 page=0 chnl=0 +char id=196 x=62 y=90 width=38 height=43 xoffset=-9 yoffset=-7 xadvance=33 page=0 chnl=0 +char id=197 x=265 y=90 width=38 height=42 xoffset=-9 yoffset=-6 xadvance=33 page=0 chnl=0 +char id=198 x=0 y=286 width=45 height=38 xoffset=-9 yoffset=-2 xadvance=44 page=0 chnl=0 +char id=199 x=30 y=0 width=36 height=45 xoffset=-7 yoffset=-2 xadvance=36 page=0 chnl=0 +char id=200 x=0 y=46 width=32 height=44 xoffset=-6 yoffset=-8 xadvance=34 page=0 chnl=0 +char id=201 x=32 y=46 width=32 height=44 xoffset=-6 yoffset=-8 xadvance=34 page=0 chnl=0 +char id=202 x=64 y=46 width=32 height=44 xoffset=-6 yoffset=-8 xadvance=34 page=0 chnl=0 +char id=203 x=100 y=90 width=32 height=43 xoffset=-6 yoffset=-7 xadvance=34 page=0 chnl=0 +char id=204 x=96 y=46 width=21 height=44 xoffset=-7 yoffset=-8 xadvance=21 page=0 chnl=0 +char id=205 x=117 y=46 width=21 height=44 xoffset=-7 yoffset=-8 xadvance=21 page=0 chnl=0 +char id=206 x=138 y=46 width=27 height=44 xoffset=-9 yoffset=-8 xadvance=21 page=0 chnl=0 +char id=207 x=484 y=46 width=26 height=43 xoffset=-9 yoffset=-7 xadvance=21 page=0 chnl=0 +char id=208 x=467 y=248 width=36 height=38 xoffset=-8 yoffset=-2 xadvance=36 page=0 chnl=0 +char id=209 x=165 y=46 width=34 height=44 xoffset=-6 yoffset=-8 xadvance=36 page=0 chnl=0 +char id=210 x=199 y=46 width=37 height=44 xoffset=-7 yoffset=-8 xadvance=37 page=0 chnl=0 +char id=211 x=236 y=46 width=37 height=44 xoffset=-7 yoffset=-8 xadvance=37 page=0 chnl=0 +char id=212 x=273 y=46 width=37 height=44 xoffset=-7 yoffset=-8 xadvance=37 page=0 chnl=0 +char id=213 x=310 y=46 width=37 height=44 xoffset=-7 yoffset=-8 xadvance=37 page=0 chnl=0 +char id=214 x=132 y=90 width=37 height=43 xoffset=-7 yoffset=-7 xadvance=37 page=0 chnl=0 +char id=215 x=90 y=393 width=29 height=29 xoffset=-6 yoffset=3 xadvance=32 page=0 chnl=0 +char id=216 x=372 y=90 width=38 height=40 xoffset=-7 yoffset=-2 xadvance=37 page=0 chnl=0 +char id=217 x=347 y=46 width=34 height=44 xoffset=-6 yoffset=-8 xadvance=36 page=0 chnl=0 +char id=218 x=381 y=46 width=34 height=44 xoffset=-6 yoffset=-8 xadvance=36 page=0 chnl=0 +char id=219 x=415 y=46 width=34 height=44 xoffset=-6 yoffset=-8 xadvance=36 page=0 chnl=0 +char id=220 x=169 y=90 width=34 height=43 xoffset=-6 yoffset=-7 xadvance=36 page=0 chnl=0 +char id=221 x=449 y=46 width=35 height=44 xoffset=-8 yoffset=-8 xadvance=33 page=0 chnl=0 +char id=222 x=45 y=286 width=33 height=38 xoffset=-6 yoffset=-2 xadvance=34 page=0 chnl=0 +char id=223 x=78 y=286 width=31 height=38 xoffset=-6 yoffset=-2 xadvance=32 page=0 chnl=0 +char id=224 x=170 y=286 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=225 x=200 y=286 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=226 x=230 y=286 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=227 x=260 y=286 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=228 x=196 y=324 width=30 height=36 xoffset=-7 yoffset=0 xadvance=30 page=0 chnl=0 +char id=229 x=109 y=286 width=30 height=38 xoffset=-7 yoffset=-2 xadvance=30 page=0 chnl=0 +char id=230 x=358 y=361 width=40 height=32 xoffset=-7 yoffset=4 xadvance=41 page=0 chnl=0 +char id=231 x=410 y=90 width=29 height=39 xoffset=-7 yoffset=4 xadvance=29 page=0 chnl=0 +char id=232 x=290 y=286 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=233 x=320 y=286 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=234 x=350 y=286 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=235 x=226 y=324 width=30 height=36 xoffset=-7 yoffset=0 xadvance=30 page=0 chnl=0 +char id=236 x=380 y=286 width=21 height=37 xoffset=-6 yoffset=-1 xadvance=23 page=0 chnl=0 +char id=237 x=401 y=286 width=21 height=37 xoffset=-6 yoffset=-1 xadvance=23 page=0 chnl=0 +char id=238 x=422 y=286 width=26 height=37 xoffset=-8 yoffset=-1 xadvance=23 page=0 chnl=0 +char id=239 x=256 y=324 width=25 height=36 xoffset=-8 yoffset=0 xadvance=23 page=0 chnl=0 +char id=240 x=139 y=286 width=31 height=38 xoffset=-7 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=241 x=448 y=286 width=29 height=37 xoffset=-6 yoffset=-1 xadvance=31 page=0 chnl=0 +char id=242 x=477 y=286 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=243 x=0 y=324 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=244 x=30 y=324 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=245 x=60 y=324 width=30 height=37 xoffset=-7 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=246 x=281 y=324 width=30 height=36 xoffset=-7 yoffset=0 xadvance=30 page=0 chnl=0 +char id=247 x=119 y=393 width=31 height=29 xoffset=-7 yoffset=3 xadvance=30 page=0 chnl=0 +char id=248 x=372 y=324 width=31 height=35 xoffset=-7 yoffset=2 xadvance=32 page=0 chnl=0 +char id=249 x=90 y=324 width=29 height=37 xoffset=-6 yoffset=-1 xadvance=31 page=0 chnl=0 +char id=250 x=119 y=324 width=29 height=37 xoffset=-6 yoffset=-1 xadvance=31 page=0 chnl=0 +char id=251 x=148 y=324 width=29 height=37 xoffset=-6 yoffset=-1 xadvance=31 page=0 chnl=0 +char id=252 x=311 y=324 width=29 height=36 xoffset=-6 yoffset=0 xadvance=31 page=0 chnl=0 +char id=253 x=203 y=90 width=32 height=43 xoffset=-8 yoffset=-1 xadvance=29 page=0 chnl=0 +char id=254 x=0 y=90 width=30 height=44 xoffset=-6 yoffset=-2 xadvance=31 page=0 chnl=0 +char id=255 x=303 y=90 width=32 height=42 xoffset=-8 yoffset=0 xadvance=29 page=0 chnl=0 +kernings count=95 +kerning first=76 second=32 amount=-1 +kerning first=114 second=44 amount=-2 +kerning first=86 second=45 amount=-2 +kerning first=118 second=44 amount=-2 +kerning first=49 second=49 amount=-2 +kerning first=89 second=105 amount=-1 +kerning first=86 second=65 amount=-2 +kerning first=86 second=58 amount=-1 kerning first=84 second=79 amount=-1 -kerning first=65 second=84 amount=-6 -kerning first=76 second=86 amount=-6 -kerning first=65 second=87 amount=-3 -kerning first=76 second=89 amount=-6 -kerning first=84 second=99 amount=-9 -kerning first=86 second=101 amount=-5 -kerning first=102 second=102 amount=-1 -kerning first=89 second=105 amount=-3 -kerning first=86 second=58 amount=-3 -kerning first=86 second=111 amount=-5 -kerning first=89 second=112 amount=-6 -kerning first=89 second=113 amount=-8 -kerning first=86 second=114 amount=-3 -kerning first=89 second=117 amount=-5 -kerning first=65 second=118 amount=-1 -kerning first=84 second=119 amount=-5 -kerning first=76 second=121 amount=-3 -kerning first=82 second=84 amount=-1 -kerning first=89 second=58 amount=-5 -kerning first=87 second=65 amount=-3 -kerning first=87 second=97 amount=-3 -kerning first=87 second=59 amount=-1 -kerning first=82 second=87 amount=-1 -kerning first=118 second=46 amount=-6 -kerning first=65 second=89 amount=-6 -kerning first=65 second=86 amount=-6 -kerning first=80 second=44 amount=-11 -kerning first=86 second=46 amount=-8 -kerning first=84 second=105 amount=-3 -kerning first=84 second=97 amount=-9 -kerning first=84 second=114 amount=-3 -kerning first=80 second=65 amount=-6 -kerning first=84 second=58 amount=-9 -kerning first=86 second=97 amount=-6 -kerning first=76 second=84 amount=-6 -kerning first=89 second=59 amount=-5 -kerning first=70 second=44 amount=-9 -kerning first=80 second=46 amount=-11 -kerning first=89 second=101 amount=-8 -kerning first=65 second=119 amount=-1 -kerning first=87 second=121 amount=-1 -kerning first=76 second=87 amount=-6 -kerning first=86 second=45 amount=-5 -kerning first=32 second=89 amount=-1 -kerning first=84 second=117 amount=-3 -kerning first=89 second=118 amount=-5 -kerning first=65 second=32 amount=-5 -kerning first=86 second=65 amount=-6 -kerning first=84 second=111 amount=-9 -kerning first=89 second=45 amount=-8 -kerning first=65 second=121 amount=-1 -kerning first=87 second=58 amount=-1 -kerning first=82 second=89 amount=-1 -kerning first=89 second=44 amount=-11 kerning first=32 second=84 amount=-1 -kerning first=87 second=111 amount=-1 -kerning first=84 second=59 amount=-9 -kerning first=84 second=101 amount=-9 -kerning first=84 second=32 amount=-1 -kerning first=86 second=59 amount=-3 -kerning first=89 second=46 amount=-11 -kerning first=87 second=101 amount=-1 -kerning first=32 second=65 amount=-5 -kerning first=84 second=44 amount=-9 -kerning first=70 second=65 amount=-5 -kerning first=86 second=117 amount=-3 -kerning first=84 second=115 amount=-9 -kerning first=84 second=65 amount=-6 -kerning first=89 second=32 amount=-1 -kerning first=87 second=44 amount=-5 -kerning first=89 second=111 amount=-8 -kerning first=89 second=97 amount=-6 -kerning first=119 second=46 amount=-5 -kerning first=87 second=46 amount=-5 kerning first=82 second=86 amount=-1 -kerning first=121 second=44 amount=-6 -kerning first=84 second=46 amount=-9 -kerning first=80 second=32 amount=-1 -kerning first=87 second=114 amount=-1 -kerning first=119 second=44 amount=-5 -kerning first=76 second=32 amount=-3 -kerning first=84 second=121 amount=-5 -kerning first=86 second=121 amount=-3 -kerning first=70 second=46 amount=-9 +kerning first=82 second=87 amount=-1 +kerning first=65 second=89 amount=-2 +kerning first=89 second=117 amount=-2 +kerning first=86 second=97 amount=-2 +kerning first=84 second=99 amount=-3 +kerning first=84 second=101 amount=-3 +kerning first=102 second=102 amount=-1 +kerning first=84 second=105 amount=-1 +kerning first=89 second=111 amount=-3 +kerning first=89 second=113 amount=-3 +kerning first=84 second=115 amount=-3 +kerning first=84 second=117 amount=-1 +kerning first=65 second=118 amount=-1 +kerning first=65 second=119 amount=-1 +kerning first=65 second=121 amount=-1 +kerning first=84 second=97 amount=-3 +kerning first=80 second=46 amount=-4 +kerning first=89 second=118 amount=-2 +kerning first=87 second=111 amount=-1 +kerning first=65 second=84 amount=-2 +kerning first=76 second=84 amount=-2 +kerning first=87 second=44 amount=-2 +kerning first=86 second=117 amount=-1 +kerning first=86 second=101 amount=-2 +kerning first=80 second=65 amount=-2 +kerning first=82 second=84 amount=-1 +kerning first=89 second=32 amount=-1 +kerning first=89 second=101 amount=-3 +kerning first=118 second=46 amount=-2 +kerning first=86 second=59 amount=-1 +kerning first=84 second=44 amount=-3 +kerning first=89 second=97 amount=-2 +kerning first=86 second=121 amount=-1 +kerning first=86 second=46 amount=-3 kerning first=87 second=45 amount=-1 -kerning first=118 second=44 amount=-6 +kerning first=89 second=65 amount=-2 +kerning first=84 second=46 amount=-3 +kerning first=87 second=46 amount=-2 +kerning first=121 second=46 amount=-2 +kerning first=89 second=44 amount=-4 +kerning first=80 second=32 amount=-1 +kerning first=82 second=89 amount=-1 +kerning first=65 second=32 amount=-2 +kerning first=84 second=45 amount=-2 +kerning first=87 second=101 amount=-1 +kerning first=84 second=59 amount=-3 +kerning first=32 second=89 amount=-1 +kerning first=119 second=44 amount=-2 +kerning first=70 second=65 amount=-2 +kerning first=89 second=45 amount=-3 +kerning first=65 second=86 amount=-2 +kerning first=121 second=44 amount=-2 +kerning first=86 second=114 amount=-1 +kerning first=70 second=44 amount=-3 +kerning first=89 second=59 amount=-2 +kerning first=84 second=65 amount=-2 +kerning first=84 second=32 amount=-1 +kerning first=87 second=97 amount=-1 +kerning first=87 second=114 amount=-1 +kerning first=70 second=46 amount=-3 +kerning first=89 second=58 amount=-2 +kerning first=114 second=46 amount=-2 +kerning first=84 second=111 amount=-3 +kerning first=87 second=65 amount=-1 +kerning first=86 second=111 amount=-2 +kerning first=80 second=44 amount=-4 +kerning first=86 second=44 amount=-3 +kerning first=84 second=58 amount=-3 kerning first=87 second=117 amount=-1 +kerning first=89 second=46 amount=-4 kerning first=86 second=105 amount=-1 +kerning first=65 second=87 amount=-1 +kerning first=76 second=86 amount=-2 +kerning first=84 second=121 amount=-2 +kerning first=84 second=114 amount=-1 +kerning first=76 second=87 amount=-2 +kerning first=87 second=59 amount=-1 +kerning first=32 second=65 amount=-2 +kerning first=89 second=112 amount=-2 +kerning first=84 second=119 amount=-2 +kerning first=119 second=46 amount=-2 +kerning first=76 second=89 amount=-2 +kerning first=87 second=58 amount=-1 +kerning first=76 second=121 amount=-1 diff --git a/assets/fonts/arial.png b/assets/fonts/arial.png index 8ae9e05..0fdb42e 100644 Binary files a/assets/fonts/arial.png and b/assets/fonts/arial.png differ diff --git a/assets/shaders/font.fs b/assets/shaders/font.fs index a740b1b..bf1dbb6 100644 --- a/assets/shaders/font.fs +++ b/assets/shaders/font.fs @@ -5,6 +5,25 @@ varying vec2 uv; uniform vec3 uColor; uniform sampler2D texture0; +uniform float uWidth; +uniform float uEdge; + +uniform float uOutlineWidth; +uniform float uOutlineEdge; + +uniform vec2 uOutlineOffset; + +uniform vec3 uOutlineColor; + void main() { - gl_FragColor = vec4(uColor, texture2D(texture0, uv).a); + float distance = 1.0 - texture2D(texture0, uv).a; + float alpha = 1.0 - smoothstep(uWidth, uWidth + uEdge, distance); + + float distanceOutline = 1.0 - texture2D(texture0, uv + uOutlineOffset).a; + float alphaOutline = 1.0 - smoothstep(uOutlineWidth, uOutlineWidth + uOutlineEdge, distanceOutline); + + float overallAlpha = alpha + (1.0 - alpha) * alphaOutline; + vec3 overallColor = mix(uOutlineColor, uColor, alpha / overallAlpha); + + gl_FragColor = vec4(overallColor, overallAlpha); } diff --git a/src/engine/components/water/index.js b/src/engine/components/water/index.js index b6537f1..25305cd 100644 --- a/src/engine/components/water/index.js +++ b/src/engine/components/water/index.js @@ -37,7 +37,7 @@ class WaterFBOs { // create the framebuffer gl.bindFramebuffer(gl.FRAMEBUFFER, frameBuffer) // indicate that we will always render to color attachment 0 - gl.drawBuffers.drawBuffersWEBGL([gl.drawBuffers.COLOR_ATTACHMENT0_WEBGL]) + // gl.drawBuffers.drawBuffersWEBGL([gl.drawBuffers.COLOR_ATTACHMENT0_WEBGL]) return frameBuffer } diff --git a/src/engine/framebuffer.js b/src/engine/framebuffer.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/engine/gui/font.js b/src/engine/gui/font.js index 364eb3f..6d523be 100644 --- a/src/engine/gui/font.js +++ b/src/engine/gui/font.js @@ -10,7 +10,7 @@ const PAD_TOP = 0 const PAD_LEFT = 1 const PAD_BOTTOM = 2 const PAD_RIGHT = 3 -const DESIRED_PADDING = 3 +const DESIRED_PADDING = 8 const SPLITTER = ' ' const NUMBER_SEPARATOR = ',' @@ -310,7 +310,18 @@ class GUIText extends Node2D { this.fontSize = fontSize this.font = font this.centered = centered + this.color = [0.0, 0.0, 0.0] + + this.width = 0.45 + this.edge = 0.1 + + this.outline = { + width: 0.0, + edge: 0.5, + color: [0.0, 0.0, 0.0], + offset: [0.0, 0.0] + } } // Do not scale the transform like we do with regular GUIs @@ -358,9 +369,25 @@ class GUIText extends Node2D { // Let only the font shader be used to render text if (shader.name !== 'font') return super.draw(gl, shader) const transformLocation = shader.getUniformLocation(gl, 'uTransformation') - const colorLocation = shader.getUniformLocation(gl, 'uColor') + const cLocation = shader.getUniformLocation(gl, 'uColor') + const wLocation = shader.getUniformLocation(gl, 'uWidth') + const eLocation = shader.getUniformLocation(gl, 'uEdge') + const owLocation = shader.getUniformLocation(gl, 'uOutlineWidth') + const oeLocation = shader.getUniformLocation(gl, 'uOutlineEdge') + const ooLocation = shader.getUniformLocation(gl, 'uOutlineOffset') + const ocLocation = shader.getUniformLocation(gl, 'uOutlineColor') gl.uniformMatrix4fv(transformLocation, false, this.transform) - gl.uniform3fv(colorLocation, this.color) + + gl.uniform1f(wLocation, this.width) + gl.uniform1f(eLocation, this.edge) + + gl.uniform1f(owLocation, this.outline.width) + gl.uniform1f(oeLocation, this.outline.edge) + gl.uniform2fv(ooLocation, this.outline.offset) + + gl.uniform3fv(cLocation, this.color) + gl.uniform3fv(ocLocation, this.outline.color) + if (!this.mesh) this.createMesh(gl) this.mesh.prepare(gl, shader) this.mesh.draw(gl, shader) diff --git a/src/engine/resource.js b/src/engine/resource.js index e7262af..aa83343 100644 --- a/src/engine/resource.js +++ b/src/engine/resource.js @@ -2,6 +2,15 @@ let imgCache = {} +// Find the assets directory properly +function fixURI (path, a = '') { + let pn = window.location.pathname + if (path.indexOf('/assets') === -1) path = '/assets/' + a + path + if (pn === '/' || pn === '/index.html') return path + let assetsDir = pn + path + return assetsDir.replace(/\/\//g, '/') +} + function GET (url, istext) { return new Promise((resolve, reject) => { var xmlHttp = new XMLHttpRequest() @@ -16,7 +25,7 @@ function GET (url, istext) { } } - xmlHttp.open('GET', url, true) + xmlHttp.open('GET', fixURI(url), true) istext && (xmlHttp.responseType = 'text') xmlHttp.send(null) }) @@ -53,7 +62,7 @@ function smartGET (data) { } function loadImage (url) { - if (url.indexOf('/') !== 0) url = '/assets/textures/' + url + url = fixURI(url, 'textures/') // Ensure we don't load a texture multiple times if (imgCache[url]) return imgCache[url]