diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-17 01:33:16 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-17 01:33:16 +0200 |
| commit | 2d915cd80a3193cca4a5b00933b7e24c9232b293 (patch) | |
| tree | 1a1f4c1a5c9ba6a2ade97847dbdb78c32d58536a | |
| parent | 6f30400073fdae990fdf4033fe184c6431491561 (diff) | |
| download | hurrycurry-2d915cd80a3193cca4a5b00933b7e24c9232b293.tar hurrycurry-2d915cd80a3193cca4a5b00933b7e24c9232b293.tar.bz2 hurrycurry-2d915cd80a3193cca4a5b00933b7e24c9232b293.tar.zst | |
icon.png for pixel client
| -rw-r--r-- | pixel-client/.gitignore | 5 | ||||
| -rw-r--r-- | pixel-client/assets/.gitignore | 4 | ||||
| -rw-r--r-- | pixel-client/assets/misc.ini | 2 | ||||
| -rw-r--r-- | pixel-client/makefile | 9 |
4 files changed, 13 insertions, 7 deletions
diff --git a/pixel-client/.gitignore b/pixel-client/.gitignore new file mode 100644 index 00000000..fbe666e8 --- /dev/null +++ b/pixel-client/.gitignore @@ -0,0 +1,5 @@ +/assets/*.png +/assets/atlas.ta +/assets/atlas.meta.csv +/assets/sprites +/icon.png diff --git a/pixel-client/assets/.gitignore b/pixel-client/assets/.gitignore deleted file mode 100644 index 89bda45f..00000000 --- a/pixel-client/assets/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.png -/atlas.ta -/atlas.meta.csv -/sprites diff --git a/pixel-client/assets/misc.ini b/pixel-client/assets/misc.ini index e1c118d9..f499bd51 100644 --- a/pixel-client/assets/misc.ini +++ b/pixel-client/assets/misc.ini @@ -11,3 +11,5 @@ conveyor-arrow=ns:conveyor_arrow_up~vflip conveyor-arrow=sn:conveyor_arrow_up conveyor-arrow=ew:conveyor_arrow_left conveyor-arrow=we:conveyor_arrow_left~hflip + +icon=pot_back,steak_in_pot~x4~y11,pot_front diff --git a/pixel-client/makefile b/pixel-client/makefile index 6aa891d3..ffd0229d 100644 --- a/pixel-client/makefile +++ b/pixel-client/makefile @@ -31,7 +31,7 @@ COMPOSE = ../target/release/tex_compose CLIENT = ../target/release/pixelcurry .PHONY: all tex_pack tex_export tex_import clean -all: $(CLIENT) +all: $(CLIENT) icon.png tex_pack: assets/atlas.ta tex_import: $(TEXTURES_IMPORT_PNG) tex_export: $(TEXTURES_PNG) $(SPRITES_PNG) assets/atlas.png @@ -50,9 +50,12 @@ $(IMPORT) $(EXPORT) $(PACK) $(COMPOSE): $(shell find tools/src -type f) %.png: %.ta $(EXPORT) $(EXPORT) $< $@ +icon.png: assets/sprites/misc/icon+a.png + ffmpeg -i $< -vf scale=512x512:sws_flags=neighbor -y $@ + assets/sprites/%/all: assets/%.ini $(TEXTURES) $(COMPOSE) - @mkdir -p $(basename $@) - $(COMPOSE) $< assets/textures $(basename $@) + @mkdir -p $(shell dirname $@) + $(COMPOSE) $< assets/textures $(shell dirname $@) @touch $@ assets/atlas.ta assets/atlas.meta.csv: assets/sprites/items/all assets/sprites/tiles/all assets/sprites/misc/all $(PACK) |