Move png assets to gif to avoid loading issues in PyGame

dciabrin · dciabrin · commit daabe12f2a93 · 2023-06-22T22:40:02.000+02:00
When PyGame is built with support for stb_image, the latter automatically translates paletted png to full color surfaces, thus losing palette and pixel data. Move all the png assets to gif, to ensure that PyGame will always be able to load images, no matter how it is compiled in the environment. Ref dciabrin/ngdevkit#96
diff --git a/01-helloworld/Makefile b/01-helloworld/Makefile
@@ -64,6 +64,6 @@ $(PROM): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -S -R .comment --gap-fill 0xff --pad-to $(PROMSIZE) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -f *.png *.o *~ $(ELF) tmp.* rom/*.*
+	rm -f *.o *~ $(ELF) tmp.* rom/*.*
 
 .PHONY: clean
diff --git a/02-sprite/Makefile b/02-sprite/Makefile
@@ -48,7 +48,7 @@ $(VROM): | rom
 # sprite ROM C1 C2: logo sprite from common assets
 CROMSIZE:=1048576
 tmp.c1 tmp.c2:
-	$(TILETOOL) --sprite -c $(ASSETS)/gfx/logo.png -o tmp.c1 tmp.c2
+	$(TILETOOL) --sprite -c $(ASSETS)/gfx/logo.gif -o tmp.c1 tmp.c2
 
 $(CROM1): tmp.c1 $(ASSETS)/rom/c1.bin | rom
 	cat $(ASSETS)/rom/c1.bin tmp.c1 > $@ && $(TRUNCATE) -s $(CROMSIZE) $@
@@ -67,6 +67,6 @@ $(PROM): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -S -R .comment --gap-fill 0xff --pad-to $(PROMSIZE) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -f *.png *.o *~ $(ELF) tmp.* rom/*.*
+	rm -f *.gif *.o *~ $(ELF) tmp.* rom/*.*
 
 .PHONY: clean
diff --git a/03-sprite-animation/Makefile b/03-sprite-animation/Makefile
@@ -36,13 +36,13 @@ sprites/%.gif: gfx/spr_m_traveler_%_anim.gif | sprites
 	printf "\xff\x00\xff" | dd of=$@ bs=1 seek=13 count=3 conv=notrunc
 
 # prepare the sprites for 64x64, and use same palette for all sprites
-sprites/all.png: $(SPRITES_IMGS)
-	$(CONVERT) -coalesce $^ -append +repage xc:'#ff00ff[64x1024!]' -compose dstover -composite PNG8:$@
+sprites/all.gif: $(SPRITES_IMGS)
+	$(CONVERT) -coalesce $^ -append +repage xc:'#ff00ff[64x1024!]' -compose dstover -compose dstover -fill '#00ffff' -opaque '#000100' -fill '#00ffff' -opaque '#000000' -fill '#181818' -opaque '#00ffff' -fill '#000000' -opaque '#ff00ff' -composite $@
 
-sprites/all.c1 sprites/all.c2: sprites/all.png | sprites
+sprites/all.c1 sprites/all.c2: sprites/all.gif | sprites
 	$(TILETOOL) --sprite -c $< -o $@ $(@:%.c1=%).c2
 
-sprite.pal: sprites/all.png | sprites
+sprite.pal: sprites/all.gif | sprites
 	$(PALTOOL) $< -o $@
 
 $(ELF):	$(OBJS:%=%.o)
@@ -81,7 +81,7 @@ $(PROM): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -S -R .comment --gap-fill 0xff --pad-to $(PROMSIZE) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -rf *.gif *.png *.pal *.o *~ $(ELF) tmp.* rom sprites
+	rm -rf *.gif *.pal *.o *~ $(ELF) tmp.* rom sprites
 
 sprites:
 	mkdir $@
diff --git a/05-scrolling/Makefile b/05-scrolling/Makefile
@@ -29,31 +29,31 @@ FIX_ASSETS=$(ASSETS)/rom/s1-shadow.bin
 $(ASSETS)/rom/c1.bin $(ASSETS)/rom/s1.bin:
 	$(MAKE) -C $(ASSETS)
 
-sprites/back.png: gfx/country-platform-back.png | sprites
-	$(CONVERT) $^ -crop 384x144+0+16 +repage PNG8:$@
+sprites/back.gif: gfx/country-platform-back.png | sprites
+	$(CONVERT) $^ -crop 384x144+0+16 +repage $@
 
-sprites/back.c1 sprites/back.c2: sprites/back.png
+sprites/back.c1 sprites/back.c2: sprites/back.gif
 	$(TILETOOL) --sprite -c $< -o $@ $(@:%.c1=%).c2
 
-sprites/back.pal: sprites/back.png
+sprites/back.pal: sprites/back.gif
 	$(PALTOOL) $< -o $@
 
-sprites/forest.png: gfx/country-platform-forest.png | sprites
-	$(CONVERT) $^ $^ $^ +append -crop 480x144+0+80 +repage PNG8:$@
+sprites/forest.gif: gfx/country-platform-forest.png | sprites
+	$(CONVERT) $^ $^ $^ +append -crop 480x144+0+80 +repage -background black -flatten $@
 
-sprites/forest.c1 sprites/forest.c2: sprites/forest.png
+sprites/forest.c1 sprites/forest.c2: sprites/forest.gif
 	$(TILETOOL) --sprite -c $< -o $@ $(@:%.c1=%).c2
 
-sprites/forest.pal: sprites/forest.png
+sprites/forest.pal: sprites/forest.gif
 	$(PALTOOL) $< -o $@
 
-sprites/front.png: gfx/country-platform-tiles-example.png | sprites
-	$(CONVERT) $^ $^ +append -crop 384x144+0+80 +repage PNG8:$@
+sprites/front.gif: gfx/country-platform-tiles-example.png | sprites
+	$(CONVERT) $^ $^ +append -crop 384x144+0+80 +repage -background black -flatten $@
 
-sprites/front.c1 sprites/front.c2: sprites/front.png
+sprites/front.c1 sprites/front.c2: sprites/front.gif
 	$(TILETOOL) --sprite -c $< -o $@ $(@:%.c1=%).c2
 
-sprites/front.pal: sprites/front.png
+sprites/front.pal: sprites/front.gif
 	$(PALTOOL) $< -o $@
 
 $(ELF):	$(OBJS:%=%.o)
@@ -92,7 +92,7 @@ $(PROM): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -S -R .comment --gap-fill 0xff --pad-to $(PROMSIZE) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -rf *.gif *.png *.pal *.o *~ $(ELF) tmp.* rom sprites
+	rm -rf *.gif *.pal *.o *~ $(ELF) tmp.* rom sprites
 
 sprites:
 	mkdir $@
diff --git a/06-sound-adpcma/Makefile b/06-sound-adpcma/Makefile
@@ -99,7 +99,7 @@ $(PROM): $(ELF) | rom
 
 
 clean:
-	rm -rf samples *.gif *.png *.pal *.adpcma *.o *~ $(ELF) *.lst *.sym *.rel *.ihx *.rst tmp.* rom
+	rm -rf samples *.adpcma *.o *~ $(ELF) *.lst *.sym *.rel *.ihx *.rst tmp.* rom
 
 samples:
 	mkdir $@
diff --git a/07-attract-and-game/Makefile b/07-attract-and-game/Makefile
@@ -63,6 +63,6 @@ $(PROM): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -S -R .comment --gap-fill 0xff --pad-to $(PROMSIZE) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -f *.png *.o *~ $(ELF) tmp.* rom/*.*
+	rm -f *.o *~ $(ELF) tmp.* rom/*.*
 
 .PHONY: clean
diff --git a/08-software-dips/Makefile b/08-software-dips/Makefile
@@ -64,6 +64,6 @@ $(PROM): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -S -R .comment --gap-fill 0xff --pad-to $(PROMSIZE) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -f *.png *.o *~ $(ELF) tmp.* rom/*.*
+	rm -f *.o *~ $(ELF) tmp.* rom/*.*
 
 .PHONY: clean
diff --git a/09-horizontal-sync/Makefile b/09-horizontal-sync/Makefile
@@ -52,7 +52,7 @@ $(VROM): | rom
 
 # sprite ROM C1 C2: logo sprite from common assets
 tmp.c1 tmp.c2:
-	$(TILETOOL) --sprite -c $(ASSETS)/gfx/logo.png -o tmp.c1 tmp.c2
+	$(TILETOOL) --sprite -c $(ASSETS)/gfx/logo.gif -o tmp.c1 tmp.c2
 
 CROMSIZE:=1048576
 $(CROM1): tmp.c1 $(ASSETS)/rom/c1.bin | rom
@@ -72,6 +72,6 @@ $(PROM): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -S -R .comment --gap-fill 0xff --pad-to $(PROMSIZE) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -f *.png *.o *~ $(ELF) tmp.* precalc.inc rom/*.*
+	rm -f *.o *~ $(ELF) tmp.* precalc.inc rom/*.*
 
 .PHONY: clean
diff --git a/10-credits-management/Makefile b/10-credits-management/Makefile
@@ -63,6 +63,6 @@ $(PROM): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -S -R .comment --gap-fill 0xff --pad-to $(PROMSIZE) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -f *.png *.o *~ $(ELF) tmp.* rom/*.*
+	rm -f *.o *~ $(ELF) tmp.* rom/*.*
 
 .PHONY: clean
diff --git a/11-backup-ram/Makefile b/11-backup-ram/Makefile
@@ -67,6 +67,6 @@ $(PROM): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -S -R .comment --gap-fill 0xff --pad-to $(PROMSIZE) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -f *.png *.o *~ $(ELF) tmp.* rom/*.*
+	rm -f *.o *~ $(ELF) tmp.* rom/*.*
 
 .PHONY: clean
diff --git a/12-prom-1mb/Makefile b/12-prom-1mb/Makefile
@@ -79,6 +79,6 @@ $(PROM): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -S -R .comment --gap-fill 0xff --pad-to $(PROMSIZE) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -f *.png *.o *~ $(ELF) tmp.* rom/*.*
+	rm -f *.o *~ $(ELF) tmp.* rom/*.*
 
 .PHONY: clean
diff --git a/13-prom-full-2mb/Makefile b/13-prom-full-2mb/Makefile
@@ -92,6 +92,6 @@ $(PROM2): $(ELF) | rom
 	$(M68KOBJCOPY) -O binary -j .text2 --gap-fill 0xff --pad-to $$((0x200000+$(PROMSIZE))) $< $@ && dd if=$@ of=$@ conv=notrunc,swab
 
 clean:
-	rm -f *.png *.o *~ $(ELF) tmp.* rom/*.*
+	rm -f *.o *~ $(ELF) tmp.* rom/*.*
 
 .PHONY: clean
diff --git a/assets/Makefile b/assets/Makefile
@@ -18,23 +18,23 @@ all: rom/s1-shadow.bin rom/s1.bin rom/c1.bin
 
 include ../Makefile.config
 
-smalltext.png:
-	$(CONVERT) gfx/unscii8.png -crop 256x24+2+1 +repage -crop 8x8 +append +repage -background black -gravity east -extent 1024x8 -fuzz 30% -fill white -opaque white -colors 2 PNG8:smalltext.png
+smalltext.gif:
+	$(CONVERT) gfx/unscii8.png -crop 256x24+2+1 +repage -crop 8x8 +append +repage -background black -gravity east -extent 1024x8 -fuzz 30% -fill white -opaque white -colors 2 smalltext.gif
 
-talltext.png:
-	$(CONVERT) gfx/unscii16.png -crop 256x48+2+1 +repage -crop 8x16 +append +repage -background black -gravity east -extent 1024x16 -fuzz 30% -fill white -opaque white -colors 2 PNG8:talltext.png
+talltext.gif:
+	$(CONVERT) gfx/unscii16.png -crop 256x48+2+1 +repage -crop 8x16 +append +repage -background black -gravity east -extent 1024x16 -fuzz 30% -fill white -opaque white -colors 2 talltext.gif
 
-smalltext-shadow.png: smalltext.png
-	$(CONVERT) -size 1024x8 xc:black \( $< -transparent black -fuzz 30% -fill '#0000ff' -opaque white \) -geometry +1+1 -composite  \( $< -transparent black -fuzz 30% -fill '#ffffff' -opaque white -geometry +0+0 \) -composite -colors 16 PNG8:$@
+smalltext-shadow.gif: smalltext.gif
+	$(CONVERT) -size 1024x8 xc:black \( $< -transparent black -fuzz 30% -fill '#ffffff' -opaque white \) -geometry +1+1 -composite  \( $< -transparent black -fuzz 30% -fill '#ff0000' -opaque white -geometry +0+0 \) -composite -colors 16 $@
 
-talltext-shadow.png: talltext.png
-	$(CONVERT) -size 1024x16 xc:black \( $< -transparent black -fuzz 30% -fill '#0000ff' -opaque white \) -geometry +1+1 -composite  \( $< -transparent black -fuzz 30% -fill '#ffffff' -opaque white -geometry +0+0 \) -composite -colors 16 PNG8:$@
+talltext-shadow.gif: talltext.gif
+	$(CONVERT) -size 1024x16 xc:black \( $< -transparent black -fuzz 30% -fill '#ffffff' -opaque white \) -geometry +1+1 -composite  \( $< -transparent black -fuzz 30% -fill '#ff0000' -opaque white -geometry +0+0 \) -composite -colors 16 $@
 
-srom.bmp: smalltext.png talltext.png
-	$(PYTHON) ./build-srom.py -s smalltext.png -t talltext.png -b talltext.png -o srom.bmp
+srom.bmp: smalltext.gif talltext.gif
+	$(PYTHON) ./build-srom.py -s smalltext.gif -t talltext.gif -b talltext.gif -o srom.bmp
 
-srom-shadow.bmp: smalltext-shadow.png talltext-shadow.png talltext.png
-	$(PYTHON) ./build-srom.py -s smalltext-shadow.png -t talltext-shadow.png -b talltext.png -o srom-shadow.bmp
+srom-shadow.bmp: smalltext-shadow.gif talltext-shadow.gif talltext.gif
+	$(PYTHON) ./build-srom.py -s smalltext-shadow.gif -t talltext-shadow.gif -b talltext.gif -o srom-shadow.bmp
 
 rom/s1.bin: srom.bmp | rom
 	$(TILETOOL) --fix -c srom.bmp -o rom/s1.bin
@@ -43,12 +43,12 @@ rom/s1-shadow.bin: srom-shadow.bmp | rom
 	$(TILETOOL) --fix -c srom-shadow.bmp -o rom/s1-shadow.bin
 
 rom/c1.bin rom/c2.bin: | rom
-	$(TILETOOL) --sprite -c gfx/logo.png -o tmp.c1 tmp.c2; \
+	$(TILETOOL) --sprite -c gfx/logo.gif -o tmp.c1 tmp.c2; \
 	(dd bs=64 count=14 if=tmp.c1; dd bs=64 skip=15 if=tmp.c1; dd bs=64 count=197 if=/dev/zero) 2>/dev/null | cat >rom/c1.bin; \
 	(dd bs=64 count=14 if=tmp.c2; dd bs=64 skip=15 if=tmp.c2; dd bs=64 count=197 if=/dev/zero) 2>/dev/null | cat >rom/c2.bin
 
 clean:
-	rm -f *.png tmp.* *.bmp *~
+	rm -f *.gif tmp.* *.bmp *~
 	rm -rf rom
 
 rom:
diff --git a/assets/gfx/logo.gif b/assets/gfx/logo.gif
diff --git a/assets/gfx/logo.png b/assets/gfx/logo.png
