diff --git a/tools/imagecon/Makefile b/tools/imagecon/Makefile index aedadec..5eee97f 100644 --- a/tools/imagecon/Makefile +++ b/tools/imagecon/Makefile @@ -26,6 +26,10 @@ HAM_IMAGE=../../assets/gigi.png HAM_BASE=out/ham REFERENCE_HAM_BASE=reference/ham +DITHERED_HAM_IMAGE=../../assets/gigi.png +DITHERED_HAM_BASE=out/dithered_ham +REFERENCE_DITHERED_HAM_BASE=reference/dithered_ham + $(IMAGECON): out bin $(OBJS) gcc $(OBJS) -o $(IMAGECON) $(LIBS) @@ -63,7 +67,10 @@ $(EHB_BASE).bin: $(EHB_IMAGE) $(HAM_BASE).bin: $(HAM_IMAGE) $(IMAGECON) --input $(HAM_IMAGE) --output $(HAM_BASE) --output-bitplanes --ham --output-palette-asm -test: $(IMAGECON) $(OUTPUT_BASE).bin $(SHARED_PALETTE) $(USED_PALETTE) $(EHB_BASE).bin $(HAM_BASE).bin +$(DITHERED_HAM_BASE).bin: $(DITHERED_HAM_IMAGE) + $(IMAGECON) --input $(DITHERED_HAM_IMAGE) --output $(DITHERED_HAM_BASE) --dither --output-bitplanes --ham --output-palette-asm + +test: $(IMAGECON) $(OUTPUT_BASE).bin $(SHARED_PALETTE) $(USED_PALETTE) $(EHB_BASE).bin $(HAM_BASE).bin $(DITHERED_HAM_BASE).bin diff $(OUTPUT_BASE).bin $(REFERENCE_BASE).bin diff $(OUTPUT_BASE)-copper-list.s $(REFERENCE_BASE)-copper-list.s diff $(OUTPUT_BASE)-palette.s $(REFERENCE_BASE)-palette.s @@ -76,6 +83,8 @@ test: $(IMAGECON) $(OUTPUT_BASE).bin $(SHARED_PALETTE) $(USED_PALETTE) $(EHB_BAS diff $(EHB_BASE)-copper-list.s $(REFERENCE_EHB_BASE)-copper-list.s diff $(HAM_BASE)-ham.bin $(REFERENCE_HAM_BASE)-ham.bin diff $(HAM_BASE)-palette.s $(REFERENCE_HAM_BASE)-palette.s + diff $(DITHERED_HAM_BASE)-ham.bin $(REFERENCE_DITHERED_HAM_BASE)-ham.bin + diff $(DITHERED_HAM_BASE)-palette.s $(REFERENCE_DITHERED_HAM_BASE)-palette.s @echo "______ ___ _____ _____ ___________ " @echo "| ___ \/ _ \ / ___/ ___| ___| _ \ " diff --git a/tools/imagecon/reference/dithered_ham-ham.bin b/tools/imagecon/reference/dithered_ham-ham.bin new file mode 100644 index 0000000..4d9291a Binary files /dev/null and b/tools/imagecon/reference/dithered_ham-ham.bin differ diff --git a/tools/imagecon/reference/dithered_ham-palette.s b/tools/imagecon/reference/dithered_ham-palette.s new file mode 100644 index 0000000..42197ea --- /dev/null +++ b/tools/imagecon/reference/dithered_ham-palette.s @@ -0,0 +1,35 @@ + 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 #$852,(a0) + lea COLOR03(a6),a0 + move.w #$210,(a0) + lea COLOR04(a6),a0 + move.w #$79a,(a0) + lea COLOR05(a6),a0 + move.w #$ea6,(a0) + lea COLOR06(a6),a0 + move.w #$c84,(a0) + lea COLOR07(a6),a0 + move.w #$a63,(a0) + lea COLOR08(a6),a0 + move.w #$552,(a0) + lea COLOR09(a6),a0 + move.w #$688,(a0) + lea COLOR10(a6),a0 + move.w #$765,(a0) + lea COLOR11(a6),a0 + move.w #$455,(a0) + lea COLOR12(a6),a0 + move.w #$fb7,(a0) + lea COLOR13(a6),a0 + move.w #$9aa,(a0) + lea COLOR14(a6),a0 + move.w #$997,(a0) + lea COLOR15(a6),a0 + move.w #$edb,(a0) + movem.l (sp)+,d0-a6