godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from pixelpicosean/improve-tileset-convert-shape-offset-2.1

Browse Source 
Subtract body position from shape offset during tileset convert
This commit is contained in:
Rémi Verschelde 2017-06-17 12:52:52 +02:00 committed by GitHub
commit f1af9f380b
1 changed files with 5 additions and 4 deletions

7
editor/plugins/tile_set_editor_plugin.cpp
View File

@ -35,15 +35,14 @@ void TileSetEditor::edit(const Ref<TileSet> &p_tileset) {
tileset = p_tileset; tileset = p_tileset;
} }
void TileSetEditor::_import_node(Node *p_node, Ref<TileSet> p_library) { void TileSetEditor::_import_node(Node *p_node, Ref<TileSet> p_library) {
for (int i = 0; i < p_node->get_child_count(); i++) { for (int i = 0; i < p_node->get_child_count(); i++) {
Node *child = p_node->get_child(i); Node *child = p_node->get_child(i);
if(!child->cast_to<Sprite>()) { if (!child->cast_to<Sprite>()) {
if(child->get_child_count() > 0) { if (child->get_child_count() > 0) {
_import_node(child, p_library); _import_node(child, p_library);
} }
@ -113,6 +112,8 @@ void TileSetEditor::_import_node(Node *p_node, Ref<TileSet> p_library) {
collisions.push_back(collision); collisions.push_back(collision);
} }
} }
phys_offset -= sb->get_pos();
} }
if (collisions.size()) { if (collisions.size()) {