drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia/core/studio] Fix bad PixelUpdate merging code that could keep wrong duplicate

Browse Source
This commit is contained in:
Gary Talent 2019-12-05 02:07:03 -06:00
parent 70022d5a96
commit 8fd49469c9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nostalgia/core/studio/tilesheeteditor.cpp
View File

@ -11,6 +11,7 @@
#include <QQmlContext> #include <QQmlContext>
#include <QQuickItem> #include <QQuickItem>
#include <QQuickWidget> #include <QQuickWidget>
#include <QSet>
#include <QSettings> #include <QSettings>
#include <QSplitter> #include <QSplitter>
#include <QUndoCommand> #include <QUndoCommand>
@ -43,13 +44,17 @@ class UpdatePixelsCommand: public QUndoCommand {
bool operator<(const PixelUpdate &o) const { bool operator<(const PixelUpdate &o) const {
return item < o.item; return item < o.item;
} }
operator auto() const {
return reinterpret_cast<quint64>(item.data());
}
}; };
uint64_t cmdIdx = 0; uint64_t cmdIdx = 0;
int m_newColorId = 0; int m_newColorId = 0;
const QStringList &m_palette; const QStringList &m_palette;
QVector<uint8_t> &m_pixels; QVector<uint8_t> &m_pixels;
QVector<PixelUpdate> m_pixelUpdates; QSet<PixelUpdate> m_pixelUpdates;
public: public:
UpdatePixelsCommand(QVector<uint8_t> &pixels, const QStringList &palette, const QVariantList &pixelItems, int newColorId, uint64_t cmdIdx): m_palette(palette), m_pixels(pixels) { UpdatePixelsCommand(QVector<uint8_t> &pixels, const QStringList &palette, const QVariantList &pixelItems, int newColorId, uint64_t cmdIdx): m_palette(palette), m_pixels(pixels) {
@ -60,7 +65,7 @@ class UpdatePixelsCommand: public QUndoCommand {
auto p = qobject_cast<QQuickItem*>(pi.value<QObject*>()); auto p = qobject_cast<QQuickItem*>(pi.value<QObject*>());
pu.item = p; pu.item = p;
pu.oldColorId = m_palette.indexOf(p->property("color").toString()); pu.oldColorId = m_palette.indexOf(p->property("color").toString());
m_pixelUpdates.push_back(std::move(pu)); m_pixelUpdates.insert(pu);
} }
} }
@ -73,11 +78,7 @@ class UpdatePixelsCommand: public QUndoCommand {
bool mergeWith(const QUndoCommand *cmd) override { bool mergeWith(const QUndoCommand *cmd) override {
auto other = static_cast<const UpdatePixelsCommand*>(cmd); auto other = static_cast<const UpdatePixelsCommand*>(cmd);
if (cmdIdx == other->cmdIdx) { if (cmdIdx == other->cmdIdx) {
m_pixelUpdates.append(other->m_pixelUpdates); m_pixelUpdates.unite(other->m_pixelUpdates);
// inefficient, but probably not worth optimizing, but something to
// look at if this operation becomes a performace problem
std::sort(m_pixelUpdates.begin(), m_pixelUpdates.end());
m_pixelUpdates.erase(std::unique(m_pixelUpdates.begin(), m_pixelUpdates.end()), m_pixelUpdates.end());
return true; return true;
} }
return false; return false;