From eaace7d9c1def6ce66ecf602176b26669e14f9a1 Mon Sep 17 00:00:00 2001 From: koniifer Date: Sat, 26 Oct 2024 09:23:28 +0100 Subject: [PATCH] unoptimised text load & render --- sysdata/consolefonts/tamsyn/10x20b.psf | Bin 0 -> 10823 bytes sysdata/consolefonts/tamsyn/10x20r.psf | Bin 0 -> 10823 bytes sysdata/consolefonts/tamsyn/5x9b.psf | Bin 0 -> 2887 bytes sysdata/consolefonts/tamsyn/5x9r.psf | Bin 0 -> 2887 bytes sysdata/consolefonts/tamsyn/6x12b.psf | Bin 0 -> 3655 bytes sysdata/consolefonts/tamsyn/6x12r.psf | Bin 0 -> 3655 bytes sysdata/consolefonts/tamsyn/7x13b.psf | Bin 0 -> 3911 bytes sysdata/consolefonts/tamsyn/7x13r.psf | Bin 0 -> 3911 bytes sysdata/consolefonts/tamsyn/7x14b.psf | Bin 0 -> 4167 bytes sysdata/consolefonts/tamsyn/7x14r.psf | Bin 0 -> 4165 bytes sysdata/consolefonts/tamsyn/8x15b.psf | Bin 0 -> 4423 bytes sysdata/consolefonts/tamsyn/8x15r.psf | Bin 0 -> 4421 bytes sysdata/consolefonts/tamsyn/8x16b.psf | Bin 0 -> 4679 bytes sysdata/consolefonts/tamsyn/8x16r.psf | Bin 0 -> 4677 bytes sysdata/consolefonts/tamsyn/LICENSE | 10 +++ sysdata/libraries/render/TODO.md | 5 +- sysdata/libraries/render/src/image.hb | 4 +- sysdata/libraries/render/src/lib.hb | 2 + sysdata/libraries/render/src/software.hb | 63 ++++++++++++++- sysdata/libraries/render/src/text.hb | 75 ++++++++++++++++++ sysdata/libraries/stn/src/assets/sin_table | Bin 0 -> 728 bytes .../stn/src/assets/this-is-temporary | 0 sysdata/libraries/stn/src/math.hb | 28 ++++--- .../render_example/src/examples/text.hb | 23 ++++++ sysdata/programs/render_example/src/main.hb | 2 +- sysdata/system_config.toml | 12 +-- 26 files changed, 198 insertions(+), 26 deletions(-) create mode 100644 sysdata/consolefonts/tamsyn/10x20b.psf create mode 100644 sysdata/consolefonts/tamsyn/10x20r.psf create mode 100644 sysdata/consolefonts/tamsyn/5x9b.psf create mode 100644 sysdata/consolefonts/tamsyn/5x9r.psf create mode 100644 sysdata/consolefonts/tamsyn/6x12b.psf create mode 100644 sysdata/consolefonts/tamsyn/6x12r.psf create mode 100644 sysdata/consolefonts/tamsyn/7x13b.psf create mode 100644 sysdata/consolefonts/tamsyn/7x13r.psf create mode 100644 sysdata/consolefonts/tamsyn/7x14b.psf create mode 100644 sysdata/consolefonts/tamsyn/7x14r.psf create mode 100644 sysdata/consolefonts/tamsyn/8x15b.psf create mode 100644 sysdata/consolefonts/tamsyn/8x15r.psf create mode 100644 sysdata/consolefonts/tamsyn/8x16b.psf create mode 100644 sysdata/consolefonts/tamsyn/8x16r.psf create mode 100644 sysdata/consolefonts/tamsyn/LICENSE create mode 100644 sysdata/libraries/render/src/text.hb create mode 100644 sysdata/libraries/stn/src/assets/sin_table create mode 100644 sysdata/libraries/stn/src/assets/this-is-temporary create mode 100644 sysdata/programs/render_example/src/examples/text.hb diff --git a/sysdata/consolefonts/tamsyn/10x20b.psf b/sysdata/consolefonts/tamsyn/10x20b.psf new file mode 100644 index 0000000000000000000000000000000000000000..4a582d9edd10dd598469dd6bb3ffb479fadb5145 GIT binary patch literal 10823 zcmeHN+ml>H8Sm6qC6=|tzVNUqQVCIRqQb_N5MkK~ihu~=uBd=Bj&1~US%^Yn;!Xn! z%0;<^n{p>0_lt&$f-sq{%BN6yg~}T*`~keC>c{t;Z@%e1=k&~(G8^DwyQ@$4>HhWC z{ayMy-92;N>*w6!I2_4okreoG9A}4f`m(%7q2-!UY(*`@7oYc+t{o-~Px13bPPv&Z zPJO=9D2+bqit#`Rldd>W>M4}UVXR#oA^kqqF86hbF_5H}>N~%6NX~D5$4K!zto+jY zD9d_SKGJe7(@WRPw_FYtz2$DwO>o?iJty3$ZquO}Dxy2?rm{Hh#=Etl6kzHxWC>U*`!w{a7J9|7$S?AuE#X$VR0-8tkHsMR zZMyYtv)k^rWaa51Bzqs_ai-jcjGl6wo~h8&u~oWtm;Ro&viXg&oCU3xl^S@&EpcP+ z2)5FuYk9?{aIMTr>u#=s-ZIvBo#R}_tMH!YSLc_PUus;HpHLB6{pp4FS~kPQ3B4Kp zSf_E>+AWXUq%3+V+Lc&=YC=}PVjjDHFilyWLe{etCX`ISDOAlhG8+_>2ANwih)nkQ zJ$|46up9UJwrjI?YDFk>XA%s%#S(}s=DJ$2yva4Gu%c@RVha){+=>*8{rpUqqH1@B zYf>TDpHWOpv5c#y$nk8{PV2ljW#q{|^V3=J+K6VEB4~a}*RDL%>sMEpt;zoO-0)47 z%m%lW>*P)vlf$2zjYqliOq3X zda3mk(^I)LQ{>pfb+k3^FsIT^+i6*E<#i+j1U{{l_G{KE`D%`_4~Zul^steo-D2&e z^{e!h&g$+gVmekgKj&!U=#H4rF5$M-nsLS^;f^l(< z{aHHZwelsFmvH(2hj=%wyOR7)We{cEgVnlHjycs{!mq?&gQA^02QhtFBi1LiKGZHp z*j8h!DUWM3g`RjKrCG*}WqY%6M%WH7y_Yn4#c_2$!LDuYd48MLy_eg!XGdgvDgP%H zAYnRb3&HQ(xaI-%8&O^#`SHx|(|%XRZMkc5QR-5mieKxa`Y_!ExmmmAd3tj_o3M7v z)A|^(=3c&;clRbE$@>NMf#w0zb}AN-<{3 zk|lL;VJY)Gke?@l277#_kZfk<$f}@E0dp{w!^6{e_k;8RpCs2RXCGN6;AIq_)P0{ z*5R4=aJ~6e;Cl0`!1d-=iBqXhv+rKzSMi;qJXf(t&!3acUaIaLjon}`HmLPY~MU~48|2k|l5N{F(lZ@Oq$<3DCu9$~3tj(|rXOgMHnZ;D$9Ip)B zUk#q0`M+v<#?f{^+8%AU+T#88x*OV7U(7{@B5#SZj$;4kxK7rb1eLXUq(Sl%UG&4n z@*9MUMW1M#1})?;V4F2jjy02II`~tHyP1+>d3pw}Sni-S^8bJ|BX;1iM$8 z&f@~Vst?5!{a?JV8;lG54#tJ~4aNnzRN;g#(U=7NTG?AxRd}cm3?6WrEi(?mPE8`3 z_qWr*xFDCoxWMmVT(G|)PP|h7>!oXP6aQ1d>}3mkIIRsl>&~h8o0Q&n8a?2n`|p8- z&a3kLXy=2R?&5R@r=6VM$!dM}e3;*NaoWx4MNT(K7j&Kij>JlQ1z*KcI2y;`SR9A1 z;dp!<-@rF<0#3vPR^eNi#J6!0R^w!>!FO;9PQ?^X!!&AGi_`I4d=F>f`#2M4;cWZ> z=irAp7w2Ie&c_9~5EtQMT!KsSBm5Yb;V1Yheum3&1+K);QAY#6Koh^juP}r4_%*J= z)wl*5uo0WE8MC++*I^5OgWuwM+<>jvhTma3cHsAz%eWZ$=sb?j6X-lCymoe>^E5io zFyqgn^BiX{aC%7uk%_RgTS#@@lE>Rw@jZ|S-3Yn~bTjA=pg)3c0o@Av6X?&N+d#L2 z?f~5h`U~ihd_S={T=i$=n>GPpvORugPs6A33>{& z3-mPT8PGpK&w`!!3G4Z-U+e{TuWj(A%JQ MK>r233wjTq0xbmld;kCd literal 0 HcmV?d00001 diff --git a/sysdata/consolefonts/tamsyn/10x20r.psf b/sysdata/consolefonts/tamsyn/10x20r.psf new file mode 100644 index 0000000000000000000000000000000000000000..e9222b77d336baf4eeeedde32764cf5352cc7b62 GIT binary patch literal 10823 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 B)?5Gp literal 0 HcmV?d00001 diff --git a/sysdata/consolefonts/tamsyn/5x9r.psf b/sysdata/consolefonts/tamsyn/5x9r.psf new file mode 100644 index 0000000000000000000000000000000000000000..185806c5575d067809dc630076f27bc65c75dde7 GIT binary patch literal 2887 zcmeHI*_IVG6fGZo@U1=}&a+z*IDpHPc0s7Kzm`y^G>Ecz}UeD-uFwX;uhlI$esF5R(Yc|tQRhbUlm7(ZGL)%GIG z=GwnSo{5C>ZX&-x8d}{oYi(&`N`cyxwiN8sN*jx9-(pG`9niRSAn*TJ`VHpg}6{|Jvg4ho0(>W7Mhx1ic6uJ)Q8}Io|YR^9fc@aHi zd}O$uA}*Dnh-A<0^t)7S0_b2WG&?Wa98} zOgdM8)flCl-8-i)5>1RueF9jKaY5>8cxny5xt^r8d6E{AXIHyPN5GZ4g4JfASivu$`ZL7xDO8Pe72Lq{uJQZ;e$ zLHZDfyKw>N>_H)&G)>7>!>AZ{W*Y6IvkyXN-|CZav}>6r^hrqgzE8M86i8hIDq#%A z>vCv(7gWpIA${YD)&KUN6ySr?OJVY|%nc*-$x3f(I166Ym`POipnN}3)+4^y_9paH zGVP}q8Ug7+PP8^_O!T#6Y7XYz-)G$Ztp)6-{X%0h;s$Mz^L-7n@L-K?fh}7wu1s`g zNy`kfmf<^V%5W7!jxvrHKc=R%1MC@@OtYvyd~4d&ly-oxom9@>1pS6rnbg@htHVXt z+{7GVc{(b1YFc1R=1OJw7$WfcZ4ZS@)D5SBDL9;-IJ^ZM9+~h}mo=QxK z0n6X0Ztt}ZIVuR`I8zXaV6i?)5J>wl{pBn)704C3L56Wkm{=`u`JUe7;OX$4#yEV5=Y@^9D`$V z9FE5cI1wk|WSoLiF~Dg!9cSQ7oQ1P-4yJG}&cpe*02ksSTnvj#a49as<+uV@;wntz zYAnGuxE9ypdfb2vH{vGTj9YLkZo}=k19##s+>Lv1FYd$raCiU@;vqbYNAM^f!{c}Y zPvR*&jc4#Io6m_d1%zXcI=8 zx$!xSw(zr+WxEOyBpl6asL@WXb_KWxQb68;EQ7oYc@OeFWI5ym$O_1ZkdGiALsmjQ zfqV-24B{c5Lsmh)fXqO?gsg^q1z7|68uATfEo2?!TgZ2i?;#~*J!Au9BV-n`39=dT z17r@e1@a?gD`XpFJLD(G&yWi83*=YGZ;*M&4#@A2KOj3He?tC(?1Jou{0;dBvIqYH D?YdE9 literal 0 HcmV?d00001 diff --git a/sysdata/consolefonts/tamsyn/6x12b.psf b/sysdata/consolefonts/tamsyn/6x12b.psf new file mode 100644 index 0000000000000000000000000000000000000000..4ae9d6a4480198d161fc665bc51ba903c5675c51 GIT binary patch literal 3655 zcmeHJOSBzB6m1jBz#zjOWN;D0zx^MA_!GZ}ApY%t@lfJ-5mp585Ihla5#;Yi5*`vl zLVDdZxx+i`;aeGH*ux&YwYGguRrkFSFDpX>=iRE_b^7!^r%s)!dW&~1SRPRtY)2?y zcQhZ`j?{4!Eg7RM@wo0g3kQF-^00yH_1s|_M~O-?WM7yjG0i-Wt)J&@3{MZ)41Ib4 zoIYT5(7hcv?$UviujA7JkRxEGFpy~mTVj( zNh?c}*zBToZKvN@)S0W%r2T$6o#(cWsj>u#lZ3-GN#ZEV^r_=aUp7itHWW~jgmd)J zdgqeV4-X93In&0*nq@k0y?lSK^!mgVKOlgO?_wr(@ z$i0oZ3Y_D4S$4+91JC}Fq=p$L#pgkTXZ{OTv{QOid$M?Dmt?)vucY83)-4!78@@26CtjIl`>c=Q@Xg-_W5Bt z>CWe$F6#Wpv}gw#t-dm>%ZP5Ty70}$D#i2o_>;&n9?$P_l1$NWmgRM>)S|Ls{gjlj6v=|<4o3RE__02QWv zwFAnqzh-N|Q`*heog5^Jyh?{t{JL3A29Ez9|Je+r+z@&T_=BEDj^Av1ZHB*9faN@9gU2RlN<2qG--oJ~n4qQQ@)zGd;Nz{*7=Z^Vp)D>FvyV ztKpenPvm3y#LTb%`G!Go^Dyu%)kEK(`3$YbE+63LSR`8$IAH70+J$ywtxiR_YSk%#s*rhScRUt^v=&F225o1#7A>{WLJ{pt~AOGBO- zlc&bCuQ54mtW)4oRq>gzxQ zti1Q9Opn(ZmyY5>H_aPvaRp3y0^h7|-Jcyoi_ZGFo^Aui`Z< z!RvU#W^u@_yB6Jb=&skfb~mEC3Ej<{cn94rd~9Xgu8FV|c6TUMcb9g%4eo_3g}ez_ z26+qeHsl@1a>%=oamag+_aPrZRzN<4d<6LzG6DGnvJ&zsWEJEy$ZE*vkT&EC$d{0> zAZs9BL%xB03t0um9X#}rW4e!fySIv3?k#SmqT=4}xRZ9l7HcWemW7NyvPD{01uWJMN8T}})$$r+<_Fwr zIl1$QvrKQ&yj$$cQ^(s@&(g}_G>>XFjCUB->QT_t>Pcr<(~xPN4Wg2-$Jrnc8tNIP zb()l9$rH4rTFdc_QR5uNE@thO8S*^CF9(p3wQ;7r3oYcCmfd11%i8+DCV4*0bA@J* z=lXZJ!Lep>qvZ3vGwbj$%LZBId+<1OJoVkY>Gip@^q!nH7N4t#r5sn@=}q@KUc;VP zyk|aB6nx)#=KG3ni5WDD_t7Bvg3|=vjb8cEvz=vW6#21mqP2L>5g)=Nnd6J1mr@$|#dY?Y!*>rj{WM!b6V0 zPmzhJ;4%n&nhyith=&?NsaH*;{dynYw>2$>uPnbLQ+Khoh_kHIn+^F_MX51{6HpW? zXVG}dF{Fgv$Mc*5r*W}Gk;7Bd4B8=XvYdc078hqD@M>9(g)p%dU*_K!vQ_S!-i?c2 zPx!tTX~5IkEYdGI6l10p`G<6E7M?xN`lPp@ zV%|f`gvA-Z;8>H!d}=}&T7_*ghnG*zVMhnO)%`MHV;c2jS=#BkZo+xNlZyU4MI;z*vAIV=3mWZmi;nLe@GCkkM0$^N2yPV)u+VNS2)ns zp4P0_n|#%nDDCom-oSe@~??2vFb~# zF_hRg(wgr1Df`qo2bu{DAWVSrIoC|v&4Q|;aN%h*b+ zo+Z}UDqLzJ?IE0}?nDY2^1z?#)6I0+}?6r76FP{-*w183qaoQ-pEE*dxw=i>q_#)Y^D z7bC_cxD=P+a$JEcaTS`l8cT2uuElk@9ycJtjkpOnV<~RIt+)-#a69h6owy5k;~w0L z7Vg9ScmNOLAv}ynupE!#F+7eZ@FbqX(@60QR^VAYhv)GEUPK!&;bpvnSMeHNccWOa z>G#mzfc{1uYkva$&FF98zzg)Z^0JL}hbF?Mu)kBS`cvBMc5p8wgS-J*33(H;3i1|Y zHRNqb4tWRiF62GP8p!*Q4{3qYKvQ{ErE!*p&}xpqOuIgs;Gma zpj7ndSO*Vts6&S_L2#TyA3XG-g6I30m08`gC`TjAnas+U|NobN$*SyGTdta4VVlZ+ zh)y^h#)tMp6|=RQY;89$$MrJ?{>tTpnzgd5bx;PeZM{L8o?CNE(;RT)G`Hr!on6cU#bm1Lfvog^lTir}0(v9qyc zp3N~2Na%!DqU#1rEUO`3a2y^*UoUSidv!Z&3ryof8kvOd+qS6lBS$$Fta zsuYetPxd&QrygKquw=HosMLDxE95+goK<%sR8HeDzCIP}b=^~|pCLG9E)rj<>>MA@ zCxe<6C;+u_k)~cN)U+R*{)EHaa$MXen6KP0xg*99HclABOux2mPaj7ixGv z_Q`m_#c=8DSBue@-hQR~6wn`DMmr6^Zk6)Np_?UO`b)sKuLS%?mB6q%{J7-)!&Ns~ zx1V+0uEm|j5V%iyO>v(RaGw&8r3AFGAN5$vNShMSrUbMp0X6&0X5O?3(Qk&kr?{+a z`rWdhL1ha-*#b}-i*!?^4ie%@rCIYoWFnJ}kMG`X5=(8hJaq|3T>`R|fF2CpS?($! znKqMV)XeN${SH@-`W=A!?SXaM1M9a3wPvkUQ^w{}!GMhx#cgWc@u0$E%{SP; zY+4~(pHQK;-N&ZhUtpvrS#g_@tpr}p-C4z5Z*NVnMhUQM$s%a$Y}Rqt;-%~h*%z=c zX5VgC=h$%>@hJNk`$qP;YJ$!xU@8vB5jYY@;bROWG@Onz zFoH927S2Wu=ipqNhdR#3G+clSaS<-YCAbuq;c{Go>9`VC;c8riYjGW}#|^j@f4m$3(sH{p2c%` z9xvcU7`%j+@e0~_6|-#=2OK)f(OH4cN{zKMiq2|u)-dq3=&a*o1N$aTgiT>*OsP6s zb=YR7J0No)uR-QQUWd$syaAaHc@y#$B4Q2=WnRG2~;& z638czrI1e{pFuu{EQ5Rj`4aLKWI1F7WF=%3WE8R*vIg=sWG!SJWIbd9WFuq~i zmr3MGFd-zQ>a2f~UogKQpSAX_drVE3M^*OB-o3wd`Sx0S?e2Y699X`_;}&s0K_)z$ z#1H8w3g*^sa%<~(HSR8If0cMqvsRwB7UdACHe2_Z)iNzws(~JtYMBPd>SlHSx$|Rl z;e2GM^+S)dbufp(ELzux^C|z8q!C5EC@TNKR;}cDdXYGeEAu!m)xSuBpq;h?zZWXI zs9VHgTnq%Fin`sX$nznYd(5VuY6!wG;ueNtCl78cQo6863TGOIW!=y7S}kMdd4G$) z)l%*pkdUXTLP^#s#9~YamWNTQG%8M81!nFPBWc=JsxZ#7 zGRrhUFU#a#gF((ejRu`2%kl{g$~5hzsaZ*b)cJI>rt!%Xv!Uh^RQu+0bD3s&ceI-u zGhULLq0YvOf=M)WHdb^T;2gM_l1Rwxq|J;*Z;5CebvsQH-#5wWa6&^}XXAMs+mbLS zielWF@v(H_WNc*3N_AXx)QKEQX(~G2L3K2RA(0a*O=*}))7D3MS-Ea?k(c=GtgR)y z?;Mdyfxm;CwbA%#l&CRu4UgHb8bSdB9CO>Dwuq6oc-sy=~1|GU_TP`6RYJo{DZe z@c3MDH;pS)==umXTbVnH19d>C9gsjPV9k8BlDX^kt!d0y103D39@6^zWjs2yk^4IC zYq?KxKdhvy)VPW9H1`?qd%3R`7xcFQ5l+S_I2BEthSPBdVw{Pya5k3V9Gr{u(8Bq+ z02g8i7vW-Df&`c1GF*-}uE3SJ3MsC}HMkZTuEX`X0Xc5Oa@>RtZpJOR6Q!?!|o=!Topu4`LJ#;bA<2F+7UL@Hn2plXwbGV;s-mSv-dcJdYK40W0w$ zUc$@h;T61!*HGehyrHrwP+6vkRng(qL?ErlT+6meP+6~$R+6&qT`X2NH mXg}yj&`+SBK{KEOpkF}0f)0Xy1N{y<1Ud}*1N0~82>t@jmacgK literal 0 HcmV?d00001 diff --git a/sysdata/consolefonts/tamsyn/7x14b.psf b/sysdata/consolefonts/tamsyn/7x14b.psf new file mode 100644 index 0000000000000000000000000000000000000000..a473750d7816a1fbf8dd3b58a859e506d5aa2b63 GIT binary patch literal 4167 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 literal 0 HcmV?d00001 diff --git a/sysdata/consolefonts/tamsyn/8x15r.psf b/sysdata/consolefonts/tamsyn/8x15r.psf new file mode 100644 index 0000000000000000000000000000000000000000..0054a2b4f3ed691ef2bcd72e08ad90c94e0ecdb5 GIT binary patch literal 4421 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 qd%4T-YdG@`(`|h62ilaSiQ*0soIQ7CI z%ZKWL!fcI5w}wIf*uUTZ`P2(Soz-f!^MWKP6qt5;l>BKs??RgBuzgN+{1(H}-TZl; zI1fE0J9|#Qea8M-JX&Au&nP(;Pptm}Uh;)7JROEB){jj#s~amsl}IX8Wb*}!#Rlit z&2$j7g<(FOE(O-vj(X3m;EHMW@rK?}tJOMY)VsUqYOJ(-`Z7UaOa?(l5yEWNBq5s( zEn_j)$R(U0`E7PfbdOw)iX1pgE$4EEm`-Q3$uO)`^h_!0?pZVtMI|d71<>IhMSK0Gncm(tBp)Xdrz50r81nP=V@q|JIv{CSO=W5B}Gfn)q9yHNA`$z z-T6-o7Tb80ZvS)mztIk`M&>*7&Ff@ikiFkce`9jx%zP`T2y_N84&5}vcZ=H?4_nw~@lcfvQB)nWnDJMJ*_{UtR}%8wQB-j9N?0F3mR{D`4}!AA%%w_a zoWH1ATexgtt?K+!&Zy?>buI6&*SpxPd^E7AhxX!lRDM-+>!D*)3M_w2&!qK?rqi6W zS7z+FOgcSm`Bg3IX0g#eqF>`;F87>>`B?yi@%kHP zN{rZF$@H?t_Kg2-{j`7d*R6j_S2*LNW+M{&rxTh=P45U*i}jUt0l0j)_$I`3osL94 zh!g9dO6dZK*PqxFz-W1sAI`D@xWyZq&UCWq&fnQ1Q~fyC3K^ zqkRw4zK3bg!`UF^-4`hDVaj`$_2yyvR4TN$uWD~E=)w{Bvye}yG39RiW zu(p@PTp|Cy;A184(dlmzw~W7X+*Om~^-Zbxy!!(6(;qf_Uoif~*!mY^ogc;S_*H(A znEOSaPw{;)l`iQ&Af<{?N_vhlfY_&HaI?UOK?|29}!p%?Q7u z1E)4`glf&hYCN@R3;PE4_3WG2Pw3gzdfZC9i~R`uLH0FD1kIg5h;|e(8AV)!YcT~= zF%8$@dfb2;F&#Id12ZraH)9rV!EDSyC+6Z-+=dcvM;UjZf-Xe36II-WZp=dsb@bqF z%ttTo!2&Eq9~NOT?nOWD!~Ix-2k;;s!cshpNAM_?;V}$gIUdIocoI+HX*`2x@f@DV z3wRMPVGu841zy3ccnz;(C5EsHZ{SS~<1I9F6z3e8+tA#O<_;BWa~GPs(cHtp_oBIv zj|1$7R3dZ=m7?Y`H5}KkCn2jL??Bc--i5pec^|SC@&V*S$VZTMkdGnjA)i1#g?t9t z0QnrU5%L9O6XZ+CX2@5NEs(Dv-$1^FY=wLW`5y8EWE*5VWCvs?WEW&NWDn#=$X>`k y$bQHH$U(><$WM@;A%`KqKz@b%1~~#b3i%!K2jm#!Psm@8= surface.width { + cursor.x = pos.x + cursor.y += font.height + font.line_gap + } + if cursor.y + font.height > surface.height break + + dest := @inline(indexptr, surface, cursor.x, cursor.y) + src := glyph_data + rows_remaining := font.height + + loop if rows_remaining == 0 break else { + byte := *glyph_data + pixel_dest := dest + mask := @as(u8, 0x80) + bits_remaining := font.width + + loop if bits_remaining == 0 break else { + if (byte & mask) != 0 { + *pixel_dest = color + } + pixel_dest += 1 + mask >>= 1 + if mask == 0 { + glyph_data += 1 + byte = *glyph_data + mask = 0x80 + } + bits_remaining -= 1 + } + + glyph_data += 1 + dest += surface.width + rows_remaining -= 1 + } + + cursor.x += font.width + font.char_gap + current_char += 1 + } + return } \ No newline at end of file diff --git a/sysdata/libraries/render/src/text.hb b/sysdata/libraries/render/src/text.hb new file mode 100644 index 0000000..4689610 --- /dev/null +++ b/sysdata/libraries/render/src/text.hb @@ -0,0 +1,75 @@ +.{log} := @use("../../stn/src/lib.hb") + +PSF1Header := packed struct { + magic: u16, + font_mode: u8, + character_size: u8, +} + +PSF2Header := packed struct { + magic: u32, + version: u32, + header_size: u32, + flags: u32, + num_glyph: u32, + bytes_per_glyph: u32, + height: u32, + width: u32, +} + +Font := struct { + data: ^u8, + width: uint, + height: uint, + num_glyphs: uint, + bytes_per_glyph: uint, + has_unicode_table: bool, + line_gap: uint, + char_gap: uint, +} + +font_from_psf1 := fn(psf: ^u8): Font { + header := @as(^PSF1Header, @bitcast(psf)) + if header.magic != 0x436 { + log.error("failed to load psf font: not a psf1 font, idiot\0") + return idk + } + + psf += @sizeof(PSF1Header) + + return .( + psf, + 8, + @intcast(header.character_size), + 256, + @intcast(header.character_size), + false, + 0, + 0, + ) +} + +font_from_psf2 := fn(psf: ^u8): Font { + header := @as(^PSF2Header, @bitcast(psf)) + if header.magic != 0x864AB572 { + log.error("failed to load psf font: not a psf2 font, idiot\0") + return idk + } + + psf += header.header_size + + return .( + psf, + @intcast(header.width), + @intcast(header.height), + @intcast(header.num_glyph), + @intcast(header.bytes_per_glyph), + (header.flags & 1) != 0, + 0, + 0, + ) +} + +get_glyph := fn(font: Font, index: uint): ^u8 { + return font.data + index * font.bytes_per_glyph +} \ No newline at end of file diff --git a/sysdata/libraries/stn/src/assets/sin_table b/sysdata/libraries/stn/src/assets/sin_table new file mode 100644 index 0000000000000000000000000000000000000000..0d1c9d8b1737b6f0e24ea094333419297756bd95 GIT binary patch literal 728 zcmXZUJxc;m7(ijO4>L{8vNBCg%b+ocen8M)DA1|Jp`oFmKw6v{S{hthirQ@`h^R>l zY-tLjIS7KF7HPEMoVz^tyzk`(0-Tms`?y4cc&D{~IyHc8-5I2_L)g*15S<^!XWb3^ zegq$NJ3=R;c&pV>x~CU0dM%D0+DOoaF?`UCB>k&L<8*EUuXQ~|ziDlf?rLL-j!t7! zGimx=KS6wPHKhzh^l$h7_ vO1ru`&wgKT^he7J>??Y#_xh>vGVfM&QxCMMEq&5={n9@TF7jVkW17%^E6g+* literal 0 HcmV?d00001 diff --git a/sysdata/libraries/stn/src/assets/this-is-temporary b/sysdata/libraries/stn/src/assets/this-is-temporary new file mode 100644 index 0000000..e69de29 diff --git a/sysdata/libraries/stn/src/math.hb b/sysdata/libraries/stn/src/math.hb index 563e9c3..9108919 100644 --- a/sysdata/libraries/stn/src/math.hb +++ b/sysdata/libraries/stn/src/math.hb @@ -30,26 +30,30 @@ Vec2 := fn($Expr: type): type { return struct {x: Expr, y: Expr} } -SIN_TABLE := [int].(0, 174, 348, 523, 697, 871, 1045, 1218, 1391, 1564, 1736, 1908, 2079, 2249, 2419, 2588, 2756, 2923, 3090, 3255, 3420, 3583, 3746, 3907, 4067, 4226, 4384, 4540, 4695, 4848, 5000, 5150, 5299, 5446, 5591, 5735, 5877, 6018, 6156, 6293, 6427, 6560, 6691, 6819, 6946, 7071, 7193, 7313, 7431, 7547, 7660, 7771, 7880, 7986, 8090, 8191, 8290, 8386, 8480, 8571, 8660, 8746, 8829, 8910, 8987, 9063, 9135, 9205, 9271, 9335, 9396, 9455, 9510, 9563, 9612, 9659, 9702, 9743, 9781, 9816, 9848, 9877, 9902, 9925, 9945, 9961, 9975, 9986, 9993, 9998, 10000) +SIN_TABLE := @as([int; 91], @bitcast(@embed("./assets/sin_table"))) -sin_i := fn(theta_deg: int, amplitude: int): int { - theta := theta_deg % 360 +sin := fn(theta: int, amplitude: uint): int { if theta < 0 { - theta += 360 + theta += (-theta / 360 + 1) * 360 + } else if theta >= 360 { + theta -= theta / 360 * 360 } quadrant := theta / 90 - theta = theta % 90 + index := theta % 90 - sign := 1 - ((quadrant & 2) >> 1) * 2 - complement := quadrant & 1 + if @as(u8, @intcast(quadrant)) == @as(u8, 1) { + index = 90 - index + } - index := theta * (1 - complement) + (90 - theta) * complement - sin_value := SIN_TABLE[index] * sign + value := SIN_TABLE[@bitcast(index)] + if quadrant >= 2 { + value = -value + } - return (sin_value * amplitude + 5000) / 10000 + return (value * @bitcast(amplitude) + 5000) / 10000 } -cos_i := fn(theta_deg: int, amplitude: int): int { - return @inline(sin_i, theta_deg + 90, amplitude) +cos := fn(theta: int, amplitude: uint): int { + return @inline(sin, theta + 90, amplitude) } \ No newline at end of file diff --git a/sysdata/programs/render_example/src/examples/text.hb b/sysdata/programs/render_example/src/examples/text.hb new file mode 100644 index 0000000..98789d6 --- /dev/null +++ b/sysdata/programs/render_example/src/examples/text.hb @@ -0,0 +1,23 @@ +.{Vec2, sin, cos} := @use("../../../../libraries/stn/src/lib.hb").math +render := @use("../../../../libraries/render/src/lib.hb") + +/* expected result: + words */ + +psf := @embed("../../../../consolefonts/tamsyn/10x20r.psf") + +example := fn(): void { + screen := render.init(true) + font := render.text.font_from_psf2(@bitcast(&psf)) + t := 0 + str := "Hello, World! +This is a test +of multiline rendering\0" + loop { + render.clear(screen, render.black) + render.put_text(screen, font, .(t, t % screen.height), render.red, str) + render.sync(screen) + t += 1 + } + return +} \ No newline at end of file diff --git a/sysdata/programs/render_example/src/main.hb b/sysdata/programs/render_example/src/main.hb index 289d812..3edd356 100644 --- a/sysdata/programs/render_example/src/main.hb +++ b/sysdata/programs/render_example/src/main.hb @@ -1,3 +1,3 @@ -.{example} := @use("./examples/surface.hb") +.{example} := @use("./examples/text.hb") main := example \ No newline at end of file diff --git a/sysdata/system_config.toml b/sysdata/system_config.toml index a97af89..f556282 100644 --- a/sysdata/system_config.toml +++ b/sysdata/system_config.toml @@ -28,8 +28,8 @@ resolution = "1024x768x24" # [boot.limine.ableos.modules.diskio_driver] # path = "boot:///diskio_driver.hbf" -# [boot.limine.ableos.modules.render_example] -# path = "boot:///render_example.hbf" +[boot.limine.ableos.modules.render_example] +path = "boot:///render_example.hbf" # [boot.limine.ableos.modules.serial_driver] # path = "boot:///serial_driver.hbf" @@ -37,11 +37,11 @@ resolution = "1024x768x24" # [boot.limine.ableos.modules.serial_driver_test] # path = "boot:///serial_driver_test.hbf" -[boot.limine.ableos.modules.horizon] -path = "boot:///horizon.hbf" +# [boot.limine.ableos.modules.horizon] +# path = "boot:///horizon.hbf" -[boot.limine.ableos.modules.horizon_testing_program] -path = "boot:///horizon_testing_program.hbf" +# [boot.limine.ableos.modules.horizon_testing_program] +# path = "boot:///horizon_testing_program.hbf" # [boot.limine.ableos.modules.dt_buffer_test] # path = "boot:///dt_buffer_test.hbf"