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

Merge pull request #15579 from damarindra/add-receptor-tileset

Browse source 
fix updating tileset list when assign texture and set autotile true
This commit is contained in:
Rémi Verschelde 2018-01-11 11:15:42 +01:00 committed by GitHub
commit 2c17af0509
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
editor/plugins/tile_set_editor_plugin.cpp
View file

@ -583,6 +583,14 @@ void AutotileEditor::_notification(int p_what) {
}
}
void AutotileEditor::_changed_callback(Object *p_changed, const char *p_prop) {
if (p_prop == StringName("texture") || p_prop == StringName("is_autotile")) {
edit(tile_set.ptr());
autotile_list->update();
workspace->update();
}
}
void AutotileEditor::_on_autotile_selected(int p_index) {
if (get_current_tile() >= 0) {
@ -1581,6 +1589,7 @@ Vector2 AutotileEditor::snap_point(const Vector2 &point) {
void AutotileEditor::edit(Object *p_node) {
tile_set = Ref<TileSet>(Object::cast_to<TileSet>(p_node));
tile_set->add_change_receptor(this);
helper->set_tileset(tile_set);
autotile_list->clear();

1
editor/plugins/tile_set_editor_plugin.h
View file

@ -124,6 +124,7 @@ class AutotileEditor : public Control {
protected:
static void _bind_methods();
void _notification(int p_what);
virtual void _changed_callback(Object *p_changed, const char *p_prop);
private:
void _on_autotile_selected(int p_index);

3
scene/resources/tile_set.cpp
View file

@ -309,6 +309,7 @@ void TileSet::tile_set_texture(int p_id, const Ref<Texture> &p_texture) {
ERR_FAIL_COND(!tile_map.has(p_id));
tile_map[p_id].texture = p_texture;
emit_changed();
_change_notify("texture");
}
Ref<Texture> TileSet::tile_get_texture(int p_id) const {
@ -386,8 +387,8 @@ void TileSet::tile_set_is_autotile(int p_id, bool p_is_autotile) {
ERR_FAIL_COND(!tile_map.has(p_id));
tile_map[p_id].is_autotile = p_is_autotile;
_change_notify("");
emit_changed();
_change_notify("is_autotile");
}
bool TileSet::tile_get_is_autotile(int p_id) const {