From 474230ae977e3afcb45a24c156f374495b09505c Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Wed, 27 Nov 2019 14:10:22 -0600
Subject: [PATCH] [nostalgia/core/studio] Make TileSheetEditor's implementation
 better match data

---
 src/nostalgia/core/studio/tilesheeteditor.cpp | 39 ++++++++-----------
 src/nostalgia/core/studio/tilesheeteditor.hpp |  8 +++-
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/nostalgia/core/studio/tilesheeteditor.cpp b/src/nostalgia/core/studio/tilesheeteditor.cpp
index 332d2e55..87b44e3b 100644
--- a/src/nostalgia/core/studio/tilesheeteditor.cpp
+++ b/src/nostalgia/core/studio/tilesheeteditor.cpp
@@ -17,20 +17,26 @@
 
 namespace nostalgia::core {
 
-[[nodiscard]]
-QVector<Color32> toPixels(const NostalgiaGraphic *ng, const NostalgiaPalette *npal) {
+
+QString SheetData::pixel(int index) {
+	return m_palette[m_pixels[index]];
+}
+
+void SheetData::updatePixels(const NostalgiaGraphic *ng, const NostalgiaPalette *npal) {
 	if (!npal) {
 		npal = &ng->pal;
 	}
 
-	QVector<Color32> out;
-	out.reserve(ng->tiles.size() * sizeof(Color16));
+	// load palette
+	for (std::size_t i = 0; i < npal->colors.size(); i++) {
+		auto c = toColor32(npal->colors[i]);
+		auto color = "#" + QString("%1").arg(QString::number(c, 16), 8, '0');
+		m_palette.append(color);
+	}
 
 	if (ng->bpp == 8) {
 		for (std::size_t i = 0; i < ng->tiles.size(); i++) {
-			auto p = ng->tiles[i];
-			auto c = p < npal->colors.size() ? npal->colors[p] : 0;
-			out.push_back(toColor32(c));
+			m_pixels.push_back(ng->tiles[i]);
 		}
 	} else {
 		for (std::size_t i = 0; i < ng->tiles.size() * 2; i++) {
@@ -40,16 +46,12 @@ QVector<Color32> toPixels(const NostalgiaGraphic *ng, const NostalgiaPalette *np
 			} else {
 				p = ng->tiles[i / 2] & 0xF;
 			}
-			auto c = p < npal->colors.size() ? npal->colors[p] : 0;
-			out.push_back(toColor32(c));
+			m_pixels.push_back(p);
 		}
 	}
-
-	return out;
 }
 
-[[nodiscard]]
-QVector<Color32> toPixels(const studio::Context *ctx, QString ngPath, QString palPath = "") {
+void SheetData::updatePixels(const studio::Context *ctx, QString ngPath, QString palPath) {
 	auto ng = ctx->project->loadObj<NostalgiaGraphic>(ngPath);
 	std::unique_ptr<NostalgiaPalette> npal;
 	if (palPath == "" && ng->defaultPalette.type() == ox::FileAddressType::Path) {
@@ -61,16 +63,7 @@ QVector<Color32> toPixels(const studio::Context *ctx, QString ngPath, QString pa
 	} catch (ox::Error) {
 		qWarning() << "Could not open palette" << palPath;
 	}
-	return toPixels(ng.get(), npal.get());
-}
-
-
-QString SheetData::pixel(int index) {
-	return "#" + QString("%1").arg(QString::number(m_pixels[index], 16), 8, '0');
-}
-
-void SheetData::updatePixels(const studio::Context *ctx, QString path) {
-	m_pixels = toPixels(ctx, path);
+	return updatePixels(ng.get(), npal.get());
 }
 
 
diff --git a/src/nostalgia/core/studio/tilesheeteditor.hpp b/src/nostalgia/core/studio/tilesheeteditor.hpp
index f0cdd053..57eea508 100644
--- a/src/nostalgia/core/studio/tilesheeteditor.hpp
+++ b/src/nostalgia/core/studio/tilesheeteditor.hpp
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <QSplitter>
+#include <QStringList>
 #include <QStringView>
 #include <QTableWidget>
 #include <QWidget>
@@ -22,12 +23,15 @@ class SheetData: public QObject {
 	Q_OBJECT
 
 	private:
-		QVector<Color32> m_pixels;
+		QStringList m_palette;
+		QVector<uint8_t> m_pixels;
 
 	public:
 		Q_INVOKABLE QString pixel(int index);
 
-		void updatePixels(const studio::Context *ctx, QString path);
+		void updatePixels(const NostalgiaGraphic *ng, const NostalgiaPalette *npal);
+
+		void updatePixels(const studio::Context *ctx, QString ngPath, QString palPath = "");
 
 	signals:
 		void refreshTileSheet();