diff --git a/tools/fonted/data/game.ini b/tools/fonted/data/game.ini index f2c739a..ae5badf 100644 --- a/tools/fonted/data/game.ini +++ b/tools/fonted/data/game.ini @@ -1,5 +1,5 @@ -title=NEW MINI PROJECT -config=newminiproject +title=FONTED +config=fonted width=320 height=240 zoom=2 diff --git a/tools/fonted/data/main.lua b/tools/fonted/data/main.lua index c80ad4a..7cb0604 100644 --- a/tools/fonted/data/main.lua +++ b/tools/fonted/data/main.lua @@ -2,15 +2,18 @@ require "ui" update = nil protofont_surface = nil +protofont_name = nil function mini.init() + pal.trans(255) surf.cls(0) update = any_update - ui.filedialog.show(select_file); + --ui.filedialog.show(select_file) end function select_file(filename) if protofont_surface then surf.free(protofont_surface) end + protofont_name = filename:match("([^/]+)$") protofont_surface = surf.loadex(filename) end @@ -22,23 +25,87 @@ function mini.update() update() end +seltab = 1 + +function draw_big_char(x,y,w,h) + if protofont_surface then + surf.source(protofont_surface) + for yy=0,h-1 do + for xx=0,w-1 do + if surf.pixel(x+xx, y+yy)~=0 then + draw.rectf(xx*8, yy*8, 7, 7, 0) + else + draw.rectf(xx*8, yy*8, 7, 7, 12) + end + end + end + end +end + function any_update() surf.cls(0) view.origin(4,4) - draw.rrectf(0,0,136,132,3,15) + draw.rrectf(0,0,140,232,3,15) + ui.button("NEW",4,4,30,11, {7,6,5}) + ui.button("LOAD",36,4,30,11, {9,10,11}) + ui.button("SAVE",68,4,30,11, {2,3,4}) + + view.origin(8,24) + local w,h = 128,20 + if protofont_surface then w,h = surf.size(protofont_surface) end + draw.rrectf(0,0,132,h+35,2,14) + + draw.text("SURFACE:",4,4,12) if protofont_surface then - local w,h = surf.size(protofont_surface) - local x,y = (136-w)/2,(132-h)/2 + draw.text(protofont_name,36,4,12) + --local w,h = surf.size(protofont_surface) + local x,y = 6,15 surf.source(protofont_surface) + pal.subpal(1,12) draw.surf(0,0,w,h,x,y,w,h) + pal.subpal(1) + draw.rect(x-1,y-1,w+2,h+2,0) + draw.rrect(x-2,y-2,w+4,h+4,2,12) draw.text(tostring(w)..","..tostring(h), 10, 100, 3) + else + draw.text("",36,4,12) + end + if ui.button("LOAD",98,20+h,30,11, {9,10,11}) then + ui.filedialog.show(select_file) end - view.origin(4,140) - draw.rrectf(0,0,136,68,3,15) - view.origin(8,144) + --view.origin(4,140) + --draw.rrectf(0,0,140,68,3,15) + + view.origin(148,4) + + draw.rrectf(0,0,21,12,3,14) + draw.text("BASE",3,2,12) + + draw.rrectf(22,0,45,12,3,15) + draw.text("DIACRITICS",25,2,0) + -- acute(Á), grave(À); diaeresis(Ä), circumflex(Â); cedilla(Ç), tilde(Ñ) + + draw.rrectf(68,0,49,12,3,15) + draw.text("PRECOMPOSED",71,2,0) + + draw.rrectf(0,8,140,140,3,14) + + view.origin(152,18) + draw.text("CARÀCTER ACTUAL:65(A)",0,0,0) + view.origin(152,25) + draw_big_char(7,7,7,7) + + ui.button("<",70,2,9,9, {9,10,11}) + --draw.rrectf(80,2,16,10,2,15) + draw.rrectf(80,2,15,9,2,13) + draw.text("240",82,4,15) + ui.button(">",96,2,9,9, {9,10,11}) + + + view.origin(152,144) local x,y=0,0 for c=32,127 do draw.rectf(x,y,7,9,12) @@ -52,17 +119,4 @@ function any_update() end draw.text("ÁÄÉÍÓÚáéíóúÀÈÌÒÙàèìòùñÑçÇ", x, y+8, 12) - view.origin(144,4) - draw.rrectf(0,0,21,12,3,14) - draw.text("BASE",3,2,12) - - draw.rrectf(22,0,45,12,3,15) - draw.text("DIACRITICS",25,2,0) - -- acute(Á), grave(À); diaeresis(Ä), circumflex(Â); cedilla(Ç), tilde(Ñ) - - draw.rrectf(68,0,49,12,3,15) - draw.text("PRECOMPOSED",71,2,0) - - draw.rrectf(0,8,140,140,3,14) - end \ No newline at end of file diff --git a/tools/fonted/data/ui.lua b/tools/fonted/data/ui.lua index 5100a21..36e14a7 100644 --- a/tools/fonted/data/ui.lua +++ b/tools/fonted/data/ui.lua @@ -10,7 +10,8 @@ ui = { else draw.rrectf(x,y,w,h,2,color[2]) end - draw.text(text,x+text_x+1,y+3,color[1]) + local text_y = (h-5)/2 + draw.text(text,x+text_x+1,y+text_y,color[1]) return false end,