uxn

commit 15435a730293318b02188b7d3684e94e6a67da07
parent c191c7ea3dcbbe7b8f6d25b491dae770feca651a
Author: neauoire <aliceffekt@gmail.com>
Date:   Mon, 22 Mar 2021 09:56:33 -0700

Fixed picking issue in Noodle

Diffstat:
M
README.md
 | 
6
++++--
M
build.sh
 | 
2
+-
M
projects/software/noodle.usm
 | 
59
++++++++++++++++++++++++++++++++---------------------------

3 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/README.md b/README.md
@@ -76,8 +76,10 @@ RTN
 - Includes
 - Defines
 - Jump helpers
-- LDRS should load from the zeropage?
-- A fast way(2 bytes) to read from the zero page #aa LDR.
+- Implement Peek/Pook to helpers
+- Create a theme designer application
+- DateTime device
+- Document controller.player2
 
 ## Notes
 
diff --git a/build.sh b/build.sh
@@ -20,5 +20,5 @@ cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werr
 # cc uxn.c emulator.c -std=c89 -Os -DNDEBUG -g0 -s -Wall -Wno-unknown-pragmas -L/usr/local/lib -lSDL2 -o bin/emulator
 
 # run
-./bin/assembler projects/examples/gui.ripples.usm bin/boot.rom
+./bin/assembler projects/software/noodle.usm bin/boot.rom
 ./bin/emulator bin/boot.rom
diff --git a/projects/software/noodle.usm b/projects/software/noodle.usm
@@ -14,22 +14,23 @@
 		- Only draw-canvas target tile
 		- Resize buttons
 		- Limit size
-		- Draw point inbetween
 		- Pixel cleanup brush
 		- Drag canvas content
-	BUGS
-		- If canvas is higher than 0, mouse picking fails
+		- [tool] fill rect
+		- [tool] spray
+		- [tool] pen
 )
 
 %RTN   { JMP2r }
 %RTN?  { JMP2r? }
 %ABS2 { DUP2 #000f SFT2 #ffff SWP2 SWP POP MUL2? } 
+%STEP8 { #0033 SFT2 }
+%MOD8 { #0007 AND2  }
+%SFL { #40 SFT SFT }
 %++ { #0001 ADD2 } %-- { #0001 SUB2 }
 %2/ { #0001 SFT2 }
 %8/ { #0003 SFT2 } %8* { #0030 SFT2 }
 %8+ { #0008 ADD2 }
-%MOD8 { #0007 AND2  }
-%SFL { #40 SFT SFT }
 
 ( variables )
 
@@ -140,8 +141,8 @@ BRK
 		$no-touch-toolbar
 
 		( in canvas )
-		,$no-touch-canvas ~Mouse.x CLN2r ~canvas.x1 GTH2 STH2r ~canvas.x2 LTH2 #0101 NEQ2 JMP2?
-		,$no-touch-canvas ~Mouse.y CLN2r ~canvas.y1 GTH2 STH2r ~canvas.y2 LTH2 #0101 NEQ2 JMP2?
+		,$no-touch-canvas ~Mouse.x CLN2r ~canvas.x1 GTS2 STH2r ~canvas.x2 LTS2 #0101 NEQ2 JMP2?
+		,$no-touch-canvas ~Mouse.y CLN2r ~canvas.y1 GTS2 STH2r ~canvas.y2 LTS2 #0101 NEQ2 JMP2?
 
 			( set cursor operation )
 			,add-pixel =cursor.oper
@@ -158,30 +159,34 @@ BRK
 			,$no-mirror-mode ~cursor.mirror #00 EQU JMP2?
 				~Mouse.x ~canvas.x1 SUB2 ~canvas.w 8* SWP2 SUB2 ~Mouse.y ~canvas.y1 SUB2 ,paint JSR2
 			$no-mirror-mode
+			,$touch-end JMP2
 
 		$no-touch-canvas
 
 		( background interface )
-		~Mouse.x ~Screen.width #0020 SUB2 SUB2 8/ 
-		DUP2 
-		#0000 NEQ2 ,$no-toggle-zoom ROT JMP2?
-			~zoom.active #00 EQU =zoom.active
-			( release ) #00 =Mouse.state
-			,redraw JSR2
-		$no-toggle-zoom
-		DUP2 
-		#0001 NEQ2 ,$no-load-button ROT JMP2?
-			,filepath ,load-file JSR2
-			,draw-canvas JSR2
-			( release ) #00 =Mouse.state
-		$no-load-button
-		DUP2 
-		#0002 NEQ2 ,$no-save-button ROT JMP2?
-			,filepath ,save-file JSR2
-			( release ) #00 =Mouse.state
-		$no-save-button
-		POP2
-
+		,$no-touch-background ~Mouse.y STEP8 ~Screen.height #0010 SUB2 NEQ2 JMP2?
+			~Mouse.x ~Screen.width #0020 SUB2 SUB2 8/ 
+			DUP2 
+			#0000 NEQ2 ,$no-toggle-zoom ROT JMP2?
+				~zoom.active #00 EQU =zoom.active
+				( release ) #00 =Mouse.state
+				,redraw JSR2
+			$no-toggle-zoom
+			DUP2 
+			#0001 NEQ2 ,$no-load-button ROT JMP2?
+				,filepath ,load-file JSR2
+				,draw-canvas JSR2
+				( release ) #00 =Mouse.state
+			$no-load-button
+			DUP2 
+			#0002 NEQ2 ,$no-save-button ROT JMP2?
+				,filepath ,save-file JSR2
+				( release ) #00 =Mouse.state
+			$no-save-button
+			POP2
+		$no-touch-background
+
+		( jump label )
 		$touch-end
 
 	$no-touch