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

[nostalgia/core/studio] Cleanup pixel data QML exposure

Browse Source
This commit is contained in:
Gary Talent 2019-12-15 00:37:06 -06:00
parent edae4563ff
commit 1499f42361
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/core/studio/Pixel.qml
View File

@ -11,7 +11,7 @@ import QtQuick 2.0
Rectangle { Rectangle {
id: pixel; id: pixel;
property int pixelNumber: index property int pixelNumber: index
color: sheetData.pixel(pixelNumber) color: sheetData.palette[sheetData.pixels[pixelNumber]]
width: parent.width / 8 width: parent.width / 8
height: parent.height / 8 height: parent.height / 8
border.color: '#717d7e' border.color: '#717d7e'

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

@ -52,11 +52,11 @@ class UpdatePixelsCommand: public QUndoCommand {
uint64_t m_cmdIdx = 0; uint64_t m_cmdIdx = 0;
int m_newColorId = 0; int m_newColorId = 0;
const QStringList &m_palette; const QStringList &m_palette;
QVector<uint8_t> &m_pixels; QVector<int> &m_pixels;
QSet<PixelUpdate> m_pixelUpdates; QSet<PixelUpdate> m_pixelUpdates;
public: public:
UpdatePixelsCommand(QVector<uint8_t> &pixels, const QStringList &palette, QQuickItem *pixelItem, int newColorId, uint64_t cmdIdx): m_palette(palette), m_pixels(pixels) { UpdatePixelsCommand(QVector<int> &pixels, const QStringList &palette, QQuickItem *pixelItem, int newColorId, uint64_t cmdIdx): m_palette(palette), m_pixels(pixels) {
m_newColorId = newColorId; m_newColorId = newColorId;
m_cmdIdx = cmdIdx; m_cmdIdx = cmdIdx;
PixelUpdate pu; PixelUpdate pu;
@ -96,10 +96,6 @@ class UpdatePixelsCommand: public QUndoCommand {
}; };
QString SheetData::pixel(int index) {
return m_palette[m_pixels[index]];
}
void SheetData::updatePixel(QVariant pixelItem) { void SheetData::updatePixel(QVariant pixelItem) {
auto p = qobject_cast<QQuickItem*>(pixelItem.value<QObject*>()); auto p = qobject_cast<QQuickItem*>(pixelItem.value<QObject*>());
if (p && p != m_prevPixelUpdated) { if (p && p != m_prevPixelUpdated) {
@ -126,6 +122,10 @@ void SheetData::setRows(int rows) {
emit rowsChanged(); emit rowsChanged();
} }
const QVector<int> &SheetData::pixels() {
return m_pixels;
}
QStringList SheetData::palette() { QStringList SheetData::palette() {
return m_palette; return m_palette;
} }
@ -180,6 +180,8 @@ void SheetData::updatePixels(const NostalgiaGraphic *ng, const NostalgiaPalette
m_pixels.push_back(p); m_pixels.push_back(p);
} }
} }
emit pixelsChanged();
emit paletteChanged();
} }
void SheetData::beginCmd() { void SheetData::beginCmd() {

12
src/nostalgia/core/studio/tilesheeteditor.hpp
View File

@ -26,20 +26,20 @@ class SheetData: public QObject {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int columns READ columns WRITE setColumns NOTIFY columnsChanged) Q_PROPERTY(int columns READ columns WRITE setColumns NOTIFY columnsChanged)
Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged) Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged)
Q_PROPERTY(QVector<int> pixels READ pixels NOTIFY pixelsChanged)
Q_PROPERTY(QStringList palette READ palette NOTIFY paletteChanged)
private: private:
QQuickItem *m_prevPixelUpdated = nullptr; QQuickItem *m_prevPixelUpdated = nullptr;
uint64_t m_cmdIdx = 0; uint64_t m_cmdIdx = 0;
QUndoStack m_cmdStack; QUndoStack m_cmdStack;
QStringList m_palette; QStringList m_palette;
QVector<uint8_t> m_pixels; QVector<int> m_pixels;
int m_columns = 2; int m_columns = 2;
int m_rows = 2; int m_rows = 2;
int m_selectedColor = 0; int m_selectedColor = 0;
public: public:
Q_INVOKABLE QString pixel(int index);
Q_INVOKABLE void updatePixel(QVariant pixel); Q_INVOKABLE void updatePixel(QVariant pixel);
Q_INVOKABLE void beginCmd(); Q_INVOKABLE void beginCmd();
@ -54,6 +54,8 @@ class SheetData: public QObject {
void setRows(int rows); void setRows(int rows);
const QVector<int> &pixels();
QStringList palette(); QStringList palette();
void updatePixels(const studio::Context *ctx, QString ngPath, QString palPath = ""); void updatePixels(const studio::Context *ctx, QString ngPath, QString palPath = "");
@ -70,6 +72,10 @@ class SheetData: public QObject {
void rowsChanged(); void rowsChanged();
void pixelsChanged();
void paletteChanged();
}; };