Relintai/texture_packer
1
0
Fork 0
mirror of https://github.com/Relintai/texture_packer.git synced 2024-11-14 10:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

texture_added and _texture_added will only be called if an addition actually occurs. (Refcount increases won't count as addition).

Browse Source
This commit is contained in:
Relintai 2019-10-23 16:08:12 +02:00
parent 4bdea3cc56
commit 9de8c209f1
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
texture_merger.cpp
View File

@ -78,7 +78,13 @@ void TextureMerger::set_textures(const Vector<Variant> &textures) {
Ref<Texture> tex = _textures.get(i); Ref<Texture> tex = _textures.get(i);
if (tex.is_valid() && !_packer->contains_texture(tex)) { if (tex.is_valid() && !_packer->contains_texture(tex)) {
_packer->add_texture(tex); Ref<AtlasTexture> tex = _packer->add_texture(tex);
if (has_method("_texture_added"))
call("_texture_added", tex);
emit_signal("texture_added", tex);
texture_added = true; texture_added = true;
} }
} }
@ -92,12 +98,16 @@ Ref<AtlasTexture> TextureMerger::add_texture(Ref<Texture> texture) {
_textures.push_back(texture); _textures.push_back(texture);
bool contains = _packer->contains_texture(texture);
Ref<AtlasTexture> tex = _packer->add_texture(texture); Ref<AtlasTexture> tex = _packer->add_texture(texture);
if (!contains) {
if (has_method("_texture_added")) if (has_method("_texture_added"))
call("_texture_added", tex); call("_texture_added", tex);
emit_signal("texture_added", tex); emit_signal("texture_added", tex);
}
return tex; return tex;
} }