interlace: put some code out into own files, also add sprites code

This commit is contained in:
Vince Weaver 2019-06-12 12:08:55 -04:00
parent 3127717947
commit 4f24ffc059
10 changed files with 4708 additions and 88 deletions

View File

@ -7,10 +7,11 @@ PNG_TO_40x48D = ../gr-utils/png_to_40x48d
all: interlace.dsk
interlace.dsk: INTERLACE RASTERBARS HELLO
interlace.dsk: INTERLACE RASTERBARS SPRITES HELLO
$(DOS33) -y interlace.dsk SAVE A HELLO
$(DOS33) -y interlace.dsk BSAVE -a 0x1000 INTERLACE
$(DOS33) -y interlace.dsk BSAVE -a 0x1000 RASTERBARS
$(DOS33) -y interlace.dsk BSAVE -a 0x1000 SPRITES
####
@ -36,6 +37,16 @@ rasterbars.o: rasterbars.s gr_copy.s \
rasterbars_screen.s rasterbars_table.s movement_table.s rb_bg.inc
ca65 -o rasterbars.o rasterbars.s -l rasterbars.lst
####
SPRITES: sprites.o
ld65 -o SPRITES sprites.o -C ../linker_scripts/apple2_1000.inc
sprites.o: sprites.s gr_copy.s \
sprites_screen.s sprites_table.s movement_table.s rb_bg.inc
ca65 -o sprites.o sprites.s -l sprites.lst
####
@ -52,4 +63,4 @@ install:
clean:
rm -f *~ *.o *.lst *.inc INTERLACE RASTERBARS HELLO
rm -f *~ *.o *.lst *.inc INTERLACE RASTERBARS SPRITES HELLO

View File

@ -0,0 +1,4 @@
gr_offsets:
.word $400,$480,$500,$580,$600,$680,$700,$780
.word $428,$4a8,$528,$5a8,$628,$6a8,$728,$7a8
.word $450,$4d0,$550,$5d0,$650,$6d0,$750,$7d0

View File

@ -0,0 +1,36 @@
;==================================
; HLINE
;==================================
; Color in A
; Y has which line
hline:
pha ; 3
ldx gr_offsets,y ; 4+
stx hline_loop+1 ; 4
lda gr_offsets+1,y ; 4+
clc ; 2
adc DRAW_PAGE ; 3
sta hline_loop+2 ; 4
pla ; 4
ldx #39 ; 2
hline_loop:
sta $5d0,X ; 38 ; 5
dex ; 2
bpl hline_loop ; 2nt/3
rts ; 6
;==========================
; Clear gr screen
;==========================
; Color in A
clear_gr:
ldy #46
clear_page_loop:
jsr hline
dey
dey
bpl clear_page_loop
rts

View File

@ -1,2 +1,2 @@
10 PRINT "INTERLACE V0.1"
100 PRINT CHR$ (4)"BRUN RASTERBARS"
100 PRINT CHR$ (4)"BRUN SPRITES"

View File

@ -3613,47 +3613,8 @@ loop2: dex ; 2
rts ; 6
;==================================
; HLINE
;==================================
; Color in A
; Y has which line
hline:
pha ; 3
ldx gr_offsets,y ; 4+
stx hline_loop+1 ; 4
lda gr_offsets+1,y ; 4+
clc ; 2
adc DRAW_PAGE ; 3
sta hline_loop+2 ; 4
pla ; 4
ldx #39 ; 2
hline_loop:
sta $5d0,X ; 38 ; 5
dex ; 2
bpl hline_loop ; 2nt/3
rts ; 6
;==========================
; Clear gr screen
;==========================
; Color in A
clear_gr:
ldy #46
clear_page_loop:
jsr hline
dey
dey
bpl clear_page_loop
rts
gr_offsets:
.word $400,$480,$500,$580,$600,$680,$700,$780
.word $428,$4a8,$528,$5a8,$628,$6a8,$728,$7a8
.word $450,$4d0,$550,$5d0,$650,$6d0,$750,$7d0
.include "gr_simple_clear.s"
.include "gr_offsets.s"
.include "../asm_routines/gr_unrle.s"
.include "../asm_routines/keypress.s"

106
interlace_demo/make_st.c Normal file
View File

@ -0,0 +1,106 @@
#include <stdio.h>
static int gr_offsets[]={
0x400,0x480,0x500,0x580,0x600,0x680,0x700,0x780,
0x428,0x4a8,0x528,0x5a8,0x628,0x6a8,0x728,0x7a8,
0x450,0x4d0,0x550,0x5d0,0x650,0x6d0,0x750,0x7d0,
};
#define X_OFFSET 0
int main(int argc, char **argv) {
int i,j,lookup,address;
for(i=0;i<96;i++) {
lookup=i/4;
printf("; %d\n",i*2);
printf("\tbit\tPAGE0\t; 4\n");
printf("smc%03d:\tldx\t#$00\t; 2\n",i*2);
for(j=0;j<7;j++) {
address=gr_offsets[lookup]+0x400+j+X_OFFSET;
if (i<15) address=0xc00;
if (i>77) address=0xc00;
printf("\tlda\t#$00\t; 2\n");
printf("\tsta\t$%3x,X\t; 5\n",address);
}
printf("\tldx\t#$00\t; 2\n");
printf("\tlda\tZERO\t; 3\n");
address=gr_offsets[lookup]+0x400+X_OFFSET;
if (i<15) address=0xc00;
if (i>77) address=0xc00;
printf("\tsta\t$%3x,X\t; 5\n",address);
printf("\n");
#if 0
; 4
lda #$00 ; 2 ldx #$5 ; 2 ; 6
sta $500 ; 4 lda #0 ; 2 ; 10
lda #$00 ; 2 sta $500,X ; 5 ; 13
sta $501 ; 4 lda #1 ; 2 ; 15
lda #$00 ; 2 sta $501,X ; 5 ; 20
sta $502 ; 4 lda #2 ; 2 ; 22
lda #$00 ; 2 sta $502,X ; 5 ; 27
sta $503 ; 4 lda #3 ; 2 ; 29
lda #$00 ; 2 sta $503,X ; 5 ; 34
sta $504 ; 4 lda #4 ; 2 ; 36
lda #$00 ; 2 sta $504,X ; 5 ; 41
sta $505 ; 4 lda #5 ; 2 ; 43
lda #$00 ; 2 sta $505,X ; 5 ; 48
sta $506 ; 4 lda #6 ; 2 ; 50
lda #$00 ; 2 sta $506,X ; 5 ; 55
sta $507 ; 4
lda #$00 ; 2
sta $508 ; 4 ldx #$10 ; 2 ; 57
bit krg ; 4 lda ZP ; 3 ; 60
lda TEMP ; 3 sta $500,X ; 5 ; 65
#endif
lookup=i/4;
if (i%4==3) lookup=(i+4)/4;
if (i==95) lookup=0;
printf("; %d\n",(i*2)+1);
printf("\tbit\tPAGE1\t; 4\n");
printf("smc%03d:\tldx\t#$00\t; 2\n",(i*2)+1);
for(j=0;j<7;j++) {
address=gr_offsets[lookup]+j+X_OFFSET;
if (i<15) address=0xc00;
if (i>77) address=0xc00;
printf("\tlda\t#$00\t; 2\n");
printf("\tsta\t$%3x,X\t; 5\n",address);
}
printf("\tldx\t#$00\t; 2\n");
printf("\tlda\tZERO\t; 3\n");
address=gr_offsets[lookup]+X_OFFSET;
if (i<15) address=0xc00;
if (i>77) address=0xc00;
printf("\tsta\t$%3x,X\t; 5\n",address);
printf("\n");
}
#if 0
printf("y_lookup_h:\n");
for(i=32;i<32+128;i++) {
if (i%8==0) printf(".byte\t");
printf(">(smc%03d+1)",i);
if (i%8!=7) printf(",");
else printf("\n");
}
printf("y_lookup_l:\n");
for(i=32;i<32+128;i++) {
if (i%8==0) printf(".byte\t");
printf("<(smc%03d+1)",i);
if (i%8!=7) printf(",");
else printf("\n");
}
#endif
return 0;
}

View File

@ -452,50 +452,8 @@ smc_raster_color1_2:
;==================================
; HLINE
;==================================
; Color in A
; Y has which line
hline:
pha ; 3
ldx gr_offsets,y ; 4+
stx hline_loop+1 ; 4
lda gr_offsets+1,y ; 4+
clc ; 2
adc DRAW_PAGE ; 3
sta hline_loop+2 ; 4
pla ; 4
ldx #39 ; 2
hline_loop:
sta $5d0,X ; 38 ; 5
dex ; 2
bpl hline_loop ; 2nt/3
rts ; 6
;==========================
; Clear gr screen
;==========================
; Color in A
clear_gr:
ldy #46
clear_page_loop:
jsr hline
dey
dey
bpl clear_page_loop
rts
gr_offsets:
.word $400,$480,$500,$580,$600,$680,$700,$780
.word $428,$4a8,$528,$5a8,$628,$6a8,$728,$7a8
.word $450,$4d0,$550,$5d0,$650,$6d0,$750,$7d0
.include "gr_simple_clear.s"
.include "gr_offsets.s"
.include "../asm_routines/gr_unrle.s"
.include "../asm_routines/keypress.s"

478
interlace_demo/sprites.s Normal file
View File

@ -0,0 +1,478 @@
; Uses the 40x48d page1/page2 every-1-scanline pageflip mode
; self modifying code to get some extra colors (pseudo 40x192 mode)
; by deater (Vince Weaver) <vince@deater.net>
; Zero Page
FRAMEBUFFER = $00 ; $00 - $0F
YPOS = $10
YPOS_SIN = $11
CH = $24
CV = $25
GBASL = $26
GBASH = $27
BASL = $28
BASH = $29
FRAME = $60
BLARGH = $69
DRAW_PAGE = $EE
LASTKEY = $F1
PADDLE_STATUS = $F2
TEMP = $FA
WHICH = $FB
OUTL = $FE
OUTH = $FF
ZERO = $80
; Soft Switches
KEYPRESS= $C000
KEYRESET= $C010
SET_GR = $C050 ; Enable graphics
FULLGR = $C052 ; Full screen, no text
PAGE0 = $C054 ; Page0
PAGE1 = $C055 ; Page1
LORES = $C056 ; Enable LORES graphics
PADDLE_BUTTON0 = $C061
PADDL0 = $C064
PTRIG = $C070
; ROM routines
TEXT = $FB36 ;; Set text mode
HOME = $FC58 ;; Clear the text screen
WAIT = $FCA8 ;; delay 1/2(26+27A+5A^2) us
start_sprites:
;===================
; init screen
jsr TEXT
jsr HOME
bit KEYRESET
;===================
; init vars
lda #0
sta DRAW_PAGE
sta WHICH
;=============================
; Load graphic page0
lda #$0c
sta BASH
lda #$00
sta BASL ; load image to $c00
lda WHICH
asl
asl ; which*4
tay
lda pictures,Y
sta GBASL
lda pictures+1,Y
sta GBASH
jsr load_rle_gr
lda #4
sta DRAW_PAGE
jsr gr_copy_to_current ; copy to page1
; GR part
bit PAGE1
bit LORES ; 4
bit SET_GR ; 4
bit FULLGR ; 4
; jsr wait_until_keypressed
;=============================
; Load graphic page1
lda #$0c
sta BASH
lda #$00
sta BASL ; load image to $c00
lda WHICH
asl
asl ; which*4
tay
lda pictures+2,Y
sta GBASL
lda pictures+3,Y
sta GBASH
jsr load_rle_gr
lda #0
sta DRAW_PAGE
jsr gr_copy_to_current
; ; GR part
bit PAGE0
; jsr wait_until_keypressed
;==============================
; setup graphics for vapor lock
;==============================
jsr vapor_lock
; vapor lock returns with us at beginning of hsync in line
; 114 (7410 cycles), so with 5070 lines to go
; GR part
bit LORES ; 4
bit SET_GR ; 4
bit FULLGR ; 4
jsr gr_copy_to_current ; 6+ 9292
; 5070 + 4550 = 9620
; 9292
; 12
; 6
; ====
; 310
; - 3 for jmp
; 307
; Try X=9 Y=6 cycles=307
ldy #6 ; 2
loopA: ldx #9 ; 2
loopB: dex ; 2
bne loopB ; 2nt/3
dey ; 2
bne loopA ; 2nt/3
jmp display_loop ; 3
.align $100
;================================================
; Display Loop
;================================================
; each scan line 65 cycles
; 1 cycle each byte (40cycles) + 25 for horizontal
; Total of 12480 cycles to draw screen
; Vertical blank = 4550 cycles (70 scan lines)
; Total of 17030 cycles to get back to where was
; We want to alternate between page1 and page2 every 65 cycles
; vblank = 4550 cycles to do scrolling
display_loop:
.include "sprites_screen.s"
;======================================================
; We have 4550 cycles in the vblank, use them wisely
;======================================================
; 4550 -- VBLANK
; -582 -- erase 22+4*(8+6+126) = 582
; -696 -- move+draw 4*(16+26+6+126) = 696
; -10 -- keypress
;=======
; 3262
pad_time:
; we erase, then draw
; doing a blanket erase of all 128 lines would cost 3459 cycles!
;=========================
; ERASE
;=========================
lda #$00 ; 2
sta smc_raster_color1_1+1 ; 4
sta smc_raster_color1_2+1 ; 4
sta smc_raster_color2_1+1 ; 4
sta smc_raster_color2_2+1 ; 4
sta smc_raster_color3_1+1 ; 4
;=============
; 22
; erase red
lda red_x ; 4
and #$7f ; 2
tax ; 2
jsr draw_rasterbar ; 6+126
; erase yellow
lda yellow_x ; 4
and #$7f ; 2
tax ; 2
jsr draw_rasterbar ; 6+126
; erase green
lda green_x ; 4
and #$7f ; 2
tax ; 2
jsr draw_rasterbar ; 6+126
; erase red
lda blue_x ; 4
and #$7f ; 2
tax ; 2
jsr draw_rasterbar ; 6+126
;=========================
; MOVE and DRAW
;=========================
;============
; move red
ldy red_x ; 4
lda movement_table,Y ; 4
sta red_x ; 4
and #$7f ; 2
tax ; 2
;==========
; 16
; draw red
lda #$33 ; 2
sta smc_raster_color1_1+1 ; 4
sta smc_raster_color1_2+1 ; 4
lda #$bb ; 2
sta smc_raster_color2_1+1 ; 4
sta smc_raster_color2_2+1 ; 4
lda #$ff ; 2
sta smc_raster_color3_1+1 ; 4
;=============
; 26
jsr draw_rasterbar ; 6+126
;============
; move yellow
ldy yellow_x ; 4
lda movement_table,Y ; 4
sta yellow_x ; 4
and #$7f ; 2
tax ; 2
;==========
; 16
; draw yellow
lda #$88 ; 2
sta smc_raster_color1_1+1 ; 4
sta smc_raster_color1_2+1 ; 4
lda #$dd ; 2
sta smc_raster_color2_1+1 ; 4
sta smc_raster_color2_2+1 ; 4
lda #$ff ; 2
sta smc_raster_color3_1+1 ; 4
;=============
; 26
jsr draw_rasterbar ; 6+126
;============
; move green
ldy green_x ; 4
lda movement_table,Y ; 4
sta green_x ; 4
and #$7f ; 2
tax ; 2
;==========
; 16
; draw green
lda #$44 ; 2
sta smc_raster_color1_1+1 ; 4
sta smc_raster_color1_2+1 ; 4
lda #$cc ; 2
sta smc_raster_color2_1+1 ; 4
sta smc_raster_color2_2+1 ; 4
lda #$ff ; 2
sta smc_raster_color3_1+1 ; 4
;=============
; 26
jsr draw_rasterbar ; 6+126
;============
; move blue
ldy blue_x ; 4
lda movement_table,Y ; 4
sta blue_x ; 4
and #$7f ; 2
tax ; 2
;==========
; 16
; draw blue
lda #$22 ; 2
sta smc_raster_color1_1+1 ; 4
sta smc_raster_color1_2+1 ; 4
lda #$66 ; 2
sta smc_raster_color2_1+1 ; 4
sta smc_raster_color2_2+1 ; 4
lda #$ff ; 2
sta smc_raster_color3_1+1 ; 4
;=============
; 26
jsr draw_rasterbar ; 6+126
;============================
; WAIT for VBLANK to finish
;============================
; Try X=5 Y=105 cycles=3256 R6
nop
nop
nop
ldy #105 ; 2
loop1: ldx #5 ; 2
loop2: dex ; 2
bne loop2 ; 2nt/3
dey ; 2
bne loop1 ; 2nt/3
lda KEYPRESS ; 4
bpl no_keypress ; 3
jmp display_loop
no_keypress:
jmp display_loop ; 3
;========================
; Draw a rasterbar
; unroll as memory is free! haha
;========================
; X is location
; 2+22+24+24+24+24+6 = 126
draw_rasterbar:
ldy #0 ; 2
;====
lda y_lookup_l,X ; 4
sta OUTL ; 3
lda y_lookup_h,X ; 4
sta OUTH ; 3
smc_raster_color1_1:
lda #$33 ; 2
sta (OUTL),Y ; 6
;============
; 22
inx ; 2
lda y_lookup_l,X ; 4
sta OUTL ; 3
lda y_lookup_h,X ; 4
sta OUTH ; 3
smc_raster_color2_1:
lda #$bb ; 2
sta (OUTL),Y ; 6
inx ; 2
lda y_lookup_l,X ; 4
sta OUTL ; 3
lda y_lookup_h,X ; 4
sta OUTH ; 3
smc_raster_color3_1:
lda #$ff ; 2
sta (OUTL),Y ; 6
inx
lda y_lookup_l,X ; 4
sta OUTL ; 3
lda y_lookup_h,X ; 4
sta OUTH ; 3
smc_raster_color2_2:
lda #$bb ; 2
sta (OUTL),Y ; 6
inx
lda y_lookup_l,X ; 4
sta OUTL ; 3
lda y_lookup_h,X ; 4
sta OUTH ; 3
smc_raster_color1_2:
lda #$33 ; 2
sta (OUTL),Y ; 6
rts ; 6
.include "gr_simple_clear.s"
.include "gr_offsets.s"
.include "../asm_routines/gr_unrle.s"
.include "../asm_routines/keypress.s"
.align $100
.include "sprites_table.s"
.include "movement_table.s"
.include "gr_copy.s"
.include "vapor_lock.s"
.include "delay_a.s"
pictures:
.word rb_bg_low,rb_bg_high
.include "rb_bg.inc"
red_x: .byte $10
yellow_x: .byte $20
green_x: .byte $30
blue_x: .byte $40

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,34 @@
y_lookup_h:
.byte >(smc032+1),>(smc033+1),>(smc034+1),>(smc035+1),>(smc036+1),>(smc037+1),>(smc038+1),>(smc039+1)
.byte >(smc040+1),>(smc041+1),>(smc042+1),>(smc043+1),>(smc044+1),>(smc045+1),>(smc046+1),>(smc047+1)
.byte >(smc048+1),>(smc049+1),>(smc050+1),>(smc051+1),>(smc052+1),>(smc053+1),>(smc054+1),>(smc055+1)
.byte >(smc056+1),>(smc057+1),>(smc058+1),>(smc059+1),>(smc060+1),>(smc061+1),>(smc062+1),>(smc063+1)
.byte >(smc064+1),>(smc065+1),>(smc066+1),>(smc067+1),>(smc068+1),>(smc069+1),>(smc070+1),>(smc071+1)
.byte >(smc072+1),>(smc073+1),>(smc074+1),>(smc075+1),>(smc076+1),>(smc077+1),>(smc078+1),>(smc079+1)
.byte >(smc080+1),>(smc081+1),>(smc082+1),>(smc083+1),>(smc084+1),>(smc085+1),>(smc086+1),>(smc087+1)
.byte >(smc088+1),>(smc089+1),>(smc090+1),>(smc091+1),>(smc092+1),>(smc093+1),>(smc094+1),>(smc095+1)
.byte >(smc096+1),>(smc097+1),>(smc098+1),>(smc099+1),>(smc100+1),>(smc101+1),>(smc102+1),>(smc103+1)
.byte >(smc104+1),>(smc105+1),>(smc106+1),>(smc107+1),>(smc108+1),>(smc109+1),>(smc110+1),>(smc111+1)
.byte >(smc112+1),>(smc113+1),>(smc114+1),>(smc115+1),>(smc116+1),>(smc117+1),>(smc118+1),>(smc119+1)
.byte >(smc120+1),>(smc121+1),>(smc122+1),>(smc123+1),>(smc124+1),>(smc125+1),>(smc126+1),>(smc127+1)
.byte >(smc128+1),>(smc129+1),>(smc130+1),>(smc131+1),>(smc132+1),>(smc133+1),>(smc134+1),>(smc135+1)
.byte >(smc136+1),>(smc137+1),>(smc138+1),>(smc139+1),>(smc140+1),>(smc141+1),>(smc142+1),>(smc143+1)
.byte >(smc144+1),>(smc145+1),>(smc146+1),>(smc147+1),>(smc148+1),>(smc149+1),>(smc150+1),>(smc151+1)
.byte >(smc152+1),>(smc153+1),>(smc154+1),>(smc155+1),>(smc156+1),>(smc157+1),>(smc158+1),>(smc159+1)
y_lookup_l:
.byte <(smc032+1),<(smc033+1),<(smc034+1),<(smc035+1),<(smc036+1),<(smc037+1),<(smc038+1),<(smc039+1)
.byte <(smc040+1),<(smc041+1),<(smc042+1),<(smc043+1),<(smc044+1),<(smc045+1),<(smc046+1),<(smc047+1)
.byte <(smc048+1),<(smc049+1),<(smc050+1),<(smc051+1),<(smc052+1),<(smc053+1),<(smc054+1),<(smc055+1)
.byte <(smc056+1),<(smc057+1),<(smc058+1),<(smc059+1),<(smc060+1),<(smc061+1),<(smc062+1),<(smc063+1)
.byte <(smc064+1),<(smc065+1),<(smc066+1),<(smc067+1),<(smc068+1),<(smc069+1),<(smc070+1),<(smc071+1)
.byte <(smc072+1),<(smc073+1),<(smc074+1),<(smc075+1),<(smc076+1),<(smc077+1),<(smc078+1),<(smc079+1)
.byte <(smc080+1),<(smc081+1),<(smc082+1),<(smc083+1),<(smc084+1),<(smc085+1),<(smc086+1),<(smc087+1)
.byte <(smc088+1),<(smc089+1),<(smc090+1),<(smc091+1),<(smc092+1),<(smc093+1),<(smc094+1),<(smc095+1)
.byte <(smc096+1),<(smc097+1),<(smc098+1),<(smc099+1),<(smc100+1),<(smc101+1),<(smc102+1),<(smc103+1)
.byte <(smc104+1),<(smc105+1),<(smc106+1),<(smc107+1),<(smc108+1),<(smc109+1),<(smc110+1),<(smc111+1)
.byte <(smc112+1),<(smc113+1),<(smc114+1),<(smc115+1),<(smc116+1),<(smc117+1),<(smc118+1),<(smc119+1)
.byte <(smc120+1),<(smc121+1),<(smc122+1),<(smc123+1),<(smc124+1),<(smc125+1),<(smc126+1),<(smc127+1)
.byte <(smc128+1),<(smc129+1),<(smc130+1),<(smc131+1),<(smc132+1),<(smc133+1),<(smc134+1),<(smc135+1)
.byte <(smc136+1),<(smc137+1),<(smc138+1),<(smc139+1),<(smc140+1),<(smc141+1),<(smc142+1),<(smc143+1)
.byte <(smc144+1),<(smc145+1),<(smc146+1),<(smc147+1),<(smc148+1),<(smc149+1),<(smc150+1),<(smc151+1)
.byte <(smc152+1),<(smc153+1),<(smc154+1),<(smc155+1),<(smc156+1),<(smc157+1),<(smc158+1),<(smc159+1)