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

Use a binary search to find cels in LayerImage

Browse Source
This commit is contained in:
David Capello 2015-09-15 08:18:52 -03:00
parent 510a686020
commit a9c3f82c11
2 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/doc/layer.cpp
View File

@ -125,16 +125,11 @@ void LayerImage::destroyAllCels()
Cel* LayerImage::cel(frame_t frame) const
{
CelConstIterator it = getCelBegin();
CelConstIterator end = getCelEnd();
for (; it != end; ++it) {
Cel* cel = *it;
if (cel->frame() == frame)
return cel;
}
return NULL;
CelConstIterator it = findCelIterator(frame);
if (it != getCelEnd())
return *it;
else
return nullptr;
}
void LayerImage::getCels(CelList& cels) const
@ -154,6 +149,46 @@ Cel* LayerImage::getLastCel() const
return NULL;
}
CelConstIterator LayerImage::findCelIterator(frame_t frame) const
{
CelIterator it = const_cast<LayerImage*>(this)->findCelIterator(frame);
return CelConstIterator(it);
}
CelIterator LayerImage::findCelIterator(frame_t frame)
{
auto first = getCelBegin();
auto end = getCelEnd();
// Here we use a binary search to find the first cel equal to "frame" (or after frame)
first = std::lower_bound(
first, end, nullptr,
[frame](Cel* cel, Cel*) -> bool {
return cel->frame() < frame;
});
// We return the iterator only if it's an exact match
if (first != end && (*first)->frame() == frame)
return first;
else
return end;
}
CelIterator LayerImage::findFirstCelIteratorAfter(frame_t firstAfterFrame)
{
auto first = getCelBegin();
auto end = getCelEnd();
// Here we use a binary search to find the first cel after the given frame
first = std::lower_bound(
first, end, nullptr,
[firstAfterFrame](Cel* cel, Cel*) -> bool {
return cel->frame() <= firstAfterFrame;
});
return first;
}
void LayerImage::addCel(Cel* cel)
{
ASSERT(cel);
@ -162,14 +197,7 @@ void LayerImage::addCel(Cel* cel)
ASSERT(sprite());
ASSERT(cel->image()->pixelFormat() == sprite()->pixelFormat());
CelIterator it = getCelBegin();
CelIterator end = getCelEnd();
for (; it != end; ++it) {
if ((*it)->frame() > cel->frame())
break;
}
CelIterator it = findFirstCelIteratorAfter(cel->frame());
m_cels.insert(it, cel);
cel->setParentLayer(this);
@ -183,8 +211,8 @@ void LayerImage::addCel(Cel* cel)
*/
void LayerImage::removeCel(Cel* cel)
{
CelIterator it = std::find(m_cels.begin(), m_cels.end(), cel);
ASSERT(cel);
CelIterator it = findCelIterator(cel->frame());
ASSERT(it != m_cels.end());
m_cels.erase(it);

5
src/doc/layer.h
View File

@ -125,10 +125,15 @@ namespace doc {
void addCel(Cel *cel);
void removeCel(Cel *cel);
void moveCel(Cel *cel, frame_t frame);
Cel* cel(frame_t frame) const override;
void getCels(CelList& cels) const override;
void displaceFrames(frame_t fromThis, frame_t delta) override;
Cel* getLastCel() const;
CelConstIterator findCelIterator(frame_t frame) const;
CelIterator findCelIterator(frame_t frame);
CelIterator findFirstCelIteratorAfter(frame_t firstAfterFrame);
void configureAsBackground();