mirror of
https://github.com/aseprite/aseprite.git
synced 2025-01-05 21:57:20 +00:00
Avoid temporary copy in app::thumb::get_cel_thumbnail()
Convert gfx::Size arg to const gfx::Size&
This commit is contained in:
David Capello
parent
15a7784c16
commit
e287d0e066
@ -20,95 +20,92 @@
|
||||
#include "she/system.h"
|
||||
|
||||
namespace app {
|
||||
namespace thumb {
|
||||
namespace thumb {
|
||||
|
||||
she::Surface* get_cel_thumbnail(const doc::Cel* cel, gfx::Size thumb_size,
|
||||
gfx::Rect cel_image_on_thumb)
|
||||
{
|
||||
app::Document* document = static_cast<app::Document*>(cel->sprite()->document());
|
||||
doc::frame_t frame = cel->frame();
|
||||
doc::Image* image = cel->image();
|
||||
she::Surface* get_cel_thumbnail(const doc::Cel* cel,
|
||||
const gfx::Size& thumb_size,
|
||||
gfx::Rect cel_image_on_thumb)
|
||||
{
|
||||
app::Document* document = static_cast<app::Document*>(cel->sprite()->document());
|
||||
doc::frame_t frame = cel->frame();
|
||||
doc::Image* image = cel->image();
|
||||
|
||||
DocumentPreferences& docPref = Preferences::instance().document(document);
|
||||
DocumentPreferences& docPref = Preferences::instance().document(document);
|
||||
|
||||
doc::color_t bg1 = color_utils::color_for_image(docPref.bg.color1(), image->pixelFormat());
|
||||
doc::color_t bg2 = color_utils::color_for_image(docPref.bg.color2(), image->pixelFormat());
|
||||
doc::color_t bg1 = color_utils::color_for_image(docPref.bg.color1(), image->pixelFormat());
|
||||
doc::color_t bg2 = color_utils::color_for_image(docPref.bg.color2(), image->pixelFormat());
|
||||
|
||||
gfx::Size image_size = image->size();
|
||||
gfx::Size image_size = image->size();
|
||||
|
||||
if (cel_image_on_thumb.isEmpty()) {
|
||||
double zw = thumb_size.w / (double)image_size.w;
|
||||
double zh = thumb_size.h / (double)image_size.h;
|
||||
double zoom = MIN(1.0, MIN(zw, zh));
|
||||
if (cel_image_on_thumb.isEmpty()) {
|
||||
double zw = thumb_size.w / (double)image_size.w;
|
||||
double zh = thumb_size.h / (double)image_size.h;
|
||||
double zoom = MIN(1.0, MIN(zw, zh));
|
||||
|
||||
cel_image_on_thumb = gfx::Rect(
|
||||
(int)(thumb_size.w * 0.5 - image_size.w * zoom * 0.5),
|
||||
(int)(thumb_size.h * 0.5 - image_size.h * zoom * 0.5),
|
||||
MAX(1, (int)(image_size.w * zoom)),
|
||||
MAX(1, (int)(image_size.h * zoom))
|
||||
);
|
||||
}
|
||||
cel_image_on_thumb = gfx::Rect(
|
||||
(int)(thumb_size.w * 0.5 - image_size.w * zoom * 0.5),
|
||||
(int)(thumb_size.h * 0.5 - image_size.h * zoom * 0.5),
|
||||
MAX(1, (int)(image_size.w * zoom)),
|
||||
MAX(1, (int)(image_size.h * zoom)));
|
||||
}
|
||||
|
||||
const doc::Sprite* sprite = document->sprite();
|
||||
// TODO doc::Image::createCopy() from pre-rendered checkered background
|
||||
base::UniquePtr<doc::Image> thumb_img(doc::Image::create(
|
||||
image->pixelFormat(), thumb_size.w, thumb_size.h));
|
||||
const doc::Sprite* sprite = document->sprite();
|
||||
// TODO doc::Image::createCopy() from pre-rendered checkered background
|
||||
base::UniquePtr<doc::Image> thumb_img(doc::Image::create(
|
||||
image->pixelFormat(), thumb_size.w, thumb_size.h));
|
||||
|
||||
double alpha = 255.0;
|
||||
uint8_t bg_r[] = { rgba_getr(bg1), rgba_getr(bg2) };
|
||||
uint8_t bg_g[] = { rgba_getg(bg1), rgba_getg(bg2) };
|
||||
uint8_t bg_b[] = { rgba_getb(bg1), rgba_getb(bg2) };
|
||||
uint8_t bg_a[] = { rgba_geta(bg1), rgba_geta(bg2) };
|
||||
double alpha = 255.0;
|
||||
uint8_t bg_r[] = { rgba_getr(bg1), rgba_getr(bg2) };
|
||||
uint8_t bg_g[] = { rgba_getg(bg1), rgba_getg(bg2) };
|
||||
uint8_t bg_b[] = { rgba_getb(bg1), rgba_getb(bg2) };
|
||||
uint8_t bg_a[] = { rgba_geta(bg1), rgba_geta(bg2) };
|
||||
|
||||
doc::color_t bg[] = {
|
||||
rgba(bg_r[0], bg_g[0], bg_b[0], (int)(bg_a[0] * alpha)),
|
||||
rgba(bg_r[1], bg_g[1], bg_b[1], (int)(bg_a[1] * alpha))
|
||||
};
|
||||
doc::color_t bg[] = {
|
||||
rgba(bg_r[0], bg_g[0], bg_b[0], (int)(bg_a[0] * alpha)),
|
||||
rgba(bg_r[1], bg_g[1], bg_b[1], (int)(bg_a[1] * alpha))
|
||||
};
|
||||
|
||||
int block_size = MID(4, thumb_size.w/8, 16);
|
||||
for (int dst_y = 0; dst_y < thumb_size.h; dst_y++) {
|
||||
for (int dst_x = 0; dst_x < thumb_size.w; dst_x++) {
|
||||
thumb_img->putPixel(dst_x, dst_y,
|
||||
bg[
|
||||
((dst_x / block_size) % 2) ^
|
||||
((dst_y / block_size) % 2)
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
base::UniquePtr<doc::Image> scale_img;
|
||||
const doc::Image* source = image;
|
||||
|
||||
if (cel_image_on_thumb.w != image_size.w || cel_image_on_thumb.h != image_size.h) {
|
||||
scale_img.reset(doc::Image::create(
|
||||
image->pixelFormat(), cel_image_on_thumb.w, cel_image_on_thumb.h));
|
||||
|
||||
doc::algorithm::resize_image(
|
||||
image, scale_img,
|
||||
doc::algorithm::ResizeMethod::RESIZE_METHOD_NEAREST_NEIGHBOR,
|
||||
sprite->palette(frame),
|
||||
sprite->rgbMap(frame),
|
||||
sprite->transparentColor());
|
||||
|
||||
source = scale_img.get();
|
||||
}
|
||||
|
||||
render::composite_image(
|
||||
thumb_img, source,
|
||||
sprite->palette(frame),
|
||||
cel_image_on_thumb.x,
|
||||
cel_image_on_thumb.y,
|
||||
255, BlendMode::NORMAL);
|
||||
|
||||
she::Surface* thumb_surf = she::instance()->createRgbaSurface(
|
||||
thumb_img->width(), thumb_img->height());
|
||||
|
||||
convert_image_to_surface(thumb_img, sprite->palette(frame), thumb_surf,
|
||||
0, 0, 0, 0, thumb_img->width(), thumb_img->height());
|
||||
|
||||
return thumb_surf;
|
||||
int block_size = MID(4, thumb_size.w/8, 16);
|
||||
for (int dst_y = 0; dst_y < thumb_size.h; dst_y++) {
|
||||
for (int dst_x = 0; dst_x < thumb_size.w; dst_x++) {
|
||||
thumb_img->putPixel(dst_x, dst_y,
|
||||
bg[((dst_x / block_size) % 2) ^
|
||||
((dst_y / block_size) % 2)]);
|
||||
}
|
||||
}
|
||||
|
||||
} // thumb
|
||||
base::UniquePtr<doc::Image> scale_img;
|
||||
const doc::Image* source = image;
|
||||
|
||||
if (cel_image_on_thumb.w != image_size.w || cel_image_on_thumb.h != image_size.h) {
|
||||
scale_img.reset(doc::Image::create(
|
||||
image->pixelFormat(), cel_image_on_thumb.w, cel_image_on_thumb.h));
|
||||
|
||||
doc::algorithm::resize_image(
|
||||
image, scale_img,
|
||||
doc::algorithm::ResizeMethod::RESIZE_METHOD_NEAREST_NEIGHBOR,
|
||||
sprite->palette(frame),
|
||||
sprite->rgbMap(frame),
|
||||
sprite->transparentColor());
|
||||
|
||||
source = scale_img.get();
|
||||
}
|
||||
|
||||
render::composite_image(
|
||||
thumb_img, source,
|
||||
sprite->palette(frame),
|
||||
cel_image_on_thumb.x,
|
||||
cel_image_on_thumb.y,
|
||||
255, BlendMode::NORMAL);
|
||||
|
||||
she::Surface* thumb_surf = she::instance()->createRgbaSurface(
|
||||
thumb_img->width(), thumb_img->height());
|
||||
|
||||
convert_image_to_surface(thumb_img, sprite->palette(frame), thumb_surf,
|
||||
0, 0, 0, 0, thumb_img->width(), thumb_img->height());
|
||||
|
||||
return thumb_surf;
|
||||
}
|
||||
|
||||
} // thumb
|
||||
} // app
|
||||
|
||||
@ -22,8 +22,9 @@ namespace she {
|
||||
namespace app {
|
||||
namespace thumb {
|
||||
|
||||
she::Surface* get_cel_thumbnail(const doc::Cel* cel, gfx::Size thumb_size,
|
||||
gfx::Rect cel_image_on_thumb = gfx::Rect());
|
||||
she::Surface* get_cel_thumbnail(const doc::Cel* cel,
|
||||
const gfx::Size& thumb_size,
|
||||
gfx::Rect cel_image_on_thumb = gfx::Rect());
|
||||
|
||||
} // thumb
|
||||
} // app
|
||||
|
||||
Loading…
Reference in New Issue
Block a user