mirror of
https://github.com/deater/dos33fsprogs.git
synced 2024-07-04 08:29:30 +00:00
fancy_lores: loads at least. now to figre out vapor lock
This commit is contained in:
Vince Weaver
parent
dd5fe8623c
commit
51dd5e9a25
|
|
@ -1,25 +0,0 @@
|
|||
include ../Makefile.inc
|
||||
|
||||
all: png_to_40x96 katahdin_40_96.inc
|
||||
|
||||
|
||||
katahdin_40_96.inc: png_to_40x96 katahdin_40_96.png
|
||||
./png_to_40x96 asm katahdin_40_96.png katahdin > katahdin_40_96.inc
|
||||
|
||||
loadpng.o: loadpng.c
|
||||
$(CC) $(CFLAGS) -c loadpng.c
|
||||
|
||||
png_to_40x96: png_to_40x96.o
|
||||
$(CC) $(LFLAGS) -lpng -o png_to_40x96 png_to_40x96.o
|
||||
|
||||
png_to_40x96.o: png_to_40x96.c
|
||||
$(CC) $(CFLAGS) -c png_to_40x96.c
|
||||
|
||||
|
||||
install:
|
||||
cp png_to_40x96 $(INSTALL_LOC)
|
||||
|
||||
clean:
|
||||
rm -f *~ *.o *.inc png_to_40x96
|
||||
|
||||
|
||||
37
fancy_lores/Makefile
Normal file
37
fancy_lores/Makefile
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
include ../Makefile.inc
|
||||
|
||||
DOS33 = ../dos33fs-utils/dos33
|
||||
|
||||
all: fancy_lores_viewer.dsk png_to_40x96 katahdin_40_96.inc
|
||||
|
||||
fancy_lores_viewer.dsk: DISP4096
|
||||
$(DOS33) -y fancy_lores_viewer.dsk BSAVE -a 0x1000 DISP4096
|
||||
|
||||
DISP4096: disp4096.o
|
||||
ld65 -o DISP4096 disp4096.o -C ../linker_scripts/apple2_1000.inc
|
||||
|
||||
|
||||
disp4096.o: disp4096.s gr_copy.s \
|
||||
katahdin_40_96.inc
|
||||
ca65 -o disp4096.o disp4096.s -l disp4096.lst
|
||||
|
||||
katahdin_40_96.inc: png_to_40x96 katahdin_40_96.png
|
||||
./png_to_40x96 asm katahdin_40_96.png katahdin > katahdin_40_96.inc
|
||||
|
||||
loadpng.o: loadpng.c
|
||||
$(CC) $(CFLAGS) -c loadpng.c
|
||||
|
||||
png_to_40x96: png_to_40x96.o
|
||||
$(CC) $(LFLAGS) -lpng -o png_to_40x96 png_to_40x96.o
|
||||
|
||||
png_to_40x96.o: png_to_40x96.c
|
||||
$(CC) $(CFLAGS) -c png_to_40x96.c
|
||||
|
||||
|
||||
install:
|
||||
cp png_to_40x96 $(INSTALL_LOC)
|
||||
|
||||
clean:
|
||||
rm -f *~ *.o *.lst *.inc png_to_40x96 DISP4096
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
351
fancy_lores/disp4096.s
Normal file
351
fancy_lores/disp4096.s
Normal file
|
|
@ -0,0 +1,351 @@
|
|||
; Display a 40x96 lo-res image
|
||||
|
||||
; Uses the 40x96 page1/page2 every-2-scanline pageflip mode
|
||||
; as shown in my kfest18 hackfest demo
|
||||
|
||||
; 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
|
||||
|
||||
; 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
|
||||
|
||||
|
||||
;===================
|
||||
; init screen
|
||||
|
||||
jsr TEXT
|
||||
jsr HOME
|
||||
|
||||
;===================
|
||||
; init vars
|
||||
|
||||
lda #0
|
||||
sta DRAW_PAGE
|
||||
|
||||
; Clear Page0
|
||||
lda #$00
|
||||
sta DRAW_PAGE
|
||||
jsr clear_gr
|
||||
|
||||
; draw border line
|
||||
|
||||
; lda #$55
|
||||
; ldy #38
|
||||
; jsr hline
|
||||
|
||||
; Clear Page1
|
||||
lda #$4
|
||||
sta DRAW_PAGE
|
||||
lda #$0
|
||||
jsr clear_gr
|
||||
|
||||
|
||||
;==================
|
||||
; Draw Blue Border on screen
|
||||
;==================
|
||||
; F -> 7 -> 6 -> 2
|
||||
|
||||
; lda #$0
|
||||
; sta DRAW_PAGE
|
||||
; lda #$6f
|
||||
; ldy #0
|
||||
; jsr hline
|
||||
; lda #$72
|
||||
; ldy #38
|
||||
; jsr hline
|
||||
|
||||
|
||||
; lda #$4
|
||||
; sta DRAW_PAGE
|
||||
; lda #$27
|
||||
; ldy #0
|
||||
; jsr hline
|
||||
; lda #$f6
|
||||
; ldy #38
|
||||
; jsr hline
|
||||
|
||||
;=============================
|
||||
; Load graphic page0
|
||||
|
||||
lda #$0c
|
||||
sta BASH
|
||||
lda #$00
|
||||
sta BASL ; load image to page0 $400
|
||||
|
||||
lda #>(katahdin_low)
|
||||
sta GBASH
|
||||
lda #<(katahdin_low)
|
||||
sta GBASL
|
||||
jsr load_rle_gr
|
||||
|
||||
lda #0
|
||||
sta DRAW_PAGE
|
||||
|
||||
jsr gr_copy_to_current
|
||||
|
||||
; GR part
|
||||
bit PAGE0
|
||||
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 page0 $400
|
||||
|
||||
lda #>(katahdin_high)
|
||||
sta GBASH
|
||||
lda #<(katahdin_high)
|
||||
sta GBASL
|
||||
jsr load_rle_gr
|
||||
|
||||
lda #4
|
||||
sta DRAW_PAGE
|
||||
|
||||
jsr gr_copy_to_current
|
||||
|
||||
; GR part
|
||||
bit PAGE1
|
||||
|
||||
jsr wait_until_keypressed
|
||||
|
||||
|
||||
|
||||
;=====================================================
|
||||
; attempt vapor lock
|
||||
; by reading the "floating bus" we can see most recently
|
||||
; written value of the display
|
||||
; we look for $55 (which is the grey line)
|
||||
;=====================================================
|
||||
; See:
|
||||
; Have an Apple Split by Bob Bishop
|
||||
; Softalk, October 1982
|
||||
|
||||
; Challenges: each scan line scans 40 bytes.
|
||||
; The blanking happens at the *beginning*
|
||||
; So 65 bytes are scanned, starting at adress of the line - 25
|
||||
|
||||
; the scan takes 8 cycles, look for 4 repeats of the value
|
||||
; to avoid false positive found if the horiz blanking is mirroring
|
||||
; the line (max 3 repeats in that case)
|
||||
|
||||
vapor_lock_loop: ; first make sure we have all zeroes
|
||||
LDA #$00
|
||||
zxloop:
|
||||
LDX #$04
|
||||
wiloop:
|
||||
CMP $C051
|
||||
BNE zxloop
|
||||
DEX
|
||||
BNE wiloop
|
||||
|
||||
LDA #$72 ; now look for our border color (4 times)
|
||||
zloop:
|
||||
LDX #$04
|
||||
qloop:
|
||||
CMP $C051
|
||||
BNE zloop
|
||||
DEX
|
||||
BNE qloop
|
||||
|
||||
; found first line of low-res grey, need to kill time
|
||||
; until we can enter at top of screen
|
||||
; so we want roughly 10 lines * 4 = 40*65 = 2600+4550-65
|
||||
; +4550 - 65 (for the scanline we missed) = 7085 - 12 = 7073
|
||||
|
||||
|
||||
; GR part
|
||||
bit LORES ; 4
|
||||
bit SET_GR ; 4
|
||||
bit FULLGR ; 4
|
||||
|
||||
|
||||
; want 7073
|
||||
; Try X=26 Y=52 cycles=7073
|
||||
|
||||
lda #0 ; 2
|
||||
lda #0 ; 2
|
||||
|
||||
ldy #52 ; 2
|
||||
loopA:
|
||||
ldx #26 ; 2
|
||||
loopB:
|
||||
dex ; 2
|
||||
bne loopB ; 2nt/3
|
||||
|
||||
dey ; 2
|
||||
bne loopA ; 2nt/3
|
||||
|
||||
jmp display_loop
|
||||
.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
|
||||
|
||||
|
||||
; 2 + 48*( (4+2+25*(2+3)) + (4+2+23*(2+3)+4+5)) + 9)
|
||||
; 48*[(6+125)-1] + [(6+115+10)-1]
|
||||
|
||||
display_loop:
|
||||
|
||||
ldy #48 ; 2
|
||||
|
||||
outer_loop:
|
||||
|
||||
bit PAGE0 ; 4
|
||||
ldx #25 ; 130 cycles with PAGE0 ; 2
|
||||
page0_loop: ; delay 126+bit
|
||||
dex ; 2
|
||||
bne page0_loop ; 2/3
|
||||
|
||||
|
||||
bit PAGE1 ; 4
|
||||
ldx #23 ; 130 cycles with PAGE1 ; 2
|
||||
page1_loop: ; delay 115+(7 loop)+4 (bit)+4(extra)
|
||||
dex ; 2
|
||||
bne page1_loop ; 2/3
|
||||
|
||||
nop ; 2
|
||||
lda DRAW_PAGE ; 3
|
||||
|
||||
dey ; 2
|
||||
bne outer_loop ; 2/3
|
||||
|
||||
|
||||
|
||||
;======================================================
|
||||
; We have 4550 cycles in the vblank, use them wisely
|
||||
;======================================================
|
||||
; scroll_the_text should be 4550+1 -2 - 13 -13 = 4523
|
||||
; rasterbars should be 4550+1 -2 - 13 -18 = 4518
|
||||
; do_nothing should be 4550+1 -2 - 13 -19 = 4517
|
||||
|
||||
jsr do_nothing ; 6
|
||||
jmp display_loop ; 3
|
||||
|
||||
|
||||
|
||||
;=================================
|
||||
; do nothing
|
||||
;=================================
|
||||
; and take 4517-6 = 4511 cycles to do it
|
||||
do_nothing:
|
||||
; Try X=7 Y=110 cycles=4511
|
||||
|
||||
ldy #110 ; 2
|
||||
loop1:
|
||||
ldx #7 ; 2
|
||||
loop2:
|
||||
dex ; 2
|
||||
bne loop2 ; 2nt/3
|
||||
|
||||
dey ; 2
|
||||
bne loop1 ; 2nt/3
|
||||
|
||||
|
||||
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 "../asm_routines/gr_unrle.s"
|
||||
.include "../asm_routines/keypress.s"
|
||||
.include "gr_copy.s"
|
||||
|
||||
.include "katahdin_40_96.inc"
|
||||
|
||||
BIN
fancy_lores/fancy_lores_viewer.dsk
Normal file
BIN
fancy_lores/fancy_lores_viewer.dsk
Normal file
Binary file not shown.
59
fancy_lores/gr_copy.s
Normal file
59
fancy_lores/gr_copy.s
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
;=========================================================
|
||||
; gr_copy_to_current, 40x48 version
|
||||
;=========================================================
|
||||
; copy 0xc00 to DRAW_PAGE
|
||||
;
|
||||
; 45 + 2 + 120*(8*9 + 5) -1 + 6 = 9292
|
||||
|
||||
gr_copy_to_current:
|
||||
|
||||
lda DRAW_PAGE ; 3
|
||||
clc ; 2
|
||||
adc #$4 ; 2
|
||||
sta gr_copy_line+5 ; 4
|
||||
sta gr_copy_line+11 ; 4
|
||||
adc #$1 ; 2
|
||||
sta gr_copy_line+17 ; 4
|
||||
sta gr_copy_line+23 ; 4
|
||||
adc #$1 ; 2
|
||||
sta gr_copy_line+29 ; 4
|
||||
sta gr_copy_line+35 ; 4
|
||||
adc #$1 ; 2
|
||||
sta gr_copy_line+41 ; 4
|
||||
sta gr_copy_line+47 ; 4
|
||||
;===========
|
||||
; 45
|
||||
|
||||
ldy #119 ; for early ones, copy 120 bytes ; 2
|
||||
|
||||
gr_copy_line:
|
||||
lda $C00,Y ; load a byte (self modified) ; 4
|
||||
sta $400,Y ; store a byte (self modified) ; 5
|
||||
|
||||
lda $C80,Y ; load a byte (self modified) ; 4
|
||||
sta $480,Y ; store a byte (self modified) ; 5
|
||||
|
||||
lda $D00,Y ; load a byte (self modified) ; 4
|
||||
sta $500,Y ; store a byte (self modified) ; 5
|
||||
|
||||
lda $D80,Y ; load a byte (self modified) ; 4
|
||||
sta $580,Y ; store a byte (self modified) ; 5
|
||||
|
||||
lda $E00,Y ; load a byte (self modified) ; 4
|
||||
sta $600,Y ; store a byte (self modified) ; 5
|
||||
|
||||
lda $E80,Y ; load a byte (self modified) ; 4
|
||||
sta $680,Y ; store a byte (self modified) ; 5
|
||||
|
||||
lda $F00,Y ; load a byte (self modified) ; 4
|
||||
sta $700,Y ; store a byte (self modified) ; 5
|
||||
|
||||
lda $F80,Y ; load a byte (self modified) ; 4
|
||||
sta $780,Y ; store a byte (self modified) ; 5
|
||||
|
||||
dey ; decrement pointer ; 2
|
||||
|
||||
|
||||
bpl gr_copy_line ; ; 2nt/3
|
||||
rts ; 6
|
||||
|
||||
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 133 KiB |
|
|
@ -103,7 +103,7 @@ int loadpng(char *filename, unsigned char **image_ptr, int *xsize, int *ysize,
|
|||
width = png_get_image_width(png_ptr, info_ptr);
|
||||
height = png_get_image_height(png_ptr, info_ptr);
|
||||
*xsize=width;
|
||||
*ysize=height;
|
||||
*ysize=height/2;
|
||||
|
||||
color_type = png_get_color_type(png_ptr, info_ptr);
|
||||
bit_depth = png_get_bit_depth(png_ptr, info_ptr);
|
||||
|
|
@ -137,7 +137,7 @@ int loadpng(char *filename, unsigned char **image_ptr, int *xsize, int *ysize,
|
|||
out_ptr=image;
|
||||
|
||||
if (color_type==PNG_COLOR_TYPE_RGB_ALPHA) {
|
||||
for(y=0;y<height;y+=2) {
|
||||
for(y=high;y<height;y+=4) {
|
||||
for(x=0;x<width;x++) {
|
||||
|
||||
/* top color */
|
||||
|
|
@ -151,9 +151,9 @@ int loadpng(char *filename, unsigned char **image_ptr, int *xsize, int *ysize,
|
|||
a2_color=convert_color(color);
|
||||
|
||||
/* bottom color */
|
||||
color= (row_pointers[y+1][x*4]<<16)+
|
||||
(row_pointers[y+1][x*4+1]<<8)+
|
||||
(row_pointers[y+1][x*4+2]);
|
||||
color= (row_pointers[y+2][x*4]<<16)+
|
||||
(row_pointers[y+2][x*4+1]<<8)+
|
||||
(row_pointers[y+2][x*4+2]);
|
||||
if (debug) {
|
||||
printf("%x ",color);
|
||||
}
|
||||
|
|
@ -167,14 +167,14 @@ int loadpng(char *filename, unsigned char **image_ptr, int *xsize, int *ysize,
|
|||
}
|
||||
}
|
||||
else if (color_type==PNG_COLOR_TYPE_PALETTE) {
|
||||
for(y=0;y<height;y+=2) {
|
||||
for(y=high;y<height;y+=4) {
|
||||
for(x=0;x<width;x++) {
|
||||
|
||||
/* top color */
|
||||
a2_color=row_pointers[y][x];
|
||||
|
||||
/* bottom color */
|
||||
color=row_pointers[y+1][x];
|
||||
color=row_pointers[y+2][x];
|
||||
|
||||
a2_color|=(color<<4);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user