Compare commits

..

No commits in common. "087c834b252820a5574cae1516ca6510d0ba2d71" and "2bdc3def7481822a9ddeae76521e6dd59d5f1491" have entirely different histories.

2 changed files with 5 additions and 6 deletions

View File

@ -101,13 +101,13 @@ struct TileSheet {
* Reads all pixels of this sheet or its children into the given pixel list * Reads all pixels of this sheet or its children into the given pixel list
* @param pixels * @param pixels
*/ */
void readPixelsTo(ox::Vector<uint8_t> &pPixels, int8_t pBpp) const noexcept; void readPixelsTo(ox::Vector<uint8_t> *pPixels, int8_t pBpp) const noexcept;
/** /**
* Reads all pixels of this sheet or its children into the given pixel list * Reads all pixels of this sheet or its children into the given pixel list
* @param pixels * @param pixels
*/ */
void readPixelsTo(ox::Vector<uint8_t> &pPixels) const noexcept; void readPixelsTo(ox::Vector<uint8_t> *pPixels) const noexcept;
[[nodiscard]] [[nodiscard]]
constexpr std::size_t size() const noexcept { constexpr std::size_t size() const noexcept {
@ -308,7 +308,6 @@ oxModelBegin(TileSheetV2)
oxModelEnd() oxModelEnd()
oxModelBegin(TileSheetV3::SubSheet) oxModelBegin(TileSheetV3::SubSheet)
oxModelField(id);
oxModelField(name); oxModelField(name);
oxModelField(rows); oxModelField(rows);
oxModelField(columns); oxModelField(columns);

View File

@ -28,12 +28,12 @@ void AddSubSheetCommand::redo() noexcept {
auto &parent = m_img.getSubSheet(m_parentIdx); auto &parent = m_img.getSubSheet(m_parentIdx);
if (m_addedSheets.size() < 2) { if (m_addedSheets.size() < 2) {
auto i = parent.subsheets.size(); auto i = parent.subsheets.size();
parent.subsheets.emplace_back(++m_img.idIt, ox::sfmt("Subsheet {}", i), 1, 1, m_img.bpp); parent.subsheets.emplace_back(m_img.idIt++, ox::sfmt("Subsheet {}", i), 1, 1, m_img.bpp);
} else { } else {
parent.subsheets.emplace_back(++m_img.idIt, "Subsheet 0", parent.columns, parent.rows, std::move(parent.pixels)); parent.subsheets.emplace_back(m_img.idIt++, "Subsheet 0", parent.columns, parent.rows, std::move(parent.pixels));
parent.rows = 0; parent.rows = 0;
parent.columns = 0; parent.columns = 0;
parent.subsheets.emplace_back(++m_img.idIt, "Subsheet 1", 1, 1, m_img.bpp); parent.subsheets.emplace_back(m_img.idIt++, "Subsheet 1", 1, 1, m_img.bpp);
} }
} }