From 58bf715b7932be0e6e611cbde0c6aa6fe82a6f70 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 12 Nov 2022 12:03:22 +0100 Subject: anim: use '-' as object-action separator - images: convert everything to RLE'd TGA --- anim/door-close.tga | Bin 0 -> 4613654 bytes anim/door_close.tga | Bin 4613654 -> 0 bytes editor/app.cpp | 2 +- images/concrete6.tga | Bin 197147 -> 193075 bytes images/concrete7.tga | Bin 49691 -> 49633 bytes images/floor-tiles.tga | Bin 8651291 -> 8427493 bytes images/metal1.tga | Bin 49691 -> 49459 bytes images/metal2.tga | Bin 1080539 -> 1070043 bytes images/teak1.tga | Bin 49691 -> 49360 bytes images/texel.tga | Bin 731 -> 663 bytes images/tiles.tga | Bin 492059 -> 492059 bytes images/wood1.tga | Bin 12827 -> 12838 bytes images/wood2.tga | Bin 12827 -> 12854 bytes 13 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 anim/door-close.tga delete mode 100644 anim/door_close.tga diff --git a/anim/door-close.tga b/anim/door-close.tga new file mode 100644 index 00000000..62aaaa69 Binary files /dev/null and b/anim/door-close.tga differ diff --git a/anim/door_close.tga b/anim/door_close.tga deleted file mode 100644 index 62aaaa69..00000000 Binary files a/anim/door_close.tga and /dev/null differ diff --git a/editor/app.cpp b/editor/app.cpp index 22c5d377..e9497520 100644 --- a/editor/app.cpp +++ b/editor/app.cpp @@ -16,7 +16,7 @@ app::app(fm_settings&& opts) : _floor2{loader.tile_atlas("metal1", {2, 2})}, _wall1{loader.tile_atlas("wood2", {2, 1})}, _wall2{loader.tile_atlas("wood1", {2, 1})}, - _door{loader.anim_atlas("door_close")} + _door{loader.anim_atlas("door-close")} { world& w = M->world(); chunk_coords coord{0 ,0}; diff --git a/images/concrete6.tga b/images/concrete6.tga index ff941760..91b332dd 100644 Binary files a/images/concrete6.tga and b/images/concrete6.tga differ diff --git a/images/concrete7.tga b/images/concrete7.tga index 92aa6278..476dcec0 100644 Binary files a/images/concrete7.tga and b/images/concrete7.tga differ diff --git a/images/floor-tiles.tga b/images/floor-tiles.tga index addd163c..1a0a6d79 100644 Binary files a/images/floor-tiles.tga and b/images/floor-tiles.tga differ diff --git a/images/metal1.tga b/images/metal1.tga index 40630e38..d305638d 100644 Binary files a/images/metal1.tga and b/images/metal1.tga differ diff --git a/images/metal2.tga b/images/metal2.tga index 69f7b96a..6e9b64e9 100644 Binary files a/images/metal2.tga and b/images/metal2.tga differ diff --git a/images/teak1.tga b/images/teak1.tga index 5618ad98..df1927c6 100644 Binary files a/images/teak1.tga and b/images/teak1.tga differ diff --git a/images/texel.tga b/images/texel.tga index cdd15718..99314406 100644 Binary files a/images/texel.tga and b/images/texel.tga differ diff --git a/images/tiles.tga b/images/tiles.tga index e064a490..1376a27c 100644 Binary files a/images/tiles.tga and b/images/tiles.tga differ diff --git a/images/wood1.tga b/images/wood1.tga index 4b5f5073..6c28183c 100644 Binary files a/images/wood1.tga and b/images/wood1.tga differ diff --git a/images/wood2.tga b/images/wood2.tga index 815a4723..e8c689d2 100644 Binary files a/images/wood2.tga and b/images/wood2.tga differ -- cgit v1.2.3