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

OverworldEditor status updates

Browse Source
This commit is contained in:
scawful
2024-04-07 13:23:29 -04:00
parent a4438dea1b
commit f6d2304e84
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1714,7 +1714,7 @@ absl::Status OverworldEditor::LoadSpriteGraphics() {
int depth = 0x40; int depth = 0x40;
auto spr_gfx = sprite.PreviewGraphics(); auto spr_gfx = sprite.PreviewGraphics();
sprite_previews_[sprite.id()].Create(width, height, depth, spr_gfx); sprite_previews_[sprite.id()].Create(width, height, depth, spr_gfx);
sprite_previews_[sprite.id()].ApplyPalette(palette_); RETURN_IF_ERROR(sprite_previews_[sprite.id()].ApplyPalette(palette_));
rom()->RenderBitmap(&(sprite_previews_[sprite.id()])); rom()->RenderBitmap(&(sprite_previews_[sprite.id()]));
} }
return absl::OkStatus(); return absl::OkStatus();
@@ -1889,15 +1889,15 @@ void OverworldEditor::DrawUsageGrid() {
} }
} }
void OverworldEditor::LoadAnimatedMaps() { absl::Status OverworldEditor::LoadAnimatedMaps() {
int world_index = 0; int world_index = 0;
static std::vector<bool> animated_built(0x40, false); static std::vector<bool> animated_built(0x40, false);
if (!animated_built[world_index]) { if (!animated_built[world_index]) {
animated_maps_[world_index] = maps_bmp_[world_index]; animated_maps_[world_index] = maps_bmp_[world_index];
auto &map = *overworld_.mutable_overworld_map(world_index); auto &map = *overworld_.mutable_overworld_map(world_index);
map.DrawAnimatedTiles(); map.DrawAnimatedTiles();
map.BuildTileset(); RETURN_IF_ERROR(map.BuildTileset());
map.BuildTiles16Gfx(overworld_.tiles16().size()); RETURN_IF_ERROR(map.BuildTiles16Gfx(overworld_.tiles16().size()));
OWBlockset blockset; OWBlockset blockset;
if (current_world_ == 0) { if (current_world_ == 0) {
blockset = overworld_.map_tiles().light_world; blockset = overworld_.map_tiles().light_world;
@@ -1906,7 +1906,7 @@ void OverworldEditor::LoadAnimatedMaps() {
} else { } else {
blockset = overworld_.map_tiles().special_world; blockset = overworld_.map_tiles().special_world;
} }
map.BuildBitmap(blockset); RETURN_IF_ERROR(map.BuildBitmap(blockset));
gui::BuildAndRenderBitmapPipeline(0x200, 0x200, 0x200, map.bitmap_data(), gui::BuildAndRenderBitmapPipeline(0x200, 0x200, 0x200, map.bitmap_data(),
*rom(), animated_maps_[world_index], *rom(), animated_maps_[world_index],
@@ -1914,6 +1914,8 @@ void OverworldEditor::LoadAnimatedMaps() {
animated_built[world_index] = true; animated_built[world_index] = true;
} }
return absl::OkStatus();
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
src/app/editor/overworld_editor.h
View File

@@ -143,7 +143,7 @@ class OverworldEditor : public Editor,
void DrawUsageGrid(); void DrawUsageGrid();
void CalculateUsageStats(); void CalculateUsageStats();
void LoadAnimatedMaps(); absl::Status LoadAnimatedMaps();
void DrawDebugWindow(); void DrawDebugWindow();
auto gfx_group_editor() const { return gfx_group_editor_; } auto gfx_group_editor() const { return gfx_group_editor_; }