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

[nostalgia/core/sdl] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2021-03-16 21:15:54 -05:00
parent e6d271295f
commit 23a7241622
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nostalgia/core/sdl/gfx.cpp
View File

@ -28,8 +28,7 @@ using TileMap = std::array<std::array<int, 128>, 128>;
constexpr auto Scale = 5; constexpr auto Scale = 5;
static ox::Result<ox::Vector<char>> readFile(Context *ctx, const ox::FileAddress &file) { static ox::Result<ox::Vector<char>> readFile(Context *ctx, const ox::FileAddress &file) {
auto [stat, err] = ctx->rom->stat(file); oxRequire(stat, ctx->rom->stat(file));
oxReturnError(err);
ox::Vector<char> buff(stat.size); ox::Vector<char> buff(stat.size);
oxReturnError(ctx->rom->read(file, buff.data(), buff.size())); oxReturnError(ctx->rom->read(file, buff.data(), buff.size()));
return buff; return buff;
@ -37,8 +36,7 @@ static ox::Result<ox::Vector<char>> readFile(Context *ctx, const ox::FileAddress
template<typename T> template<typename T>
ox::Result<T> readObj(Context *ctx, const ox::FileAddress &file) { ox::Result<T> readObj(Context *ctx, const ox::FileAddress &file) {
auto [buff, err] = readFile(ctx, file); oxRequire(buff, readFile(ctx, file));
oxReturnError(err);
T t; T t;
oxReturnError(ox::readClaw(buff.data(), buff.size(), &t)); oxReturnError(ox::readClaw(buff.data(), buff.size(), &t));
return t; return t;
@ -103,17 +101,14 @@ ox::Error loadBgTileSheet(Context *ctx,
int section, int section,
ox::FileAddress tilesheetPath, ox::FileAddress tilesheetPath,
ox::FileAddress palettePath) { ox::FileAddress palettePath) {
//auto id = ctx->windowerData<SdlImplData>(); oxRequire(tilesheet, readObj<NostalgiaGraphic>(ctx, tilesheetPath));
const auto [tilesheet, tserr] = readObj<NostalgiaGraphic>(ctx, tilesheetPath);
oxReturnError(tserr);
NostalgiaPalette palette;
if (!palettePath) { if (!palettePath) {
palettePath = tilesheet.defaultPalette; palettePath = tilesheet.defaultPalette;
} }
oxReturnError(readObj<NostalgiaPalette>(ctx, palettePath).get(&palette)); oxRequire(palette, readObj<NostalgiaPalette>(ctx, palettePath));
const unsigned bytesPerTile = tilesheet.bpp == 8 ? 64 : 32; const unsigned bytesPerTile = tilesheet.bpp == 8 ? 64 : 32;
const auto tiles = tilesheet.pixels.size() / bytesPerTile; const auto tiles = tilesheet.pixels.size() / bytesPerTile;
const int width = 8; constexpr int width = 8;
const int height = 8 * tiles; const int height = 8 * tiles;
std::vector<uint32_t> pixels; std::vector<uint32_t> pixels;
if (bytesPerTile == 64) { // 8 BPP if (bytesPerTile == 64) { // 8 BPP