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

[nostalgia/core] Make invalid palette lookups return 0 instead of garbage memory

Browse Source
This commit is contained in:
Gary Talent 2022-07-30 14:47:44 -05:00
parent c8dc14dd8e
commit 29fd9b8c4f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nostalgia/core/gfx.hpp
View File

@ -39,6 +39,13 @@ struct Palette {
static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.Palette"; static constexpr auto TypeName = "net.drinkingtea.nostalgia.core.Palette";
static constexpr auto TypeVersion = 1; static constexpr auto TypeVersion = 1;
ox::Vector<Color16> colors = {}; ox::Vector<Color16> colors = {};
[[nodiscard]]
constexpr Color16 color(auto idx) const noexcept {
if (idx < colors.size()) [[likely]] {
return colors[idx];
}
return 0;
}
}; };
// Predecessor to TileSheet, kept for backward compatibility // Predecessor to TileSheet, kept for backward compatibility

2
src/nostalgia/core/studio/tilesheetpixels.cpp
View File

@ -93,7 +93,7 @@ void TileSheetPixels::setBufferObjects(const geo::Vec2 &paneSize) noexcept {
m_bufferSet.elements.resize(pixels * VertexEboLength); m_bufferSet.elements.resize(pixels * VertexEboLength);
// set pixels // set pixels
subSheet->walkPixels(m_model->img().bpp, [&](std::size_t i, uint8_t p) { subSheet->walkPixels(m_model->img().bpp, [&](std::size_t i, uint8_t p) {
auto color = pal->colors[p]; auto color = pal->color(p);
const auto pt = idxToPt(static_cast<int>(i), subSheet->columns); const auto pt = idxToPt(static_cast<int>(i), subSheet->columns);
const auto fx = static_cast<float>(pt.x); const auto fx = static_cast<float>(pt.x);
const auto fy = static_cast<float>(pt.y); const auto fy = static_cast<float>(pt.y);