maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #5563 from opmana/fix-convert-tileset

Browse source 
Respect frame property when converting to TileSet.
This commit is contained in:
Juan Linietsky 2016-07-10 13:02:55 -03:00 committed by GitHub
parent 49b288d331 0a8d6de0c3
commit 5dd6530acf
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tools/editor/plugins/tile_set_editor_plugin.cpp
View file

@ -73,24 +73,24 @@ void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_me
p_library->tile_set_name(id,mi->get_name());
}
p_library->tile_set_texture(id,texture);
p_library->tile_set_material(id,material);
Vector2 phys_offset;
Size2 s;
if (mi->is_centered()) {
Size2 s;
if (mi->is_region()) {
s=mi->get_region_rect().size;
} else {
s=texture->get_size();
}
phys_offset+=-s/2;
}
if (mi->is_region()) {
s=mi->get_region_rect().size;
p_library->tile_set_region(id,mi->get_region_rect());
} else {
const int frame = mi->get_frame();
const int hframes = mi->get_hframes();
s=texture->get_size()/Size2(hframes,mi->get_vframes());
p_library->tile_set_region(id,Rect2(Vector2(frame%hframes,frame/hframes)*s,s));
}
if (mi->is_centered()) {
phys_offset+=-s/2;
}
Vector<Ref<Shape2D> >collisions;