From 40a09f17e9541a7eca5d20aeacc6b0db17ae6002 Mon Sep 17 00:00:00 2001 From: scawful Date: Mon, 6 Jan 2025 21:38:59 -0500 Subject: [PATCH] re-render graphics injected into tile16 editor --- src/app/editor/graphics/tile16_editor.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/editor/graphics/tile16_editor.cc b/src/app/editor/graphics/tile16_editor.cc index e5b3e4b5..6efc6fc6 100644 --- a/src/app/editor/graphics/tile16_editor.cc +++ b/src/app/editor/graphics/tile16_editor.cc @@ -45,17 +45,22 @@ absl::Status Tile16Editor::InitBlockset( const gfx::Bitmap &tile16_blockset_bmp, const gfx::Bitmap ¤t_gfx_bmp, std::array &all_tiles_types) { all_tiles_types_ = all_tiles_types; - tile16_blockset_bmp_ = tile16_blockset_bmp; - current_gfx_bmp_.Create(current_gfx_bmp.width(), current_gfx_bmp.height(), - current_gfx_bmp.depth(), current_gfx_bmp.vector()); - core::Renderer::GetInstance().RenderBitmap(&tile16_blockset_bmp_); + current_gfx_bmp_.Create(current_gfx_bmp.width(), current_gfx_bmp.height(), + current_gfx_bmp.depth(), current_gfx_bmp.vector()); + RETURN_IF_ERROR(current_gfx_bmp_.ApplyPalette(current_gfx_bmp.palette())); + core::Renderer::GetInstance().RenderBitmap(¤t_gfx_bmp_); + tile16_blockset_bmp_.Create( + tile16_blockset_bmp.width(), tile16_blockset_bmp.height(), + tile16_blockset_bmp.depth(), tile16_blockset_bmp.vector()); + RETURN_IF_ERROR( + tile16_blockset_bmp_.ApplyPalette(tile16_blockset_bmp.palette())); + core::Renderer::GetInstance().RenderBitmap(&tile16_blockset_bmp_); RETURN_IF_ERROR(LoadTile8()); ImVector tile16_names; for (int i = 0; i < 0x200; ++i) { std::string str = core::HexByte(all_tiles_types_[i]); tile16_names.push_back(str); } - *tile8_source_canvas_.mutable_labels(0) = tile16_names; *tile8_source_canvas_.custom_labels_enabled() = true; return absl::OkStatus();