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

Added "automatic_merge" property, and a "texture_merged" signal.

Browse Source
This commit is contained in:
Relintai 2019-10-22 01:00:39 +02:00
parent 8f19801eaa
commit 63b908afb6
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
texture_merger.cpp
View File

@ -35,6 +35,13 @@ void TextureMerger::set_margin(const int margin) {
_packer->set_margin(margin); _packer->set_margin(margin);
} }
bool TextureMerger::get_automatic_merge() const {
return _automatic_merge;
}
void TextureMerger::set_automatic_merge(const bool value) {
_automatic_merge = value;
}
Ref<TexturePacker> TextureMerger::get_packer() const { Ref<TexturePacker> TextureMerger::get_packer() const {
return _packer; return _packer;
} }
@ -69,8 +76,8 @@ void TextureMerger::set_textures(const Vector<Variant> &textures) {
} }
} }
if (texture_added) if (texture_added && _automatic_merge)
_packer->merge(); merge();
} }
Ref<AtlasTexture> TextureMerger::add_texture(Ref<Texture> texture) { Ref<AtlasTexture> TextureMerger::add_texture(Ref<Texture> texture) {
@ -126,9 +133,13 @@ int TextureMerger::get_generated_texture_count() {
void TextureMerger::merge() { void TextureMerger::merge() {
_packer->merge(); _packer->merge();
emit_signal("texture_merged");
} }
TextureMerger::TextureMerger() { TextureMerger::TextureMerger() {
_automatic_merge = true;
_packer.instance(); _packer.instance();
_packer->set_keep_original_atlases(true); _packer->set_keep_original_atlases(true);
} }
@ -138,6 +149,8 @@ TextureMerger::~TextureMerger() {
} }
void TextureMerger::_bind_methods() { void TextureMerger::_bind_methods() {
ADD_SIGNAL(MethodInfo("texture_merged"));
ClassDB::bind_method(D_METHOD("get_texture_flags"), &TextureMerger::get_texture_flags); ClassDB::bind_method(D_METHOD("get_texture_flags"), &TextureMerger::get_texture_flags);
ClassDB::bind_method(D_METHOD("set_texture_flags", "flags"), &TextureMerger::set_texture_flags); ClassDB::bind_method(D_METHOD("set_texture_flags", "flags"), &TextureMerger::set_texture_flags);
ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_flags", PROPERTY_HINT_FLAGS, "Mipmaps,Repeat,Filter,Anisotropic Linear,Convert to Linear,Mirrored Repeat,Video Surface"), "set_texture_flags", "get_texture_flags"); ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_flags", PROPERTY_HINT_FLAGS, "Mipmaps,Repeat,Filter,Anisotropic Linear,Convert to Linear,Mirrored Repeat,Video Surface"), "set_texture_flags", "get_texture_flags");
@ -158,6 +171,10 @@ void TextureMerger::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_margin", "size"), &TextureMerger::set_margin); ClassDB::bind_method(D_METHOD("set_margin", "size"), &TextureMerger::set_margin);
ADD_PROPERTY(PropertyInfo(Variant::INT, "margin"), "set_margin", "get_margin"); ADD_PROPERTY(PropertyInfo(Variant::INT, "margin"), "set_margin", "get_margin");
ClassDB::bind_method(D_METHOD("get_automatic_merge"), &TextureMerger::get_automatic_merge);
ClassDB::bind_method(D_METHOD("set_automatic_merge", "value"), &TextureMerger::set_automatic_merge);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "automatic_merge"), "set_automatic_merge", "get_automatic_merge");
ClassDB::bind_method(D_METHOD("get_textures"), &TextureMerger::get_textures); ClassDB::bind_method(D_METHOD("get_textures"), &TextureMerger::get_textures);
ClassDB::bind_method(D_METHOD("set_textures", "textures"), &TextureMerger::set_textures); ClassDB::bind_method(D_METHOD("set_textures", "textures"), &TextureMerger::set_textures);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "textures", PROPERTY_HINT_NONE, "17/17:Texture", PROPERTY_USAGE_DEFAULT, "Texture"), "set_textures", "get_textures"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "textures", PROPERTY_HINT_NONE, "17/17:Texture", PROPERTY_USAGE_DEFAULT, "Texture"), "set_textures", "get_textures");

5
texture_merger.h
View File

@ -26,6 +26,9 @@ public:
int get_margin() const; int get_margin() const;
void set_margin(const int margin); void set_margin(const int margin);
bool get_automatic_merge() const;
void set_automatic_merge(const bool value);
Ref<TexturePacker> get_packer() const; Ref<TexturePacker> get_packer() const;
void set_packer(const Ref<TexturePacker> packer); void set_packer(const Ref<TexturePacker> packer);
@ -57,6 +60,8 @@ protected:
static void _bind_methods(); static void _bind_methods();
private: private:
bool _automatic_merge;
Ref<TexturePacker> _packer; Ref<TexturePacker> _packer;
Vector<Ref<Texture> > _textures; Vector<Ref<Texture> > _textures;
}; };