godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Fix generating terrain icon with certain image formats.

Browse Source 
(cherry picked from commit 35c105e796)
This commit is contained in:
Saracen
2023-11-06 07:45:02 +00:00
committed by Rémi Verschelde
parent bd2cad52ed
commit dbb86ed144
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scene/resources/tile_set.cpp
View File

@@ -1839,20 +1839,25 @@ Vector<Vector<Ref<Texture2D>>> TileSet::generate_terrains_icons(Size2i p_size) {
// Generate the icons. // Generate the icons.
for (int terrain_set = 0; terrain_set < get_terrain_sets_count(); terrain_set++) { for (int terrain_set = 0; terrain_set < get_terrain_sets_count(); terrain_set++) {
for (int terrain = 0; terrain < get_terrains_count(terrain_set); terrain++) { for (int terrain = 0; terrain < get_terrains_count(terrain_set); terrain++) {
Ref<Image> image; Ref<Image> dst_image;
image.instantiate(); dst_image.instantiate();
if (counts[terrain_set][terrain].count > 0) { if (counts[terrain_set][terrain].count > 0) {
// Get the best tile. // Get the best tile.
Ref<Texture2D> texture = counts[terrain_set][terrain].texture; Ref<Texture2D> src_texture = counts[terrain_set][terrain].texture;
ERR_FAIL_COND_V(src_texture.is_null(), output);
Ref<Image> src_image = src_texture->get_image();
ERR_FAIL_COND_V(src_image.is_null(), output);
Rect2i region = counts[terrain_set][terrain].region; Rect2i region = counts[terrain_set][terrain].region;
image->initialize_data(region.size.x, region.size.y, false, Image::FORMAT_RGBA8);
image->blit_rect(texture->get_image(), region, Point2i()); dst_image->initialize_data(region.size.x, region.size.y, false, src_image->get_format());
image->resize(p_size.x, p_size.y, Image::INTERPOLATE_NEAREST); dst_image->blit_rect(src_image, region, Point2i());
dst_image->convert(Image::FORMAT_RGBA8);
dst_image->resize(p_size.x, p_size.y, Image::INTERPOLATE_NEAREST);
} else { } else {
image->initialize_data(1, 1, false, Image::FORMAT_RGBA8); dst_image->initialize_data(1, 1, false, Image::FORMAT_RGBA8);
image->set_pixel(0, 0, get_terrain_color(terrain_set, terrain)); dst_image->set_pixel(0, 0, get_terrain_color(terrain_set, terrain));
} }
Ref<ImageTexture> icon = ImageTexture::create_from_image(image); Ref<ImageTexture> icon = ImageTexture::create_from_image(dst_image);
icon->set_size_override(p_size); icon->set_size_override(p_size);
output.write[terrain_set].write[terrain] = icon; output.write[terrain_set].write[terrain] = icon;
} }