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

removing junk and housekeeping

Browse Source
This commit is contained in:
Justin Scofield
2022-06-20 22:43:56 -04:00
parent 0bdda2c84c
commit 6994feb19f
4 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/gui/editor/overworld_editor.cc
View File

@@ -449,20 +449,41 @@ void OverworldEditor::DrawChangelist() {
}
void OverworldEditor::LoadBlockset() {
rom_.CreateAllGraphicsData(allGfx16Ptr);
for (int i = 0; i < 16; i++) {
staticgfx[i] = i;
}
// Update gfx to be on selected map
auto currentmapgfx8Data = current_gfx_ptr_;
auto allgfxData = allGfx16Ptr;
for (int i = 0; i < 16; i++) {
for (int j = 0; j < 2048; j++) {
auto mapByte = allgfxData[j + (staticgfx[i] * 2048)];
switch (i) {
case 0:
case 3:
case 4:
case 5:
mapByte += 0x88;
break;
}
currentmapgfx8Data[(i * 2048) + j] = mapByte; // Upload used gfx data
}
}
auto tiles = overworld_.GetTiles16();
app::gfx::BuildTiles16Gfx(tile16_blockset_ptr_, current_gfx_ptr_, tiles);
current_gfx_bmp_.Create(128, 512, 64, current_gfx_ptr_);
current_gfx_bmp_.CreateTexture(rom_.Renderer());
tile16_blockset_bmp_.Create(128, 8192, 8, tile16_blockset_ptr_);
tile16_blockset_bmp_.CreateTexture(rom_.Renderer());
rom_.CreateAllGraphicsData(allGfx16Ptr);
auto tiles = overworld_.GetTiles16();
app::gfx::BuildTiles16Gfx(overworld_.GetMapBlockset16Ptr(),
overworld_.GetCurrentGfxSetPtr(), tiles);
mapblockset16Bitmap.Create(128, 8192, 8, overworld_.GetMapBlockset16Ptr());
mapblockset16Bitmap.CreateTexture(rom_.Renderer());
map_blockset_loaded_ = true;
// mapblockset16Bitmap.Create(128, 8192, 8, overworld_.GetMapBlockset16Ptr());
// mapblockset16Bitmap.CreateTexture(rom_.Renderer());
}
void OverworldEditor::LoadGraphics() {

5
src/gui/editor/overworld_editor.h
View File

@@ -46,18 +46,19 @@ class OverworldEditor {
uchar *current_gfx_ptr_ = new uchar[(128 * 512) / 2];
app::gfx::Bitmap allgfxBitmap;
uchar *allGfx16Ptr = new uchar[(128 * 7136) / 2];
app::gfx::Bitmap mapblockset16Bitmap;
std::unordered_map<unsigned int, SDL_Texture *> all_texture_sheet_;
uchar *allGfx16Ptr = new uchar[(128 * 7136) / 2];
int current_world_ = 0;
char map_gfx_[3] = "";
char map_palette_[3] = "";
char spr_gfx_[3] = "";
char spr_palette_[3] = "";
char message_id_[5] = "";
char staticgfx[16];
bool isLoaded = false;
bool doneLoaded = false;
bool opt_enable_grid = true;