From 397ff19d80e6e61ec453cdc10d189f4f393782a9 Mon Sep 17 00:00:00 2001 From: Dennis Ranke Date: Sat, 1 Jan 2022 15:37:17 +0100 Subject: [PATCH] test remaining control codes --- examples/curlywas/control.cwa | 4 ++++ platform/bin/platform.uw8 | Bin 2701 -> 2710 bytes platform/src/platform.cwa | 9 ++++++++- site/content/_index.md | 2 +- site/static/v0.1pre5/index.html | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/examples/curlywas/control.cwa b/examples/curlywas/control.cwa index 623aade..e9202b5 100644 --- a/examples/curlywas/control.cwa +++ b/examples/curlywas/control.cwa @@ -13,7 +13,11 @@ data 0x20000 { i8(14, 10, 10, 10) // scroll down 2 lines i8(31, 40, 3, 14, 10, 15, 0xf0) "Other colors" i8(24, 0xb0) "inverted" + i8(13, 10, 8, 8) "->" + i8(10, 10, 9, 9, 1) "|<-" i8(5, 31, 7, 28+17, 15, 0xe3) "Graphics text!" i8(5, 31, 6, 28+16, 15, 0xe5) "Graphics text!" + i8(4, 24, 14, 10, 0x90, 0x80, 0xf1) + i8(31, 37, 29, 0xf1, 0x80, 0x90) i8(0) } diff --git a/platform/bin/platform.uw8 b/platform/bin/platform.uw8 index 7c8c182dc142054d9706f26291e80733f9a57995..5ae23fafecb1a6850b110809307e675ed012b734 100644 GIT binary patch literal 2710 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 Q!i+L>|1w;?TBAwuFo>mGGynhq literal 2701 zcmV;83Uc)V4u6>^c5|Aoq-!V;;a#6?bLBN~;W7FN5yg<^M>h(T0fdpRwb$KSdW>)z8FAmgG9I!&Li4vYYIdYqoRU z(IUhx=gQ|mf8;Ui&Tp{LQ5Id>xj#h;`dT)`>fFk}q3<1+CxAE)_a+^CQIUp@R6Z`( zos7i+zK+f35^&@GB0EsFE(R`CGo8tTt|4xdc3^Ihh2^ldk5k#+*SBU-mW9Qde`IRa zj_8xjnN*qQ%sC-J)0M%g?O^@1HOe;f(M=47y%A>*ZsF9p2hmv7fqhr(JF0P?}Zqi|hIESv^yv`4Luma_dR6NGQBp?^XJ2t)zI0PD~?V z)9*3?FBKhwz9q{r_7 zMv@}qZwp;K(LAlDNrhxqgC2<3C|~x?M!etRopRu8W7tLRMJ}&_&6D+G6w3^dnZ&!A zP%T8cDOUei*QLs@Ip;S?BwInso=gbT8Zm06#>{r3oUgH8RTshqiVp^jLK-en;VDgwK>MN#VgXFv(l>1knVfG53Va@PPW(?=zxm{P!2YB_IeMq}Zk^ z`D-^_usyTB;9l_~fp$(ld8||7f||UuePR4{BA5QhAxGm(tij&_@gj0bH zK5?%xvp=EwwEhSH;nnJB@ox^LL%gj?rnK3fQM5E^TRFV4pSisbr zl=*ZlF`rIwBQIw!fVziRJ--h?FqtI+`#vY-c@jWeIXdx?B*}4oMiK)a!K`ZSfX!?x zf6S3bWY&V>(1E;j8N4(bmhVhe_7<2D97&me)-gE5<)JxYi5Jt+GTsg5lHHsGJ+7EHyXmlBzPja z;OvGBbIqmeT>diGZzI<56EE{t@2P-w!qZS?+uVS;&tdu4d;09?!Gli92`;K+?AA6{ zP1OPe;+NdB=4jW#wjBij2jINe z(Jl=yD&+(|URG|R6;W(utqOx$;poMUBm5FFvI?$5D zoQA8D00jdwlI#?JM8C-kgbytrRI32vQxDmQDHSk-7uQ%56k$**cqlgbDKg=ie z4H#B0T{W0=`;d+GZ*3i*oN?%_e?T_QWvgPaFNyioGTq42{0?9qpJ=S}ODDR_j z`#N6t^kjQ&*yTlLSw-afTQgX77dLk3APGJ%X}5aMYg-(*(Q6bZxx$z1s_@OSK0}(m zOW;6g$ZEv~=Amo0po34MdT+dk0=ynzp(vr(KzNUld=i}_$97+ZspR^78s=Y??kmV! zFG9?kBOWIc2`(iR3Q$Sh?-^v&bVdUp9I`)$D<#yfGW5g&xd^b`E7eobKEbxk^ZbP= z4?gibUKr(ggD+(M8FvjaU83Od%c_|k5axU339$4f*}@_ig_eLok91W3Ol<$4;S@DY z9~s|InR4#h8tyC&!&IpKCqOOei$DmAwmmH(MnsBmPyD~&V5&*kjl@RsjhD7;?&%0j zSb6Rf?k&-kA6+T{p7|Ze`J7!|mG02$ijAbGoAZ0M8N~n&OG@jd`-~^XEH%ezWTzAmPYD1wnig8ijK*e?YrMraZsZY3J9f)tR+&O^+ zoI3TB$*O%ja45aU00j2E#?kcH;fzMPV z%(A$3@ZKc;L+se}YF`?n1eo^Yc!Lq(g7AlBivo}n`6T=gVHT}PqJu}1flncF%4o>xrYby1ydE@d6@ z`xYwt?;JznHR6`!ecRFKBh!0#28o-r$$spm>!B0E1wQq}^>fG!@uF&T{Lb>o+3Ust zwJLI09Znd_hWj^TR4+2K_Kfw_@*a6ueI{}9*b+u7ow$#<7*DFg@8!Y@y#0T6a@QWz+HH*T2Y3uGT!KeS zpw<5tD@+iBPtn?Oi9*@M<}V)9pNhiPk@o)(%H(jZE2ri-ESI~zV?TD>79;uJfbc*Z16Bex zqW$suWXv@j_khizY+ea|U@;KYXbUGgzR+rsPdN4f=%jMXO(~A>2N!$}ZtM(Rp>Ce< z3F7_t1-y)cfW-vo9#O>f*aD H)0{Rs3|nTI diff --git a/platform/src/platform.cwa b/platform/src/platform.cwa index b704a1b..67ef63e 100644 --- a/platform/src/platform.cwa +++ b/platform/src/platform.cwa @@ -326,7 +326,7 @@ fn printSingleChar(char: i32) { if char == 4 | char == 5 { graphicsText = char == 5; - textCursorX = 0; + textCursorX = 0; textCursorY = 0; return; } @@ -341,6 +341,9 @@ fn printSingleChar(char: i32) { } if char == 9 { + if !graphicsText & textCursorX >= 320 { + printChar(0xd0a); + } textCursorX = textCursorX + 8; return; } @@ -406,6 +409,10 @@ fn printSingleChar(char: i32) { return; } + if char < 31 { + return; + } + drawChar(char); } diff --git a/site/content/_index.md b/site/content/_index.md index ccdd576..5cf5fdc 100644 --- a/site/content/_index.md +++ b/site/content/_index.md @@ -120,7 +120,7 @@ possible but no examples are provided, yet. ## Examples * [Fireworks](v0.1pre5#AgwvgP+M59snqjl4CMKw5sqm1Zw9yJCbSviMjeLUdHus2a3yl/a99+uiBeqZgP/2jqSjrLjRk73COMM6OSLpsxK8ugT1kuk/q4hQUqqPpGozHoa0laulzGGcahzdfdJsYaK1sIdeIYS9M5PnJx/Wk9H+PvWEPy2Zvv7I6IW7Fg==) (127 bytes): Some fireworks to welcome 2022. -* [Skip Ahead](v0.1pre4#AiP94km33q5hBFbBcKl2W1ZMY67wHByUz15/qRHIr71Dvq8bTVux/DXZzSTKU5MufRXxnGEn6mOul4dil/5WLT1Y+Y/4TGd1E3U4rQaxlpcKObxc5YLdr4xo6jyBND96a569LoECv6Q4EIqxJi+3QPE21r/++js41XsBLr44X/O2XpP3kHQva3B8o6duD5WkLCf7PhsxjTBeND1ADIaJe05JCrBim18RPY9VYFmltqQ9gVzbxE/ZpojR/GJ4aCbx0hRn73RPhpA7Cd4jk0AVSOeRx+7kuHrLzpaeqeYWK5pYd/4Rv+8=) (230 bytes): A port of my [TIC-80 256byte game](http://tic80.com/play?cart=1735) from LoveByte'21 +* [Skip Ahead](v0.1pre5#AgyfpZ80wkW28kiUZ9VIK4v+RPnVxqjK1dz2BcDoNyQPsS2g4OgEzkTe6jyoAfFOmqKrS8SM2aRljBal9mjNn8i4fP9eBK+RehQKxxGtJa9FqftvqEnh3ez1YaYxqj7jgTdzJ/WAYVmKMovBT1myrX3FamqKSOgMsNedLhVTLAhQup3sNcYEjGNo8b0HZ5+AgMgCwYRGCe//XQOMAaAAzqDILgmpEZ/43RKHcQpHEQwbURfNQJpadJe2sz3q5FlQnTGXQ9oSMokidhlC+aR/IpNHieuBGLhFZ2GfnwVQ0geBbQpTPA==) (229 bytes): A port of my [TIC-80 256byte game](http://tic80.com/play?cart=1735) from LoveByte'21 * [OhNoAnotherTunnel](v0.1pre4#Ag95rdCB5Ww5NofyQaKF4P1mrNRso4azgiem4hK99Gh8OMzSpFq3NsNDo7O7pqln10D11l9uXr/ritw7OEzKwbEfCdvaRnS2Z0Kz0iDEZt/gIqOdvFmxsL1MjPQ4XInPbUJpQUonhQq29oP2omFabnQxn0bzoK7mZjcwc5GetHG+hGajkJcRr8oOnjfCol8RD+ha33GYtPnut+GLe4ktzf5UxZwGs6oT9qqC61lRDakN) (177 bytes): A port of my [entry](http://tic80.com/play?cart=1871) in the Outline'21 bytebattle final * [Technotunnel](v0.1pre4#AqL8HeK1M9dn2nWNIF5vaq/Vh64pMt5nJIFoFKpBMPUsGtDtpqjo1JbT9LzPhAxCqJ7Yh4TA6oTGd4xhLowf+cWZMY73+7AZmfXJJsBi4cej/hH+4wlAgxFIrnOYnr/18IpnZbsHf0eGm1BhahX74+cVR0TRmNQmYC7GhCNS3mv/3MJn74lCj7t28aBJPjEZhP9fGXdG2u5Egh/Tjdg=) (158 bytes): A port of my [entry](https://tic80.com/play?cart=1873) in the Outline'21 bytebattle quater final * [Font & Palette](v0.1pre4#AgKaeeOuwg5gCKvFIeiitEwMpUI2rymEcu+DDB1vMu9uBoufvUxIr4Y5p4Jj2ukoNO4PE7QS5cN1ZyDMCRfSzYIGZxKlN2J6NKEWK7KVPk9wVUgn1Ip+hsMinWgEO8ETKfPuHoIa4kjI+ULFOMad7vd3rt/lh1Vy9w+R2MXG/7T61d3c7C6KY+eQNS0eW3ys4iU8R6SycuWZuuZ2Sg3Qxp826s+Kt+2qBojpzNOSoyFqyrVyYMTKEkSl0BZOj59Cs1hPm5bq0F1MmVhGAzMhW9V4YeAe): Just a simple viewer for the default font and palette. diff --git a/site/static/v0.1pre5/index.html b/site/static/v0.1pre5/index.html index 658f372..2aa2b1a 100644 --- a/site/static/v0.1pre5/index.html +++ b/site/static/v0.1pre5/index.html @@ -1 +1 @@ -MicroW8
\ No newline at end of file +MicroW8
\ No newline at end of file