From b60043e4b2e7999c69161f519ed0e110bdd0c318 Mon Sep 17 00:00:00 2001 From: blondie7575 Date: Sun, 30 Jul 2017 11:54:37 -0700 Subject: [PATCH] Improved terrain data structure Terrain debug rendering --- GSCats.xcodeproj/project.pbxproj | 6 ++ V2Make.scpt | Bin 2462 -> 2526 bytes equates.s | 1 + gscats.2mg | Bin 819264 -> 819264 bytes gscats.s | 53 +++------------- loader.s | 52 +++++++++++++++ macros.s | 6 ++ terrain.s | 105 +++++++++++++++++++++++++++++++ trigtables.s | 33 ++++++++++ 9 files changed, 213 insertions(+), 43 deletions(-) create mode 100644 loader.s create mode 100644 terrain.s create mode 100644 trigtables.s diff --git a/GSCats.xcodeproj/project.pbxproj b/GSCats.xcodeproj/project.pbxproj index fe1d467..47bd992 100644 --- a/GSCats.xcodeproj/project.pbxproj +++ b/GSCats.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXFileReference section */ + 700C39C51F2E5CA800C24F9C /* trigtables.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = trigtables.s; sourceTree = ""; }; + 706DF1641F2D39F700AA6680 /* loader.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = loader.s; sourceTree = ""; }; + 706DF1651F2D4A8100AA6680 /* terrain.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = terrain.s; sourceTree = ""; }; 70E9D85F1F2BD95400555C19 /* equates.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = equates.s; sourceTree = ""; }; 70E9D8601F2BD95400555C19 /* graphics.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = graphics.s; sourceTree = ""; }; 70E9D8611F2BD95400555C19 /* gscats.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = gscats.s; sourceTree = ""; }; @@ -21,6 +24,9 @@ 70E9D85F1F2BD95400555C19 /* equates.s */, 70E9D8601F2BD95400555C19 /* graphics.s */, 70E9D8621F2BD95400555C19 /* macros.s */, + 706DF1641F2D39F700AA6680 /* loader.s */, + 706DF1651F2D4A8100AA6680 /* terrain.s */, + 700C39C51F2E5CA800C24F9C /* trigtables.s */, 70E9D8611F2BD95400555C19 /* gscats.s */, 70E9D8631F2BD95400555C19 /* Makefile */, ); diff --git a/V2Make.scpt b/V2Make.scpt index cdcc6ea32183ceca9a0ec53f23a2d33f0f2fddf1..5da294f64385c78fb8336372324041c56ea07422 100644 GIT binary patch delta 214 zcmbOyd{218b5^Ez9Fsq?dQD>Em~71^$T(rLFPjDnqv4r`$(3wQOlM|H-pi)U&l_Bx znp$FL7H_O)pl8f5`7N7tumDIA184p{AilxCH2Eq66N9a9Vsd6)Nq%vLf`^M$XmM&$ zu@ysMiWP%PetBL_eqsuci((XEm~71^$QUr$mra9(Vaw)+lPlSrn9iPT(mn3*R>v}kHNaXvCwuX*4B=fQp;dB|X8FGnleN(KgnG|ojz zN(yT^6fScrY~xg@nY^S$g^i&BXdC}TMMaW#y$6q;JbUr#_1pI!K7Ri4_1ll1zkdDx^Y`z+fB*hN0Fd?f z@1Nhle*OIM?dzA%A3wZ*`})<3XHOnIxOeB)jjNY0o;!2$_>qJA_w3xZdE>g(E0!*r zKWFB&$rE}y+v=MeYOBgi3Uag3QxfB%BSM4xeZAaW9PMo^%}tE-b+t9rRFo9tWTYg- zM1=(f_<4D_xj5L_*jQPZnVFcF7$E@2VrFJxWn*LK;Ns@tT(md>JQ4v}h{Za6U3vuX*4B=fQp;dB|X8J4Y+qN(Kgn1kOc* zf(pwy6v`&AYEfa~|G>aMQBivG+ZGO~TF#XW{iX*Vtj{>`ptp{b)1V*7IHX|RTR)k< oHBPXW6C}B|juRrhwtjM5tLNltxl)@abS^O%CCCbcgf>nl0CzCwbN~PV diff --git a/gscats.s b/gscats.s index aff6e36..3176d05 100644 --- a/gscats.s +++ b/gscats.s @@ -1,6 +1,5 @@ ; -; gsshr -; GS sample application +; gscats ; ; Created by Quinn Dunki on 7/9/17 ; @@ -8,43 +7,7 @@ .include "macros.s" .include "equates.s" - - -.org $800 - -main: - NATIVE - -mainCopyStart: - ldx #0 - lda #mainBank2 - sta mainCopyDest+1 - -mainCopyLoop: - lda mainBank2,x - -mainCopyDest: - sta $020800,x - inx - cpx #endMainBank2-mainBank2 - bne mainCopyLoop - - lda #returnToProDOS - sta proDOSLongJump - lda #mainBank2 - sta mainLongJump - jml (mainLongJump) - -returnToProDOS: - SYNCDBR - EMULATION - rts - -mainLongJump: - .byte 00,08,02 -proDOSLongJump: - .byte 00,00,00 - +.include "loader.s" mainBank2: SYNCDBR @@ -54,6 +17,7 @@ mainBank2: sta TEXTCOLOR BITS16 + ; Set up SCBs jsr initSCBs SHRVIDEO @@ -62,9 +26,12 @@ mainBank2: lda #0 jsr setPalette - ldx #$1111 + ldx #$2222 jsr colorFill + jsr generateTerrain + jsr renderTerrainColumns + jsr kbdWait CLASSICVIDEO @@ -91,12 +58,12 @@ kbdWaitLoop: basePalette: - .word $0F00,$00F0,$000F,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000 + .word $0000,$0080,$0000,$000F,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000,$0000 .include "graphics.s" - - +.include "terrain.s" +.include "trigTables.s" endMainBank2: diff --git a/loader.s b/loader.s new file mode 100644 index 0000000..d4c35b4 --- /dev/null +++ b/loader.s @@ -0,0 +1,52 @@ +; +; loader +; A very simplistic code loader designed to manage +; GS code under ProDOS 8 (if it's good enough for Will Harvey...) +; +; Created by Quinn Dunki on 7/29/17 +; + +.org $800 + +main: + NATIVE + +; Copy main code that ProDOS 8 loaded into bank 2. +; Bank 2 is our "main" code bank because the GS fast +; graphics path really messes with banks 0 and 1. +; ProDOS 8 doesn't know anything about non-zero banks +; though, so things get loaded here and moved. + +mainCopyStart: + ldx #0 + lda #mainBank2 + sta mainCopyDest+1 + +mainCopyLoop: + lda mainBank2,x + +mainCopyDest: + sta $020800,x + inx + cpx #endMainBank2-mainBank2 + bne mainCopyLoop + + ; Set up a long jump into bank 2, and + ; a way for game code to get back here to exit + ; properly to ProDOS 8 + lda #returnToProDOS + sta proDOSLongJump + lda #mainBank2 + sta mainLongJump + jml (mainLongJump) + +returnToProDOS: + SYNCDBR + EMULATION + rts + +mainLongJump: + .byte 00,08,02 +proDOSLongJump: + .byte 00,00,00 + diff --git a/macros.s b/macros.s index 31a1f58..93153ab 100644 --- a/macros.s +++ b/macros.s @@ -110,6 +110,12 @@ .endmacro +.macro LOADPARAM24 bankNumDoubled,addr16 + lda #bankNumDoubled + sta PARAM24+1 + lda #addr16 + sta PARAM24 +.endmacro ;;;;;;;;;; ; Stack Macros diff --git a/terrain.s b/terrain.s new file mode 100644 index 0000000..06bf777 --- /dev/null +++ b/terrain.s @@ -0,0 +1,105 @@ +; +; terrain +; +; Created by Quinn Dunki on 7/29/17 +; + + +TERRAINWIDTH = 320 ; In pixels +MAXTERRAINHEIGHT = 80 ; In pixels + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; renderTerrainColumn +; +; This is not fast- probably only useful for debugging +; +; Y = Index into height data +; PARAM24 = 24-bit pointer to bottom of column in VRAM +; +; Trashes A and X + +renderTerrainColumn: + phy + BITS8 + lda PARAM24+2 + sta renderTerrainColumnSMC+3 + BITS16 + ply + + lda PARAM24 + sta renderTerrainColumnSMC+1 + pha ; Cache 16-bit VRAM pointer on the stack + + lda terrainData,y + and #$00ff + tax + +renderTerrainColumnLoop: + dex + beq renderTerrainColumnDone + lda #$1111 + +renderTerrainColumnSMC: + sta $e19c60 + pla + sec + sbc #160 + sta renderTerrainColumnSMC+1 + pha + bra renderTerrainColumnLoop + +renderTerrainColumnDone: + pla + rts + + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; renderTerrainColumns +; +; This is not fast- probably only useful for debugging +; + +renderTerrainColumns: + LOADPARAM24 $e1e1,$9c60 + ldy #0 + +renderTerrainColumnsLoop: + jsr renderTerrainColumn + iny + cpy #TERRAINWIDTH/4 + beq renderTerrainColumnsDone + inc PARAM24 + inc PARAM24 + bra renderTerrainColumnsLoop + +renderTerrainColumnsDone: + rts + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; generateTerrain +; +; Trashes A and Y +; +generateTerrain: + ldy #0 + lda #terrainData + sta SCRATCHL + lda #MAXTERRAINHEIGHT + +generateTerrainLoop: + sta (SCRATCHL),y + iny + cpy #TERRAINWIDTH/4 + bne generateTerrainLoop + + rts + + +; Terrain data, stored as height values 4 pixels wide + +terrainData: + .repeat TERRAINWIDTH/4 + .byte 0 + .endrepeat diff --git a/trigtables.s b/trigtables.s new file mode 100644 index 0000000..91287f2 --- /dev/null +++ b/trigtables.s @@ -0,0 +1,33 @@ +sineTable: + .byte $80, $83, $86, $89, $8C, $90, $93, $96 + .byte $99, $9C, $9F, $A2, $A5, $A8, $AB, $AE + .byte $B1, $B3, $B6, $B9, $BC, $BF, $C1, $C4 + .byte $C7, $C9, $CC, $CE, $D1, $D3, $D5, $D8 + .byte $DA, $DC, $DE, $E0, $E2, $E4, $E6, $E8 + .byte $EA, $EB, $ED, $EF, $F0, $F1, $F3, $F4 + .byte $F5, $F6, $F8, $F9, $FA, $FA, $FB, $FC + .byte $FD, $FD, $FE, $FE, $FE, $FF, $FF, $FF + .byte $FF, $FF, $FF, $FF, $FE, $FE, $FE, $FD + .byte $FD, $FC, $FB, $FA, $FA, $F9, $F8, $F6 + .byte $F5, $F4, $F3, $F1, $F0, $EF, $ED, $EB + .byte $EA, $E8, $E6, $E4, $E2, $E0, $DE, $DC + .byte $DA, $D8, $D5, $D3, $D1, $CE, $CC, $C9 + .byte $C7, $C4, $C1, $BF, $BC, $B9, $B6, $B3 + .byte $B1, $AE, $AB, $A8, $A5, $A2, $9F, $9C + .byte $99, $96, $93, $90, $8C, $89, $86, $83 + .byte $80, $7D, $7A, $77, $74, $70, $6D, $6A + .byte $67, $64, $61, $5E, $5B, $58, $55, $52 + .byte $4F, $4D, $4A, $47, $44, $41, $3F, $3C + .byte $39, $37, $34, $32, $2F, $2D, $2B, $28 + .byte $26, $24, $22, $20, $1E, $1C, $1A, $18 + .byte $16, $15, $13, $11, $10, $0F, $0D, $0C + .byte $0B, $0A, $08, $07, $06, $06, $05, $04 + .byte $03, $03, $02, $02, $02, $01, $01, $01 + .byte $01, $01, $01, $01, $02, $02, $02, $03 + .byte $03, $04, $05, $06, $06, $07, $08, $0A + .byte $0B, $0C, $0D, $0F, $10, $11, $13, $15 + .byte $16, $18, $1A, $1C, $1E, $20, $22, $24 + .byte $26, $28, $2B, $2D, $2F, $32, $34, $37 + .byte $39, $3C, $3F, $41, $44, $47, $4A, $4D + .byte $4F, $52, $55, $58, $5B, $5E, $61, $64 + .byte $67, $6A, $6D, $70, $74, $77, $7A, $7D