diff --git a/Makefile b/Makefile index eae6b2a..5b7a261 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ SUBDIRS=tools/makeadf \ tools/imagecon\ tools/resize\ + tools/croppa\ tools/external/shrinkler\ tools/external/doynamite68k\ 000.trackdisk\ @@ -27,7 +28,11 @@ SUBDIRS=tools/makeadf \ 021.calling_c\ 022.photons_bootloader\ 023.slideshow\ - 024.simple_text + 024.simple_text\ + 025.scroll_text\ + 026.tile_hscroll\ + 027.parallax\ + 028.bs .PHONY: subdirs $(SUBDIRS) @@ -64,6 +69,12 @@ test: @echo "" @echo "" @echo "" + @echo "Testing tools/croppa..." + @echo "-------------------------" + make -C tools/croppa test + @echo "" + @echo "" + @echo "" $(SUBDIRS): @echo "" diff --git a/tools/croppa/Makefile b/tools/croppa/Makefile index 867f95b..c127c35 100644 --- a/tools/croppa/Makefile +++ b/tools/croppa/Makefile @@ -6,42 +6,17 @@ EXTRA_CFLAGS=`GraphicsMagick-config --cppflags` include ../../shared/tools.mk TEST_IMAGE=../../assets/gigi_full.png -RESIZED_IMAGE=out/gigi.png -RESIZED_LACED=out/gigi_laced.png -REFERENCE_IMAGE=reference/gigi.png -REFERENCE_LACED=reference/gigi_laced.png -TEST_IMAGE2=../../assets/Amiga2000.png -RESIZED_IMAGE2=out/Amiga2000.png -REFERENCE_IMAGE2=reference/Amiga2000.png -RESIZED_LACED2=out/Amiga2000_laced.png -REFERENCE_LACED2=reference/Amiga2000_laced.png +CROPPED_IMAGE=cropped -ODD_SIZE_IMAGE=../../assets/mr.png -REFERENCE_ODD_SIZE=reference/mr.png -ODD_SIZE=out/mr.png +out/$(CROPPED_IMAGE): $(TEST_IMAGE) $(PROGRAM) Makefile + $(PROGRAM) --input=$(TEST_IMAGE) --output=out/$(CROPPED_IMAGE) --width=16 --height=16 --rows=2 --cols=2 --dx=16 --dy=16 --x=192 --y=112 -$(RESIZED_IMAGE): $(TEST_IMAGE) $(PROGRAM) Makefile - $(PROGRAM) --width=320 --height=256 --blur=0.75 --input=$(TEST_IMAGE) --output=$(RESIZED_IMAGE) - -$(RESIZED_IMAGE2): $(TEST_IMAGE2) $(PROGRAM) Makefile - $(PROGRAM) --width=320 --height=256 --blur=0.75 --input=$(TEST_IMAGE2) --output=$(RESIZED_IMAGE2) - -$(RESIZED_LACED): $(TEST_IMAGE) $(PROGRAM) Makefile - $(PROGRAM) --width=320 --height=512 --interlaced --blur=0.75 --input=$(TEST_IMAGE) --output=$(RESIZED_LACED) - -$(RESIZED_LACED2): $(TEST_IMAGE2) $(PROGRAM) Makefile - $(PROGRAM) --width=320 --height=512 --interlaced --blur=0.75 --input=$(TEST_IMAGE2) --output=$(RESIZED_LACED2) - -$(ODD_SIZE): $(ODD_SIZE_IMAGE) $(PROGRAM) Makefile - $(PROGRAM) --width=320 --height=512 --interlaced --blur=0.75 --input=$(ODD_SIZE_IMAGE) --output=$(ODD_SIZE) - -test: $(RESIZED_IMAGE) $(RESIZED_LACED) $(RESIZED_IMAGE2) $(RESIZED_LACED2) $(ODD_SIZE) - diff $(RESIZED_IMAGE) $(REFERENCE_IMAGE) - diff $(RESIZED_LACED) $(REFERENCE_LACED) - diff $(RESIZED_IMAGE2) $(REFERENCE_IMAGE2) - diff $(RESIZED_LACED2) $(REFERENCE_LACED2) - diff $(ODD_SIZE) $(REFERENCE_ODD_SIZE) +test: out/$(CROPPED_IMAGE) + diff out/$(CROPPED_IMAGE)-0.png reference/$(CROPPED_IMAGE)-0.png + diff out/$(CROPPED_IMAGE)-1.png reference/$(CROPPED_IMAGE)-1.png + diff out/$(CROPPED_IMAGE)-2.png reference/$(CROPPED_IMAGE)-2.png + diff out/$(CROPPED_IMAGE)-3.png reference/$(CROPPED_IMAGE)-3.png @echo "______ ___ _____ _____ ___________ " @echo "| ___ \/ _ \ / ___/ ___| ___| _ \ " @echo "| |_/ / /_\ \\\\\ \`--.\ \`--.| |__ | | | | " diff --git a/tools/croppa/reference/cropped-0.png b/tools/croppa/reference/cropped-0.png new file mode 100644 index 0000000..b38981c Binary files /dev/null and b/tools/croppa/reference/cropped-0.png differ diff --git a/tools/croppa/reference/cropped-1.png b/tools/croppa/reference/cropped-1.png new file mode 100644 index 0000000..f082444 Binary files /dev/null and b/tools/croppa/reference/cropped-1.png differ diff --git a/tools/croppa/reference/cropped-2.png b/tools/croppa/reference/cropped-2.png new file mode 100644 index 0000000..e4e700c Binary files /dev/null and b/tools/croppa/reference/cropped-2.png differ diff --git a/tools/croppa/reference/cropped-3.png b/tools/croppa/reference/cropped-3.png new file mode 100644 index 0000000..02009ef Binary files /dev/null and b/tools/croppa/reference/cropped-3.png differ diff --git a/tools/imagecon/reference/32color-quant.png-grey.s b/tools/imagecon/reference/32color-quant.png-grey.s index 7e55605..fdd168c 100644 --- a/tools/imagecon/reference/32color-quant.png-grey.s +++ b/tools/imagecon/reference/32color-quant.png-grey.s @@ -1,67 +1,32 @@ - movem.l d0-a6,-(sp) - lea CUSTOM,a6 - lea COLOR00(a6),a0 - move.w #$666,(a0) - lea COLOR01(a6),a0 - move.w #$777,(a0) - lea COLOR02(a6),a0 - move.w #$444,(a0) - lea COLOR03(a6),a0 - move.w #$eee,(a0) - lea COLOR04(a6),a0 - move.w #$111,(a0) - lea COLOR05(a6),a0 - move.w #$333,(a0) - lea COLOR06(a6),a0 - move.w #$ddd,(a0) - lea COLOR07(a6),a0 - move.w #$777,(a0) - lea COLOR08(a6),a0 - move.w #$222,(a0) - lea COLOR09(a6),a0 - move.w #$222,(a0) - lea COLOR10(a6),a0 - move.w #$555,(a0) - lea COLOR11(a6),a0 - move.w #$ccc,(a0) - lea COLOR12(a6),a0 - move.w #$444,(a0) - lea COLOR13(a6),a0 - move.w #$999,(a0) - lea COLOR14(a6),a0 - move.w #$888,(a0) - lea COLOR15(a6),a0 - move.w #$666,(a0) - lea COLOR16(a6),a0 - move.w #$888,(a0) - lea COLOR17(a6),a0 - move.w #$ccc,(a0) - lea COLOR18(a6),a0 - move.w #$aaa,(a0) - lea COLOR19(a6),a0 - move.w #$bbb,(a0) - lea COLOR20(a6),a0 - move.w #$aaa,(a0) - lea COLOR21(a6),a0 - move.w #$999,(a0) - lea COLOR22(a6),a0 - move.w #$999,(a0) - lea COLOR23(a6),a0 - move.w #$eee,(a0) - lea COLOR24(a6),a0 - move.w #$888,(a0) - lea COLOR25(a6),a0 - move.w #$bbb,(a0) - lea COLOR26(a6),a0 - move.w #$fff,(a0) - lea COLOR27(a6),a0 - move.w #$666,(a0) - lea COLOR28(a6),a0 - move.w #$aaa,(a0) - lea COLOR29(a6),a0 - move.w #$666,(a0) - lea COLOR30(a6),a0 - move.w #$999,(a0) - lea COLOR31(a6),a0 - move.w #$777,(a0) - movem.l (sp)+,d0-a6 + move.w #$666,COLOR00(a6) + move.w #$777,COLOR01(a6) + move.w #$444,COLOR02(a6) + move.w #$eee,COLOR03(a6) + move.w #$111,COLOR04(a6) + move.w #$333,COLOR05(a6) + move.w #$ddd,COLOR06(a6) + move.w #$777,COLOR07(a6) + move.w #$222,COLOR08(a6) + move.w #$222,COLOR09(a6) + move.w #$555,COLOR10(a6) + move.w #$ccc,COLOR11(a6) + move.w #$444,COLOR12(a6) + move.w #$999,COLOR13(a6) + move.w #$888,COLOR14(a6) + move.w #$666,COLOR15(a6) + move.w #$888,COLOR16(a6) + move.w #$ccc,COLOR17(a6) + move.w #$aaa,COLOR18(a6) + move.w #$bbb,COLOR19(a6) + move.w #$aaa,COLOR20(a6) + move.w #$999,COLOR21(a6) + move.w #$999,COLOR22(a6) + move.w #$eee,COLOR23(a6) + move.w #$888,COLOR24(a6) + move.w #$bbb,COLOR25(a6) + move.w #$fff,COLOR26(a6) + move.w #$666,COLOR27(a6) + move.w #$aaa,COLOR28(a6) + move.w #$666,COLOR29(a6) + move.w #$999,COLOR30(a6) + move.w #$777,COLOR31(a6) diff --git a/tools/imagecon/reference/32color-quant.png-palette.s b/tools/imagecon/reference/32color-quant.png-palette.s index f062381..ceacbe3 100644 --- a/tools/imagecon/reference/32color-quant.png-palette.s +++ b/tools/imagecon/reference/32color-quant.png-palette.s @@ -1,67 +1,32 @@ - movem.l d0-a6,-(sp) - lea CUSTOM,a6 - lea COLOR00(a6),a0 - move.w #$36b,(a0) - lea COLOR01(a6),a0 - move.w #$48b,(a0) - lea COLOR02(a6),a0 - move.w #$363,(a0) - lea COLOR03(a6),a0 - move.w #$ffd,(a0) - lea COLOR04(a6),a0 - move.w #$111,(a0) - lea COLOR05(a6),a0 - move.w #$443,(a0) - lea COLOR06(a6),a0 - move.w #$fec,(a0) - lea COLOR07(a6),a0 - move.w #$37b,(a0) - lea COLOR08(a6),a0 - move.w #$222,(a0) - lea COLOR09(a6),a0 - move.w #$332,(a0) - lea COLOR10(a6),a0 - move.w #$574,(a0) - lea COLOR11(a6),a0 - move.w #$eda,(a0) - lea COLOR12(a6),a0 - move.w #$554,(a0) - lea COLOR13(a6),a0 - move.w #$ca5,(a0) - lea COLOR14(a6),a0 - move.w #$59c,(a0) - lea COLOR15(a6),a0 - move.w #$684,(a0) - lea COLOR16(a6),a0 - move.w #$a95,(a0) - lea COLOR17(a6),a0 - move.w #$bde,(a0) - lea COLOR18(a6),a0 - move.w #$aba,(a0) - lea COLOR19(a6),a0 - move.w #$dc9,(a0) - lea COLOR20(a6),a0 - move.w #$9bc,(a0) - lea COLOR21(a6),a0 - move.w #$aa8,(a0) - lea COLOR22(a6),a0 - move.w #$8a9,(a0) - lea COLOR23(a6),a0 - move.w #$def,(a0) - lea COLOR24(a6),a0 - move.w #$897,(a0) - lea COLOR25(a6),a0 - move.w #$bcc,(a0) - lea COLOR26(a6),a0 - move.w #$fff,(a0) - lea COLOR27(a6),a0 - move.w #$765,(a0) - lea COLOR28(a6),a0 - move.w #$db6,(a0) - lea COLOR29(a6),a0 - move.w #$486,(a0) - lea COLOR30(a6),a0 - move.w #$6ad,(a0) - lea COLOR31(a6),a0 - move.w #$8a4,(a0) - movem.l (sp)+,d0-a6 + move.w #$36b,COLOR00(a6) + move.w #$48b,COLOR01(a6) + move.w #$363,COLOR02(a6) + move.w #$ffd,COLOR03(a6) + move.w #$111,COLOR04(a6) + move.w #$443,COLOR05(a6) + move.w #$fec,COLOR06(a6) + move.w #$37b,COLOR07(a6) + move.w #$222,COLOR08(a6) + move.w #$332,COLOR09(a6) + move.w #$574,COLOR10(a6) + move.w #$eda,COLOR11(a6) + move.w #$554,COLOR12(a6) + move.w #$ca5,COLOR13(a6) + move.w #$59c,COLOR14(a6) + move.w #$684,COLOR15(a6) + move.w #$a95,COLOR16(a6) + move.w #$bde,COLOR17(a6) + move.w #$aba,COLOR18(a6) + move.w #$dc9,COLOR19(a6) + move.w #$9bc,COLOR20(a6) + move.w #$aa8,COLOR21(a6) + move.w #$8a9,COLOR22(a6) + move.w #$def,COLOR23(a6) + move.w #$897,COLOR24(a6) + move.w #$bcc,COLOR25(a6) + move.w #$fff,COLOR26(a6) + move.w #$765,COLOR27(a6) + move.w #$db6,COLOR28(a6) + move.w #$486,COLOR29(a6) + move.w #$6ad,COLOR30(a6) + move.w #$8a4,COLOR31(a6) diff --git a/tools/imagecon/reference/dithered_ham.png-palette.s b/tools/imagecon/reference/dithered_ham.png-palette.s index c880851..040949b 100644 --- a/tools/imagecon/reference/dithered_ham.png-palette.s +++ b/tools/imagecon/reference/dithered_ham.png-palette.s @@ -1,35 +1,16 @@ - movem.l d0-a6,-(sp) - lea CUSTOM,a6 - lea COLOR00(a6),a0 - move.w #$421,(a0) - lea COLOR01(a6),a0 - move.w #$631,(a0) - lea COLOR02(a6),a0 - move.w #$742,(a0) - lea COLOR03(a6),a0 - move.w #$79a,(a0) - lea COLOR04(a6),a0 - move.w #$210,(a0) - lea COLOR05(a6),a0 - move.w #$665,(a0) - lea COLOR06(a6),a0 - move.w #$678,(a0) - lea COLOR07(a6),a0 - move.w #$e95,(a0) - lea COLOR08(a6),a0 - move.w #$552,(a0) - lea COLOR09(a6),a0 - move.w #$963,(a0) - lea COLOR10(a6),a0 - move.w #$344,(a0) - lea COLOR11(a6),a0 - move.w #$987,(a0) - lea COLOR12(a6),a0 - move.w #$c74,(a0) - lea COLOR13(a6),a0 - move.w #$fb7,(a0) - lea COLOR14(a6),a0 - move.w #$9aa,(a0) - lea COLOR15(a6),a0 - move.w #$edb,(a0) - movem.l (sp)+,d0-a6 + move.w #$421,COLOR00(a6) + move.w #$631,COLOR01(a6) + move.w #$742,COLOR02(a6) + move.w #$79a,COLOR03(a6) + move.w #$210,COLOR04(a6) + move.w #$665,COLOR05(a6) + move.w #$678,COLOR06(a6) + move.w #$e95,COLOR07(a6) + move.w #$552,COLOR08(a6) + move.w #$963,COLOR09(a6) + move.w #$344,COLOR10(a6) + move.w #$987,COLOR11(a6) + move.w #$c74,COLOR12(a6) + move.w #$fb7,COLOR13(a6) + move.w #$9aa,COLOR14(a6) + move.w #$edb,COLOR15(a6) diff --git a/tools/imagecon/reference/extra_half_brite.png-palette.s b/tools/imagecon/reference/extra_half_brite.png-palette.s index f062381..ceacbe3 100644 --- a/tools/imagecon/reference/extra_half_brite.png-palette.s +++ b/tools/imagecon/reference/extra_half_brite.png-palette.s @@ -1,67 +1,32 @@ - movem.l d0-a6,-(sp) - lea CUSTOM,a6 - lea COLOR00(a6),a0 - move.w #$36b,(a0) - lea COLOR01(a6),a0 - move.w #$48b,(a0) - lea COLOR02(a6),a0 - move.w #$363,(a0) - lea COLOR03(a6),a0 - move.w #$ffd,(a0) - lea COLOR04(a6),a0 - move.w #$111,(a0) - lea COLOR05(a6),a0 - move.w #$443,(a0) - lea COLOR06(a6),a0 - move.w #$fec,(a0) - lea COLOR07(a6),a0 - move.w #$37b,(a0) - lea COLOR08(a6),a0 - move.w #$222,(a0) - lea COLOR09(a6),a0 - move.w #$332,(a0) - lea COLOR10(a6),a0 - move.w #$574,(a0) - lea COLOR11(a6),a0 - move.w #$eda,(a0) - lea COLOR12(a6),a0 - move.w #$554,(a0) - lea COLOR13(a6),a0 - move.w #$ca5,(a0) - lea COLOR14(a6),a0 - move.w #$59c,(a0) - lea COLOR15(a6),a0 - move.w #$684,(a0) - lea COLOR16(a6),a0 - move.w #$a95,(a0) - lea COLOR17(a6),a0 - move.w #$bde,(a0) - lea COLOR18(a6),a0 - move.w #$aba,(a0) - lea COLOR19(a6),a0 - move.w #$dc9,(a0) - lea COLOR20(a6),a0 - move.w #$9bc,(a0) - lea COLOR21(a6),a0 - move.w #$aa8,(a0) - lea COLOR22(a6),a0 - move.w #$8a9,(a0) - lea COLOR23(a6),a0 - move.w #$def,(a0) - lea COLOR24(a6),a0 - move.w #$897,(a0) - lea COLOR25(a6),a0 - move.w #$bcc,(a0) - lea COLOR26(a6),a0 - move.w #$fff,(a0) - lea COLOR27(a6),a0 - move.w #$765,(a0) - lea COLOR28(a6),a0 - move.w #$db6,(a0) - lea COLOR29(a6),a0 - move.w #$486,(a0) - lea COLOR30(a6),a0 - move.w #$6ad,(a0) - lea COLOR31(a6),a0 - move.w #$8a4,(a0) - movem.l (sp)+,d0-a6 + move.w #$36b,COLOR00(a6) + move.w #$48b,COLOR01(a6) + move.w #$363,COLOR02(a6) + move.w #$ffd,COLOR03(a6) + move.w #$111,COLOR04(a6) + move.w #$443,COLOR05(a6) + move.w #$fec,COLOR06(a6) + move.w #$37b,COLOR07(a6) + move.w #$222,COLOR08(a6) + move.w #$332,COLOR09(a6) + move.w #$574,COLOR10(a6) + move.w #$eda,COLOR11(a6) + move.w #$554,COLOR12(a6) + move.w #$ca5,COLOR13(a6) + move.w #$59c,COLOR14(a6) + move.w #$684,COLOR15(a6) + move.w #$a95,COLOR16(a6) + move.w #$bde,COLOR17(a6) + move.w #$aba,COLOR18(a6) + move.w #$dc9,COLOR19(a6) + move.w #$9bc,COLOR20(a6) + move.w #$aa8,COLOR21(a6) + move.w #$8a9,COLOR22(a6) + move.w #$def,COLOR23(a6) + move.w #$897,COLOR24(a6) + move.w #$bcc,COLOR25(a6) + move.w #$fff,COLOR26(a6) + move.w #$765,COLOR27(a6) + move.w #$db6,COLOR28(a6) + move.w #$486,COLOR29(a6) + move.w #$6ad,COLOR30(a6) + move.w #$8a4,COLOR31(a6) diff --git a/tools/imagecon/reference/ham_mode.png-palette.s b/tools/imagecon/reference/ham_mode.png-palette.s index c880851..040949b 100644 --- a/tools/imagecon/reference/ham_mode.png-palette.s +++ b/tools/imagecon/reference/ham_mode.png-palette.s @@ -1,35 +1,16 @@ - movem.l d0-a6,-(sp) - lea CUSTOM,a6 - lea COLOR00(a6),a0 - move.w #$421,(a0) - lea COLOR01(a6),a0 - move.w #$631,(a0) - lea COLOR02(a6),a0 - move.w #$742,(a0) - lea COLOR03(a6),a0 - move.w #$79a,(a0) - lea COLOR04(a6),a0 - move.w #$210,(a0) - lea COLOR05(a6),a0 - move.w #$665,(a0) - lea COLOR06(a6),a0 - move.w #$678,(a0) - lea COLOR07(a6),a0 - move.w #$e95,(a0) - lea COLOR08(a6),a0 - move.w #$552,(a0) - lea COLOR09(a6),a0 - move.w #$963,(a0) - lea COLOR10(a6),a0 - move.w #$344,(a0) - lea COLOR11(a6),a0 - move.w #$987,(a0) - lea COLOR12(a6),a0 - move.w #$c74,(a0) - lea COLOR13(a6),a0 - move.w #$fb7,(a0) - lea COLOR14(a6),a0 - move.w #$9aa,(a0) - lea COLOR15(a6),a0 - move.w #$edb,(a0) - movem.l (sp)+,d0-a6 + move.w #$421,COLOR00(a6) + move.w #$631,COLOR01(a6) + move.w #$742,COLOR02(a6) + move.w #$79a,COLOR03(a6) + move.w #$210,COLOR04(a6) + move.w #$665,COLOR05(a6) + move.w #$678,COLOR06(a6) + move.w #$e95,COLOR07(a6) + move.w #$552,COLOR08(a6) + move.w #$963,COLOR09(a6) + move.w #$344,COLOR10(a6) + move.w #$987,COLOR11(a6) + move.w #$c74,COLOR12(a6) + move.w #$fb7,COLOR13(a6) + move.w #$9aa,COLOR14(a6) + move.w #$edb,COLOR15(a6) diff --git a/tools/imagecon/reference/lace.png-palette.s b/tools/imagecon/reference/lace.png-palette.s index 8810acc..44b01b2 100644 --- a/tools/imagecon/reference/lace.png-palette.s +++ b/tools/imagecon/reference/lace.png-palette.s @@ -1,35 +1,16 @@ - movem.l d0-a6,-(sp) - lea CUSTOM,a6 - lea COLOR00(a6),a0 - move.w #$421,(a0) - lea COLOR01(a6),a0 - move.w #$631,(a0) - lea COLOR02(a6),a0 - move.w #$752,(a0) - lea COLOR03(a6),a0 - move.w #$e96,(a0) - lea COLOR04(a6),a0 - move.w #$89a,(a0) - lea COLOR05(a6),a0 - move.w #$210,(a0) - lea COLOR06(a6),a0 - move.w #$689,(a0) - lea COLOR07(a6),a0 - move.w #$963,(a0) - lea COLOR08(a6),a0 - move.w #$c84,(a0) - lea COLOR09(a6),a0 - move.w #$552,(a0) - lea COLOR10(a6),a0 - move.w #$665,(a0) - lea COLOR11(a6),a0 - move.w #$fb7,(a0) - lea COLOR12(a6),a0 - move.w #$886,(a0) - lea COLOR13(a6),a0 - move.w #$455,(a0) - lea COLOR14(a6),a0 - move.w #$aa8,(a0) - lea COLOR15(a6),a0 - move.w #$edb,(a0) - movem.l (sp)+,d0-a6 + move.w #$421,COLOR00(a6) + move.w #$631,COLOR01(a6) + move.w #$752,COLOR02(a6) + move.w #$e96,COLOR03(a6) + move.w #$89a,COLOR04(a6) + move.w #$210,COLOR05(a6) + move.w #$689,COLOR06(a6) + move.w #$963,COLOR07(a6) + move.w #$c84,COLOR08(a6) + move.w #$552,COLOR09(a6) + move.w #$665,COLOR10(a6) + move.w #$fb7,COLOR11(a6) + move.w #$886,COLOR12(a6) + move.w #$455,COLOR13(a6) + move.w #$aa8,COLOR14(a6) + move.w #$edb,COLOR15(a6)