Apple-2gs-SW/iigs-game-engine
1
0
Fork 0
mirror of https://github.com/lscharen/iigs-game-engine.git synced 2024-11-28 20:49:38 +00:00
Code Issues Projects Releases Wiki Activity

Update dynamic tile rendered to use fixed snippets. Add DAMAGES flag for the one render that doesn't fit the mold

Browse Source
This commit is contained in:
Lucas Scharenbroich 2023-03-03 21:44:39 -06:00
parent dd9ced08f1
commit 6832c7f405
3 changed files with 62 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Defs.s
View File

@ -216,16 +216,16 @@ PAD_BUTTON_A equ $0200
PAD_KEY_DOWN equ $0400 PAD_KEY_DOWN equ $0400
; Tile constants ; Tile constants
; TILE_RESERVED_BIT equ $8000 TILE_DAMAGED_BIT equ $8000 ; Mark a tile as damaged (internal only)
TILE_PRIORITY_BIT equ $4000 ; Put tile on top of sprite TILE_PRIORITY_BIT equ $4000 ; Put tile on top of sprite (unimplemented)
TILE_FRINGE_BIT equ $2000 ; Unused TILE_FRINGE_BIT equ $2000 ; Unused
TILE_SOLID_BIT equ $1000 ; Hint bit used in TWO_LAYER_MODE to optimize rendering TILE_SOLID_BIT equ $1000 ; Hint bit used in TWO_LAYER_MODE to optimize rendering
TILE_DYN_BIT equ $0800 ; Is this a Dynamic Tile? TILE_DYN_BIT equ $0800 ; Is this a Dynamic Tile?
TILE_VFLIP_BIT equ $0400 TILE_VFLIP_BIT equ $0400
TILE_HFLIP_BIT equ $0200 TILE_HFLIP_BIT equ $0200
TILE_ID_MASK equ $01FF TILE_ID_MASK equ $01FF
TILE_CTRL_MASK equ $FE00 TILE_CTRL_MASK equ $7E00
; TILE_PROC_MASK equ $F800 ; Select tile proc for rendering ; TILE_PROC_MASK equ $7800 ; Select tile proc for rendering
; Sprite constants ; Sprite constants
SPRITE_COMPILED equ $4000 ; This is a compiled sprite (SPRITE_DISP points to a routine in the compiled cache bank) SPRITE_COMPILED equ $4000 ; This is a compiled sprite (SPRITE_DISP points to a routine in the compiled cache bank)

21
src/blitter/Template.s
View File

@ -29,7 +29,8 @@ SNIPPET_BASE equ snippets-base
SNIPPET_ENTRY_1 equ 0 ; two layer + dynamic tile + sprite SNIPPET_ENTRY_1 equ 0 ; two layer + dynamic tile + sprite
SNIPPET_ENTRY_2 equ 4 ; (two layer | dynamic tile) + sprite SNIPPET_ENTRY_2 equ 4 ; (two layer | dynamic tile) + sprite
SNIPPET_ENTRY_3 equ 18 ; two layer + dynamic tile (no sprite) SNIPPET_ENTRY_3 equ 18 ; sprite under dynamic tile
SNIPPET_ENTRY_4 equ 19 ; two layer + dynamic tile (no sprite)
; Locations that need the page offset added ; Locations that need the page offset added
PagePatches da {long_0-base+2} PagePatches da {long_0-base+2}
@ -51,7 +52,7 @@ PagePatches da {long_0-base+2}
]index equ 0 ]index equ 0
lup 82 ; Patch anything that needs updating within the snippets lup 82 ; Patch anything that needs updating within the snippets
da {snippets-base+{]index*32}+17} da {snippets-base+{]index*32}+17}
da {snippets-base+{]index*32}+28} da {snippets-base+{]index*32}+29}
]index equ ]index+1 ]index equ ]index+1
--^ --^
PagePatchNum equ *-PagePatches PagePatchNum equ *-PagePatches
@ -296,7 +297,8 @@ epilogue_1 tsc
; bcs _alt ; bcs _alt
; _16bit pha ; _16bit pha
; jmp NEXT ; jmp NEXT
; lda (00),y <--- Entry Point 3 (sneak this in here to avoid extra branch) ; db 1 <--- Entry Point 3 (opcode for an LDA #DATA instruction)
; lda (00),y <--- Entry Point 4 (sneak this in here to avoid extra branch)
; and $80,x ; and $80,x
; ora $00,x ; ora $00,x
; bcc _16bit ; bcc _16bit
@ -319,12 +321,13 @@ snippets lup 82
bcs :byte ; 12: if C = 0, just push the data and return bcs :byte ; 12: if C = 0, just push the data and return
:word pha ; 14: :word pha ; 14:
jmp loop+3+{3*]index}-base ; 15: Return address offset within the code field jmp loop+3+{3*]index}-base ; 15: Return address offset within the code field
lda ({{81-]index}*2}),y ; 18: Pre-set the LDA (XX),y instructions db $A9 ; 18: LDA #DATA opcode
and $80,x ; 20: lda ({{81-]index}*2}),y ; 19: Pre-set the LDA (XX),y instructions
ora $00,x ; 22: and $80,x ; 21:
bcc :word ; 24: ora $00,x ; 23:
:byte jmp jmp_rtn-base ; 26: bcc :word ; 25:
ds 3 ; 29: Padding to make a full 32 bytes :byte jmp jmp_rtn-base ; 27:
ds 2 ; 30: Padding to make a full 32 bytes
]index equ ]index+1 ]index equ ]index+1
--^ --^
top top

144
src/render/Dynamic.s
View File

@ -45,6 +45,7 @@ CopyDynamicTile
; populating the code field and snippet space ; populating the code field and snippet space
DynamicOver DynamicOver
lda TileStore+TS_JMP_ADDR,x ; Get the address of the exception handler lda TileStore+TS_JMP_ADDR,x ; Get the address of the exception handler
ora #SNIPPET_ENTRY_2
sta _JTBL_CACHE sta _JTBL_CACHE
lda TileStore+TS_TILE_ID,x ; Get the original tile descriptor lda TileStore+TS_TILE_ID,x ; Get the original tile descriptor
@ -91,6 +92,7 @@ DynamicOver
DynamicUnder DynamicUnder
lda TileStore+TS_JMP_ADDR,x ; Get the address of the exception handler lda TileStore+TS_JMP_ADDR,x ; Get the address of the exception handler
ora #SNIPPET_ENTRY_3
sta _JTBL_CACHE sta _JTBL_CACHE
lda TileStore+TS_TILE_ID,x ; Get the original tile descriptor lda TileStore+TS_TILE_ID,x ; Get the original tile descriptor
@ -164,6 +166,7 @@ _DynFillJmpOpcode
CopyDynamicTileTwoLyr CopyDynamicTileTwoLyr
ldal TileStore+TS_JMP_ADDR,x ; Get the address of the exception handler ldal TileStore+TS_JMP_ADDR,x ; Get the address of the exception handler
ora #SNIPPET_ENTRY_4
sta _JTBL_CACHE sta _JTBL_CACHE
ldal TileStore+TS_WORD_OFFSET,x ldal TileStore+TS_WORD_OFFSET,x
@ -215,9 +218,10 @@ CopyDynamicTileTwoLyr
jmp _DynFillJmpOpcode jmp _DynFillJmpOpcode
; Render a sprite on top of a dyamic tile with transparent areas shwing the second background ; Render a sprite on top of a dyamic tile with transparent areas showing the second background
DynamicOverTwoLyr DynamicOverTwoLyr
lda TileStore+TS_JMP_ADDR,x ; Get the address of the exception handler lda TileStore+TS_JMP_ADDR,x ; Get the address of the exception handler
ora #SNIPPET_ENTRY_1
sta _JTBL_CACHE sta _JTBL_CACHE
lda TileStore+TS_WORD_OFFSET,x lda TileStore+TS_WORD_OFFSET,x
@ -275,9 +279,19 @@ DynamicOverTwoLyr
plb plb
rts rts
; Render a sprite on top of a dyamic tile with transparent areas shwing the second background ; Render a sprite under a dyamic tile with transparent areas showing the second background
;
; This is a special case where we cannot fit the code into the fixed snippet structure. As such,
; any tile drawn with this routine will set a DAMAGED flag on the TileStore flags. If another
; tile blitter in the TwoLayer function set sees that a tile is marked as DAMAGED, it must
; restore the original code structure before proceeding.
;
; The damages area is not too bad -- just the 10 bytes from [2, 10] are overwritten and must be
; restored. This is actually less work than a lot of the snippet macros were doing before
; applying the fixed snippet optimization.
DynamicUnderTwoLyr DynamicUnderTwoLyr
lda TileStore+TS_JMP_ADDR,x ; Get the address of the exception handler lda TileStore+TS_JMP_ADDR,x ; Get the address of the exception handler
ora #SNIPPET_ENTRY_1
sta _JTBL_CACHE sta _JTBL_CACHE
lda TileStore+TS_WORD_OFFSET,x lda TileStore+TS_WORD_OFFSET,x
@ -290,6 +304,8 @@ DynamicUnderTwoLyr
; perform and EOR #$2080 to covert the opcode and operand in one instruction ; perform and EOR #$2080 to covert the opcode and operand in one instruction
lda TileStore+TS_TILE_ID,x ; Get the original tile descriptor lda TileStore+TS_TILE_ID,x ; Get the original tile descriptor
ora #TILE_DAMAGED_BIT ; Set the DAMAGED bit here since we have to load TILE_ID anyway
sta TileStore+TS_TILE_ID,x
and #$007F ; clamp to < (32 * 4) and #$007F ; clamp to < (32 * 4)
ora #$3580 ; Pre-calc the AND $80,x opcode + operand ora #$3580 ; Pre-calc the AND $80,x opcode + operand
xba xba
@ -368,18 +384,12 @@ mixed cmp #$FFFF ; All 1's in the mask is a fully transparent sp
lda _OP_CACHE ; Get the LDA dp,x instruction for this column lda _OP_CACHE ; Get the LDA dp,x instruction for this column
sta: $0000,x sta: $0000,x
lda #$0029 ; AND #SPRITE_MASK
sta: $0002,x
lda tmp_sprite_mask+{]1} lda tmp_sprite_mask+{]1}
sta: $0003,x sta: $0003,x
lda #$0009 ; ORA #SPRITE_DATA
sta: $0005,x
lda tmp_sprite_data+{]1} lda tmp_sprite_data+{]1}
sta: $0006,x sta: $0006,x
lda #$0D80 ; branch to the prologue (BRA *+15)
sta: $0008,x
bra next bra next
; This is a transparent word, so just show the dynamic data ; This is a transparent word, so just show the dynamic data
@ -412,8 +422,6 @@ CopyDynUnder MAC
sta: {]2}+1,y sta: {]2}+1,y
tax ; This becomes the new address that we use to patch in tax ; This becomes the new address that we use to patch in
lda #$00A9 ; LDA #DATA
sta: $0000,x
lda tmp_sprite_data+{]1} lda tmp_sprite_data+{]1}
sta: $0001,x sta: $0001,x
@ -421,9 +429,6 @@ CopyDynUnder MAC
sta: $0003,x ; AND $80,x sta: $0003,x ; AND $80,x
eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand
sta: $0005,x ; ORA $00,x sta: $0005,x ; ORA $00,x
lda #$0E80 ; branch to the prologue (BRA *+16)
sta: $0007,x
eom eom
; Masked renderer for a dynamic tile. What's interesting about this renderer is that the mask ; Masked renderer for a dynamic tile. What's interesting about this renderer is that the mask
@ -449,22 +454,14 @@ CopyMaskedDWord MAC
lda _JTBL_CACHE lda _JTBL_CACHE
ora #{{]1}&$7000} ; adjust for the current row offset ora #{{]1}&$7000} ; adjust for the current row offset
sta: {]1}+1,y sta: {]1}+1,y
tax ; This becomes the new address that we use to patch in tax ; This becomes the new address that we use to patch in
lda _OP_CACHE lda _OP_CACHE
sta: $0000,x ; LDA (00),y sta: $0000,x ; LDA (00),y
lda _OP_CACHE2 lda _OP_CACHE2
sta: $0002,x ; AND $80,x sta: $0002,x ; AND $80,x
eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand
sta: $0004,x ; ORA $00,x sta: $0004,x ; ORA $00,x
lda #$0F80 ; branch to the prologue (BRA *+17)
sta: $0006,x
; Version 2 only needs to set the JMP address to Entry Point 3
; lda _JTBL_CACHE
; ora #{{]1}&$7000} ; adjust for the current row offset
; sta: {]1}+1,y
eom eom
; Version 2 will set the JMP to Entry Point 1 and set the Opcode at Entry Point 2 to a ora $00,x. Also ; Version 2 will set the JMP to Entry Point 1 and set the Opcode at Entry Point 2 to a ora $00,x. Also
@ -479,7 +476,7 @@ CopyMaskedDWord MAC
; lda OP_CACHE_2 ; switch from AND to ORA instruction cached in setup ; lda OP_CACHE_2 ; switch from AND to ORA instruction cached in setup
; sta: $0004,x ; ORA $00,x ; sta: $0004,x ; ORA $00,x
CopyDynMaskedSpriteWord2 MAC CopyDynMaskedSpriteWord MAC
; If MASK == 0, then we can do a PEA. If MASK == $FFFF, then fall back to the simple Dynamic Tile ; If MASK == 0, then we can do a PEA. If MASK == $FFFF, then fall back to the simple Dynamic Tile
; code and eliminate the constant AND/ORA instructions. ; code and eliminate the constant AND/ORA instructions.
@ -489,7 +486,6 @@ CopyDynMaskedSpriteWord2 MAC
; This is a solid word ; This is a solid word
lda #$00F4 ; PEA instruction lda #$00F4 ; PEA instruction
sta: {]2},y sta: {]2},y
lda tmp_sprite_data+{]1} ; load the sprite data lda tmp_sprite_data+{]1} ; load the sprite data
sta: {]2}+1,y ; PEA operand sta: {]2}+1,y ; PEA operand
bra next bra next
@ -502,13 +498,14 @@ mixed
lda #$004C ; JMP to handler lda #$004C ; JMP to handler
sta: {]2},y sta: {]2},y
lda _JTBL_CACHE ; Get the offset to the exception handler for this column lda _JTBL_CACHE ; Get the offset to the exception handler for this column
ora #{]2&$7000} ; adjust for the current row offset ora #{]2&$7000} ; adjust for the current row offset
sta: {]2}+1,y sta: {]2}+1,y
tax ; This becomes the new address that we use to patch in tax ; This becomes the new address that we use to patch in
lda _OP_CACHE2 lda _OP_CACHE2
sta: $0002,x ; AND $80,x
eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand
sta: $0004,x ; ORA $00,x sta: $0004,x ; ORA $00,x
lda tmp_sprite_mask+{]1} lda tmp_sprite_mask+{]1}
@ -524,51 +521,9 @@ transparent
lda #$004C ; JMP to handler lda #$004C ; JMP to handler
sta: {]2},y sta: {]2},y
lda _JTBL_CACHE ; Get the offset to the exception handler for this column lda _JTBL_CACHE ; Get the offset to the exception handler for this column
ora #{]2&$7000}.ENTRY_POINT_2 ; adjust for the current row offset and OR in the offset since snippets are 32-byte aligned ora #{]2&$7000}.SNIPPET_ENTRY_4 ; adjust for the current row offset and OR in the offset since snippets are 32-byte aligned
sta: {]2}+1,y sta: {]2}+1,y
tax
next
eom
; Masked renderer for a masked dynamic tile with sprite data overlaid.
;
; ]1 : sprite plane offset
; ]2 : code field offset
CopyDynMaskedSpriteWord MAC
; Need to fill in the first 14 bytes of the JMP handler with the following code sequence where
; the data and mask from from the sprite plane
;
; lda ($00),y
; and $80,x
; ora $00,x
; and #MASK
; ora #DATA
; bra *+15
;
; If MASK == 0, then we can do a PEA. If MASK == $FFFF, then fall back to the simple Dynamic Tile
; code and eliminate the constant AND/ORA instructions.
lda tmp_sprite_mask+{]1} ; load the mask value
bne mixed ; a non-zero value may be mixed
; This is a solid word
lda #$00F4 ; PEA instruction
sta: {]2},y
lda tmp_sprite_data+{]1} ; load the sprite data
sta: {]2}+1,y ; PEA operand
bra next
; We will always do a JMP to the exception handler, so set that up, then check for sprite
; transparency
mixed
lda #$004C ; JMP to handler
sta: {]2},y
lda _JTBL_CACHE ; Get the offset to the exception handler for this column
ora #{]2&$7000} ; adjust for the current row offset
sta: {]2}+1,y
tax ; This becomes the new address that we use to patch in
lda _OP_CACHE lda _OP_CACHE
sta: $0000,x ; LDA (00),y sta: $0000,x ; LDA (00),y
@ -576,31 +531,9 @@ mixed
sta: $0002,x ; AND $80,x sta: $0002,x ; AND $80,x
eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand
sta: $0004,x ; ORA $00,x sta: $0004,x ; ORA $00,x
lda #$0029 ; AND #SPRITE_MASK
sta: $0006,x
lda tmp_sprite_mask+{]1}
cmp #$FFFF ; All 1's in the mask is a fully transparent sprite word
beq transparent
sta: $0007,x
lda #$0009 ; ORA #SPRITE_DATA
sta: $0009,x
lda tmp_sprite_data+{]1}
sta: $000A,x
lda #$0980 ; branch to the prologue (BRA *+11)
sta: $000C,x
bra next
; This is a transparent word, so just show the dynamic data
transparent
lda #$0F80 ; branch to the epilogue (BRA *+17)
sta: $0006,x
next next
eom eom
; Masked renderer for a masked dynamic tile with sprite data underlaid. ; Masked renderer for a masked dynamic tile with sprite data underlaid.
; ;
; ]1 : sprite plane offset ; ]1 : sprite plane offset
@ -615,7 +548,12 @@ CopyDynPrioMaskedSpriteWord MAC
; ora #DATA ; ora #DATA
; and $80,x ; and $80,x
; ora $00,x ; ora $00,x
; bra *+15
; This macro has different targets based on the transparency
lda tmp_sprite_mask+{]1}
cmp #$FFFF ; All 1's in the mask is a fully transparent sprite word
beq transparent
lda #$004C ; JMP to handler lda #$004C ; JMP to handler
sta: {]2},y sta: {]2},y
@ -624,15 +562,10 @@ CopyDynPrioMaskedSpriteWord MAC
sta: {]2}+1,y sta: {]2}+1,y
tax ; This becomes the new address that we use to patch in tax ; This becomes the new address that we use to patch in
lda _OP_CACHE
sta: $0000,x ; LDA (00),y
lda #$0029 ; AND #SPRITE_MASK lda #$0029 ; AND #SPRITE_MASK
sta: $0002,x sta: $0002,x
lda tmp_sprite_mask+{]1} lda tmp_sprite_mask+{]1}
cmp #$FFFF ; All 1's in the mask is a fully transparent sprite word
beq transparent ; so we can use the Tile00011 method
sta: $0003,x sta: $0003,x
lda #$0009 ; ORA #SPRITE_DATA lda #$0009 ; ORA #SPRITE_DATA
@ -645,19 +578,22 @@ CopyDynPrioMaskedSpriteWord MAC
eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand
sta: $000A,x ; ORA $00,x sta: $000A,x ; ORA $00,x
lda #$0980 ; branch to the prologue (BRA *+11)
sta: $000C,x
bra next bra next
; This is a transparent word, so just show the dynamic data
transparent transparent
; This is a transparent word, so just show the dynamic data
lda #$004C ; JMP to handler
sta: {]2},y
lda _JTBL_CACHE ; Get the offset to the exception handler for this column
ora #{]2&$7000}.SNIPPET_ENTRY_4 ; adjust for the current row offset and OR in the offset since snippets are 32-byte aligned
sta: {]2}+1,y
tax
lda _OP_CACHE
sta: $0000,x ; LDA (00),y
lda _OP_CACHE2 lda _OP_CACHE2
sta: $0002,x ; AND $80,x sta: $0002,x ; AND $80,x
eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand eor #$8020 ; Switch the opcode to an ORA and remove the high bit of the operand
sta: $0004,x ; ORA $00,x sta: $0004,x ; ORA $00,x
lda #$0F80 ; branch to the epilogue (BRA *+17)
sta: $0006,x
next next
eom eom