mirror of
https://github.com/Ttanasart-pt/Pixel-Composer.git
synced 2025-02-26 11:44:52 +01:00
fix timeline overlay ordering
This commit is contained in:
Tanasart
parent
5516a5e2ef
commit
ae07617500
13 changed files with 246 additions and 230 deletions
|
|
@ -479,7 +479,7 @@
|
|||
"isEcma":false,
|
||||
"LibraryEmitters":[],
|
||||
"MetaData":{
|
||||
"IDEVersion":"2024.6.0.157",
|
||||
"IDEVersion":"2024.4.1.152",
|
||||
},
|
||||
"name":"PixelComposer",
|
||||
"resources":[
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 6.7 KiB |
|
|
@ -3,7 +3,7 @@
|
|||
"%Name":"_f_p4",
|
||||
"AntiAlias":1,
|
||||
"applyKerning":0,
|
||||
"ascender":12,
|
||||
"ascender":11,
|
||||
"ascenderOffset":0,
|
||||
"bold":true,
|
||||
"canGenerateBitmap":true,
|
||||
|
|
@ -12,102 +12,102 @@
|
|||
"fontName":"Noto Sans",
|
||||
"glyphOperations":0,
|
||||
"glyphs":{
|
||||
"32":{"character":32,"h":16,"offset":0,"shift":3,"w":3,"x":2,"y":2,},
|
||||
"33":{"character":33,"h":16,"offset":0,"shift":3,"w":3,"x":78,"y":38,},
|
||||
"34":{"character":34,"h":16,"offset":0,"shift":6,"w":5,"x":71,"y":38,},
|
||||
"35":{"character":35,"h":16,"offset":0,"shift":8,"w":8,"x":61,"y":38,},
|
||||
"36":{"character":36,"h":16,"offset":0,"shift":7,"w":7,"x":52,"y":38,},
|
||||
"37":{"character":37,"h":16,"offset":0,"shift":11,"w":11,"x":39,"y":38,},
|
||||
"38":{"character":38,"h":16,"offset":0,"shift":9,"w":9,"x":28,"y":38,},
|
||||
"39":{"character":39,"h":16,"offset":0,"shift":3,"w":3,"x":23,"y":38,},
|
||||
"40":{"character":40,"h":16,"offset":0,"shift":4,"w":4,"x":17,"y":38,},
|
||||
"41":{"character":41,"h":16,"offset":0,"shift":4,"w":4,"x":11,"y":38,},
|
||||
"42":{"character":42,"h":16,"offset":0,"shift":7,"w":7,"x":83,"y":38,},
|
||||
"43":{"character":43,"h":16,"offset":0,"shift":7,"w":7,"x":2,"y":38,},
|
||||
"44":{"character":44,"h":16,"offset":0,"shift":3,"w":3,"x":235,"y":20,},
|
||||
"45":{"character":45,"h":16,"offset":0,"shift":4,"w":4,"x":229,"y":20,},
|
||||
"46":{"character":46,"h":16,"offset":0,"shift":3,"w":3,"x":224,"y":20,},
|
||||
"47":{"character":47,"h":16,"offset":0,"shift":5,"w":5,"x":217,"y":20,},
|
||||
"48":{"character":48,"h":16,"offset":0,"shift":7,"w":7,"x":208,"y":20,},
|
||||
"49":{"character":49,"h":16,"offset":0,"shift":7,"w":5,"x":201,"y":20,},
|
||||
"50":{"character":50,"h":16,"offset":0,"shift":7,"w":7,"x":192,"y":20,},
|
||||
"51":{"character":51,"h":16,"offset":0,"shift":7,"w":7,"x":183,"y":20,},
|
||||
"52":{"character":52,"h":16,"offset":0,"shift":7,"w":7,"x":174,"y":20,},
|
||||
"53":{"character":53,"h":16,"offset":0,"shift":7,"w":7,"x":240,"y":20,},
|
||||
"54":{"character":54,"h":16,"offset":0,"shift":7,"w":7,"x":92,"y":38,},
|
||||
"55":{"character":55,"h":16,"offset":0,"shift":7,"w":7,"x":101,"y":38,},
|
||||
"56":{"character":56,"h":16,"offset":0,"shift":7,"w":7,"x":110,"y":38,},
|
||||
"57":{"character":57,"h":16,"offset":0,"shift":7,"w":7,"x":47,"y":56,},
|
||||
"58":{"character":58,"h":16,"offset":0,"shift":3,"w":3,"x":42,"y":56,},
|
||||
"59":{"character":59,"h":16,"offset":0,"shift":3,"w":3,"x":37,"y":56,},
|
||||
"60":{"character":60,"h":16,"offset":0,"shift":7,"w":7,"x":28,"y":56,},
|
||||
"61":{"character":61,"h":16,"offset":0,"shift":7,"w":7,"x":19,"y":56,},
|
||||
"62":{"character":62,"h":16,"offset":0,"shift":7,"w":7,"x":10,"y":56,},
|
||||
"63":{"character":63,"h":16,"offset":0,"shift":6,"w":6,"x":2,"y":56,},
|
||||
"64":{"character":64,"h":16,"offset":0,"shift":11,"w":11,"x":236,"y":38,},
|
||||
"65":{"character":65,"h":16,"offset":0,"shift":8,"w":9,"x":225,"y":38,},
|
||||
"66":{"character":66,"h":16,"offset":1,"shift":8,"w":7,"x":216,"y":38,},
|
||||
"67":{"character":67,"h":16,"offset":0,"shift":8,"w":8,"x":206,"y":38,},
|
||||
"68":{"character":68,"h":16,"offset":1,"shift":9,"w":8,"x":196,"y":38,},
|
||||
"69":{"character":69,"h":16,"offset":1,"shift":7,"w":6,"x":188,"y":38,},
|
||||
"70":{"character":70,"h":16,"offset":1,"shift":7,"w":5,"x":181,"y":38,},
|
||||
"71":{"character":71,"h":16,"offset":0,"shift":9,"w":8,"x":171,"y":38,},
|
||||
"72":{"character":72,"h":16,"offset":1,"shift":9,"w":8,"x":161,"y":38,},
|
||||
"73":{"character":73,"h":16,"offset":0,"shift":5,"w":5,"x":154,"y":38,},
|
||||
"74":{"character":74,"h":16,"offset":-1,"shift":4,"w":4,"x":148,"y":38,},
|
||||
"75":{"character":75,"h":16,"offset":1,"shift":8,"w":7,"x":139,"y":38,},
|
||||
"76":{"character":76,"h":16,"offset":1,"shift":7,"w":6,"x":131,"y":38,},
|
||||
"77":{"character":77,"h":16,"offset":1,"shift":11,"w":10,"x":119,"y":38,},
|
||||
"78":{"character":78,"h":16,"offset":1,"shift":10,"w":8,"x":164,"y":20,},
|
||||
"79":{"character":79,"h":16,"offset":0,"shift":10,"w":9,"x":153,"y":20,},
|
||||
"80":{"character":80,"h":16,"offset":1,"shift":8,"w":6,"x":145,"y":20,},
|
||||
"81":{"character":81,"h":16,"offset":0,"shift":10,"w":9,"x":192,"y":2,},
|
||||
"82":{"character":82,"h":16,"offset":1,"shift":8,"w":7,"x":177,"y":2,},
|
||||
"83":{"character":83,"h":16,"offset":0,"shift":7,"w":7,"x":168,"y":2,},
|
||||
"84":{"character":84,"h":16,"offset":0,"shift":7,"w":7,"x":159,"y":2,},
|
||||
"85":{"character":85,"h":16,"offset":1,"shift":9,"w":8,"x":149,"y":2,},
|
||||
"86":{"character":86,"h":16,"offset":0,"shift":8,"w":8,"x":139,"y":2,},
|
||||
"87":{"character":87,"h":16,"offset":0,"shift":12,"w":12,"x":125,"y":2,},
|
||||
"88":{"character":88,"h":16,"offset":0,"shift":8,"w":8,"x":115,"y":2,},
|
||||
"89":{"character":89,"h":16,"offset":0,"shift":7,"w":8,"x":105,"y":2,},
|
||||
"90":{"character":90,"h":16,"offset":0,"shift":7,"w":7,"x":96,"y":2,},
|
||||
"91":{"character":91,"h":16,"offset":0,"shift":4,"w":4,"x":186,"y":2,},
|
||||
"92":{"character":92,"h":16,"offset":0,"shift":5,"w":5,"x":89,"y":2,},
|
||||
"93":{"character":93,"h":16,"offset":0,"shift":4,"w":4,"x":75,"y":2,},
|
||||
"94":{"character":94,"h":16,"offset":0,"shift":7,"w":7,"x":66,"y":2,},
|
||||
"95":{"character":95,"h":16,"offset":-1,"shift":5,"w":6,"x":58,"y":2,},
|
||||
"96":{"character":96,"h":16,"offset":0,"shift":4,"w":4,"x":52,"y":2,},
|
||||
"97":{"character":97,"h":16,"offset":0,"shift":7,"w":7,"x":43,"y":2,},
|
||||
"98":{"character":98,"h":16,"offset":0,"shift":8,"w":8,"x":33,"y":2,},
|
||||
"99":{"character":99,"h":16,"offset":0,"shift":6,"w":6,"x":25,"y":2,},
|
||||
"100":{"character":100,"h":16,"offset":0,"shift":8,"w":7,"x":16,"y":2,},
|
||||
"101":{"character":101,"h":16,"offset":0,"shift":7,"w":7,"x":7,"y":2,},
|
||||
"102":{"character":102,"h":16,"offset":0,"shift":5,"w":6,"x":81,"y":2,},
|
||||
"103":{"character":103,"h":16,"offset":0,"shift":8,"w":7,"x":203,"y":2,},
|
||||
"104":{"character":104,"h":16,"offset":0,"shift":8,"w":7,"x":42,"y":20,},
|
||||
"105":{"character":105,"h":16,"offset":0,"shift":4,"w":3,"x":212,"y":2,},
|
||||
"106":{"character":106,"h":16,"offset":-1,"shift":4,"w":4,"x":131,"y":20,},
|
||||
"107":{"character":107,"h":16,"offset":0,"shift":7,"w":8,"x":121,"y":20,},
|
||||
"108":{"character":108,"h":16,"offset":0,"shift":4,"w":3,"x":116,"y":20,},
|
||||
"109":{"character":109,"h":16,"offset":0,"shift":12,"w":11,"x":103,"y":20,},
|
||||
"110":{"character":110,"h":16,"offset":0,"shift":8,"w":7,"x":94,"y":20,},
|
||||
"111":{"character":111,"h":16,"offset":0,"shift":7,"w":7,"x":85,"y":20,},
|
||||
"112":{"character":112,"h":16,"offset":0,"shift":8,"w":8,"x":75,"y":20,},
|
||||
"113":{"character":113,"h":16,"offset":0,"shift":8,"w":7,"x":66,"y":20,},
|
||||
"114":{"character":114,"h":16,"offset":0,"shift":5,"w":6,"x":58,"y":20,},
|
||||
"115":{"character":115,"h":16,"offset":0,"shift":6,"w":6,"x":137,"y":20,},
|
||||
"116":{"character":116,"h":16,"offset":0,"shift":5,"w":5,"x":51,"y":20,},
|
||||
"117":{"character":117,"h":16,"offset":0,"shift":8,"w":7,"x":33,"y":20,},
|
||||
"118":{"character":118,"h":16,"offset":0,"shift":7,"w":7,"x":24,"y":20,},
|
||||
"119":{"character":119,"h":16,"offset":0,"shift":10,"w":11,"x":11,"y":20,},
|
||||
"120":{"character":120,"h":16,"offset":0,"shift":7,"w":7,"x":2,"y":20,},
|
||||
"121":{"character":121,"h":16,"offset":0,"shift":7,"w":7,"x":243,"y":2,},
|
||||
"122":{"character":122,"h":16,"offset":0,"shift":6,"w":6,"x":235,"y":2,},
|
||||
"123":{"character":123,"h":16,"offset":0,"shift":5,"w":5,"x":228,"y":2,},
|
||||
"124":{"character":124,"h":16,"offset":2,"shift":7,"w":2,"x":224,"y":2,},
|
||||
"125":{"character":125,"h":16,"offset":0,"shift":5,"w":5,"x":217,"y":2,},
|
||||
"126":{"character":126,"h":16,"offset":0,"shift":7,"w":7,"x":56,"y":56,},
|
||||
"9647":{"character":9647,"h":16,"offset":2,"shift":12,"w":8,"x":65,"y":56,},
|
||||
"32":{"character":32,"h":15,"offset":0,"shift":3,"w":3,"x":2,"y":2,},
|
||||
"33":{"character":33,"h":15,"offset":0,"shift":3,"w":3,"x":66,"y":70,},
|
||||
"34":{"character":34,"h":15,"offset":0,"shift":5,"w":5,"x":59,"y":70,},
|
||||
"35":{"character":35,"h":15,"offset":0,"shift":7,"w":7,"x":50,"y":70,},
|
||||
"36":{"character":36,"h":15,"offset":0,"shift":6,"w":6,"x":42,"y":70,},
|
||||
"37":{"character":37,"h":15,"offset":0,"shift":10,"w":10,"x":30,"y":70,},
|
||||
"38":{"character":38,"h":15,"offset":0,"shift":8,"w":9,"x":19,"y":70,},
|
||||
"39":{"character":39,"h":15,"offset":0,"shift":3,"w":3,"x":14,"y":70,},
|
||||
"40":{"character":40,"h":15,"offset":0,"shift":4,"w":4,"x":8,"y":70,},
|
||||
"41":{"character":41,"h":15,"offset":0,"shift":4,"w":4,"x":2,"y":70,},
|
||||
"42":{"character":42,"h":15,"offset":0,"shift":6,"w":6,"x":71,"y":70,},
|
||||
"43":{"character":43,"h":15,"offset":0,"shift":6,"w":6,"x":117,"y":53,},
|
||||
"44":{"character":44,"h":15,"offset":0,"shift":3,"w":3,"x":104,"y":53,},
|
||||
"45":{"character":45,"h":15,"offset":0,"shift":4,"w":4,"x":98,"y":53,},
|
||||
"46":{"character":46,"h":15,"offset":0,"shift":3,"w":3,"x":93,"y":53,},
|
||||
"47":{"character":47,"h":15,"offset":0,"shift":5,"w":5,"x":86,"y":53,},
|
||||
"48":{"character":48,"h":15,"offset":0,"shift":6,"w":6,"x":78,"y":53,},
|
||||
"49":{"character":49,"h":15,"offset":0,"shift":6,"w":5,"x":71,"y":53,},
|
||||
"50":{"character":50,"h":15,"offset":0,"shift":6,"w":6,"x":63,"y":53,},
|
||||
"51":{"character":51,"h":15,"offset":0,"shift":6,"w":6,"x":55,"y":53,},
|
||||
"52":{"character":52,"h":15,"offset":0,"shift":6,"w":7,"x":46,"y":53,},
|
||||
"53":{"character":53,"h":15,"offset":0,"shift":6,"w":6,"x":109,"y":53,},
|
||||
"54":{"character":54,"h":15,"offset":0,"shift":6,"w":6,"x":79,"y":70,},
|
||||
"55":{"character":55,"h":15,"offset":0,"shift":6,"w":6,"x":87,"y":70,},
|
||||
"56":{"character":56,"h":15,"offset":0,"shift":6,"w":6,"x":95,"y":70,},
|
||||
"57":{"character":57,"h":15,"offset":0,"shift":6,"w":6,"x":28,"y":104,},
|
||||
"58":{"character":58,"h":15,"offset":0,"shift":3,"w":3,"x":23,"y":104,},
|
||||
"59":{"character":59,"h":15,"offset":0,"shift":3,"w":3,"x":18,"y":104,},
|
||||
"60":{"character":60,"h":15,"offset":0,"shift":6,"w":6,"x":10,"y":104,},
|
||||
"61":{"character":61,"h":15,"offset":0,"shift":6,"w":6,"x":2,"y":104,},
|
||||
"62":{"character":62,"h":15,"offset":0,"shift":6,"w":6,"x":117,"y":87,},
|
||||
"63":{"character":63,"h":15,"offset":0,"shift":5,"w":5,"x":110,"y":87,},
|
||||
"64":{"character":64,"h":15,"offset":0,"shift":10,"w":10,"x":98,"y":87,},
|
||||
"65":{"character":65,"h":15,"offset":0,"shift":8,"w":8,"x":88,"y":87,},
|
||||
"66":{"character":66,"h":15,"offset":0,"shift":7,"w":7,"x":79,"y":87,},
|
||||
"67":{"character":67,"h":15,"offset":0,"shift":7,"w":7,"x":70,"y":87,},
|
||||
"68":{"character":68,"h":15,"offset":0,"shift":8,"w":8,"x":60,"y":87,},
|
||||
"69":{"character":69,"h":15,"offset":0,"shift":6,"w":6,"x":52,"y":87,},
|
||||
"70":{"character":70,"h":15,"offset":0,"shift":6,"w":6,"x":44,"y":87,},
|
||||
"71":{"character":71,"h":15,"offset":0,"shift":8,"w":8,"x":34,"y":87,},
|
||||
"72":{"character":72,"h":15,"offset":0,"shift":8,"w":8,"x":24,"y":87,},
|
||||
"73":{"character":73,"h":15,"offset":0,"shift":4,"w":4,"x":18,"y":87,},
|
||||
"74":{"character":74,"h":15,"offset":-1,"shift":4,"w":4,"x":12,"y":87,},
|
||||
"75":{"character":75,"h":15,"offset":0,"shift":7,"w":8,"x":2,"y":87,},
|
||||
"76":{"character":76,"h":15,"offset":0,"shift":6,"w":6,"x":115,"y":70,},
|
||||
"77":{"character":77,"h":15,"offset":0,"shift":10,"w":10,"x":103,"y":70,},
|
||||
"78":{"character":78,"h":15,"offset":0,"shift":9,"w":8,"x":36,"y":53,},
|
||||
"79":{"character":79,"h":15,"offset":0,"shift":9,"w":9,"x":25,"y":53,},
|
||||
"80":{"character":80,"h":15,"offset":0,"shift":7,"w":7,"x":16,"y":53,},
|
||||
"81":{"character":81,"h":15,"offset":0,"shift":9,"w":9,"x":68,"y":19,},
|
||||
"82":{"character":82,"h":15,"offset":0,"shift":7,"w":8,"x":52,"y":19,},
|
||||
"83":{"character":83,"h":15,"offset":0,"shift":6,"w":6,"x":44,"y":19,},
|
||||
"84":{"character":84,"h":15,"offset":0,"shift":6,"w":7,"x":35,"y":19,},
|
||||
"85":{"character":85,"h":15,"offset":0,"shift":8,"w":8,"x":25,"y":19,},
|
||||
"86":{"character":86,"h":15,"offset":0,"shift":7,"w":8,"x":15,"y":19,},
|
||||
"87":{"character":87,"h":15,"offset":0,"shift":11,"w":11,"x":2,"y":19,},
|
||||
"88":{"character":88,"h":15,"offset":0,"shift":7,"w":8,"x":110,"y":2,},
|
||||
"89":{"character":89,"h":15,"offset":0,"shift":7,"w":7,"x":101,"y":2,},
|
||||
"90":{"character":90,"h":15,"offset":0,"shift":6,"w":7,"x":92,"y":2,},
|
||||
"91":{"character":91,"h":15,"offset":0,"shift":4,"w":4,"x":62,"y":19,},
|
||||
"92":{"character":92,"h":15,"offset":0,"shift":5,"w":5,"x":85,"y":2,},
|
||||
"93":{"character":93,"h":15,"offset":0,"shift":4,"w":3,"x":73,"y":2,},
|
||||
"94":{"character":94,"h":15,"offset":0,"shift":6,"w":7,"x":64,"y":2,},
|
||||
"95":{"character":95,"h":15,"offset":-1,"shift":5,"w":6,"x":56,"y":2,},
|
||||
"96":{"character":96,"h":15,"offset":0,"shift":4,"w":4,"x":50,"y":2,},
|
||||
"97":{"character":97,"h":15,"offset":0,"shift":7,"w":6,"x":42,"y":2,},
|
||||
"98":{"character":98,"h":15,"offset":0,"shift":7,"w":7,"x":33,"y":2,},
|
||||
"99":{"character":99,"h":15,"offset":0,"shift":6,"w":6,"x":25,"y":2,},
|
||||
"100":{"character":100,"h":15,"offset":0,"shift":7,"w":7,"x":16,"y":2,},
|
||||
"101":{"character":101,"h":15,"offset":0,"shift":7,"w":7,"x":7,"y":2,},
|
||||
"102":{"character":102,"h":15,"offset":0,"shift":4,"w":5,"x":78,"y":2,},
|
||||
"103":{"character":103,"h":15,"offset":0,"shift":7,"w":7,"x":79,"y":19,},
|
||||
"104":{"character":104,"h":15,"offset":0,"shift":7,"w":7,"x":41,"y":36,},
|
||||
"105":{"character":105,"h":15,"offset":0,"shift":3,"w":3,"x":88,"y":19,},
|
||||
"106":{"character":106,"h":15,"offset":-1,"shift":3,"w":4,"x":2,"y":53,},
|
||||
"107":{"character":107,"h":15,"offset":0,"shift":7,"w":7,"x":117,"y":36,},
|
||||
"108":{"character":108,"h":15,"offset":0,"shift":3,"w":3,"x":112,"y":36,},
|
||||
"109":{"character":109,"h":15,"offset":0,"shift":11,"w":10,"x":100,"y":36,},
|
||||
"110":{"character":110,"h":15,"offset":0,"shift":7,"w":7,"x":91,"y":36,},
|
||||
"111":{"character":111,"h":15,"offset":0,"shift":7,"w":7,"x":82,"y":36,},
|
||||
"112":{"character":112,"h":15,"offset":0,"shift":7,"w":7,"x":73,"y":36,},
|
||||
"113":{"character":113,"h":15,"offset":0,"shift":7,"w":7,"x":64,"y":36,},
|
||||
"114":{"character":114,"h":15,"offset":0,"shift":5,"w":5,"x":57,"y":36,},
|
||||
"115":{"character":115,"h":15,"offset":0,"shift":5,"w":6,"x":8,"y":53,},
|
||||
"116":{"character":116,"h":15,"offset":0,"shift":5,"w":5,"x":50,"y":36,},
|
||||
"117":{"character":117,"h":15,"offset":0,"shift":7,"w":7,"x":32,"y":36,},
|
||||
"118":{"character":118,"h":15,"offset":0,"shift":6,"w":7,"x":23,"y":36,},
|
||||
"119":{"character":119,"h":15,"offset":0,"shift":9,"w":10,"x":11,"y":36,},
|
||||
"120":{"character":120,"h":15,"offset":0,"shift":6,"w":7,"x":2,"y":36,},
|
||||
"121":{"character":121,"h":15,"offset":0,"shift":6,"w":7,"x":118,"y":19,},
|
||||
"122":{"character":122,"h":15,"offset":0,"shift":5,"w":6,"x":110,"y":19,},
|
||||
"123":{"character":123,"h":15,"offset":0,"shift":4,"w":4,"x":104,"y":19,},
|
||||
"124":{"character":124,"h":15,"offset":2,"shift":6,"w":2,"x":100,"y":19,},
|
||||
"125":{"character":125,"h":15,"offset":0,"shift":4,"w":5,"x":93,"y":19,},
|
||||
"126":{"character":126,"h":15,"offset":0,"shift":6,"w":6,"x":36,"y":104,},
|
||||
"9647":{"character":9647,"h":15,"offset":2,"shift":11,"w":7,"x":44,"y":104,},
|
||||
},
|
||||
"hinting":0,
|
||||
"includeTTF":false,
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
"italic":false,
|
||||
"kerningPairs":[],
|
||||
"last":0,
|
||||
"lineHeight":16,
|
||||
"lineHeight":15,
|
||||
"maintainGms1Font":false,
|
||||
"name":"_f_p4",
|
||||
"parent":{
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.9 KiB |
|
|
@ -9,105 +9,105 @@
|
|||
"canGenerateBitmap":true,
|
||||
"charset":0,
|
||||
"first":0,
|
||||
"fontName":"Noto Sans",
|
||||
"fontName":"Noto Sans SemiBold",
|
||||
"glyphOperations":0,
|
||||
"glyphs":{
|
||||
"32":{"character":32,"h":15,"offset":0,"shift":3,"w":3,"x":2,"y":2,},
|
||||
"33":{"character":33,"h":15,"offset":0,"shift":3,"w":3,"x":66,"y":70,},
|
||||
"34":{"character":34,"h":15,"offset":0,"shift":5,"w":5,"x":59,"y":70,},
|
||||
"35":{"character":35,"h":15,"offset":0,"shift":7,"w":7,"x":50,"y":70,},
|
||||
"36":{"character":36,"h":15,"offset":0,"shift":6,"w":6,"x":42,"y":70,},
|
||||
"37":{"character":37,"h":15,"offset":0,"shift":10,"w":10,"x":30,"y":70,},
|
||||
"38":{"character":38,"h":15,"offset":0,"shift":8,"w":9,"x":19,"y":70,},
|
||||
"39":{"character":39,"h":15,"offset":0,"shift":3,"w":3,"x":14,"y":70,},
|
||||
"40":{"character":40,"h":15,"offset":0,"shift":4,"w":4,"x":8,"y":70,},
|
||||
"41":{"character":41,"h":15,"offset":0,"shift":4,"w":4,"x":2,"y":70,},
|
||||
"42":{"character":42,"h":15,"offset":0,"shift":6,"w":6,"x":71,"y":70,},
|
||||
"43":{"character":43,"h":15,"offset":0,"shift":6,"w":6,"x":117,"y":53,},
|
||||
"44":{"character":44,"h":15,"offset":0,"shift":3,"w":3,"x":104,"y":53,},
|
||||
"45":{"character":45,"h":15,"offset":0,"shift":4,"w":4,"x":98,"y":53,},
|
||||
"46":{"character":46,"h":15,"offset":0,"shift":3,"w":3,"x":93,"y":53,},
|
||||
"47":{"character":47,"h":15,"offset":0,"shift":5,"w":5,"x":86,"y":53,},
|
||||
"48":{"character":48,"h":15,"offset":0,"shift":6,"w":6,"x":78,"y":53,},
|
||||
"49":{"character":49,"h":15,"offset":0,"shift":6,"w":5,"x":71,"y":53,},
|
||||
"50":{"character":50,"h":15,"offset":0,"shift":6,"w":6,"x":63,"y":53,},
|
||||
"51":{"character":51,"h":15,"offset":0,"shift":6,"w":6,"x":55,"y":53,},
|
||||
"52":{"character":52,"h":15,"offset":0,"shift":6,"w":7,"x":46,"y":53,},
|
||||
"53":{"character":53,"h":15,"offset":0,"shift":6,"w":6,"x":109,"y":53,},
|
||||
"54":{"character":54,"h":15,"offset":0,"shift":6,"w":6,"x":79,"y":70,},
|
||||
"55":{"character":55,"h":15,"offset":0,"shift":6,"w":6,"x":87,"y":70,},
|
||||
"56":{"character":56,"h":15,"offset":0,"shift":6,"w":6,"x":95,"y":70,},
|
||||
"57":{"character":57,"h":15,"offset":0,"shift":6,"w":6,"x":28,"y":104,},
|
||||
"58":{"character":58,"h":15,"offset":0,"shift":3,"w":3,"x":23,"y":104,},
|
||||
"59":{"character":59,"h":15,"offset":0,"shift":3,"w":3,"x":18,"y":104,},
|
||||
"60":{"character":60,"h":15,"offset":0,"shift":6,"w":6,"x":10,"y":104,},
|
||||
"61":{"character":61,"h":15,"offset":0,"shift":6,"w":6,"x":2,"y":104,},
|
||||
"62":{"character":62,"h":15,"offset":0,"shift":6,"w":6,"x":117,"y":87,},
|
||||
"63":{"character":63,"h":15,"offset":0,"shift":5,"w":5,"x":110,"y":87,},
|
||||
"64":{"character":64,"h":15,"offset":0,"shift":10,"w":10,"x":98,"y":87,},
|
||||
"65":{"character":65,"h":15,"offset":0,"shift":8,"w":8,"x":88,"y":87,},
|
||||
"66":{"character":66,"h":15,"offset":0,"shift":7,"w":7,"x":79,"y":87,},
|
||||
"67":{"character":67,"h":15,"offset":0,"shift":7,"w":7,"x":70,"y":87,},
|
||||
"68":{"character":68,"h":15,"offset":0,"shift":8,"w":8,"x":60,"y":87,},
|
||||
"69":{"character":69,"h":15,"offset":0,"shift":6,"w":6,"x":52,"y":87,},
|
||||
"70":{"character":70,"h":15,"offset":0,"shift":6,"w":6,"x":44,"y":87,},
|
||||
"71":{"character":71,"h":15,"offset":0,"shift":8,"w":8,"x":34,"y":87,},
|
||||
"72":{"character":72,"h":15,"offset":0,"shift":8,"w":8,"x":24,"y":87,},
|
||||
"73":{"character":73,"h":15,"offset":0,"shift":4,"w":4,"x":18,"y":87,},
|
||||
"74":{"character":74,"h":15,"offset":-1,"shift":4,"w":4,"x":12,"y":87,},
|
||||
"75":{"character":75,"h":15,"offset":0,"shift":7,"w":8,"x":2,"y":87,},
|
||||
"76":{"character":76,"h":15,"offset":0,"shift":6,"w":6,"x":115,"y":70,},
|
||||
"77":{"character":77,"h":15,"offset":0,"shift":10,"w":10,"x":103,"y":70,},
|
||||
"78":{"character":78,"h":15,"offset":0,"shift":9,"w":8,"x":36,"y":53,},
|
||||
"79":{"character":79,"h":15,"offset":0,"shift":9,"w":9,"x":25,"y":53,},
|
||||
"80":{"character":80,"h":15,"offset":0,"shift":7,"w":7,"x":16,"y":53,},
|
||||
"81":{"character":81,"h":15,"offset":0,"shift":9,"w":9,"x":68,"y":19,},
|
||||
"82":{"character":82,"h":15,"offset":0,"shift":7,"w":8,"x":52,"y":19,},
|
||||
"83":{"character":83,"h":15,"offset":0,"shift":6,"w":6,"x":44,"y":19,},
|
||||
"84":{"character":84,"h":15,"offset":0,"shift":6,"w":7,"x":35,"y":19,},
|
||||
"85":{"character":85,"h":15,"offset":0,"shift":8,"w":8,"x":25,"y":19,},
|
||||
"86":{"character":86,"h":15,"offset":0,"shift":7,"w":8,"x":15,"y":19,},
|
||||
"87":{"character":87,"h":15,"offset":0,"shift":11,"w":11,"x":2,"y":19,},
|
||||
"88":{"character":88,"h":15,"offset":0,"shift":7,"w":8,"x":110,"y":2,},
|
||||
"89":{"character":89,"h":15,"offset":0,"shift":7,"w":7,"x":101,"y":2,},
|
||||
"90":{"character":90,"h":15,"offset":0,"shift":6,"w":7,"x":92,"y":2,},
|
||||
"91":{"character":91,"h":15,"offset":0,"shift":4,"w":4,"x":62,"y":19,},
|
||||
"92":{"character":92,"h":15,"offset":0,"shift":5,"w":5,"x":85,"y":2,},
|
||||
"93":{"character":93,"h":15,"offset":0,"shift":4,"w":3,"x":73,"y":2,},
|
||||
"94":{"character":94,"h":15,"offset":0,"shift":6,"w":7,"x":64,"y":2,},
|
||||
"95":{"character":95,"h":15,"offset":-1,"shift":5,"w":6,"x":56,"y":2,},
|
||||
"96":{"character":96,"h":15,"offset":0,"shift":4,"w":4,"x":50,"y":2,},
|
||||
"97":{"character":97,"h":15,"offset":0,"shift":7,"w":6,"x":42,"y":2,},
|
||||
"98":{"character":98,"h":15,"offset":0,"shift":7,"w":7,"x":33,"y":2,},
|
||||
"99":{"character":99,"h":15,"offset":0,"shift":6,"w":6,"x":25,"y":2,},
|
||||
"100":{"character":100,"h":15,"offset":0,"shift":7,"w":7,"x":16,"y":2,},
|
||||
"101":{"character":101,"h":15,"offset":0,"shift":7,"w":7,"x":7,"y":2,},
|
||||
"102":{"character":102,"h":15,"offset":0,"shift":4,"w":5,"x":78,"y":2,},
|
||||
"103":{"character":103,"h":15,"offset":0,"shift":7,"w":7,"x":79,"y":19,},
|
||||
"104":{"character":104,"h":15,"offset":0,"shift":7,"w":7,"x":41,"y":36,},
|
||||
"105":{"character":105,"h":15,"offset":0,"shift":3,"w":3,"x":88,"y":19,},
|
||||
"106":{"character":106,"h":15,"offset":-1,"shift":3,"w":4,"x":2,"y":53,},
|
||||
"107":{"character":107,"h":15,"offset":0,"shift":7,"w":7,"x":117,"y":36,},
|
||||
"108":{"character":108,"h":15,"offset":0,"shift":3,"w":3,"x":112,"y":36,},
|
||||
"109":{"character":109,"h":15,"offset":0,"shift":11,"w":10,"x":100,"y":36,},
|
||||
"110":{"character":110,"h":15,"offset":0,"shift":7,"w":7,"x":91,"y":36,},
|
||||
"111":{"character":111,"h":15,"offset":0,"shift":7,"w":7,"x":82,"y":36,},
|
||||
"112":{"character":112,"h":15,"offset":0,"shift":7,"w":7,"x":73,"y":36,},
|
||||
"113":{"character":113,"h":15,"offset":0,"shift":7,"w":7,"x":64,"y":36,},
|
||||
"114":{"character":114,"h":15,"offset":0,"shift":5,"w":5,"x":57,"y":36,},
|
||||
"115":{"character":115,"h":15,"offset":0,"shift":5,"w":6,"x":8,"y":53,},
|
||||
"116":{"character":116,"h":15,"offset":0,"shift":5,"w":5,"x":50,"y":36,},
|
||||
"117":{"character":117,"h":15,"offset":0,"shift":7,"w":7,"x":32,"y":36,},
|
||||
"118":{"character":118,"h":15,"offset":0,"shift":6,"w":7,"x":23,"y":36,},
|
||||
"119":{"character":119,"h":15,"offset":0,"shift":9,"w":10,"x":11,"y":36,},
|
||||
"120":{"character":120,"h":15,"offset":0,"shift":6,"w":7,"x":2,"y":36,},
|
||||
"121":{"character":121,"h":15,"offset":0,"shift":6,"w":7,"x":118,"y":19,},
|
||||
"122":{"character":122,"h":15,"offset":0,"shift":5,"w":6,"x":110,"y":19,},
|
||||
"123":{"character":123,"h":15,"offset":0,"shift":4,"w":4,"x":104,"y":19,},
|
||||
"124":{"character":124,"h":15,"offset":2,"shift":6,"w":2,"x":100,"y":19,},
|
||||
"125":{"character":125,"h":15,"offset":0,"shift":4,"w":5,"x":93,"y":19,},
|
||||
"126":{"character":126,"h":15,"offset":0,"shift":6,"w":6,"x":36,"y":104,},
|
||||
"9647":{"character":9647,"h":15,"offset":2,"shift":11,"w":7,"x":44,"y":104,},
|
||||
"33":{"character":33,"h":15,"offset":0,"shift":3,"w":3,"x":37,"y":70,},
|
||||
"34":{"character":34,"h":15,"offset":0,"shift":5,"w":5,"x":30,"y":70,},
|
||||
"35":{"character":35,"h":15,"offset":0,"shift":7,"w":7,"x":21,"y":70,},
|
||||
"36":{"character":36,"h":15,"offset":0,"shift":6,"w":6,"x":13,"y":70,},
|
||||
"37":{"character":37,"h":15,"offset":0,"shift":9,"w":9,"x":2,"y":70,},
|
||||
"38":{"character":38,"h":15,"offset":0,"shift":8,"w":8,"x":115,"y":53,},
|
||||
"39":{"character":39,"h":15,"offset":0,"shift":3,"w":2,"x":111,"y":53,},
|
||||
"40":{"character":40,"h":15,"offset":0,"shift":3,"w":4,"x":105,"y":53,},
|
||||
"41":{"character":41,"h":15,"offset":0,"shift":3,"w":4,"x":99,"y":53,},
|
||||
"42":{"character":42,"h":15,"offset":0,"shift":6,"w":6,"x":42,"y":70,},
|
||||
"43":{"character":43,"h":15,"offset":0,"shift":6,"w":6,"x":91,"y":53,},
|
||||
"44":{"character":44,"h":15,"offset":0,"shift":3,"w":3,"x":78,"y":53,},
|
||||
"45":{"character":45,"h":15,"offset":0,"shift":3,"w":4,"x":72,"y":53,},
|
||||
"46":{"character":46,"h":15,"offset":0,"shift":3,"w":3,"x":67,"y":53,},
|
||||
"47":{"character":47,"h":15,"offset":0,"shift":4,"w":5,"x":60,"y":53,},
|
||||
"48":{"character":48,"h":15,"offset":0,"shift":6,"w":6,"x":52,"y":53,},
|
||||
"49":{"character":49,"h":15,"offset":0,"shift":6,"w":5,"x":45,"y":53,},
|
||||
"50":{"character":50,"h":15,"offset":0,"shift":6,"w":6,"x":37,"y":53,},
|
||||
"51":{"character":51,"h":15,"offset":0,"shift":6,"w":6,"x":29,"y":53,},
|
||||
"52":{"character":52,"h":15,"offset":0,"shift":6,"w":6,"x":21,"y":53,},
|
||||
"53":{"character":53,"h":15,"offset":0,"shift":6,"w":6,"x":83,"y":53,},
|
||||
"54":{"character":54,"h":15,"offset":0,"shift":6,"w":6,"x":50,"y":70,},
|
||||
"55":{"character":55,"h":15,"offset":0,"shift":6,"w":6,"x":58,"y":70,},
|
||||
"56":{"character":56,"h":15,"offset":0,"shift":6,"w":6,"x":66,"y":70,},
|
||||
"57":{"character":57,"h":15,"offset":0,"shift":6,"w":6,"x":114,"y":87,},
|
||||
"58":{"character":58,"h":15,"offset":0,"shift":3,"w":3,"x":109,"y":87,},
|
||||
"59":{"character":59,"h":15,"offset":0,"shift":3,"w":3,"x":104,"y":87,},
|
||||
"60":{"character":60,"h":15,"offset":0,"shift":6,"w":6,"x":96,"y":87,},
|
||||
"61":{"character":61,"h":15,"offset":0,"shift":6,"w":6,"x":88,"y":87,},
|
||||
"62":{"character":62,"h":15,"offset":0,"shift":6,"w":6,"x":80,"y":87,},
|
||||
"63":{"character":63,"h":15,"offset":0,"shift":5,"w":5,"x":73,"y":87,},
|
||||
"64":{"character":64,"h":15,"offset":0,"shift":10,"w":10,"x":61,"y":87,},
|
||||
"65":{"character":65,"h":15,"offset":0,"shift":7,"w":8,"x":51,"y":87,},
|
||||
"66":{"character":66,"h":15,"offset":1,"shift":7,"w":6,"x":43,"y":87,},
|
||||
"67":{"character":67,"h":15,"offset":0,"shift":7,"w":7,"x":34,"y":87,},
|
||||
"68":{"character":68,"h":15,"offset":1,"shift":8,"w":7,"x":25,"y":87,},
|
||||
"69":{"character":69,"h":15,"offset":1,"shift":6,"w":5,"x":18,"y":87,},
|
||||
"70":{"character":70,"h":15,"offset":1,"shift":6,"w":5,"x":11,"y":87,},
|
||||
"71":{"character":71,"h":15,"offset":0,"shift":8,"w":7,"x":2,"y":87,},
|
||||
"72":{"character":72,"h":15,"offset":1,"shift":8,"w":7,"x":111,"y":70,},
|
||||
"73":{"character":73,"h":15,"offset":0,"shift":4,"w":4,"x":105,"y":70,},
|
||||
"74":{"character":74,"h":15,"offset":-1,"shift":3,"w":4,"x":99,"y":70,},
|
||||
"75":{"character":75,"h":15,"offset":1,"shift":7,"w":6,"x":91,"y":70,},
|
||||
"76":{"character":76,"h":15,"offset":1,"shift":6,"w":5,"x":84,"y":70,},
|
||||
"77":{"character":77,"h":15,"offset":1,"shift":10,"w":8,"x":74,"y":70,},
|
||||
"78":{"character":78,"h":15,"offset":1,"shift":8,"w":7,"x":12,"y":53,},
|
||||
"79":{"character":79,"h":15,"offset":0,"shift":8,"w":8,"x":2,"y":53,},
|
||||
"80":{"character":80,"h":15,"offset":1,"shift":7,"w":6,"x":115,"y":36,},
|
||||
"81":{"character":81,"h":15,"offset":0,"shift":8,"w":8,"x":51,"y":19,},
|
||||
"82":{"character":82,"h":15,"offset":1,"shift":7,"w":6,"x":37,"y":19,},
|
||||
"83":{"character":83,"h":15,"offset":0,"shift":6,"w":6,"x":29,"y":19,},
|
||||
"84":{"character":84,"h":15,"offset":0,"shift":6,"w":6,"x":21,"y":19,},
|
||||
"85":{"character":85,"h":15,"offset":0,"shift":8,"w":8,"x":11,"y":19,},
|
||||
"86":{"character":86,"h":15,"offset":0,"shift":7,"w":7,"x":2,"y":19,},
|
||||
"87":{"character":87,"h":15,"offset":0,"shift":10,"w":11,"x":114,"y":2,},
|
||||
"88":{"character":88,"h":15,"offset":0,"shift":7,"w":7,"x":105,"y":2,},
|
||||
"89":{"character":89,"h":15,"offset":0,"shift":6,"w":7,"x":96,"y":2,},
|
||||
"90":{"character":90,"h":15,"offset":0,"shift":6,"w":6,"x":88,"y":2,},
|
||||
"91":{"character":91,"h":15,"offset":0,"shift":4,"w":4,"x":45,"y":19,},
|
||||
"92":{"character":92,"h":15,"offset":0,"shift":4,"w":5,"x":81,"y":2,},
|
||||
"93":{"character":93,"h":15,"offset":0,"shift":4,"w":3,"x":69,"y":2,},
|
||||
"94":{"character":94,"h":15,"offset":0,"shift":6,"w":6,"x":61,"y":2,},
|
||||
"95":{"character":95,"h":15,"offset":-1,"shift":5,"w":6,"x":53,"y":2,},
|
||||
"96":{"character":96,"h":15,"offset":0,"shift":4,"w":4,"x":47,"y":2,},
|
||||
"97":{"character":97,"h":15,"offset":0,"shift":6,"w":6,"x":39,"y":2,},
|
||||
"98":{"character":98,"h":15,"offset":0,"shift":7,"w":7,"x":30,"y":2,},
|
||||
"99":{"character":99,"h":15,"offset":0,"shift":5,"w":5,"x":23,"y":2,},
|
||||
"100":{"character":100,"h":15,"offset":0,"shift":7,"w":6,"x":15,"y":2,},
|
||||
"101":{"character":101,"h":15,"offset":0,"shift":6,"w":6,"x":7,"y":2,},
|
||||
"102":{"character":102,"h":15,"offset":0,"shift":4,"w":5,"x":74,"y":2,},
|
||||
"103":{"character":103,"h":15,"offset":0,"shift":7,"w":6,"x":61,"y":19,},
|
||||
"104":{"character":104,"h":15,"offset":0,"shift":7,"w":7,"x":18,"y":36,},
|
||||
"105":{"character":105,"h":15,"offset":0,"shift":3,"w":3,"x":69,"y":19,},
|
||||
"106":{"character":106,"h":15,"offset":-1,"shift":3,"w":4,"x":102,"y":36,},
|
||||
"107":{"character":107,"h":15,"offset":0,"shift":6,"w":7,"x":93,"y":36,},
|
||||
"108":{"character":108,"h":15,"offset":0,"shift":3,"w":3,"x":88,"y":36,},
|
||||
"109":{"character":109,"h":15,"offset":0,"shift":10,"w":10,"x":76,"y":36,},
|
||||
"110":{"character":110,"h":15,"offset":0,"shift":7,"w":7,"x":67,"y":36,},
|
||||
"111":{"character":111,"h":15,"offset":0,"shift":7,"w":7,"x":58,"y":36,},
|
||||
"112":{"character":112,"h":15,"offset":0,"shift":7,"w":7,"x":49,"y":36,},
|
||||
"113":{"character":113,"h":15,"offset":0,"shift":7,"w":6,"x":41,"y":36,},
|
||||
"114":{"character":114,"h":15,"offset":0,"shift":5,"w":5,"x":34,"y":36,},
|
||||
"115":{"character":115,"h":15,"offset":0,"shift":5,"w":5,"x":108,"y":36,},
|
||||
"116":{"character":116,"h":15,"offset":0,"shift":4,"w":5,"x":27,"y":36,},
|
||||
"117":{"character":117,"h":15,"offset":0,"shift":7,"w":6,"x":10,"y":36,},
|
||||
"118":{"character":118,"h":15,"offset":0,"shift":6,"w":6,"x":2,"y":36,},
|
||||
"119":{"character":119,"h":15,"offset":0,"shift":9,"w":9,"x":113,"y":19,},
|
||||
"120":{"character":120,"h":15,"offset":0,"shift":6,"w":6,"x":105,"y":19,},
|
||||
"121":{"character":121,"h":15,"offset":0,"shift":6,"w":6,"x":97,"y":19,},
|
||||
"122":{"character":122,"h":15,"offset":0,"shift":5,"w":5,"x":90,"y":19,},
|
||||
"123":{"character":123,"h":15,"offset":0,"shift":4,"w":4,"x":84,"y":19,},
|
||||
"124":{"character":124,"h":15,"offset":2,"shift":6,"w":2,"x":80,"y":19,},
|
||||
"125":{"character":125,"h":15,"offset":0,"shift":4,"w":4,"x":74,"y":19,},
|
||||
"126":{"character":126,"h":15,"offset":0,"shift":6,"w":6,"x":2,"y":104,},
|
||||
"9647":{"character":9647,"h":15,"offset":2,"shift":11,"w":7,"x":10,"y":104,},
|
||||
},
|
||||
"hinting":0,
|
||||
"includeTTF":false,
|
||||
|
|
@ -133,7 +133,7 @@
|
|||
"sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)",
|
||||
"sdfSpread":8,
|
||||
"size":8.0,
|
||||
"styleName":"Bold",
|
||||
"styleName":"SemiBold",
|
||||
"textureGroupId":{
|
||||
"name":"Default",
|
||||
"path":"texturegroups/Default",
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ function buttonInstant(spr, _x, _y, _w, _h, _m, _act, _hvr, _tip = "", _icon = n
|
|||
} else if(spr)
|
||||
draw_sprite_stretched(spr, 0, _x, _y, _w, _h);
|
||||
|
||||
if(_icon) draw_sprite_ui_uniform(_icon, _icon_index, _x + _w / 2, _y + _h / 2, _icon_scale, cc, _icon_alpha);
|
||||
if(_icon) draw_sprite_ui_uniform(_icon, _icon_index, _x + _w / 2, _y + _h / 2, _icon_scale, cc, _icon_alpha == 1 || res == 0? _icon_alpha : _icon_alpha + 0.4);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
globalvar FONT_DEF, FONT_ISLOADED, FONT_CACHE, FONT_CUST_CACHE, GLYPH_MAP;
|
||||
globalvar f_h1, f_h2, f_h3, f_h5, f_p0, f_p0b, f_p1, f_p2, f_p3, f_code, f_sdf, f_sdf_medium;
|
||||
globalvar f_h1, f_h2, f_h3, f_h5, f_p0, f_p0b, f_p1, f_p2, f_p3, f_p4;
|
||||
globalvar f_code, f_sdf, f_sdf_medium;
|
||||
|
||||
global.LINE_HEIGHTS = {};
|
||||
|
||||
|
|
@ -19,6 +20,8 @@ global.LINE_HEIGHTS = {};
|
|||
f_p1 = _f_p1;
|
||||
f_p2 = _f_p2;
|
||||
f_p3 = _f_p3;
|
||||
f_p4 = _f_p4;
|
||||
|
||||
f_code = _f_code;
|
||||
f_sdf = _f_sdf;
|
||||
f_sdf_medium = _f_sdf_medium;
|
||||
|
|
@ -44,6 +47,7 @@ function __font_refresh() { #region
|
|||
__font_add_height(f_p1);
|
||||
__font_add_height(f_p2);
|
||||
__font_add_height(f_p3);
|
||||
__font_add_height(f_p4);
|
||||
|
||||
__font_add_height(f_code);
|
||||
__font_add_height(f_sdf);
|
||||
|
|
@ -139,6 +143,7 @@ function loadFonts() { #region
|
|||
font_clear(f_p1);
|
||||
font_clear(f_p2);
|
||||
font_clear(f_p3);
|
||||
font_clear(f_p4);
|
||||
|
||||
font_clear(f_code);
|
||||
font_clear(f_sdf);
|
||||
|
|
@ -157,6 +162,8 @@ function loadFonts() { #region
|
|||
f_p1 = _f_p1;
|
||||
f_p2 = _f_p2;
|
||||
f_p3 = _f_p3;
|
||||
f_p4 = _f_p4;
|
||||
|
||||
f_code = _f_code;
|
||||
f_sdf = _f_sdf;
|
||||
f_sdf_medium = _f_sdf_medium;
|
||||
|
|
@ -180,6 +187,7 @@ function loadFonts() { #region
|
|||
f_p1 = _font_load_from_struct(fontDef, "p1", _f_p1);
|
||||
f_p2 = _font_load_from_struct(fontDef, "p2", _f_p2);
|
||||
f_p3 = _font_load_from_struct(fontDef, "p3", _f_p3);
|
||||
f_p4 = _font_load_from_struct(fontDef, "p4", _f_p4);
|
||||
|
||||
f_code = _font_load_from_struct(fontDef, "code", _f_code, false);
|
||||
f_sdf = _font_load_from_struct(fontDef, "sdf", _f_sdf);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"$GMScript":"v1",
|
||||
"$GMScript":"",
|
||||
"%Name":"globals",
|
||||
"isCompatibility":false,
|
||||
"isDnD":false,
|
||||
|
|
|
|||
|
|
@ -1937,28 +1937,41 @@ function Panel_Animation() : PanelContent() constructor {
|
|||
#region overlay
|
||||
var hh = ui(20);
|
||||
|
||||
draw_set_color(COLORS.panel_animation_timeline_top);
|
||||
draw_rectangle(0, 0, bar_w, hh, false);
|
||||
var bar_line_x = (CURRENT_FRAME + 1) * timeline_scale + timeline_shift;
|
||||
var cc = PROJECT.animator.is_playing? COLORS._main_value_positive : COLORS._main_accent;
|
||||
|
||||
draw_set_color(cc);
|
||||
draw_line(bar_line_x, PANEL_PAD, bar_line_x, dope_sheet_h);
|
||||
|
||||
var _phover = pHOVER && msy > hh;
|
||||
for( var i = 0, n = array_length(timeline_contents); i < n; i++ ) {
|
||||
var _cont = timeline_contents[i];
|
||||
if(!_cont.show) continue;
|
||||
|
||||
var _hov = _cont.item.drawDopesheetOver(timeline_shift, _cont.y, timeline_scale, msx, msy, _phover, pFOCUS);
|
||||
if(is_undefined(_hov)) continue;
|
||||
if(_hov) keyframe_boxable = false;
|
||||
}
|
||||
|
||||
var _fr = ceil((bar_w / timeline_scale - timeline_shift) / timeline_separate) * timeline_separate;
|
||||
|
||||
for(var i = timeline_separate; i <= _fr; i += timeline_separate) {
|
||||
var bar_line_x = i * timeline_scale + timeline_shift;
|
||||
var ln_x = i * timeline_scale + timeline_shift;
|
||||
|
||||
if(i > TOTAL_FRAMES) draw_set_alpha(0.5);
|
||||
|
||||
draw_set_color(COLORS.panel_animation_frame_divider);
|
||||
draw_line(bar_line_x, 0, bar_line_x, hh);
|
||||
draw_line(ln_x, 0, ln_x, hh);
|
||||
|
||||
draw_set_text(f_p2, fa_center, fa_top, COLORS._main_text_sub);
|
||||
draw_text_add(bar_line_x, PANEL_PAD, i);
|
||||
draw_text_add(ln_x, PANEL_PAD, i);
|
||||
}
|
||||
|
||||
draw_set_alpha(1);
|
||||
|
||||
var bar_line_x = TOTAL_FRAMES * timeline_scale + timeline_shift;
|
||||
var end_x = TOTAL_FRAMES * timeline_scale + timeline_shift;
|
||||
draw_set_color(COLORS.panel_animation_end_line);
|
||||
draw_line_width(bar_line_x, 0, bar_line_x, ui(20), 2);
|
||||
draw_line_width(end_x, 0, end_x, ui(20), 2);
|
||||
|
||||
if(PROJECT.onion_skin.enabled) { //ONION SKIN
|
||||
var rang = PROJECT.onion_skin.range;
|
||||
|
|
@ -2018,13 +2031,10 @@ function Panel_Animation() : PanelContent() constructor {
|
|||
}
|
||||
}
|
||||
|
||||
var bar_line_x = (CURRENT_FRAME + 1) * timeline_scale + timeline_shift;
|
||||
var cc = PROJECT.animator.is_playing? COLORS._main_value_positive : COLORS._main_accent;
|
||||
draw_set_color(COLORS.panel_animation_timeline_top);
|
||||
draw_rectangle(0, 0, bar_w, hh, false);
|
||||
|
||||
draw_set_color(cc);
|
||||
draw_set_font(f_p2);
|
||||
draw_line(bar_line_x, PANEL_PAD, bar_line_x, dope_sheet_h);
|
||||
|
||||
var cf = string(CURRENT_FRAME + 1);
|
||||
var tx = string_width(cf) + ui(4);
|
||||
draw_sprite_stretched_ext(THEME.menu_button_mask, 0, bar_line_x - tx / 2, 0, tx, hh + PANEL_PAD, cc, 1);
|
||||
|
|
@ -2032,12 +2042,6 @@ function Panel_Animation() : PanelContent() constructor {
|
|||
draw_set_text(f_p2, fa_center, fa_top, COLORS._main_text_on_accent);
|
||||
draw_text_add(bar_line_x, PANEL_PAD, cf);
|
||||
|
||||
for( var i = 0, n = array_length(timeline_contents); i < n; i++ ) {
|
||||
var _cont = timeline_contents[i];
|
||||
var _hov = _cont.item.drawDopesheetOver(timeline_shift, _cont.y, timeline_scale, msx, msy, pHOVER, pFOCUS);
|
||||
if(is_undefined(_hov)) continue;
|
||||
if(_hov) keyframe_boxable = false;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region stretch
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"$GMScript":"v1",
|
||||
"$GMScript":"",
|
||||
"%Name":"panel_animation",
|
||||
"isCompatibility":false,
|
||||
"isDnD":false,
|
||||
|
|
|
|||
|
|
@ -70,19 +70,22 @@ function timelineItemNode(node) : timelineItem() constructor {
|
|||
color_cur = col;
|
||||
|
||||
var cc = colorMultiply(col, COLORS.panel_animation_dope_bg);
|
||||
color_dsp = cc;
|
||||
|
||||
draw_sprite_stretched_ext(THEME.menu_button_mask, 0, _x, _y, _w, lh, cc, alpha);
|
||||
|
||||
if(hover && point_in_rectangle(_msx, _msy, _x + ui(20), _y, _x + _w, _y + lh - 1)) {
|
||||
cc = colorMultiply(col, COLORS.panel_animation_dope_bg_hover);
|
||||
draw_sprite_stretched_add(THEME.menu_button_mask, 0, _x, _y, _w, lh, col, 0.05);
|
||||
res = 1;
|
||||
}
|
||||
|
||||
color_dsp = cc;
|
||||
draw_sprite_stretched_ext(THEME.menu_button_mask, 0, _x, _y, _w, lh, cc, alpha);
|
||||
// draw_sprite_stretched_add(THEME.menu_button_mask, 1, _x, _y, _w, lh, c_white, 0.1);
|
||||
// draw_sprite_stretched_add(THEME.menu_button_mask, 1, _x, _y, _w, lh, c_white, 0.15);
|
||||
|
||||
var tx = lx + lw - ui(7);
|
||||
if(buttonInstant(THEME.button_hide, tx - ui(9), _y + ui(1), ui(18), ui(18), [ _msx, _msy ], focus, hover,
|
||||
__txtx("panel_animation_goto", "Go to node"), THEME.animate_node_go, 0, col == -1? CDEF.main_grey : col) == 2)
|
||||
var tt = __txtx("panel_animation_goto", "Go to node");
|
||||
var _m = [ _msx, _msy ];
|
||||
|
||||
if(buttonInstant(noone, tx - ui(9), _y + ui(1), ui(18), ui(18), _m, focus, hover, tt, THEME.animate_node_go, 0, col == -1? COLORS._main_icon_light : col, 0.4) == 2)
|
||||
graphFocusNode(node);
|
||||
|
||||
if(_sel) draw_sprite_stretched_ext(THEME.menu_button_mask, 1, _x, _y, _w, lh, COLORS._main_accent, 1);
|
||||
|
|
@ -107,7 +110,7 @@ function timelineItemNode(node) : timelineItem() constructor {
|
|||
txx += tw;
|
||||
}
|
||||
|
||||
draw_set_font(f_p2);
|
||||
draw_set_font(f_p3);
|
||||
draw_set_alpha(1);
|
||||
if(nameType == 0 || nameType == 2)
|
||||
draw_text_add(txx, _y + lh / 2 - ui(2), node.display_name);
|
||||
|
|
@ -211,10 +214,11 @@ function timelineItemGroup() : timelineItem() constructor {
|
|||
draw_sprite_stretched_ext(THEME.menu_button_mask, 0, _x, _y, _w, lh, cc, alpha);
|
||||
|
||||
if(hover && point_in_rectangle(_msx, _msy, _x + ui(20), _y, _x + _w, _y + lh - 1)) {
|
||||
draw_sprite_stretched_add(THEME.menu_button_mask, 1, _x, _y, _w, lh, c_white, 0.1);
|
||||
draw_sprite_stretched_add(THEME.menu_button_mask, 0, _x, _y, _w, lh, col, 0.05);
|
||||
res = 1;
|
||||
}
|
||||
|
||||
draw_sprite_stretched_add(THEME.menu_button_mask, 1, _x, _y, _w, lh, c_white, 0.15);
|
||||
if(fdHover == self)
|
||||
draw_sprite_stretched_ext(THEME.menu_button_mask, 1, _x, _y + 1, _w, lh - 2, col == -1? COLORS._main_accent : col, 1);
|
||||
|
||||
|
|
@ -225,10 +229,10 @@ function timelineItemGroup() : timelineItem() constructor {
|
|||
}
|
||||
draw_sprite_ui_uniform(THEME.folder_16, show, lx + ui(10), _y + lh / 2, 1, col == -1? CDEF.main_grey : col, aa);
|
||||
|
||||
draw_set_text(f_p2, fa_left, fa_center);
|
||||
draw_set_text(f_p3, fa_left, fa_center);
|
||||
if(renaming) {
|
||||
var _param = new widgetParam(lx + ui(20), _y + 1, _w - ui(24), lh - ui(4), name,, [ _msx, _msy ]);
|
||||
_param.font = f_p2;
|
||||
_param.font = f_p3;
|
||||
|
||||
tb_name.highlight_color = cc;
|
||||
tb_name.highlight_alpha = .5;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"$GMScript":"v1",
|
||||
"$GMScript":"",
|
||||
"%Name":"timeline_data",
|
||||
"isCompatibility":false,
|
||||
"isDnD":false,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue