second: add rotozoom

demos/second/Makefile

@@ -60,6 +60,7 @@ second.o:	second.s zx02_optim.s \
 	graphics/icekngdm.hgr.zx02 \
 	graphics/final3.hgr.zx02 \
 	graphics/mntscrl3.hgr.zx02 \
+	roto.s rotozoom.s \
 	zp.inc hardware.inc qload.inc music.inc
 	ca65 -o second.o second.s -l second.lst
 
@@ -77,6 +78,8 @@ qload.inc:	generate_common QLOAD
 	./generate_common -a 0x1200 -s detect_language_card qload.lst >> qload.inc
 	./generate_common -a 0x1200 -s mockingboard_detect qload.lst >> qload.inc
 	./generate_common -a 0x1200 -s clear_bottom qload.lst >> qload.inc
+	./generate_common -a 0x1200 -s clear_bottoms qload.lst >> qload.inc
+	./generate_common -a 0x1200 -s clear_screens qload.lst >> qload.inc
 
 #	./generate_common -a 0x1200 -s mockingboard_patch qload.lst >> qload.inc
 #	./generate_common -a 0x1200 -s mockingboard_init qload.lst >> qload.inc

demos/second/gr_fast_clear.s

@@ -1,23 +1,23 @@
-;clear_screens:
-;	;===================================
-;	; Clear top/bottom of page 0
-;	;===================================
-;
-;	lda	#$0
-;	sta	DRAW_PAGE
-;	jsr	clear_top
-;	jsr	clear_bottom
+clear_screens:
+	;===================================
+	; Clear top/bottom of page 0
+	;===================================
 
-;	;===================================
-;	; Clear top/bottom of page 1
-;	;===================================
-;
-;	lda	#$4
-;	sta	DRAW_PAGE
-;	jsr	clear_top
-;	jsr	clear_bottom
-;
-;	rts
+	lda	#$0
+	sta	DRAW_PAGE
+	jsr	clear_top
+	jsr	clear_bottom
+
+	;===================================
+	; Clear top/bottom of page 1
+	;===================================
+
+	lda	#$4
+	sta	DRAW_PAGE
+	jsr	clear_top
+	jsr	clear_bottom
+
+	rts
 
 
 

demos/second/graphics/Makefile

@@ -2,8 +2,10 @@ include ../../../Makefile.inc
 
 ZX02 = ~/research/6502_compression/zx02.git/build/zx02
 PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr
+PNG2GR = ../../../utils/gr-utils/png2gr
 
-all:	icekngdm.hgr.zx02 mntscrl3.hgr.zx02 final3.hgr.zx02 fc_sr_logo.hgr.zx02
+all:	icekngdm.hgr.zx02 mntscrl3.hgr.zx02 final3.hgr.zx02 fc_sr_logo.hgr.zx02 \
+	lenspic.gr.zx02
 
 ####
 
@@ -26,6 +28,15 @@ fc_sr_logo.hgr.zx02:	fc_sr_logo.hgr
 	$(ZX02) fc_sr_logo.hgr fc_sr_logo.hgr.zx02
 
 
+####
+
+lenspic.gr.zx02:	lenspic.gr
+	$(ZX02) lenspic.gr lenspic.gr.zx02
+
+lenspic.gr:	lenspic.png
+	$(PNG2GR) lenspic.png lenspic.gr
+
+
 ####
 
 clean:

demos/second/qload.s

@@ -172,7 +172,7 @@ sector_array:
         .byte  0, 0, 0, 0	; ZW, MUSIC, ?, ?
 
 length_array:
-        .byte  80, 32, 48, 48	; ZW, MUSIC, ?, ?
+        .byte  84, 32, 48, 48	; ZW, MUSIC, ?, ?
 
 	.include	"lc_detect.s"
 	.include	"wait.s"

demos/second/second.s

@@ -259,6 +259,16 @@ load_loop:
 	jsr	wait_until_keypress
 
 
+	;================================
+	; ROTO
+	;================================
+
+	jsr	do_rotozoom
+
+
+	bit	HIRES
+	bit	FULLGR
+	bit	PAGE0
 
 	;================================
 	; MNTSCRL3 (gorilla looking guy)
@@ -350,6 +360,8 @@ fc_sr_logo_data:
 
 .include "title.s"
 
+.include "roto.s"
+
 config_string:
 ;             0123456789012345678901234567890123456789
 .byte   0,23,"APPLE II?, 48K, MOCKINGBOARD: NO, SSI: N",0

demos/second/zp.inc

@@ -43,6 +43,7 @@ FILEMH		= $65
 
 
 FRAME           = $60
+FRAMEL		= $60
 FRAMEH		= $61
 WAITING         = $62
 LETTERL         = $63
@@ -120,6 +121,14 @@ DRAW_PAGE	= $8E
 ;WHICH_SLOT      = $88
 
 
+NUM1L	= $90
+NUM1H	= $91
+NUM2L	= $92
+NUM2H	= $93
+RESULT	= $94	; 95,96,97
+SCALE_I	= $98
+SCALE_F	= $99
+ANGLE	= $9A
 
 ; More zero-page addresses
 ; we try not to conflict with anything DOS, MONITOR or BASIC related

graphics/gr/rotozoom/Makefile

@@ -3,11 +3,12 @@ include ../../../Makefile.inc
 DOS33 = ../../../utils/dos33fs-utils/dos33
 TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
 LINKERSCRIPTS = ../../../linker_scripts
+EMPTY = ../../../empty_disk/empty.dsk
 
 all:	roto.dsk make_sine_table
 
 roto.dsk:	HELLO ROTO ROTOPLASMA ROTOPLASMA_TINY
-	cp empty.dsk roto.dsk
+	cp $(EMPTY) roto.dsk
 	$(DOS33) -y roto.dsk SAVE A HELLO
 	$(DOS33) -y roto.dsk BSAVE -a 0x1000 ROTO
 	$(DOS33) -y roto.dsk BSAVE -a 0x1000 ROTOPLASMA

graphics/gr/rotozoom/roto.s

@@ -206,6 +206,8 @@ images:
 	.word	shipup_lzsa
 	.word	monkey_lzsa
 
+shipup_lzsa:
+monkey_lzsa:
 title_lzsa:	.incbin "title.lzsa"
-shipup_lzsa:	.incbin	"tree1_shipup_n.lzsa"
-monkey_lzsa:	.incbin "monkey.lzsa"
+;shipup_lzsa:	.incbin	"tree1_shipup_n.lzsa"
+;monkey_lzsa:	.incbin "monkey.lzsa"

graphics/gr/rotozoom/rotozoom.s

@@ -96,7 +96,7 @@ rotozoom:
 
 	; cca = -20*ca;
 
-	lda	#-20							; 2
+	lda	#<(-20)							; 2
 	sta	NUM1H							; 3
 	lda	#0							; 2
 	sta	NUM1L							; 3

graphics/gr/rotozoom/rotozoom_texture.s

@@ -88,7 +88,7 @@ rotozoom:
 
 	; cca = -20*ca;
 
-	lda	#-20							; 2
+	lda	#<(-20)							; 2
 	sta	NUM1H							; 3
 	lda	#0							; 2
 	sta	NUM1L							; 3