From 5dbfb6603e130178ff57438c6498de4fc7efd361 Mon Sep 17 00:00:00 2001
From: neauoire <aliceffekt@gmail.com>
Date: Mon, 10 May 2021 20:52:57 -0700
Subject: [PATCH] Progress on nasu redesign

---
 build.sh                      |   2 +-
 projects/pictures/cyr10x8.chr | Bin 1024 -> 2048 bytes
 projects/software/nasu.usm    |  58 ++++++++++++++++++++--------------
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/build.sh b/build.sh
index 67c690a..7fd87ce 100755
--- a/build.sh
+++ b/build.sh
@@ -34,7 +34,7 @@ else
 fi
 
 echo "Assembling.."
-./bin/assembler projects/demos/life.usm bin/boot.rom
+./bin/assembler projects/demos/polycat.usm bin/boot.rom
 
 echo "Running.."
 if [ "${2}" = '--cli' ]; 
diff --git a/projects/pictures/cyr10x8.chr b/projects/pictures/cyr10x8.chr
index 91ee7cea7078fe6ad36d49e0ef1beda00b18c2fe..191e84c84521916db2db5746a83a02b970772d8a 100644
GIT binary patch
literal 2048
zcmeH{-%ndr9KcUo+DkIli$)y@&~{I1_J9i-W-idyS7W9RhM0^Mos0)z#qgs;484vB
zCQF9dgTx>fm*}EP_QPdpT-d#A$vTtGF452^EBCUF6@m8NdX?L9?!CwFY1d@`gMJ^*
zr{CW1_j|rS&N*0Dl3&lgJ%kXduB(5>P6#nEuBrtcM9Y8<Vz-xd(=;tGXl@Qs-G2Kv
z&vCEz4IUq%{vbBn2cx5n?=V+)*+8STTb5-L?_D(LSD>O}8?NtRsCA*P3$1UgXS3OV
zRAdKd5N48})^$A$oQzNEo59!nN1{>T7O?;L`$A&sLN2?p_FFqYC$HWI8jz7?nMLrX
zA(599h<{3yyu`p!FG4Db3YO~fP?CasY+yZcAsmiynk@1q2Uu(lhJ_+66YB~>FBsOT
zVN4RuCS}EjcERjCbck`3_t7!kcV&xZYupU{sVG}HJ-PXWImtCP&W;mGZ)}Qy|HO&Y
z-~ZLgy*z*B^kt1!8C(oHdiy%tI#Zq8k&aNf%|4!f54iBk%qHE3&|FIr6-*O;WRi&r
z_pmWRh_Osdm@?d<X?T1DQmHVONXu%WXiAD^Kt(1kiq$Z#(Bb^}W-hlPq`R*yQI_|4
ze6_Y8K76wo+VO~x&Dgc`)PmBA3e(ePznQ2IW~J+&9eujONbtZ|@GEil5kEh5{#ftE
zYSt`K&YCaw%Ra=<&Al{`X=2!>rta>Mg*f!G!nTEbX(BI@{g>{h>7E5#G)zoP1KLmN
zlaWt`*)=Itq?l{RC`pBe5R0#>hGhy;CSNct?1Ba`nM{QNB+4pC$SWx{=Ui%eIhkC$
zE-&7=5s$B3KX`E8^WWxoU~WF&oVr7lJHIR~{ZV7V9BXUqYAiuYDAW<u($TmwKiEGs
zG&D~+IQZ1WhtWdhSl_O2h3%Fn=Q?rua*1cg$8}xH|E&!Ul$;$^j`^kReJEsm;%4@K
z4oHKKLa`P8^gA3%kBPtgxy(qU`)IJEqlICdE*}KJ#T`s9B`y{UhGCH?A!D{sC`^fh
zfi7K%jV&z4W0b9R2(?58HaAl%0=QOJH+cLE>uId#I8K#C@$N~U*TaceEEEdCccvi_
z2teSWq2b{kg!aE%<#I8!>)F(o9@NEy2}0by=XTqiP8ZMfAFbx|YN+?f4Et>4T%e1x
z=iKgF7uW7&O#}Gg_LgBB_B4Dk+t~S503n`7fq;tval74gCaNsUcp&=2RY6E;1EVdR
z-`_ybz+)0!K0B@J+0?Aae+u>@?{SyXK%%IY%yN#h?tT)QNX5`tuh;93wQ8&+NkS_m
z%8R0m9DYF%B)IRWx~j@)14|w66pM7OdrOYW3Z>77x(X0Ql43oSjAL(Y^(VL9$lz3N
zcz)?M2jkkar>VLI>)UIY#QGLdyo7k!79BXnFwGcZ7zItoIw`1XKL2YnJ`OKP;AA{G
z)7ajA*zIz_i{NzTwqcBBu{etT;6Vt-l?g`;G9y?cM1xpqQI;R9rQ-=Jm)rPrQ%@X#
w*DDV8H!YK+BvC&*_v1AI7`j9&6yWAFtaM|NQjvrxH6o<Ka<~3p|EnGN7vYVY2><{9

literal 1024
zcmd^7&rcIU7@bnmH36x{A0e@H<H;Bg)o=h)Xp1K=1}}ySm0|)M6pH~VO-;A42|Z|R
z;z2N&6g`LuiC_#IB)E;2dO*s-fClJR2rSxmr<=xZ%k1np!@uE6CST^8{oZ@?cFdfW
zpPV{dLkPhDlw?{702u2AAvG&25vQ~6_|RDJVJH-8y2CBi85E}E);!dZsnX~Jpaz%<
zg}*8ni%g_qTCU^fP;l&ln2ygWg`K_cE?_bN!_X@{(TTtVP$Ys#Dh=V%L3$2QP&or5
z4U%*-HlB?lrjNbd-5SDFDU*jVuV@>&lQ?E>;uCS=bzYr+^ZaA!-k`VLyX|$}?dtI_
zUz^IYIYPNHrbXUJxA+sHnDBR%N+=qnR1z%dR0%UNYYCy<zJ+x~$%x=GZ)KCzN^*by
zRx<z%Z9@3-`}#%zCT8A_GmqMf{xgA&)^Nw`<jcsk&-W)=z*mN42WNFSdV7QIDeAR-
zd25&P=+r(&1Un#ulmHd|2w0S4wW1ryLJe@T%<~e|D3tBZ%~WddOK0b$i_^tJ0>7=U
zpJ=Q%L`i~7dtq^8Xk_H{_#>ebxIb9ucNuoY@;DmRw2}(UwdTe3!j1xA8B(?o760^;
zhH1wr5a{b?^Qd}=bow&|Lc+k~@o6v-ZliZ=2@L0s+3ao&X13R!L?W6$J!$iJJOq6`
zS!=OyFz!FnUz&aQ^p~m@`Fhhi>xF^Y+UxUsD|ubF+ikBRl(0<iP|RktXjqtWy4^OG
z0fn$R6O)VCWF)g%JZdPXs5uHlS2;<N#I~sD7DWlN9y+X6X~~>t8<H5P&=|8ctI@^v
z8%Qf_a{3@oAWz~P*UTPBv8bv)*48GQT&~+n8DWg8)ev&CVWQDRzu7euMfsi6()8`M
brr3et?)e~6MbXd^2c-zjhP7En|1<sp52E-Y

diff --git a/projects/software/nasu.usm b/projects/software/nasu.usm
index 695d2e4..9ab2b75 100644
--- a/projects/software/nasu.usm
+++ b/projects/software/nasu.usm
@@ -334,6 +334,7 @@ BRK
 	#40 SFT ADD #11 ADD
 	.settings/ratio POK
 
+	( release ) #00 .Mouse/state DEO
 	;redraw JSR2
 
 BRK
@@ -555,14 +556,6 @@ RTN
 
 	.editview/x1 PEK2 #0002 SUB2 .editview/y1 PEK2 #0002 SUB2 .editview/x2 PEK2 #0001 ADD2 .editview/y2 PEK2 #0001 ADD2 #03 ;line-rect JSR2
 
-	( grid )
-	.editview/x1 PEK2 DUP2 #0080 ADD2 .editview/y1 PEK2 #0020 ADD2 #03 ;line-hor JSR2
-	.editview/x1 PEK2 DUP2 #0080 ADD2 .editview/y1 PEK2 #0040 ADD2 #03 ;line-hor JSR2
-	.editview/x1 PEK2 DUP2 #0080 ADD2 .editview/y1 PEK2 #0060 ADD2 #03 ;line-hor JSR2
-	.editview/x1 PEK2 #0020 ADD2 .editview/y1 PEK2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
-	.editview/x1 PEK2 #0040 ADD2 .editview/y1 PEK2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
-	.editview/x1 PEK2 #0060 ADD2 .editview/y1 PEK2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
-
 	( position )
 
 	.editview/x1 PEK2 .Screen/x DEO2
@@ -584,21 +577,17 @@ RTN
 			.settings/ratio PEK #04 SFT LTH STHr
 			#0101 NEQ2 ,&outside JNZ 
 
-				( draw zoomed tile )
-				.Screen/x DEI2
-				.Screen/y DEI2
-				#01 ;draw-tile JSR2
-
 				( get tile ) DUP2r STH2r .Screen/addr DEO2
-				( get blending ) .settings/blending PEK
-				( get depth ) .settings/depth PEK #20 MUL
-				( draw ) #20 ADD ADD .Screen/color DEO
+
+				( draw zoomed tile )
+				#01 ;draw-tile JSR2
 
 				( incr ) STH2r #0008 ADD2 STH2
 				,&resume JMP
 			&outside
 			;halftone_icn .Screen/addr DEO2
 			#23 .Screen/color DEO
+			#00 ;draw-tile JSR2
 			&resume
 			( incr ) SWP #01 ADD SWP
 			DUP2 LTH ,&hor JNZ
@@ -608,19 +597,44 @@ RTN
 	POP2
 	POP2r
 
+	( grid )
+	.editview/x1 PEK2 DUP2 #0080 ADD2 .editview/y1 PEK2 #0020 ADD2 #03 ;line-hor JSR2
+	.editview/x1 PEK2 DUP2 #0080 ADD2 .editview/y1 PEK2 #0040 ADD2 #03 ;line-hor JSR2
+	.editview/x1 PEK2 DUP2 #0080 ADD2 .editview/y1 PEK2 #0060 ADD2 #03 ;line-hor JSR2
+	.editview/x1 PEK2 #0020 ADD2 .editview/y1 PEK2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
+	.editview/x1 PEK2 #0040 ADD2 .editview/y1 PEK2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
+	.editview/x1 PEK2 #0060 ADD2 .editview/y1 PEK2 DUP2 #0080 ADD2 #03 ;line-ver JSR2
+
 RTN
 
-@draw-tile ( x* y* color -- )
+@draw-tile ( color -- )
 	
 	( TODO: complete )
 	STH
-	.Screen/y DEO2 
-	.Screen/x DEO2 
 	#00 #20
 	&ver
 		#00 #20
 		&hor
-			DUPr STHr .Screen/color DEO
+
+			( get x,y )
+			SWP2 OVR STH SWP2 OVR STHr
+
+			( get address )
+			.Screen/addr DEI2 
+
+			( after this, ADDR XY )
+			SWP2 SWP STH
+
+
+			( got sprite line )
+			#04 DIV TOS ADD2 LDA
+
+			( get pixel )
+			STHr #04 DIV
+			#07 SWP SUB SFT #01 AND
+
+			.Screen/color DEO
+
 			#0001 .Screen/x DEI2 ADD2 .Screen/x DEO2
 			( incr ) SWP #01 ADD SWP
 			DUP2 LTH ,&hor JNZ
@@ -748,8 +762,6 @@ RTN
 
 @draw-preview ( -- )
 
-	( .preview/x1 PEK2 #0002 SUB2 .preview/y1 PEK2 #0002 SUB2 .preview/x2 PEK2 #0001 ADD2 .preview/y2 PEK2 #0001 ADD2 #03 ;line-rect JSR2 )
-	
 	( stash address )
 	.settings/tile PEK2 DUP2 STH2 .Screen/addr DEO2
 	#00 #04
@@ -768,7 +780,7 @@ RTN
 				( get blending ) .settings/blending PEK
 				( get depth ) .settings/depth PEK #20 MUL
 				( draw ) #20 ADD ADD .Screen/color DEO
-				( incr ) STH2r #0008 ADD2 STH2
+				( incr ) STH2r #0008 [ .settings/depth PEK #08 MUL TOS ADD2 ] ADD2 STH2
 				,&resume JMP
 			&outside
 			;halftone_icn .Screen/addr DEO2