mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-01 10:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a persistent ImageBuffer for the app::Document's extra cel

Browse Source
This commit is contained in:
David Capello 2015-08-18 19:38:08 -03:00
parent 82243a0763
commit dd11cffdb7
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/document.cpp
View File

@ -52,8 +52,9 @@ Document::Document(Sprite* sprite)
// Information about the file format used to load/save this document
, m_format_options(NULL)
// Extra cel
, m_extraCel(NULL)
, m_extraImage(NULL)
, m_extraCel(nullptr)
, m_extraImage(nullptr)
, m_extraImageBuffer(nullptr)
, m_extraCelBlendMode(BlendMode::NORMAL)
, m_extraCelType(render::ExtraType::NONE)
// Mask
@ -238,8 +239,9 @@ void Document::destroyExtraCel()
{
delete m_extraCel;
m_extraCel = NULL;
m_extraImage.reset(NULL);
m_extraCel = nullptr;
m_extraImage.reset(nullptr);
m_extraImageBuffer.reset(nullptr);
m_extraCelType = render::ExtraType::NONE;
}
@ -251,7 +253,9 @@ void Document::prepareExtraCel(const gfx::Rect& bounds, frame_t frame, int opaci
m_extraImage->pixelFormat() != sprite()->pixelFormat() ||
m_extraImage->width() != bounds.w ||
m_extraImage->height() != bounds.h) {
Image* newImage = Image::create(sprite()->pixelFormat(), bounds.w, bounds.h);
if (!m_extraImageBuffer)
m_extraImageBuffer.reset(new ImageBuffer(1));
Image* newImage = Image::create(sprite()->pixelFormat(), bounds.w, bounds.h, m_extraImageBuffer);
m_extraImage.reset(newImage);
}

2
src/app/document.h
View File

@ -20,6 +20,7 @@
#include "doc/document.h"
#include "doc/frame.h"
#include "doc/image_ref.h"
#include "doc/image_buffer.h"
#include "doc/pixel_format.h"
#include "gfx/rect.h"
#include "gfx/transformation.h"
@ -213,6 +214,7 @@ namespace app {
// Image of the extra cel.
ImageRef m_extraImage;
ImageBufferPtr m_extraImageBuffer;
BlendMode m_extraCelBlendMode;
render::ExtraType m_extraCelType;