From d8de617a0607f1d8a8da6df11560e6c683ab29f4 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 13 Jan 2018 00:59:53 -0500
Subject: [PATCH] mode7: add initial rasterbars code

---
 gr-sim/rasterbars.c       |   8 +-
 gr-sim/rasterbars_fixed.c |  33 ++---
 mode7/Makefile            |  21 +++-
 mode7/mode7.dsk           | Bin 143360 -> 143360 bytes
 mode7/rasterbars.s        | 257 ++++++++++++++++++++++++++++++++++++++
 mode7/zp.inc              |   2 +
 6 files changed, 301 insertions(+), 20 deletions(-)
 create mode 100644 mode7/rasterbars.s

diff --git a/gr-sim/rasterbars.c b/gr-sim/rasterbars.c
index cf5b1f0f..d957f1fc 100644
--- a/gr-sim/rasterbars.c
+++ b/gr-sim/rasterbars.c
@@ -24,7 +24,7 @@ int set_row_color(double offset, int color) {
 
 int main(int argc, char **argv) {
 
-	int ch,i=0,j;
+	int ch,i=0,j,end=3;
 
 	grsim_init();
 
@@ -61,7 +61,11 @@ int main(int argc, char **argv) {
 
 
 		i++;
-		if (i>ELEMENTS-1) i=0;
+		if (i>ELEMENTS-1) {
+			i=0;
+			end--;
+			if (end==0) break;
+		}
 	}
 
 	return 0;
diff --git a/gr-sim/rasterbars_fixed.c b/gr-sim/rasterbars_fixed.c
index a31f2ef1..e1d2049d 100644
--- a/gr-sim/rasterbars_fixed.c
+++ b/gr-sim/rasterbars_fixed.c
@@ -9,7 +9,7 @@ static int row_color[40];
 
 #define ELEMENTS	64
 
-int fixed_sin[ELEMENTS][2]={
+static int fixed_sin[ELEMENTS][2]={
 {0x00,0x00}, // 0.000000
 {0x00,0x19}, // 0.098017
 {0x00,0x31}, // 0.195090
@@ -26,7 +26,7 @@ int fixed_sin[ELEMENTS][2]={
 {0x00,0xF4}, // 0.956940
 {0x00,0xFB}, // 0.980785
 {0x00,0xFE}, // 0.995185
-{0x01,0x00}, // 1.000000
+{0x00,0xFF}, // 1.000000
 {0x00,0xFE}, // 0.995185
 {0x00,0xFB}, // 0.980785
 {0x00,0xF4}, // 0.956940
@@ -76,9 +76,9 @@ int fixed_sin[ELEMENTS][2]={
 {0xFF,0xE7}, // -0.098017
 };
 
-int set_row_color(int offset, int color) {
+static int set_row_color(int offset, int color) {
 
-	int y,s=0;
+	int y=0,s=0;
 
 	short x;
 
@@ -100,7 +100,7 @@ int set_row_color(int offset, int color) {
 
 int main(int argc, char **argv) {
 
-	int ch,i=0,j;
+	int ch,i=0,j,end=3;
 
 	grsim_init();
 
@@ -114,14 +114,14 @@ int main(int argc, char **argv) {
 
 		gr();
 
-		set_row_color(i+7,14);	// aqua
-		set_row_color(i+6,6);		// med-blue
-		set_row_color(i+5,12);	// light-green
-		set_row_color(i+4,4);		// green
-		set_row_color(i+3,13);	// yellow
-		set_row_color(i+2,9);		// orange
-		set_row_color(i+1,11);	// pink
-		set_row_color(i+0.0,1);		// red
+		set_row_color(i+0,14);	// aqua
+		set_row_color(i+1,6);		// med-blue
+		set_row_color(i+2,12);	// light-green
+		set_row_color(i+3,4);		// green
+		set_row_color(i+4,13);	// yellow
+		set_row_color(i+5,9);		// orange
+		set_row_color(i+6,11);	// pink
+		set_row_color(i+7,1);		// red
 
 		for(j=0;j<40;j++) {
 			if (row_color[j]) {
@@ -131,12 +131,17 @@ int main(int argc, char **argv) {
 		}
 
 		grsim_update();
+
 		ch=grsim_input();
 		if (ch=='q') exit(0);
 		usleep(100000);
 
 		i++;
-		if (i>ELEMENTS-1) i=0;
+		if (i>(ELEMENTS-1)) {
+			i=0;
+			end--;
+			if (end==0) break;
+		}
 
 //		printf("\n");
 	}
diff --git a/mode7/Makefile b/mode7/Makefile
index 5e227b47..fa8501b2 100644
--- a/mode7/Makefile
+++ b/mode7/Makefile
@@ -10,12 +10,13 @@ $(DOS33):
 	cd ../dos33fs-utils && make
 
 mode7.dsk:	$(DOS33) MODE7_ISLAND MODE7_CHECKERBOARD MODE7_RAINBOW \
-			PLOT_TEST SCROLL_DEMO SKY_DEMO STARFIELD_DEMO \
-			STARFIELD_1K
+			PLOT_TEST RASTERBARS SCROLL_DEMO SKY_DEMO \
+			STARFIELD_DEMO STARFIELD_1K
 	$(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_ISLAND
 	$(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_CHECKERBOARD
 	$(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_RAINBOW
 	$(DOS33) -y mode7.dsk BSAVE -a 0x1000 PLOT_TEST
+	$(DOS33) -y mode7.dsk BSAVE -a 0x1000 RASTERBARS
 	$(DOS33) -y mode7.dsk BSAVE -a 0x1000 SCROLL_DEMO
 	$(DOS33) -y mode7.dsk BSAVE -a 0x1000 SKY_DEMO
 	$(DOS33) -y mode7.dsk BSAVE -a 0x1000 STARFIELD_DEMO
@@ -113,8 +114,20 @@ starfield_demo.o:	starfield_demo.s \
 	../asm_routines/gr_fast_clear.s
 	ca65 -o starfield_demo.o starfield_demo.s -l starfield_demo.lst
 
+
+RASTERBARS:	rasterbars.o
+	ld65 -o RASTERBARS rasterbars.o -C ./apple2_1000.inc
+
+rasterbars.o:	rasterbars.s \
+	../asm_routines/gr_scroll.s \
+	../asm_routines/pageflip.s \
+	../asm_routines/gr_setpage.s \
+	../asm_routines/gr_fast_clear.s
+	ca65 -o rasterbars.o rasterbars.s -l rasterbars.lst
+
+
 STARFIELD_1K:	starfield_1k.o
-	ld65 -o STARFIELD_1K starfield_demo.o -C ./apple2_1000.inc
+	ld65 -o STARFIELD_1K starfield_1k.o -C ./apple2_1000.inc
 
 starfield_1k.o:	starfield_1k.s \
 	../asm_routines/gr_scroll.s \
@@ -138,5 +151,5 @@ background.o:	background.c
 clean:	
 	rm -f *~ *.o scroller background \
 	MODE7 MODE7_ISLAND MODE7_CHECKERBOARD MODE7_RAINBOW \
-	PLOT_TEST SCROLL_DEMO STARFIELD_DEMO STARFIELD_1K *.lst
+	PLOT_TEST RASTERBARS SCROLL_DEMO STARFIELD_DEMO STARFIELD_1K *.lst
 
diff --git a/mode7/mode7.dsk b/mode7/mode7.dsk
index 2335c3ac748aa6305d1cae00baee7e1f4c928102..876340ff6dd43eafeaa22014bbdd5d36a75319ad 100644
GIT binary patch
delta 8006
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
WwApM9&rK`9pvMvthX4xCP5%XJq|F}y

delta 10652
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

diff --git a/mode7/rasterbars.s b/mode7/rasterbars.s
new file mode 100644
index 00000000..87482784
--- /dev/null
+++ b/mode7/rasterbars.s
@@ -0,0 +1,257 @@
+; Not quite a raster-bar, but why not
+
+.include "zp.inc"
+
+;===========
+; CONSTANTS
+;===========
+
+ELEMENTS	EQU	64
+
+
+	;=====================
+	; Rasterbars
+	;=====================
+
+	;================================
+	; Clear screen and setup graphics
+	;================================
+
+	jsr	clear_screens		 ; clear top/bottom of page 0/1
+	jsr     set_gr_page0
+
+
+	;===============
+	; Init Variables
+	;===============
+	lda	#0							; 2
+	sta	DRAW_PAGE						; 3
+	sta	SCREEN_Y
+
+	;===========================
+	;===========================
+	; Main Loop
+	;===========================
+	;===========================
+raster_loop:
+	; clear rows
+
+	ldy	#19						; 2
+	lda	#0
+init_rows:
+	sta	row_color,Y
+	dey
+	bpl	init_rows
+
+	jsr	clear_top
+
+	;================
+	; set colors
+
+	lda	#COLOR_BOTH_AQUA	; aqua
+	sta	COLOR
+
+	ldy	SCREEN_Y
+	jsr	set_row_color
+
+;	lda	#6		; medium blue
+;	iny
+;	jsr	set_row_color
+
+	;=================
+	; draw rows
+
+	ldy	#19
+draw_rows_loop:
+	lda	row_color,Y
+	sta	COLOR
+
+	tya
+	pha
+	asl
+
+	ldy	#39							; 2
+        sty	V2							; 3
+        ldy	#0							; 2
+        jsr	hlin_double		; hlin y,V2 at A	; 63+(X*16)
+        pla								; 4
+	tay
+	dey
+	bpl	draw_rows_loop
+
+
+	;==================
+	; flip pages
+	;==================
+
+	jsr	page_flip						; 6
+
+
+	;==================
+	; delay?
+	;==================
+
+
+	;==================
+	; update y pointer
+	;==================
+	ldy	SCREEN_Y
+	iny
+	cpy	#ELEMENTS
+	bne	not_there
+	ldy	#0
+not_there:
+	sty	SCREEN_Y
+
+
+	;==================
+	; loop forever
+	;==================
+
+	jmp	raster_loop						; 3
+
+
+	;===================
+	; set_row_color
+	;===================
+	; color in COLOR
+	; Y=offset
+	; Y preserved?
+set_row_color:
+
+	tya
+	and	#(ELEMENTS-1)
+	tax
+
+	lda	fine_sine,X
+	cpx	#33
+	bpl	sin_negative
+
+sin_positive:
+	clc
+	ror
+	clc
+	ror
+	clc
+	ror
+	clc
+	ror
+	clc
+	adc	#18
+	lsr
+
+	tax
+	lda	COLOR
+	sta	row_color,X
+
+	jmp	sin_no_more
+
+	; FIXME: precalculate as we shift same each time
+sin_negative:
+
+	sec
+	ror
+	sec
+	ror
+	sec
+	ror
+	sec
+	ror
+	clc
+
+	adc	#18
+	lsr
+
+	tax
+	lda	COLOR
+	sta	row_color,X
+
+sin_no_more:
+
+	rts
+
+;===============================================
+; External modules
+;===============================================
+
+.include "../asm_routines/pageflip.s"
+.include "../asm_routines/gr_setpage.s"
+;.include "../asm_routines/keypress.s"
+.include "../asm_routines/gr_offsets.s"
+.include "../asm_routines/gr_fast_clear.s"
+.include "../asm_routines/gr_hlin.s"
+
+;======================
+; some arrays
+;======================
+
+row_color:
+.byte $00,$00,$00,$00,$00, $00,$00,$00,$00,$00
+.byte $00,$00,$00,$00,$00, $00,$00,$00,$00,$00
+
+fine_sine:
+.byte $00 ; 0.000000
+.byte $19 ; 0.098017
+.byte $31 ; 0.195090
+.byte $4A ; 0.290285
+.byte $61 ; 0.382683
+.byte $78 ; 0.471397
+.byte $8E ; 0.555570
+.byte $A2 ; 0.634393
+.byte $B5 ; 0.707107
+.byte $C5 ; 0.773010
+.byte $D4 ; 0.831470
+.byte $E1 ; 0.881921
+.byte $EC ; 0.923880
+.byte $F4 ; 0.956940
+.byte $FB ; 0.980785
+.byte $FE ; 0.995185
+.byte $FF ; 1.000000
+.byte $FE ; 0.995185
+.byte $FB ; 0.980785
+.byte $F4 ; 0.956940
+.byte $EC ; 0.923880
+.byte $E1 ; 0.881921
+.byte $D4 ; 0.831470
+.byte $C5 ; 0.773010
+.byte $B5 ; 0.707107
+.byte $A2 ; 0.634393
+.byte $8E ; 0.555570
+.byte $78 ; 0.471397
+.byte $61 ; 0.382683
+.byte $4A ; 0.290285
+.byte $31 ; 0.195090
+.byte $19 ; 0.098017
+.byte $00 ; 0.000000
+.byte $E7 ; -0.098017
+.byte $CF ; -0.195090
+.byte $B6 ; -0.290285
+.byte $9F ; -0.382683
+.byte $88 ; -0.471397
+.byte $72 ; -0.555570
+.byte $5E ; -0.634393
+.byte $4B ; -0.707107
+.byte $3B ; -0.773010
+.byte $2C ; -0.831470
+.byte $1F ; -0.881921
+.byte $14 ; -0.923880
+.byte $0C ; -0.956940
+.byte $05 ; -0.980785
+.byte $02 ; -0.995185
+.byte $00 ; -1.000000
+.byte $02 ; -0.995185
+.byte $05 ; -0.980785
+.byte $0C ; -0.956940
+.byte $14 ; -0.923880
+.byte $1F ; -0.881921
+.byte $2C ; -0.831470
+.byte $3B ; -0.773010
+.byte $4B ; -0.707107
+.byte $5E ; -0.634393
+.byte $72 ; -0.555570
+.byte $88 ; -0.471397
+.byte $9F ; -0.382683
+.byte $B6 ; -0.290285
+.byte $CF ; -0.195090
+.byte $E7 ; -0.098017
+
diff --git a/mode7/zp.inc b/mode7/zp.inc
index 8e7f29e0..676eaa71 100644
--- a/mode7/zp.inc
+++ b/mode7/zp.inc
@@ -176,8 +176,10 @@ COLOR_BOTH_MEDIUMBLUE	EQU	$66
 COLOR_BOTH_LIGHTBLUE	EQU	$77
 COLOR_BOTH_BROWN	EQU	$88
 COLOR_BOTH_ORANGE	EQU	$99
+COLOR_BOTH_PINK		EQU	$BB
 COLOR_BOTH_LIGHTGREEN	EQU	$CC
 COLOR_BOTH_YELLOW	EQU	$DD
+COLOR_BOTH_AQUA		EQU	$EE
 COLOR_BOTH_WHITE	EQU	$FF
 
 AUX_BOTH_MEDIUMBLUE	EQU	$33	; 0011 0011