mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-29 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support to resize the current mask.

Browse Source
This commit is contained in:
David Capello 2009-06-14 16:10:12 +00:00
parent 8ac979667c
commit b84fa3a8c6
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/commands/cmd_sprite_size.cpp
View File

@ -30,6 +30,7 @@
#include "modules/sprites.h" #include "modules/sprites.h"
#include "raster/cel.h" #include "raster/cel.h"
#include "raster/image.h" #include "raster/image.h"
#include "raster/mask.h"
#include "raster/sprite.h" #include "raster/sprite.h"
#include "raster/stock.h" #include "raster/stock.h"
#include "undoable.h" #include "undoable.h"
@ -43,6 +44,9 @@ class SpriteSizeJob : public Job
int m_new_height; int m_new_height;
ResizeMethod m_resize_method; ResizeMethod m_resize_method;
inline int scale_x(int x) const { return x * m_new_width / m_sprite->w; }
inline int scale_y(int y) const { return y * m_new_height / m_sprite->h; }
public: public:
SpriteSizeJob(const SpriteReader& sprite, int new_width, int new_height, ResizeMethod resize_method) SpriteSizeJob(const SpriteReader& sprite, int new_width, int new_height, ResizeMethod resize_method)
@ -73,9 +77,7 @@ protected:
Cel* cel = (Cel*)link->data; Cel* cel = (Cel*)link->data;
// change it location // change it location
undoable.set_cel_position(cel, undoable.set_cel_position(cel, scale_x(cel->x), scale_y(cel->y));
cel->x * m_new_width / m_sprite->w,
cel->y * m_new_height / m_sprite->h);
} }
jlist_free(cels); jlist_free(cels);
@ -86,8 +88,8 @@ protected:
continue; continue;
// resize the image // resize the image
int w = image->w * m_new_width / m_sprite->w; int w = scale_x(image->w);
int h = image->h * m_new_height / m_sprite->h; int h = scale_y(image->h);
Image* new_image = image_new(image->imgtype, MAX(1, w), MAX(1, h)); Image* new_image = image_new(image->imgtype, MAX(1, w), MAX(1, h));
image_resize(image, new_image, image_resize(image, new_image,
@ -104,14 +106,30 @@ protected:
return; // Undoable destructor will undo all operations return; // Undoable destructor will undo all operations
} }
// resize mask
if (m_sprite->mask->bitmap) {
int w = scale_x(m_sprite->mask->bitmap->w);
int h = scale_y(m_sprite->mask->bitmap->h);
Mask* new_mask = mask_new();
mask_replace(new_mask,
scale_x(m_sprite->mask->x),
scale_y(m_sprite->mask->y), MAX(1, w), MAX(1, h));
image_resize(m_sprite->mask->bitmap, new_mask->bitmap,
RESIZE_METHOD_NEAREST_NEIGHBOR,
get_current_palette(),
orig_rgb_map);
undoable.copy_to_current_mask(new_mask);
mask_free(new_mask);
// regenerate mask
sprite_generate_mask_boundaries(m_sprite);
}
// resize sprite // resize sprite
undoable.set_sprite_size(m_new_width, m_new_height); undoable.set_sprite_size(m_new_width, m_new_height);
// TODO resize mask
// regenerate mask
sprite_generate_mask_boundaries(m_sprite);
// commit changes // commit changes
undoable.commit(); undoable.commit();
} }