1
0
mirror of https://frontier.innolan.net/github/AmigaExamples.git synced 2026-01-12 01:22:01 +00:00

moved background assets into their own png

This commit is contained in:
alpine9000
2016-05-17 17:15:41 +10:00
parent 4f81441b0a
commit 3c3d60041a
7 changed files with 34 additions and 6 deletions

View File

@ -103,7 +103,7 @@ out/%_tileFadeFrom.pal: assets/%_foreground_playarea.pal
out/%_tileFadeTo.pal: assets/%_foreground_playarea.pal
cat assets/$*_foreground_playarea.pal | tail -3 | head -2 > out/$*_tileFadeTo.pal
out/background.bin: assets/assets.png
out/background.bin: assets/background.png
$(IMAGECON) --use-palette=assets/paletteA_background.pal --input $< $(IMAGECON_ARGS) --colors 8 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-grey-palette --output-palette --output-png --output-copperlist --output out/background --palette-offset 8
out/panel.bin: assets/panel.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -36,7 +36,7 @@ RenderBackgroundTile:
move.l backgroundScrollX,d2
lsr.b #BACKGROUND_SCROLL_SHIFT_CONVERT,d2 ; convert to pixels
andi.w #$f,d2 ; find the shift component
jsr BlitTile
jsr BlitBackgroundTile
cmp.l #backgroundBitplanes1,backgroundOffscreen
bne .offsetSub
add.l #backgroundBitplanes2-backgroundBitplanes1,a0
@ -44,7 +44,7 @@ RenderBackgroundTile:
.offsetSub:
sub.l #backgroundBitplanes2-backgroundBitplanes1,a0
.doBlit:
jsr BlitTile
jsr BlitBackgroundTile
rts
RenderNextBackgroundFrame:

View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" renderorder="left-down" width="200" height="16" tilewidth="16" tileheight="16" nextobjectid="1">
<tileset firstgid="1" name="tilemap" tilewidth="16" tileheight="16" tilecount="320" columns="20">
<image source="assets/assets.png" width="320" height="256"/>
<tileset firstgid="1" name="background" tilewidth="16" tileheight="16" tilecount="48" columns="8">
<image source="assets/background.png" width="128" height="96"/>
</tileset>
<layer name="background" width="200" height="16">
<data encoding="base64" compression="zlib">
eJztmssNwjAMhrsA4sICIF4LQMtjBR4LwA6w/wH3gFRFJbEdhwbyH74DUhqSz2oSu2mqqpp0mDu/P9Ew27UsiCWxItbM/m7EPTA2yRg0c4ILuAhRG/SxI/bEgTgyn3kQT6Mxv/1x4gEXcBE7r5YpMWO2PRFn4kJcjf7/W/GAi7JdjJV9bojtgHNqkb73vnjUzD7goiwX2vcjNZz923oNtFxH4eI/XAy5r8VivT/DBVxI6asXlApcwIVLTL2gyyiDucAFXPwS3DxKUhPxYdUPXMAFl5g6ODePktREfOtR6toKXMCFJbnUv3MALuAiJ5BfwoXEheYMluK7fCrc/dWXX8IFXLjtNGcw6XcY6zwoVRzgAi4skJ4TY/KgvvzKFwfufVO4gItYtLUIyT1jzZ3kUBxcFxb3oOGiLBcv7ZMzAQ==
eJztmstuAjEMRQepLEAqL4mWBX3ACvr/H1hvKlWjycP2je0MLM6qmjq24xvH4TYMw03IhbgqvvdmRawV378SG2JL7AL4w/FtAbQVOQ6e/t2JH4D9l8LfU7nU5mVPHBTrPBJvxDtxAuYDoTtc3zSx5cRhKtclW2dgbCW0yvPc1/1BfBJfxDfju5J2/+lO6gyw0GtObKVx8MrjckQpR1r/crTMpWbdU5oUrU9InQEW+6nlnkDbKp2341yj86w537w1fo5rRexdy55Fe88rwe3zI+XZUoceaa09kToHS/fOqHmW1DtiHtJaZyyR+GLtf02fUdrDvc8wJWhnH73ZlZLrUSS+oPyvrTNEn4GaYUp9eIKJH/d861kXa+sscj9pqZXe8+Oo8cv1Dq10EYVH7x7lPbVG6yTxWWT+9xxr6AkWrSZFmhu1QFr/c6g9i7cRr3mOFZH7OQSR6t/6LQ/lO3fdmp7GKkbR3lVzILQ61YNZ1H/tvdi6VlG+c9et6WlqbWn3DCIXqHkVqlYt52ec2VHtvRhdq9r3m9p49vS7jf/31ZxuSeyMe8mcDnBmiZJancp9b28NXKzvPN7xRP5efQrPeR7HNlp/fgE3ztiW
</data>
</layer>
</map>

View File

@ -2,6 +2,7 @@
xdef BlitFillColor
xdef BlitTile
xdef BlitBackgroundTile
xref BlueFill
xref SimpleBlit
@ -123,6 +124,29 @@ BlitTile:
move.w #(16*SCREEN_BIT_DEPTH)<<6|(1),BLTSIZE(a6) ;rectangle size, starts blit
movem.l (sp)+,d2/a0
rts
BlitBackgroundTile:
;; a0 - dest bitplane pointer
;; a1 - source tile pointer
;; d2 - y tile index
WaitBlitter
movem.l d2/a0,-(sp)
move.w #0,BLTCON1(a6) ;
move.w #BC0F_SRCA|BC0F_DEST|$f0,BLTCON0(a6)
move.w #BACKGROUND_TILEMAP_WIDTH_BYTES-2,BLTAMOD(a6)
move.w #BITPLANE_WIDTH_BYTES-2,BLTDMOD(a6) ;
mulu.w #BITPLANE_WIDTH_BYTES*SCREEN_BIT_DEPTH*16,d2
add.l d2,a0
move.l a1,BLTAPTH(a6) ; source
move.l a0,BLTDPTH(a6) ; dest
move.w #$ffff,BLTAFWM(a6)
move.w #$ffff,BLTALWM(a6)
move.w #(16*SCREEN_BIT_DEPTH)<<6|(1),BLTSIZE(a6) ;rectangle size, starts blit
movem.l (sp)+,d2/a0
rts
BlueFill:

View File

@ -92,6 +92,10 @@ BITPLANE_WIDTH_WORDS equ BITPLANE_WIDTH_BYTES/2
TILEMAP_WIDTH equ 320
TILEMAP_WIDTH_BYTES equ TILEMAP_WIDTH/8
TILEMAP_WIDTH_WORDS equ TILEMAP_WIDTH_BYTES/2
BACKGROUND_TILEMAP_WIDTH equ 128
BACKGROUND_TILEMAP_WIDTH_BYTES equ BACKGROUND_TILEMAP_WIDTH/8
BACKGROUND_TILEMAP_WIDTH_WORDS equ BACKGROUND_TILEMAP_WIDTH_BYTES/2
SCREEN_BIT_DEPTH equ 3