From 7e5779cfc3b4cdec683191fe8c26d1ca51bc6aaa Mon Sep 17 00:00:00 2001
From: neauoire <aliceffekt@gmail.com>
Date: Thu, 25 Mar 2021 09:24:26 -0700
Subject: [PATCH] Fixed mouse pickin g for noodle

---
 projects/pictures/macpaint4020.bit | Bin 0 -> 16384 bytes
 projects/software/noodle.usm       |  96 +++++++++++++++++------------
 2 files changed, 57 insertions(+), 39 deletions(-)
 create mode 100644 projects/pictures/macpaint4020.bit

diff --git a/projects/pictures/macpaint4020.bit b/projects/pictures/macpaint4020.bit
new file mode 100644
index 0000000000000000000000000000000000000000..6aee9cbc3642534443028cb2fa1dd3fee9ab8684
GIT binary patch
literal 16384
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
D^iA_@

literal 0
HcmV?d00001

diff --git a/projects/software/noodle.usm b/projects/software/noodle.usm
index 47e3be9..a5a3407 100644
--- a/projects/software/noodle.usm
+++ b/projects/software/noodle.usm
@@ -41,7 +41,7 @@
 ;canvas { x1 2 y1 2 x2 2 y2 2 w 2 h 2 }
 
 ;rect { x1 2 y1 2 x2 2 y2 2 }
-;line { x0 2 y0 2 x 2 y 2 sx 2 sy 2 dx 2 dy 2 e1 2 e2 2 }
+;line { x1 2 y1 2 x2 2 y2 2 sx 2 sy 2 dx 2 dy 2 e1 2 e2 2 }
 ;origin { x1 2 y1 2 x2 2 y2 2 }
 ;color { byte 1 }
 ;pt0 { x 2 y 2 }
@@ -66,7 +66,7 @@
 |0200 @RESET 
 	
 	( default canvas )
-	#002a =canvas.w #001a =canvas.h
+	#0020 =canvas.w #0010 =canvas.h
 
 	( default brush )
 	#04 =brush.size
@@ -92,7 +92,7 @@
 	#0010 =pattpane.x1 ~Screen.height #0018 SUB2 =pattpane.y1
 	~Screen.width #0050 SUB2 =sizepane.x1 #0010 =sizepane.y1
 
-	~toolpane.x1 #0020 ADD2 =toolpane.x2
+	~toolpane.x1 #0028 ADD2 =toolpane.x2
 	~toolpane.y1 #0008 ADD2 =toolpane.y2
 	,draw-toolpane JSR2
 
@@ -210,16 +210,20 @@ BRK
 				,$touch-end JMP2
 			$no-touch-brush
 
+			,$no-touch-zoom ~brush.tool #04 NEQ JMP2?
+				~zoom.active #00 EQU =zoom.active
+				( release ) #00 =Mouse.state
+				~Mouse.x ~canvas.x1 SUB2 ~canvas.w 2/ SUB2 =zoom.x
+				~Mouse.y ~canvas.y1 SUB2 ~canvas.h 2/ SUB2 =zoom.y
+				,redraw JSR2
+				,$touch-end JMP2
+			$no-touch-zoom
+
 		$no-touch-canvas
 
 		( background interface )
 		,$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
@@ -262,6 +266,8 @@ BRK
 			( tool0 ) #02 =brush.tool ,draw-toolpane JSR2 $no-ekey
 		DUP #72 NEQ ,$no-rkey ROT JMP2?
 			( tool0 ) #03 =brush.tool ,draw-toolpane JSR2 $no-rkey
+		DUP #74 NEQ ,$no-tkey ROT JMP2?
+			( tool0 ) #04 =brush.tool ,draw-toolpane JSR2 $no-tkey
 		DUP 
 			DUP #30 GTH SWP #39 LTH #0101 NEQ2 ,$no-numkey ROT JMP2?
 			( size ) ~Keys #31 SUB =brush.size ,draw-sizepane JSR2 $no-numkey
@@ -311,23 +317,32 @@ RTN
 
 @paint-line ( x1 y1 x2 y2 )
 	
-	( load ) =line.y0 =line.x0 =line.y =line.x
-	~line.x0 ~line.x SUB2 ABS2 =line.dx
-	~line.y0 ~line.y SUB2 ABS2 #0000 SWP2 SUB2 =line.dy
-	#ffff #00 ~line.x ~line.x0 LTS2 #0002 MUL2 ADD2 =line.sx 
-	#ffff #00 ~line.y ~line.y0 LTS2 #0002 MUL2 ADD2 =line.sy 
+	( load ) =line.y1 =line.x1 =line.y2 =line.x2
+
+	( trim if zoomed )
+	,$no-zoom ~zoom.active #01 NEQ JMP2?
+		~line.x1 8/ ~zoom.x ADD2 =line.x1
+		~line.y1 8/ ~zoom.y ADD2 =line.y1
+		~line.x2 8/ ~zoom.x ADD2 =line.x2
+		~line.y2 8/ ~zoom.y ADD2 =line.y2
+	$no-zoom
+
+	~line.x1 ~line.x2 SUB2 ABS2 =line.dx
+	~line.y1 ~line.y2 SUB2 ABS2 #0000 SWP2 SUB2 =line.dy
+	#ffff #00 ~line.x2 ~line.x1 LTS2 #0002 MUL2 ADD2 =line.sx 
+	#ffff #00 ~line.y2 ~line.y1 LTS2 #0002 MUL2 ADD2 =line.sy 
 	~line.dx ~line.dy ADD2 =line.e1
 	$loop
-		( paint ) ~line.x ~line.y ~brush.oper JSR2
-		,$end ~line.x ~line.x0 EQU2 ~line.y ~line.y0 EQU2 #0101 EQU2 JMP2?
+		( paint ) ~line.x2 ~line.y2 ~brush.oper JSR2
+		,$end ~line.x2 ~line.x1 EQU2 ~line.y2 ~line.y1 EQU2 #0101 EQU2 JMP2?
 		~line.e1 #0002 MUL2 =line.e2
 		,$skipy ~line.e2 ~line.dy LTS2 JMP2?
 			~line.e1 ~line.dy ADD2 =line.e1
-			~line.x ~line.sx ADD2 =line.x
+			~line.x2 ~line.sx ADD2 =line.x2
 		$skipy
 		,$skipx ~line.e2 ~line.dx GTS2 JMP2?
 			~line.e1 ~line.dx ADD2 =line.e1
-			~line.y ~line.sy ADD2 =line.y
+			~line.y2 ~line.sy ADD2 =line.y2
 		$skipx
 		,$loop JMP2
 
@@ -342,7 +357,19 @@ RTN
 
 @paint-rect ( x1 y1 x2 y2  )
 
-	( load ) =rect.y2 =rect.x2 DUP2 =pt2.y =rect.y1 DUP2 =pt2.x =rect.x1
+	( load ) =rect.y2 =rect.x2 =rect.y1 =rect.x1
+
+	( trim if zoomed )
+	,$no-zoom ~zoom.active #01 NEQ JMP2?
+		~rect.x1 8/ ~zoom.x ADD2 =rect.x1
+		~rect.y1 8/ ~zoom.y ADD2 =rect.y1
+		~rect.x2 8/ ~zoom.x ADD2 #0001 ADD2 =rect.x2
+		~rect.y2 8/ ~zoom.y ADD2 #0001 ADD2 =rect.y2
+	$no-zoom
+
+	~rect.x1 =pt2.x
+	~rect.y1 =pt2.y
+
 	$ver
 		~rect.x1 =pt2.x
 		$hor
@@ -351,9 +378,9 @@ RTN
 				( draw ) ~pt2.x ~pt2.y ~brush.oper JSR2
 			$no-pixel
 			( incr ) ~pt2.x ++ =pt2.x
-			,$hor ~pt2.x ~rect.x2 LTH2 JMP2?
+			,$hor ~pt2.x ~rect.x2 LTS2 JMP2?
 		~pt2.y ++ =pt2.y
-		,$ver ~pt2.y ~rect.y2 LTH2 JMP2?
+		,$ver ~pt2.y ~rect.y2 LTS2 JMP2?
 
 	,draw-canvas JSR2
 	,draw-toolpane JSR2
@@ -372,12 +399,6 @@ RTN
 		~pt0.y 8/ ~zoom.y ADD2 #0003 SUB2 =pt0.y
 	$no-zoom
 
-	( center zoom on paint )
-	,$no-follow ~zoom.active JMP2?
-		~pt0.x ~canvas.w 2/ SUB2 #0003 ADD2 =zoom.x
-		~pt0.y ~canvas.h 2/ SUB2 #0003 ADD2 =zoom.y
-	$no-follow
-
 	#00 =px.x #00 =px.y 
 	$ver
 		#00 =px.x
@@ -592,6 +613,12 @@ RTN
 		( incr ) ~Sprite.addr 8+ =Sprite.addr
 		,$tools ~Sprite.x ~toolpane.x2 LTH2 JMP2?
 
+	,$no-zoom ~zoom.active #01 NEQ JMP2?
+		~Sprite.x #0008 SUB2 =Sprite.x
+		,tool_icn #0028 ADD2 =Sprite.addr
+		#01 #04 ~brush.tool EQU #02 MUL ADD =Sprite.color
+	$no-zoom
+
 RTN
 
 @draw-pattpane
@@ -657,11 +684,9 @@ RTN
 	,save_icn =Sprite.addr
 	#01 =Sprite.color
 	~Screen.width #0020 SUB2 =Sprite.x
-	,zoom_icn #00 ~zoom.active 8* ADD2 =Sprite.addr
-	#01 =Sprite.color
 
 	( draw width )
-	~Screen.width #0048 SUB2 =Sprite.x
+	~Screen.width #0040 SUB2 =Sprite.x
 	,font_hex ~canvas.w #f0 AND #04 SFT #08 MUL ADD2 =Sprite.addr
 	( draw ) #02 =Sprite.color
 	~Sprite.x 8+ =Sprite.x
@@ -735,11 +760,8 @@ RTN
 	[ e0d0 a844 2212 0c00 ]
 	[ c0b8 4848 7804 0200 ]
 	[ 44ba 4444 44ba 4400 ]
-	[ 3844 8282 8244 3800 ]
-	[ fe82 8282 8282 fe00 ]
-	[ 80c0 e0f0 f8e0 1000 ]
-	[ 0202 0438 4080 8000 ]
-	[ 0204 0810 2040 8000 ]
+	[ 3048 8484 4834 0200 ] ( zoom )
+	[ 3245 8284 4834 0200 ] ( zoom out )
 
 @brush_view 
 	[ 0000 0010 0000 0000 ]
@@ -752,10 +774,6 @@ RTN
 	[ 7c82 8282 8282 7c00 ]
 	[ 7cfe fefe fefe 7c00 ]
 
-@zoom_icn
-	[ 3048 8484 4834 0200 ]
-	[ 3245 8284 4834 0200 ]
-
 @bigpixel_icn 
 	[ 5580 0080 0080 0080 ]
 	[ 55ff 7fff 7fff 7fff ]
@@ -768,7 +786,7 @@ RTN
 @save_icn       [ fe82 8282 848a f400 ]
 
 @blank_icn      [ 0000 0000 0000 0000 ]
-@filepath       [ projects/pictures/tima2a1a.bit 00 ]
+@filepath       [ projects/pictures/akane2010.bit 00 ]
 
 @font_hex ( 0-F ) 
 [