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

Implemented reference counting.

Browse Source
This commit is contained in:
Relintai 2019-10-21 23:18:06 +02:00
parent fe6c61d22d
commit 37043e7b2d
3 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rectpack2D/pack.h
View File

@ -74,6 +74,8 @@ struct rect_xywhf : public rect_xywh {
void flip();
bool flipped;
int refcount;
Ref<AtlasTexture> atlas_texture;
Ref<Texture> original_texture;
};

65
texture_packer.cpp
View File

@ -30,9 +30,12 @@ Ref<AtlasTexture> TexturePacker::add_texture(Ref<Texture> texture) {
//we need to check differently this case
for (int i = 0; i < _rects.size(); ++i) {
rect_xywhf *r = _rects.get(i);
//Refcount!
if (r->atlas_texture == texture)
if (r->atlas_texture == texture) {
++(r->refcount);
return r->atlas_texture;
}
}
Ref<AtlasTexture> tex;
@ -43,6 +46,7 @@ Ref<AtlasTexture> TexturePacker::add_texture(Ref<Texture> texture) {
rect_xywhf *rect = memnew(rect_xywhf);
rect->refcount = 1;
rect->w = atlas_text->get_region().size.x;
rect->h = atlas_text->get_region().size.y;
@ -63,9 +67,12 @@ Ref<AtlasTexture> TexturePacker::add_texture(Ref<Texture> texture) {
for (int i = 0; i < _rects.size(); ++i) {
rect_xywhf *r = _rects.get(i);
//Refcount!
if (r->original_texture == texture)
if (r->original_texture == texture) {
++(r->refcount);
return r->atlas_texture;
}
}
Ref<AtlasTexture> tex;
@ -77,6 +84,7 @@ Ref<AtlasTexture> TexturePacker::add_texture(Ref<Texture> texture) {
rect_xywhf *rect = memnew(rect_xywhf);
rect->refcount = 1;
rect->original_texture = texture;
rect->atlas_texture = tex;
@ -100,11 +108,49 @@ Ref<AtlasTexture> TexturePacker::get_texture(int index) {
return _rects.get(index)->atlas_texture;
}
void TexturePacker::unref_texture_index(int index) {
ERR_FAIL_INDEX(index, _rects.size());
rect_xywhf *r = _rects.get(index);
int rc = --(r->refcount);
if (rc <= 0) {
_rects.remove(index);
r->atlas_texture.unref();
r->atlas_texture.unref();
memdelete(r);
}
}
void TexturePacker::unref_texture(Ref<Texture> texture) {
for (int i = 0; i < _rects.size(); ++i) {
rect_xywhf *r = _rects.get(i);
if (r->original_texture == texture) {
int rc = --(r->refcount);
if (rc <= 0) {
_rects.remove(i);
r->atlas_texture.unref();
r->atlas_texture.unref();
memdelete(r);
}
return;
}
}
}
void TexturePacker::remove_texture_index(int index) {
ERR_FAIL_INDEX(index, _rects.size());
rect_xywhf *r = _rects.get(index);
_rects.remove(index);
r->atlas_texture.unref();
r->atlas_texture.unref();
@ -116,10 +162,13 @@ void TexturePacker::remove_texture(Ref<Texture> texture) {
for (int i = 0; i < _rects.size(); ++i) {
rect_xywhf *r = _rects.get(i);
//TODO refcount!
if (r->original_texture == texture) {
_rects.remove(i);
r->atlas_texture.unref();
r->atlas_texture.unref();
memdelete(r);
return;
@ -266,8 +315,12 @@ void TexturePacker::_bind_methods() {
ClassDB::bind_method(D_METHOD("add_texture", "texture"), &TexturePacker::add_texture);
ClassDB::bind_method(D_METHOD("get_texture", "index"), &TexturePacker::get_texture);
ClassDB::bind_method(D_METHOD("get_original_texture", "index"), &TexturePacker::get_original_texture);
ClassDB::bind_method(D_METHOD("unref_texture_index", "index"), &TexturePacker::unref_texture_index);
ClassDB::bind_method(D_METHOD("unref_texture", "texture"), &TexturePacker::unref_texture);
ClassDB::bind_method(D_METHOD("remove_texture_index", "index"), &TexturePacker::remove_texture_index);
ClassDB::bind_method(D_METHOD("remove_texture", "texture"), &TexturePacker::remove_texture);
ClassDB::bind_method(D_METHOD("get_texture_count"), &TexturePacker::get_texture_count);
ClassDB::bind_method(D_METHOD("clear"), &TexturePacker::clear);

4
texture_packer.h
View File

@ -26,8 +26,12 @@ public:
Ref<AtlasTexture> add_texture(Ref<Texture> texture);
Ref<AtlasTexture> get_texture(int index);
Ref<Texture> get_original_texture(int index);
void unref_texture_index(int index);
void unref_texture(Ref<Texture> texture);
void remove_texture_index(int index);
void remove_texture(Ref<Texture> texture);
int get_texture_count();
void clear();