From c242646e40d6085fd24393deda84b21abd57dea5 Mon Sep 17 00:00:00 2001 From: Nakidai Date: Sun, 29 Sep 2024 00:44:36 +0300 Subject: Replace a lot of gifs with single --- cpetpet.c | 16 +++++++++------- share/cpetpet/pet.gif | Bin 0 -> 28211 bytes share/cpetpet/pet0.gif | Bin 2764 -> 0 bytes share/cpetpet/pet1.gif | Bin 2745 -> 0 bytes share/cpetpet/pet2.gif | Bin 3042 -> 0 bytes share/cpetpet/pet3.gif | Bin 3042 -> 0 bytes share/cpetpet/pet4.gif | Bin 2934 -> 0 bytes share/cpetpet/pet5.gif | Bin 2934 -> 0 bytes share/cpetpet/pet6.gif | Bin 2936 -> 0 bytes share/cpetpet/pet7.gif | Bin 2936 -> 0 bytes share/cpetpet/pet8.gif | Bin 2598 -> 0 bytes share/cpetpet/pet9.gif | Bin 2598 -> 0 bytes 12 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 share/cpetpet/pet.gif delete mode 100644 share/cpetpet/pet0.gif delete mode 100644 share/cpetpet/pet1.gif delete mode 100644 share/cpetpet/pet2.gif delete mode 100644 share/cpetpet/pet3.gif delete mode 100644 share/cpetpet/pet4.gif delete mode 100644 share/cpetpet/pet5.gif delete mode 100644 share/cpetpet/pet6.gif delete mode 100644 share/cpetpet/pet7.gif delete mode 100644 share/cpetpet/pet8.gif delete mode 100644 share/cpetpet/pet9.gif diff --git a/cpetpet.c b/cpetpet.c index d106c8e..5bef133 100644 --- a/cpetpet.c +++ b/cpetpet.c @@ -38,11 +38,11 @@ void CPetPet(const char *in, const char *out, const size_t delay) empty = NewPixelWand(); - result = NewMagickWand(); - concat = NewMagickWand(); - avatar = NewMagickWand(); - concat = NewMagickWand(); - hand = NewMagickWand(); + result = NewMagickWand(); + concat = NewMagickWand(); + avatar = NewMagickWand(); + concat = NewMagickWand(); + hand = NewMagickWand(); PixelSetColor(empty, "none"); @@ -51,6 +51,9 @@ void CPetPet(const char *in, const char *out, const size_t delay) MagickReadImage(avatar, in); MagickResizeImage(avatar, 128, 128, Lanczos2Filter); + MagickReadImage(hand, SHAREDIR "/pet.gif"); + MagickSetFirstIterator(hand); + for (int i = 0; i < FRAMES; ++i) { squeeze = (i < FRAMES/2) ? i : FRAMES - i; @@ -64,14 +67,13 @@ void CPetPet(const char *in, const char *out, const size_t delay) MagickSetImageDispose(concat, BackgroundDispose); MagickSetImageDelay(concat, delay); MagickResizeImage(edited, (double)MagickGetImageWidth(avatar)*width, (double)MagickGetImageHeight(avatar)*height, Lanczos2Filter); - MagickReadImage(hand, gifs[i]); + MagickNextImage(hand); MagickCompositeImage(concat, edited, OverCompositeOp, MagickTrue, MagickGetImageWidth(concat)*offset_x, MagickGetImageHeight(concat)*offset_y); MagickCompositeImage(concat, hand, OverCompositeOp, MagickTrue, 0, 0); MagickAddImage(result, concat); ClearMagickWand(concat); - ClearMagickWand(hand); } MagickWriteImages(result, out, MagickTrue); diff --git a/share/cpetpet/pet.gif b/share/cpetpet/pet.gif new file mode 100644 index 0000000..11576c8 Binary files /dev/null and b/share/cpetpet/pet.gif differ diff --git a/share/cpetpet/pet0.gif b/share/cpetpet/pet0.gif deleted file mode 100644 index 09c40d4..0000000 Binary files a/share/cpetpet/pet0.gif and /dev/null differ diff --git a/share/cpetpet/pet1.gif b/share/cpetpet/pet1.gif deleted file mode 100644 index f3f1fdc..0000000 Binary files a/share/cpetpet/pet1.gif and /dev/null differ diff --git a/share/cpetpet/pet2.gif b/share/cpetpet/pet2.gif deleted file mode 100644 index ee33972..0000000 Binary files a/share/cpetpet/pet2.gif and /dev/null differ diff --git a/share/cpetpet/pet3.gif b/share/cpetpet/pet3.gif deleted file mode 100644 index e70c930..0000000 Binary files a/share/cpetpet/pet3.gif and /dev/null differ diff --git a/share/cpetpet/pet4.gif b/share/cpetpet/pet4.gif deleted file mode 100644 index 4d09c16..0000000 Binary files a/share/cpetpet/pet4.gif and /dev/null differ diff --git a/share/cpetpet/pet5.gif b/share/cpetpet/pet5.gif deleted file mode 100644 index e250e13..0000000 Binary files a/share/cpetpet/pet5.gif and /dev/null differ diff --git a/share/cpetpet/pet6.gif b/share/cpetpet/pet6.gif deleted file mode 100644 index 09dedb3..0000000 Binary files a/share/cpetpet/pet6.gif and /dev/null differ diff --git a/share/cpetpet/pet7.gif b/share/cpetpet/pet7.gif deleted file mode 100644 index a467e92..0000000 Binary files a/share/cpetpet/pet7.gif and /dev/null differ diff --git a/share/cpetpet/pet8.gif b/share/cpetpet/pet8.gif deleted file mode 100644 index f9fb14c..0000000 Binary files a/share/cpetpet/pet8.gif and /dev/null differ diff --git a/share/cpetpet/pet9.gif b/share/cpetpet/pet9.gif deleted file mode 100644 index f9fb14c..0000000 Binary files a/share/cpetpet/pet9.gif and /dev/null differ -- cgit 1.4.1