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

Implemented margins.

Browse Source
This commit is contained in:
Relintai 2019-10-22 00:03:04 +02:00
parent 1d8256548c
commit 280dabf737
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
texture_packer.cpp
View File

@ -28,6 +28,13 @@ void TexturePacker::set_background_color(const Color color) {
_background_color = color; _background_color = color;
} }
int TexturePacker::get_margin() const {
return _margin;
}
void TexturePacker::set_margin(const int margin) {
_margin = margin;
}
Ref<AtlasTexture> TexturePacker::add_texture(Ref<Texture> texture) { Ref<AtlasTexture> TexturePacker::add_texture(Ref<Texture> texture) {
Ref<AtlasTexture> atlas_text = texture; Ref<AtlasTexture> atlas_text = texture;
@ -54,8 +61,8 @@ Ref<AtlasTexture> TexturePacker::add_texture(Ref<Texture> texture) {
rect_xywhf *rect = memnew(rect_xywhf); rect_xywhf *rect = memnew(rect_xywhf);
rect->refcount = 1; rect->refcount = 1;
rect->w = atlas_text->get_region().size.x; rect->w = atlas_text->get_region().size.x + 2 * _margin;
rect->h = atlas_text->get_region().size.y; rect->h = atlas_text->get_region().size.y + 2 * _margin;
_rects.push_back(rect); _rects.push_back(rect);
@ -95,8 +102,8 @@ Ref<AtlasTexture> TexturePacker::add_texture(Ref<Texture> texture) {
rect->original_texture = texture; rect->original_texture = texture;
rect->atlas_texture = tex; rect->atlas_texture = tex;
rect->w = texture->get_width(); rect->w = texture->get_width() + 2 * _margin;
rect->h = texture->get_height(); rect->h = texture->get_height() + 2 * _margin;
_rects.push_back(rect); _rects.push_back(rect);
@ -271,13 +278,14 @@ void TexturePacker::merge() {
PoolByteArray image_data = img->get_data(); PoolByteArray image_data = img->get_data();
for (int y = 0; y < r->h; ++y) { int h_wo_margin = r->h - 2 * _margin;
int indx = (rect_pos_y + y) * img_width * 4 + rect_pos_x * 4; for (int y = 0; y < h_wo_margin; ++y) {
int start_indx = (r->y + y) * b.size.w * 4 + r->x * 4; int orig_img_indx = (rect_pos_y + y) * img_width * 4 + rect_pos_x * 4;
int start_indx = (r->y + y + _margin) * b.size.w * 4 + (r->x + _margin) * 4;
int row_width = r->w * 4; int row_width = (r->w - 2 * _margin) * 4;
for (int x = 0; x < row_width; ++x) { for (int x = 0; x < row_width; ++x) {
data.set(start_indx + x, image_data[indx + x]); data.set(start_indx + x, image_data[orig_img_indx + x]);
} }
} }
} }
@ -298,7 +306,7 @@ void TexturePacker::merge() {
Ref<AtlasTexture> at = r->atlas_texture; Ref<AtlasTexture> at = r->atlas_texture;
at->set_atlas(texture); at->set_atlas(texture);
at->set_region(Rect2(r->x, r->y, r->w, r->h)); at->set_region(Rect2(r->x + _margin, r->y + _margin, r->w - 2 * _margin, r->h - 2 * _margin));
} }
} }
} }
@ -308,6 +316,7 @@ TexturePacker::TexturePacker() {
_texture_flags = Texture::FLAGS_DEFAULT; _texture_flags = Texture::FLAGS_DEFAULT;
_max_atlas_size = 1024; _max_atlas_size = 1024;
_keep_original_atlases = false; _keep_original_atlases = false;
_margin = 0;
} }
TexturePacker::~TexturePacker() { TexturePacker::~TexturePacker() {
@ -331,6 +340,10 @@ void TexturePacker::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_background_color", "color"), &TexturePacker::set_background_color); ClassDB::bind_method(D_METHOD("set_background_color", "color"), &TexturePacker::set_background_color);
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "background_color"), "set_background_color", "get_background_color"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "background_color"), "set_background_color", "get_background_color");
ClassDB::bind_method(D_METHOD("get_margin"), &TexturePacker::get_margin);
ClassDB::bind_method(D_METHOD("set_margin", "size"), &TexturePacker::set_margin);
ADD_PROPERTY(PropertyInfo(Variant::INT, "margin"), "set_margin", "get_margin");
ClassDB::bind_method(D_METHOD("add_texture", "texture"), &TexturePacker::add_texture); 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_texture", "index"), &TexturePacker::get_texture);
ClassDB::bind_method(D_METHOD("get_original_texture", "index"), &TexturePacker::get_original_texture); ClassDB::bind_method(D_METHOD("get_original_texture", "index"), &TexturePacker::get_original_texture);

4
texture_packer.h
View File

@ -27,6 +27,9 @@ public:
Color get_background_color() const; Color get_background_color() const;
void set_background_color(const Color color); void set_background_color(const Color color);
int get_margin() const;
void set_margin(const int margin);
Ref<AtlasTexture> add_texture(Ref<Texture> texture); Ref<AtlasTexture> add_texture(Ref<Texture> texture);
Ref<AtlasTexture> get_texture(int index); Ref<AtlasTexture> get_texture(int index);
Ref<Texture> get_original_texture(int index); Ref<Texture> get_original_texture(int index);
@ -55,6 +58,7 @@ private:
int _max_atlas_size; int _max_atlas_size;
bool _keep_original_atlases; bool _keep_original_atlases;
Color _background_color; Color _background_color;
int _margin;
Vector<rect_xywhf *> _rects; Vector<rect_xywhf *> _rects;
Vector<Ref<ImageTexture> > _generated_textures; Vector<Ref<ImageTexture> > _generated_textures;