github/AmigaExamples
1
0
Fork 0
mirror of https://frontier.innolan.net/github/AmigaExamples.git synced 2026-09-12 22:23:46 +00:00
Code Releases Activity

refactoring for multiple item sprites

Browse Source
This commit is contained in:
alpine9000
2016-04-20 17:42:27 +10:00
parent f66d63089f
commit 34ca62a0ea
4 changed files with 123 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
028.game2/constants.i
+12
View File
@@ -17,6 +17,18 @@ FOREGROUND_PLAYAREA_WIDTH_WORDS equ 24
FOREGROUND_PLAYAREA_RIGHT_MARGIN_BYTES equ 12
FOREGROUND_PLAYAREA_HEIGHT_WORDS equ 8
ITEM_SPRITE_HEIGHT equ 15
ITEM_SPRITE_NUM_VERTICAL_SPRITES equ 8
ITEM_SPRITE_BYTES equ (ITEM_SPRITE_NUM_VERTICAL_SPRITES*(64+4))+4
ITEM_X equ 0
ITEM_LAGX equ 2
ITEM_Y equ 4
ITEM_LAGY equ 6
ITEM_YEND equ 8
ITEM_LAGYEND equ 10
ITEM_INDEX equ 12
SCREEN_WIDTH equ 320
SCREEN_HEIGHT equ 256
SCREEN_WIDTH_BYTES equ (SCREEN_WIDTH/8)
028.game2/game1.s
+2
View File
@@ -374,6 +374,7 @@ message:
align 4
copperList:
panelCopperListBpl1Ptr:
dc.w BPL1PTL,0
dc.w BPL1PTH,0
@@ -411,6 +412,7 @@ copperListBpl1Ptr:
dc.w BPL5PTL,0
dc.w BPL5PTH,0
copperListBpl2Ptr:
;; 3 bitplanes per playfield, playfield2 gets bitplanes 2,4,6
dc.w BPL2PTL,0
028.game2/items.s
+66 -102
View File
@@ -4,17 +4,30 @@
xdef ScrollItemSprites
xdef RenderItemSprite
ScrollItemSprites:
;; sub.w #1,itemX
ScrollItemSprites:
move.l #1,d0
lsl.w #4,d0 ; multiply by 16 (item control structure size)
lea item1,a1
add.l d0,a1
move.l foregroundScrollPixels,d0
sub.w d0,itemX
sub.w d0,ITEM_X(a1)
rts
SetupItemSpriteData:
;; d0 - item slot
;; d1 - sprite slot
move.l #1,d0
lsl.w #4,d0 ; multiply by 16 (item control structure size)
lea item1,a1
add.l d0,a1
move.l currentItemSprite,a0
cmp.w #13<<3,itemIndex
;; add.l #64+4,a0
cmp.w #13<<3,ITEM_INDEX(a1)
ble .dontResetIndex
move.l #0,itemIndex
move.l #0,ITEM_INDEX(a1)
.dontResetIndex:
cmp.l #deadSprite,a0
bne .setupSprite
@@ -22,33 +35,42 @@ SetupItemSpriteData:
.setupSprite:
move.l #0,d0
move.w itemIndex,d0
move.w ITEM_INDEX(a1),d0
lsr.l #3,d0
mulu.w #64+12,d0
mulu.w #ITEM_SPRITE_BYTES,d0
add.l d0,a0
move.w itemLagX,d0
move.w ITEM_LAGX(a1),d0
lsr.w #FOREGROUND_SCROLL_SHIFT_CONVERT,d0 ; convert to pixels
move.w itemX,itemLagX
move.w ITEM_X(a1),ITEM_LAGX(a1)
add.w #32,d0
move.w d0,d1
andi #1,d1
move.b d1,3(a0) ;spriteControl
lsr.l #1,d0
move.b d0,1(a0) ;spriteHStart
move.w itemLagY,d0
move.w itemY,itemLagY
move.w ITEM_LAGY(a1),d0
move.w ITEM_Y(a1),ITEM_LAGY(a1)
move.b d0,(a0) ;spriteVStart
move.w itemLagYEnd,d0
move.w itemYEnd,itemLagYEnd
move.w ITEM_LAGYEND(a1),d0
move.w ITEM_YEND(a1),ITEM_LAGYEND(a1)
move.b d0,2(a0) ;spriteVStop
.c1:
move.l a0,SPR2PTH(a6)
add.w #1,itemIndex
add.w #1,ITEM_INDEX(a1)
rts
RenderItemSprite:
;; d2 - y tile index ?
movem.l d2-d3,-(sp)
movem.l d2-d3,-(sp)
move.l #1,d0
lsl.w #4,d0 ; multiply by 16 (item control structure size)
lea item1,a1
add.l d0,a1
move.l foregroundScrollX,d0
lsr.w #FOREGROUND_SCROLL_SHIFT_CONVERT,d0 ; convert to pixels
andi.w #$f,d0
@@ -59,13 +81,13 @@ RenderItemSprite:
cmpi.w #0,(a3)
beq .dontAddSprite
move.l #deadSprite,currentItemSprite
move.w #337<<FOREGROUND_SCROLL_SHIFT_CONVERT,itemX
move.w #336<<FOREGROUND_SCROLL_SHIFT_CONVERT,ITEM_X(a1)
mulu.w #16,d2
move.w #255-12,d3
move.w #255-10,d3
sub.w d2,d3
move.w d3,itemY
add.w #16,d3
move.w d3,itemYEnd
move.w d3,ITEM_Y(a1)
add.w #ITEM_SPRITE_HEIGHT,d3
move.w d3,ITEM_YEND(a1)
;; move.w #0,itemIndex
move.l #spriteCoin1,currentItemSprite
.dontAddSprite:
@@ -74,86 +96,28 @@ RenderItemSprite:
currentItemSprite:
dc.l deadSprite
itemX:
dc.w 0
itemLagX:
dc.w 0
itemY:
dc.w 0
itemLagY:
dc.w 0
itemYEnd:
dc.w 0
itemLagYEnd:
dc.w 0
itemIndex:
dc.w 0
spriteCoin1:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin1.bin"
dc.l 0
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin1.bin"
dc.l 0
spriteCoin2:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin2.bin"
dc.l 0
spriteCoin3:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin3.bin"
dc.l 0
spriteCoin4:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin4.bin"
dc.l 0
spriteCoin5:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin3.bin"
dc.l 0
spriteCoin6:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin6.bin"
dc.l 0
spriteCoin7:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin7.bin"
dc.l 0
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin7.bin"
dc.l 0
spriteCoin8:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin6.bin"
dc.l 0
spriteCoin9:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin3.bin"
dc.l 0
spriteCoin10:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin4.bin"
dc.l 0
spriteCoin11:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin3.bin"
dc.l 0
spriteCoin12:
dc.w 0,0
dc.w 0,0
incbin "out/sprite_coin2.bin"
dc.l 0
ItemControl item1
ItemControl item2
ItemControl item3
ItemControl item4
ItemControl item5
ItemControl item6
ItemControl item7
ItemControl item8
ItemSprite spriteCoin1,sprite_coin1.bin
ItemSprite spriteCoin1_1,sprite_coin1.bin
ItemSprite spriteCoin2,sprite_coin2.bin
ItemSprite spriteCoin3,sprite_coin3.bin
ItemSprite spriteCoin4,sprite_coin4.bin
ItemSprite spriteCoin5,sprite_coin3.bin
ItemSprite spriteCoin6,sprite_coin6.bin
ItemSprite spriteCoin7,sprite_coin7.bin
ItemSprite spriteCoin7_1,sprite_coin7.bin
ItemSprite spriteCoin8,sprite_coin6.bin
ItemSprite spriteCoin9,sprite_coin3.bin
ItemSprite spriteCoin10,sprite_coin4.bin
ItemSprite spriteCoin11,sprite_coin3.bin
ItemSprite spriteCoin12,sprite_coin2.bin
028.game2/macros.i
+43
View File
@@ -3,4 +3,47 @@ WaitBlitter: macro
.\@:
btst #6,DMACONR(a6)
bne.s .\@
endm
ItemSprite: macro
\1:
dc.w 0,0
incbin "out/\2"
dc.w 0,0
incbin "out/\2"
dc.w 0,0
incbin "out/\2"
dc.w 0,0
incbin "out/\2"
dc.w 0,0
incbin "out/\2"
dc.w 0,0
incbin "out/\2"
dc.w 0,0
incbin "out/\2"
dc.w 0,0
incbin "out/\2"
dc.l 0
endm
ItemControl: macro
\1:
.itemX:
dc.w 0
.itemLagX:
dc.w 0
.itemY:
dc.w 0
.itemLagY:
dc.w 0
.itemYEnd:
dc.w 0
.itemLagYEnd:
dc.w 0
.itemIndex:
dc.w 0
.pad ; make the control word 16 bytes
dc.w 0
endm