mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-16 05:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now 'rotate canvas' supports mask-rotation.

Browse Source
This commit is contained in:
David Capello 2009-06-14 22:08:50 +00:00
parent 371e592f8c
commit a5a71d6c86
3 changed files with 77 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/commands/cmd_rotate_canvas.cpp
View File

@ -95,25 +95,7 @@ protected:
Image* new_image = image_new(image->imgtype,
m_angle == 180 ? image->w: image->h,
m_angle == 180 ? image->h: image->w);
switch (m_angle) {
case 180:
for (int y=0; y<image->h; ++y)
for (int x=0; x<image->w; ++x)
new_image->putpixel(image->w - x - 1,
image->h - y - 1, image->getpixel(x, y));
break;
case 90:
for (int y=0; y<image->h; ++y)
for (int x=0; x<image->w; ++x)
new_image->putpixel(image->h - y - 1, x, image->getpixel(x, y));
break;
case -90:
for (int y=0; y<image->h; ++y)
for (int x=0; x<image->w; ++x)
new_image->putpixel(y, image->w - x - 1, image->getpixel(x, y));
break;
}
image_rotate(image, new_image, m_angle);
undoable.replace_stock_image(i, new_image);
@ -124,15 +106,44 @@ protected:
return; // Undoable destructor will undo all operations
}
// resize sprite
// rotate mask
if (m_sprite->mask->bitmap) {
Mask* new_mask = mask_new();
int x, y;
switch (m_angle) {
case 180:
x = m_sprite->w - m_sprite->mask->x - m_sprite->mask->w;
y = m_sprite->h - m_sprite->mask->y - m_sprite->mask->h;
break;
case 90:
x = m_sprite->h - m_sprite->mask->y - m_sprite->mask->h;
y = m_sprite->mask->x;
break;
case -90:
x = m_sprite->mask->y;
y = m_sprite->w - m_sprite->mask->x - m_sprite->mask->w;
break;
}
// create the new rotated mask
mask_replace(new_mask, x, y,
m_angle == 180 ? m_sprite->mask->w: m_sprite->mask->h,
m_angle == 180 ? m_sprite->mask->h: m_sprite->mask->w);
image_rotate(m_sprite->mask->bitmap, new_mask->bitmap, m_angle);
// copy new mask
undoable.copy_to_current_mask(new_mask);
mask_free(new_mask);
// regenerate mask
sprite_generate_mask_boundaries(m_sprite);
}
// change the sprite's size
if (m_angle != 180)
undoable.set_sprite_size(m_sprite->h, m_sprite->w);
// TODO rotate mask
// regenerate mask
sprite_generate_mask_boundaries(m_sprite);
// commit changes
undoable.commit();
}

40
src/raster/image.cpp
View File

@ -126,6 +126,46 @@ Image* image_crop(const Image* image, int x, int y, int w, int h, int bgcolor)
return trim;
}
void image_rotate(const Image* src, Image* dst, int angle)
{
int x, y;
switch (angle) {
case 180:
assert(dst->w == src->w);
assert(dst->h == src->h);
for (y=0; y<src->h; ++y)
for (x=0; x<src->w; ++x)
dst->putpixel(src->w - x - 1,
src->h - y - 1, src->getpixel(x, y));
break;
case 90:
assert(dst->w == src->h);
assert(dst->h == src->w);
for (y=0; y<src->h; ++y)
for (x=0; x<src->w; ++x)
dst->putpixel(src->h - y - 1, x, src->getpixel(x, y));
break;
case -90:
assert(dst->w == src->h);
assert(dst->h == src->w);
for (y=0; y<src->h; ++y)
for (x=0; x<src->w; ++x)
dst->putpixel(y, src->w - x - 1, src->getpixel(x, y));
break;
// bad angle
default:
throw std::invalid_argument("Invalid angle specified to rotate the image");
}
}
void image_hline(Image* image, int x1, int y, int x2, int color)
{
int t;

1
src/raster/image.h
View File

@ -77,6 +77,7 @@ void image_merge(Image* dst, const Image* src, int x, int y, int opacity,
int blend_mode);
Image* image_crop(const Image* image, int x, int y, int w, int h, int bgcolor);
void image_rotate(const Image* src, Image* dst, int angle);
void image_hline(Image* image, int x1, int y, int x2, int color);
void image_vline(Image* image, int x, int y1, int y2, int color);