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

[nostalgia/core/studio] Fix TileSheetEditor to clear pixel data on reload

Browse Source
This commit is contained in:
Gary Talent 2020-03-29 23:48:07 -05:00
parent 2e7a81563d
commit 5a5905d257
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,7 +354,7 @@ std::unique_ptr<NostalgiaGraphic> SheetData::toNostalgiaGraphic() const {
auto pixelCount = ng->rows * ng->columns * PixelsPerTile; auto pixelCount = ng->rows * ng->columns * PixelsPerTile;
if (ng->bpp == 4) { if (ng->bpp == 4) {
ng->tiles.resize(pixelCount / 2); ng->tiles.resize(pixelCount / 2);
for (int i = 0; i < m_pixels.size(); ++i) { for (int i = 0; i < pixelCount; ++i) {
if (i & 1) { if (i & 1) {
ng->tiles[i / 2] |= static_cast<uint8_t>(m_pixels[i]) << 4; ng->tiles[i / 2] |= static_cast<uint8_t>(m_pixels[i]) << 4;
} else { } else {
@ -391,6 +391,7 @@ void SheetData::updateRows(int rows) {
} }
void SheetData::updatePixels(const NostalgiaGraphic *ng) { void SheetData::updatePixels(const NostalgiaGraphic *ng) {
m_pixels.clear();
if (ng->bpp == 8) { if (ng->bpp == 8) {
for (std::size_t i = 0; i < ng->tiles.size(); i++) { for (std::size_t i = 0; i < ng->tiles.size(); i++) {
m_pixels.push_back(ng->tiles[i]); m_pixels.push_back(ng->tiles[i]);