Move all graphical utilities into /shape

diff --git a/.gitignore b/.gitignore
index 44a74d5..fcbdcb0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,23 +9,6 @@
 *.rel
 *.rst
 *.seed
-/disasm/dhgr_pixel_shape_data_aux.inc
-/disasm/dhgr_pixel_shape_data_main.inc
-/disasm/dhgr_pixel_shape_index.inc
-/disasm/pixel_shape_data.inc
-/disasm/pixel_shape_index.inc
-/disasm/shape0.png
-/disasm/shape0a.png
-/disasm/shape0b.png
-/disasm/shape0c.png
-/disasm/shape1.png
-/disasm/shape2.png
-/disasm/shape3.png
-/disasm/shape4.png
-/disasm/shape5.png
-/disasm/shape6.png
-/disasm/shape_data.inc
-/disasm/shape_index.inc
 /disasm/star_blazer.asm
 /disasm/star_blazer.asm0
 /disasm/star_blazer.dsk
@@ -38,5 +21,22 @@
 /orig/APPLE Computer and Peripheral Card Roms Collection.zip
 /orig/Apple_DOS_v3.3_1980_Apple.do
 /orig/Star_Blazer_1981_Star_Craft.do
+/shape/dhgr_pixel_shape_data_aux.inc
+/shape/dhgr_pixel_shape_data_main.inc
+/shape/dhgr_pixel_shape_index.inc
+/shape/pixel_shape_data.inc
+/shape/pixel_shape_index.inc
+/shape/shape0.png
+/shape/shape0a.png
+/shape/shape0b.png
+/shape/shape0c.png
+/shape/shape1.png
+/shape/shape2.png
+/shape/shape3.png
+/shape/shape4.png
+/shape/shape5.png
+/shape/shape6.png
+/shape/shape_data.inc
+/shape/shape_index.inc
 /test/test.dsk
 /util/bootable.dsk

diff --git a/Makefile b/Makefile
index 0cd10a6..8fad249 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ emu_65c02 \
 linapple-pie \
 loader \
 orig \
+shape \
 util \
 test
 
@@ -15,7 +16,7 @@ asxv5pxx:
        ${MAKE} ${MAKEFLAGS} -C asxv5pxx/asxmak/linux/build as6500 aslink
 
 .PHONY: disasm
-disasm: asxv5pxx loader
+disasm: asxv5pxx loader shape
        ${MAKE} ${MAKEFLAGS} -C disasm
 
 .PHONY: dos33fsprogs
@@ -38,6 +39,10 @@ loader: asxv5pxx dos33fsprogs orig
 orig:
        ${MAKE} ${MAKEFLAGS} -C orig
 
+.PHONY: shape
+shape: loader
+       ${MAKE} ${MAKEFLAGS} -C shape
+
 .PHONY: util
 util: dos33fsprogs linapple-pie orig
        ${MAKE} ${MAKEFLAGS} -C util

diff --git a/disasm/Makefile b/disasm/Makefile
index e235d8c..8bded5b 100644 (file)
--- a/disasm/Makefile
+++ b/disasm/Makefile
@@ -7,17 +7,7 @@ LOAD_ADDR=0x800
 
 .PHONY: all
 all: \
-star_blazer.dsk \
-shape0.png \
-shape0a.png \
-shape0b.png \
-shape0c.png \
-shape1.png \
-shape2.png \
-shape3.png \
-shape4.png \
-shape5.png \
-shape6.png
+star_blazer.dsk
 
 star_blazer.dsk: ../util/bootable.dsk star_blazer_pack_rev.a2bin
        cp ../util/bootable.dsk $@
@@ -53,13 +43,13 @@ $@ $<
 
 star_blazer.rel: \
 star_blazer.asm \
-dhgr_pixel_shape_index.inc \
-dhgr_pixel_shape_data_main.inc \
-dhgr_pixel_shape_data_aux.inc \
-pixel_shape_index.inc \
-pixel_shape_data.inc \
-shape_index.inc \
-shape_data.inc \
+../shape/dhgr_pixel_shape_index.inc \
+../shape/dhgr_pixel_shape_data_main.inc \
+../shape/dhgr_pixel_shape_data_aux.inc \
+../shape/pixel_shape_index.inc \
+../shape/pixel_shape_data.inc \
+../shape/shape_index.inc \
+../shape/shape_data.inc \
 ucode_defs.inc \
 ucode_data.inc
        ${AS6500} -3 -l -o $<
@@ -77,62 +67,6 @@ star_blazer.asm.patch
        cp $@ $@0
        patch $@ <$@.patch
 
-dhgr_pixel_shape_index.inc: pixel.txt dhgr_shape.txt shape0c.png
-       cat pixel.txt dhgr_shape.txt \
-|./shape_compile.py --dhgr --index shape0c.png >$@
-
-dhgr_pixel_shape_data_aux.inc: pixel.txt dhgr_shape.txt shape0c.png
-       cat pixel.txt dhgr_shape.txt \
-|./shape_compile.py --dhgr --aux --data shape0c.png >$@
-
-dhgr_pixel_shape_data_main.inc: pixel.txt dhgr_shape.txt shape0c.png
-       cat pixel.txt dhgr_shape.txt \
-|./shape_compile.py --dhgr --main --data shape0c.png >$@
-
-pixel_shape_index.inc: pixel.txt shape.txt shape0a.png
-       cat pixel.txt shape.txt \
-|./shape_compile.py --index shape0a.png >$@
-
-pixel_shape_data.inc: pixel.txt shape.txt shape0a.png
-       cat pixel.txt shape.txt \
-|./shape_compile.py --data shape0a.png >$@
-
-shape_index.inc: shape.txt shape0.png
-       ./shape_compile.py --index shape0.png <$< >$@
-
-shape_data.inc: shape.txt shape0.png
-       ./shape_compile.py --data shape0.png <$< >$@
-
-shape0.png: ../loader/star_blazer_recrack.a2bin
-       ./shape_extract.py $< $@
-
-shape1.png: shape0.png
-       ./shape_round.py --mono $< $@
-
-shape2.png: shape0.png
-       ./shape_mono_to_color.py $< $@
-
-shape3.png: shape2.png
-       ./shape_round.py $< $@
-
-shape4.png: shape2.png
-       ./shape_unfringe.py $< $@
-
-shape5.png: shape4.png
-       ./shape_round.py $< $@
-
-shape6.png: shape5.png
-       ./shape_enhance.py $< $@
-
-shape0a.png: shape_hgr.png
-       ./shape_color_to_mono.py --hgr $< $@
-
-shape0b.png: shape0.png shape0a.png
-       gmic $^ -blend xor -o $@
-
-shape0c.png: shape_dhgr.png
-       ./shape_color_to_mono.py $< $@
-
 .PHONY: clean
 clean:
        rm -f \
@@ -145,8 +79,5 @@ clean:
 *.o \
 *.rel \
 *.rst \
-shape[0-6].png \
 star_blazer.asm \
-shape_index.inc \
-shape_data.inc \
 star_blazer.dsk

diff --git a/disasm/star_blazer.asm.patch b/disasm/star_blazer.asm.patch
index 607d247..7f8bb34 100644 (file)
--- a/disasm/star_blazer.asm.patch
+++ b/disasm/star_blazer.asm.patch
@@ -1,11 +1,11 @@
 --- star_blazer.asm0   2022-06-25 00:04:33.079828875 +1000
-+++ star_blazer.asm    2022-06-25 00:04:33.083828875 +1000
++++ star_blazer.asm    2022-06-25 10:55:50.799994461 +1000
 @@ -1,3 +1,9 @@
 +ALIGN = 0
 +DHGR = 1
 +PIXEL_SHAPE = 1
 +SHAPE = 1
-+UCODE = 1
++UCODE = 0
 +
  HIRES_SCREEN = 0x2000                 ; 2000
  HW_KBD = 0xc000                               ; c000
@@ -39,7 +39,7 @@
 +HW_SET80VID = 0xc00d
 +.endif
 +
-+.include /ucode_defs.inc/
++.include "ucode_defs.inc"
 +
 +      .globl  start
 +
@@ -992,13 +992,13 @@
 +data0_start:
 + 
 +.if DHGR
-+.include /dhgr_pixel_shape_index.inc/
++.include "../shape/dhgr_pixel_shape_index.inc"
 +.else
 +.if PIXEL_SHAPE
-+.include /pixel_shape_index.inc/
++.include "../shape/pixel_shape_index.inc"
 +.else
 +.if SHAPE
-+.include /shape_index.inc/
++.include "../shape/shape_index.inc"
 +.else
  shape_data_ptr_lo:
        .db     <shape_23_bomb3 + 0x28  ; 4000 r
@@ -1018,13 +1018,13 @@
        .db     0x00                    ; 5bfe
        .db     0x00                    ; 5bff
 +.if DHGR
-+.include /dhgr_pixel_shape_data_main.inc/
++.include "../shape/dhgr_pixel_shape_data_main.inc"
 +.else
 +.if PIXEL_SHAPE
-+.include /pixel_shape_data.inc/
++.include "../shape/pixel_shape_data.inc"
 +.else
 +.if SHAPE
-+.include /shape_data.inc/
++.include "../shape/shape_data.inc"
 +.else
  shape_20_bomb0:
        .db     0x5c                    ; 5c00 r
@@ -1544,7 +1544,7 @@
 +      .ds     0x8e00 - 0x4000 - (. - data0_start)
 +.endif
 +.if UCODE
-+.include /ucode_data.inc/
++.include "ucode_data.inc"
 +.else
  ucode1080_countdown_30_pixel:
        .dw     0x0f30                  ; 8e00 r
@@ -1879,7 +1879,7 @@
 +
 +      .area   data1
 +
-+.include /dhgr_pixel_shape_data_aux.inc/
++.include "../shape/dhgr_pixel_shape_data_aux.inc"
 +.endif
  
        .area   udata2

diff --git a/shape/Makefile b/shape/Makefile
new file mode 100644 (file)
index 0000000..b654028
--- /dev/null
+++ b/shape/Makefile
@@ -0,0 +1,88 @@
+.PHONY: all
+all: \
+dhgr_pixel_shape_index.inc \
+dhgr_pixel_shape_data_aux.inc \
+dhgr_pixel_shape_data_main.inc \
+pixel_shape_index.inc \
+pixel_shape_data.inc \
+shape_index.inc \
+shape_data.inc \
+shape0.png \
+shape0a.png \
+shape0b.png \
+shape0c.png \
+shape1.png \
+shape2.png \
+shape3.png \
+shape4.png \
+shape5.png \
+shape6.png
+
+dhgr_pixel_shape_index.inc: pixel.txt dhgr_shape.txt shape0c.png
+       cat pixel.txt dhgr_shape.txt \
+|./shape_compile.py --dhgr --index shape0c.png >$@
+
+dhgr_pixel_shape_data_aux.inc: pixel.txt dhgr_shape.txt shape0c.png
+       cat pixel.txt dhgr_shape.txt \
+|./shape_compile.py --dhgr --aux --data shape0c.png >$@
+
+dhgr_pixel_shape_data_main.inc: pixel.txt dhgr_shape.txt shape0c.png
+       cat pixel.txt dhgr_shape.txt \
+|./shape_compile.py --dhgr --main --data shape0c.png >$@
+
+pixel_shape_index.inc: pixel.txt shape.txt shape0a.png
+       cat pixel.txt shape.txt \
+|./shape_compile.py --index shape0a.png >$@
+
+pixel_shape_data.inc: pixel.txt shape.txt shape0a.png
+       cat pixel.txt shape.txt \
+|./shape_compile.py --data shape0a.png >$@
+
+shape_index.inc: shape.txt shape0.png
+       ./shape_compile.py --index shape0.png <$< >$@
+
+shape_data.inc: shape.txt shape0.png
+       ./shape_compile.py --data shape0.png <$< >$@
+
+shape0.png: ../loader/star_blazer_recrack.a2bin
+       ./shape_extract.py $< $@
+
+shape1.png: shape0.png
+       ./shape_round.py --mono $< $@
+
+shape2.png: shape0.png
+       ./shape_mono_to_color.py $< $@
+
+shape3.png: shape2.png
+       ./shape_round.py $< $@
+
+shape4.png: shape2.png
+       ./shape_unfringe.py $< $@
+
+shape5.png: shape4.png
+       ./shape_round.py $< $@
+
+shape6.png: shape5.png
+       ./shape_enhance.py $< $@
+
+shape0a.png: shape_hgr.png
+       ./shape_color_to_mono.py --hgr $< $@
+
+shape0b.png: shape0.png shape0a.png
+       gmic $^ -blend xor -o $@
+
+shape0c.png: shape_dhgr.png
+       ./shape_color_to_mono.py $< $@
+
+.PHONY: clean
+clean:
+       rm -f \
+dhgr_pixel_shape_index.inc \
+dhgr_pixel_shape_data_aux.inc \
+dhgr_pixel_shape_data_main.inc \
+pixel_shape_index.inc \
+pixel_shape_data.inc \
+shape_index.inc \
+shape_data.inc \
+shape0[abc].png \
+shape[0-6].png

diff --git a/disasm/dhgr_shape.txt b/shape/dhgr_shape.txt
similarity index 100%
rename from disasm/dhgr_shape.txt
rename to shape/dhgr_shape.txt

diff --git a/disasm/pixel.txt b/shape/pixel.txt
similarity index 100%
rename from disasm/pixel.txt
rename to shape/pixel.txt

diff --git a/projectiles/aspect.txt b/shape/projectiles/aspect.txt
similarity index 100%
rename from projectiles/aspect.txt
rename to shape/projectiles/aspect.txt

diff --git a/projectiles/bomb_1200x300.xcf b/shape/projectiles/bomb_1200x300.xcf
similarity index 100%
rename from projectiles/bomb_1200x300.xcf
rename to shape/projectiles/bomb_1200x300.xcf

diff --git a/projectiles/bomb_120x20.xcf b/shape/projectiles/bomb_120x20.xcf
similarity index 100%
rename from projectiles/bomb_120x20.xcf
rename to shape/projectiles/bomb_120x20.xcf

diff --git a/projectiles/bomb_120x20_edited.xcf b/shape/projectiles/bomb_120x20_edited.xcf
similarity index 100%
rename from projectiles/bomb_120x20_edited.xcf
rename to shape/projectiles/bomb_120x20_edited.xcf

diff --git a/projectiles/bomb_120x20_quantized.xcf b/shape/projectiles/bomb_120x20_quantized.xcf
similarity index 100%
rename from projectiles/bomb_120x20_quantized.xcf
rename to shape/projectiles/bomb_120x20_quantized.xcf

diff --git a/projectiles/missile_1500x300.xcf b/shape/projectiles/missile_1500x300.xcf
similarity index 100%
rename from projectiles/missile_1500x300.xcf
rename to shape/projectiles/missile_1500x300.xcf

diff --git a/projectiles/missile_150x20.xcf b/shape/projectiles/missile_150x20.xcf
similarity index 100%
rename from projectiles/missile_150x20.xcf
rename to shape/projectiles/missile_150x20.xcf

diff --git a/projectiles/missile_150x20_edited.xcf b/shape/projectiles/missile_150x20_edited.xcf
similarity index 100%
rename from projectiles/missile_150x20_edited.xcf
rename to shape/projectiles/missile_150x20_edited.xcf

diff --git a/projectiles/missile_150x20_quantized.xcf b/shape/projectiles/missile_150x20_quantized.xcf
similarity index 100%
rename from projectiles/missile_150x20_quantized.xcf
rename to shape/projectiles/missile_150x20_quantized.xcf

diff --git a/disasm/shape.txt b/shape/shape.txt
similarity index 100%
rename from disasm/shape.txt
rename to shape/shape.txt

diff --git a/disasm/shape_color_to_mono.py b/shape/shape_color_to_mono.py
similarity index 100%
rename from disasm/shape_color_to_mono.py
rename to shape/shape_color_to_mono.py

diff --git a/disasm/shape_compile.py b/shape/shape_compile.py
similarity index 100%
rename from disasm/shape_compile.py
rename to shape/shape_compile.py

diff --git a/disasm/shape_dhgr.png b/shape/shape_dhgr.png
similarity index 100%
rename from disasm/shape_dhgr.png
rename to shape/shape_dhgr.png

diff --git a/disasm/shape_enhance.py b/shape/shape_enhance.py
similarity index 100%
rename from disasm/shape_enhance.py
rename to shape/shape_enhance.py

diff --git a/disasm/shape_extract.py b/shape/shape_extract.py
similarity index 100%
rename from disasm/shape_extract.py
rename to shape/shape_extract.py

diff --git a/disasm/shape_hgr.png b/shape/shape_hgr.png
similarity index 100%
rename from disasm/shape_hgr.png
rename to shape/shape_hgr.png

diff --git a/disasm/shape_mono_to_color.py b/shape/shape_mono_to_color.py
similarity index 100%
rename from disasm/shape_mono_to_color.py
rename to shape/shape_mono_to_color.py

diff --git a/disasm/shape_mono_to_grey.py b/shape/shape_mono_to_grey.py
similarity index 100%
rename from disasm/shape_mono_to_grey.py
rename to shape/shape_mono_to_grey.py

diff --git a/disasm/shape_round.py b/shape/shape_round.py
similarity index 100%
rename from disasm/shape_round.py
rename to shape/shape_round.py

diff --git a/disasm/shape_unfringe.py b/shape/shape_unfringe.py
similarity index 100%
rename from disasm/shape_unfringe.py
rename to shape/shape_unfringe.py

diff --git a/disasm/shape_versions.py b/shape/shape_versions.py
similarity index 100%
rename from disasm/shape_versions.py
rename to shape/shape_versions.py