asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added optional cropping for texture atlas importer

Browse source
This commit is contained in:
Alexandr Xenofontov 2021-09-14 13:35:19 +09:00
parent 37fab65e00
commit 9913af974f
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/import/resource_importer_texture_atlas.cpp
View file

@ -71,6 +71,7 @@ String ResourceImporterTextureAtlas::get_preset_name(int p_idx) const {
void ResourceImporterTextureAtlas::get_import_options(List<ImportOption> *r_options, int p_preset) const { void ResourceImporterTextureAtlas::get_import_options(List<ImportOption> *r_options, int p_preset) const {
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "atlas_file", PROPERTY_HINT_SAVE_FILE, "*.png"), "")); r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "atlas_file", PROPERTY_HINT_SAVE_FILE, "*.png"), ""));
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "import_mode", PROPERTY_HINT_ENUM, "Region,Mesh2D"), 0)); r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "import_mode", PROPERTY_HINT_ENUM, "Region,Mesh2D"), 0));
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "crop_to_region"), false));
} }
String ResourceImporterTextureAtlas::get_option_group_file() const { String ResourceImporterTextureAtlas::get_option_group_file() const {
@ -203,6 +204,7 @@ Error ResourceImporterTextureAtlas::import_group_file(const String &p_group_file
ERR_CONTINUE(err != OK); ERR_CONTINUE(err != OK);
pack_data.image = image; pack_data.image = image;
pack_data.is_cropped = options["crop_to_region"];
int mode = options["import_mode"]; int mode = options["import_mode"];
@ -325,7 +327,10 @@ Error ResourceImporterTextureAtlas::import_group_file(const String &p_group_file
atlas_texture.instance(); atlas_texture.instance();
atlas_texture->set_atlas(cache); atlas_texture->set_atlas(cache);
atlas_texture->set_region(Rect2(offset, pack_data.region.size)); atlas_texture->set_region(Rect2(offset, pack_data.region.size));
atlas_texture->set_margin(Rect2(pack_data.region.position, Size2(pack_data.image->get_width(), pack_data.image->get_height()) - pack_data.region.size));
if (!pack_data.is_cropped) {
atlas_texture->set_margin(Rect2(pack_data.region.position, pack_data.image->get_size() - pack_data.region.size));
}
texture = atlas_texture; texture = atlas_texture;
} else { } else {

1
editor/import/resource_importer_texture_atlas.h
View file

@ -38,6 +38,7 @@ class ResourceImporterTextureAtlas : public ResourceImporter {
struct PackData { struct PackData {
Rect2 region; Rect2 region;
bool is_cropped;
bool is_mesh; bool is_mesh;
Vector<int> chart_pieces; //one for region, many for mesh Vector<int> chart_pieces; //one for region, many for mesh
Vector<Vector<Vector2>> chart_vertices; //for mesh Vector<Vector<Vector2>> chart_vertices; //for mesh