scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ow rom housekeeping

Browse Source
This commit is contained in:
Justin Scofield
2022-07-20 22:13:21 -04:00
parent c98985fd3a
commit 2da8a4a126
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/editor/overworld_editor.cc
View File

@@ -198,17 +198,25 @@ void OverworldEditor::DrawOverworldCanvas() {
overworld_map_canvas_.DrawBackground(); overworld_map_canvas_.DrawBackground();
overworld_map_canvas_.UpdateContext(); overworld_map_canvas_.UpdateContext();
overworld_map_canvas_.DrawGrid(64.f); overworld_map_canvas_.DrawGrid(64.f);
if (overworld_.isLoaded()) { if (all_gfx_loaded_) {
// overworld_map_canvas_.GetDrawList()->AddImage( static bool tiles_made = false;
// (void *)overworld_.GetOverworldMap(0).GetBitmap().GetTexture(), static std::vector<gfx::Bitmap> tiles;
// ImVec2(overworld_map_canvas_.GetZeroPoint().x + 2, if (!tiles_made) {
// overworld_map_canvas_.GetZeroPoint().y + 2), tiles = graphics_bin_.at(0).CreateTiles();
// ImVec2( auto renderer = rom_.Renderer();
// overworld_map_canvas_.GetZeroPoint().x + for (auto &tile : tiles) {
// (overworld_.GetOverworldMap(0).GetBitmap().GetWidth() * 2), tile.CreateTexture(renderer);
// overworld_map_canvas_.GetZeroPoint().y + }
// (overworld_.GetOverworldMap(0).GetBitmap().GetHeight() * }
// 2)));
overworld_map_canvas_.GetDrawList()->AddImage(
(void *)tiles[0].GetTexture(),
ImVec2(overworld_map_canvas_.GetZeroPoint().x + 2,
overworld_map_canvas_.GetZeroPoint().y + 2),
ImVec2(
overworld_map_canvas_.GetZeroPoint().x + (tiles[0].GetWidth() * 2),
overworld_map_canvas_.GetZeroPoint().y +
(tiles[0].GetHeight() * 2)));
} }
overworld_map_canvas_.DrawOverlay(); overworld_map_canvas_.DrawOverlay();
} }

3
src/app/rom.cc
View File

@@ -58,8 +58,7 @@ void ROM::LoadFromPointer(uchar *data) { current_rom_ = data; }
// 127-217 -> compressed 3bpp sprites -> (decompressed each) 0x600 chars // 127-217 -> compressed 3bpp sprites -> (decompressed each) 0x600 chars
// 218-222 -> compressed 2bpp -> (decompressed each) 0x800 chars // 218-222 -> compressed 2bpp -> (decompressed each) 0x800 chars
void ROM::LoadAllGraphicsData() { void ROM::LoadAllGraphicsData() {
int buffer_size = 346624; auto buffer = new uchar[346624];
auto buffer = new uchar[buffer_size];
auto data = new uchar[2048]; auto data = new uchar[2048];
int buffer_pos = 0; int buffer_pos = 0;