From 64f5a7c41980c0fb83a6c060ed9d3bd798e03dbf Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Thu, 2 Nov 2023 14:14:14 -0400
Subject: [PATCH] second: get bouncing lens going

it's not doing a proper lens effect but probably out of time for that
---
 demos/second/part10_lens_rotozoom/lens.s      | 96 ++++++++++++++++++-
 .../part15_transmission/graphics/Makefile     | 11 ++-
 demos/second/zp.inc                           |  7 ++
 3 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/demos/second/part10_lens_rotozoom/lens.s b/demos/second/part10_lens_rotozoom/lens.s
index 10be8819..976a882d 100644
--- a/demos/second/part10_lens_rotozoom/lens.s
+++ b/demos/second/part10_lens_rotozoom/lens.s
@@ -112,12 +112,34 @@ load_background:
 
 
 	;===============================
-	; draw lens
+	; draw/move lens
 	;===============================
 
-	lda     #10
-	sta	XPOS
 	lda	#10
+	jsr	setup_timeout
+
+
+	lda	#10
+	sta	LENS_X
+	lda	#2
+	sta	LENS_Y
+
+	lda	#1
+	sta	XADD
+	lda	#2
+	sta	YADD
+
+	lda	#0
+	sta	COUNT
+
+lens_move_loop:
+
+	jsr	gr_copy_to_current
+
+	ldx	COUNT
+	lda	LENS_X
+	sta	XPOS
+	lda	LENS_Y
 	sta	YPOS
 
 	lda	#<lens_mask
@@ -132,9 +154,58 @@ load_background:
 
 	jsr	gr_put_sprite_mask
 
-	lda	#15
-	jsr	wait_seconds
+	jsr	page_flip
 
+	; move lens
+
+	; move x
+move_x:
+	clc
+	lda	LENS_X
+	adc	XADD
+	sta	LENS_X
+	cmp	#2
+	bcc	reverse_x
+	cmp	#28
+	bcc	no_reverse_x
+reverse_x:
+	lda	XADD
+	eor	#$FF
+	sta	XADD
+	inc	XADD
+
+no_reverse_x:
+
+move_y:
+	clc
+	lda	LENS_Y
+	adc	YADD
+	sta	LENS_Y
+	cmp	#2
+	bcc	reverse_y
+	cmp	#22
+	bcc	no_reverse_y
+reverse_y:
+	lda	YADD
+	eor	#$FF
+	sta	YADD
+	inc	YADD
+
+no_reverse_y:
+
+
+
+
+	; wait a bit
+
+	lda	#200
+	jsr	wait
+
+no_lens_bounce_oflo:
+	jsr	check_timeout
+	bcc	lens_move_loop		; clear if not timed out
+
+done_lens_bounce_loop:
 
 	;=================================
 	;=================================
@@ -179,3 +250,18 @@ lens_zx02:
 
 
 .include "graphics/lens_sprites.inc"
+
+.if 0
+
+lens_coords_x:
+	.byte 10,11,12,13,14,15,16,17
+	.byte 18,19,20,21,22,23,24,25
+	.byte 26,27,28,28,27,26,25,24
+	.byte 23,22,21,20,19,18,17,16
+
+lens_coords_y:
+	.byte  2, 4, 6, 8,10,12,14,16
+	.byte 18,20,22,22,20,18,16,14
+	.byte 12,10, 8, 6, 4, 2, 2, 4
+	.byte  6, 8,10,12,14,16,18,20
+.endif
diff --git a/demos/second/part15_transmission/graphics/Makefile b/demos/second/part15_transmission/graphics/Makefile
index d9864597..164bd29e 100644
--- a/demos/second/part15_transmission/graphics/Makefile
+++ b/demos/second/part15_transmission/graphics/Makefile
@@ -4,7 +4,16 @@ ZX02 = ~/research/6502_compression/zx02.git/build/zx02
 PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr
 PNG2GR = ../../../../utils/gr-utils/png2gr
 
-all:	spheres.hgr.zx02
+all:	spheres.hgr.zx02 spheres.gr.zx02
+
+####
+
+spheres.gr.zx02:	spheres.gr
+	$(ZX02) spheres.gr spheres.gr.zx02
+
+spheres.gr:	spheres_lores.png
+	$(PNG2GR) spheres_lores.png spheres.gr
+
 
 ####
 
diff --git a/demos/second/zp.inc b/demos/second/zp.inc
index f7421f0d..6ee31fa0 100644
--- a/demos/second/zp.inc
+++ b/demos/second/zp.inc
@@ -176,6 +176,13 @@ Y2		= $F7
 SCENE_COUNT	= $F8
 LAST_TYPE	= $F9
 
+
+; lens
+LENS_X		= $F0
+LENS_Y		= $F1
+XADD		= $F2
+YADD		= $F3
+
 ; rotozoom
 NUM1L		= $F0
 NUM1H		= $F1