Refactor bitmap palette management across various components to streamline palette setting and improve error handling; remove unnecessary status checks and enhance consistency in palette application methods.
This commit is contained in:
@@ -1068,7 +1068,7 @@ absl::Status OverworldEditor::LoadGraphics() {
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_IF_ERROR(tile16_individual_[i].SetPalette(palette_));
|
||||
tile16_individual_[i].SetPalette(palette_);
|
||||
Renderer::GetInstance().RenderBitmap(&tile16_individual_[i]);
|
||||
}
|
||||
|
||||
@@ -1109,7 +1109,7 @@ absl::Status OverworldEditor::LoadSpriteGraphics() {
|
||||
}
|
||||
sprite_previews_[sprite.id()].Create(width, height, depth,
|
||||
*sprite.preview_graphics());
|
||||
RETURN_IF_ERROR(sprite_previews_[sprite.id()].SetPalette(palette_));
|
||||
sprite_previews_[sprite.id()].SetPalette(palette_);
|
||||
Renderer::GetInstance().RenderBitmap(&(sprite_previews_[sprite.id()]));
|
||||
}
|
||||
return absl::OkStatus();
|
||||
@@ -1178,11 +1178,11 @@ absl::Status OverworldEditor::RefreshMapPalette() {
|
||||
if (i >= 2) sibling_index += 6;
|
||||
RETURN_IF_ERROR(
|
||||
overworld_.mutable_overworld_map(sibling_index)->LoadPalette());
|
||||
RETURN_IF_ERROR(maps_bmp_[sibling_index].SetPalette(current_map_palette));
|
||||
maps_bmp_[sibling_index].SetPalette(current_map_palette);
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_IF_ERROR(maps_bmp_[current_map_].SetPalette(current_map_palette));
|
||||
maps_bmp_[current_map_].SetPalette(current_map_palette);
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
@@ -1218,7 +1218,7 @@ absl::Status OverworldEditor::RefreshTile16Blockset() {
|
||||
palette_ = overworld_.current_area_palette();
|
||||
// Create the tile16 blockset image
|
||||
Renderer::GetInstance().UpdateBitmap(&tile16_blockset_bmp_);
|
||||
RETURN_IF_ERROR(tile16_blockset_bmp_.SetPalette(palette_));
|
||||
tile16_blockset_bmp_.SetPalette(palette_);
|
||||
|
||||
// Copy the tile16 data into individual tiles.
|
||||
const auto tile16_data = overworld_.tile16_blockset_data();
|
||||
@@ -1240,7 +1240,7 @@ absl::Status OverworldEditor::RefreshTile16Blockset() {
|
||||
}
|
||||
}
|
||||
tile16_individual_[index].set_data(tile_data);
|
||||
RETURN_IF_ERROR(tile16_individual_[index].SetPalette(palette_));
|
||||
tile16_individual_[index].SetPalette(palette_);
|
||||
return absl::OkStatus();
|
||||
},
|
||||
i));
|
||||
|
||||
Reference in New Issue
Block a user