Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-19 15:57:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Properly lock image.

Browse Source
This commit is contained in:
Relintai 2024-03-09 16:40:10 +01:00
parent c67d45375b
commit 3be690da76
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/layered_tile_map/layered_tile_set.cpp
View File

@ -154,9 +154,9 @@ PoolVector2iArray LayeredTileMapPattern::get_used_cells() const {
a.resize(pattern.size()); a.resize(pattern.size());
PoolVector2iArray::Write w = a.write(); PoolVector2iArray::Write w = a.write();
Vector2i *wptr = w.ptr(); Vector2i *wptr = w.ptr();
int i = 0; int i = 0;
for (const HashMap<Vector2i, LayeredTileMapCell>::Element *E = pattern.front(); E; E = E->next) { for (const HashMap<Vector2i, LayeredTileMapCell>::Element *E = pattern.front(); E; E = E->next) {
wptr[i++] = E->key(); wptr[i++] = E->key();
} }
@ -2578,6 +2578,7 @@ Vector<Vector<Ref<Texture>>> LayeredTileSet::generate_terrains_icons(Size2i p_si
for (int terrain = 0; terrain < get_terrains_count(terrain_set); terrain++) { for (int terrain = 0; terrain < get_terrains_count(terrain_set); terrain++) {
Ref<Image> dst_image; Ref<Image> dst_image;
dst_image.instance(); dst_image.instance();
if (counts[terrain_set][terrain].count > 0) { if (counts[terrain_set][terrain].count > 0) {
// Get the best tile. // Get the best tile.
Ref<Texture> src_texture = counts[terrain_set][terrain].texture; Ref<Texture> src_texture = counts[terrain_set][terrain].texture;
@ -2592,8 +2593,12 @@ Vector<Vector<Ref<Texture>>> LayeredTileSet::generate_terrains_icons(Size2i p_si
dst_image->resize(p_size.x, p_size.y, Image::INTERPOLATE_NEAREST); dst_image->resize(p_size.x, p_size.y, Image::INTERPOLATE_NEAREST);
} else { } else {
dst_image->create(1, 1, false, Image::FORMAT_RGBA8); dst_image->create(1, 1, false, Image::FORMAT_RGBA8);
dst_image->lock();
dst_image->set_pixel(0, 0, get_terrain_color(terrain_set, terrain)); dst_image->set_pixel(0, 0, get_terrain_color(terrain_set, terrain));
dst_image->unlock();
} }
Ref<ImageTexture> icon; Ref<ImageTexture> icon;
icon.instance(); icon.instance();
icon->create_from_image(dst_image); icon->create_from_image(dst_image);
@ -5704,7 +5709,7 @@ Ref<ImageTexture> LayeredTileSetAtlasSource::_create_padded_image_texture(const
Ref<Image> image; Ref<Image> image;
image.instance(); image.instance();
image->create(size.x, size.y, false, src_image->get_format()); image->create(size.x, size.y, false, src_image->get_format());
src_image->lock(); src_image->lock();
image->lock(); image->lock();
@ -5737,7 +5742,7 @@ Ref<ImageTexture> LayeredTileSetAtlasSource::_create_padded_image_texture(const
image->blit_rect(*src_image, Rect2i(src_rect.position + Vector2i(src_rect.size.x - 1, src_rect.size.y - 1), Vector2i(1, 1)), base_pos + Vector2i(src_rect.size.x, src_rect.size.y)); image->blit_rect(*src_image, Rect2i(src_rect.position + Vector2i(src_rect.size.x - 1, src_rect.size.y - 1), Vector2i(1, 1)), base_pos + Vector2i(src_rect.size.x, src_rect.size.y));
} }
} }
image->unlock(); image->unlock();
src_image->unlock(); src_image->unlock();