Relintai/tile_map_backport
1
0
Fork 0
mirror of https://github.com/Relintai/tile_map_backport.git synced 2024-11-05 10:11:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

More fixes.

Browse Source
This commit is contained in:
Relintai 2021-12-12 11:59:11 +01:00
parent 1b1a971320
commit 3120b3d146
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tile_editor/tile_set_atlas_source_editor.cpp
View File

@ -124,20 +124,22 @@ void RTileSetAtlasSourceEditor::RTileSetAtlasSourceProxyObject::edit(Ref<RTileSe
} }
// Disconnect to changes. // Disconnect to changes.
if (tile_set_atlas_source) { //if (tile_set_atlas_source) {
tile_set_atlas_source->disconnect(CoreStringNames::get_singleton()->property_list_changed, callable_mp((Object *)this, &Object::notify_property_list_changed)); // tile_set_atlas_source->disconnect(CoreStringNames::get_singleton()->property_list_changed, callable_mp((Object *)this, &Object::notify_property_list_changed));
} //}
tile_set = p_tile_set; tile_set = p_tile_set;
tile_set_atlas_source = p_tile_set_atlas_source; tile_set_atlas_source = p_tile_set_atlas_source;
source_id = p_source_id; source_id = p_source_id;
// Connect to changes. // Connect to changes.
/*
if (tile_set_atlas_source) { if (tile_set_atlas_source) {
if (!tile_set_atlas_source->is_connected(CoreStringNames::get_singleton()->property_list_changed, callable_mp((Object *)this, &Object::notify_property_list_changed))) { if (!tile_set_atlas_source->is_connected(CoreStringNames::get_singleton()->property_list_changed, callable_mp((Object *)this, &Object::notify_property_list_changed))) {
tile_set_atlas_source->connect(CoreStringNames::get_singleton()->property_list_changed, callable_mp((Object *)this, &Object::notify_property_list_changed)); tile_set_atlas_source->connect(CoreStringNames::get_singleton()->property_list_changed, callable_mp((Object *)this, &Object::notify_property_list_changed));
} }
} }
*/
property_list_changed_notify(); property_list_changed_notify();
} }
@ -303,7 +305,7 @@ bool RTileSetAtlasSourceEditor::AtlasTileProxyObject::_get(const StringName &p_n
if (alternative == 0) { if (alternative == 0) {
Vector<String> components = String(p_name).split("/", true, 2); Vector<String> components = String(p_name).split("/", true, 2);
if (p_name == "atlas_coords") { if (p_name == "atlas_coords") {
r_ret = coords; r_ret = Vector2(coords);
return true; return true;
} else if (p_name == "size_in_atlas") { } else if (p_name == "size_in_atlas") {
r_ret = tile_set_atlas_source->get_tile_size_in_atlas(coords); r_ret = tile_set_atlas_source->get_tile_size_in_atlas(coords);
@ -343,7 +345,7 @@ bool RTileSetAtlasSourceEditor::AtlasTileProxyObject::_get(const StringName &p_n
} else if (p_name == "animation_frames_count") { } else if (p_name == "animation_frames_count") {
r_ret = tile_set_atlas_source->get_tile_animation_frames_count(coords); r_ret = tile_set_atlas_source->get_tile_animation_frames_count(coords);
return true; return true;
} else if (components.size() == 2 && components[0].begins_with("animation_frame_") && components[0].trim_prefix("animation_frame_").is_valid_int()) { } else if (components.size() == 2 && components[0].begins_with("animation_frame_") && components[0].trim_prefix("animation_frame_").is_valid_integer()) {
int frame = components[0].trim_prefix("animation_frame_").to_int(); int frame = components[0].trim_prefix("animation_frame_").to_int();
if (components[1] == "duration") { if (components[1] == "duration") {
if (frame < 0 || frame >= tile_set_atlas_source->get_tile_animation_frames_count(coords)) { if (frame < 0 || frame >= tile_set_atlas_source->get_tile_animation_frames_count(coords)) {
@ -628,8 +630,8 @@ void RTileSetAtlasSourceEditor::_update_tile_data_editors() {
RTileDataTextureOffsetEditor *tile_data_texture_offset_editor = memnew(RTileDataTextureOffsetEditor); RTileDataTextureOffsetEditor *tile_data_texture_offset_editor = memnew(RTileDataTextureOffsetEditor);
tile_data_texture_offset_editor->hide(); tile_data_texture_offset_editor->hide();
tile_data_texture_offset_editor->setup_property_editor(Variant::VECTOR2, "texture_offset"); tile_data_texture_offset_editor->setup_property_editor(Variant::VECTOR2, "texture_offset");
tile_data_texture_offset_editor->connect("needs_redraw", callable_mp((CanvasItem *)tile_atlas_control_unscaled, &Control::update)); tile_data_texture_offset_editor->connect("needs_redraw", tile_atlas_control_unscaled, "udpate");
tile_data_texture_offset_editor->connect("needs_redraw", callable_mp((CanvasItem *)alternative_tiles_control_unscaled, &Control::update)); tile_data_texture_offset_editor->connect("needs_redraw", alternative_tiles_control_unscaled, "udpate");
tile_data_editors["texture_offset"] = tile_data_texture_offset_editor; tile_data_editors["texture_offset"] = tile_data_texture_offset_editor;
} }
@ -639,7 +641,7 @@ void RTileSetAtlasSourceEditor::_update_tile_data_editors() {
tile_data_modulate_editor->hide(); tile_data_modulate_editor->hide();
tile_data_modulate_editor->setup_property_editor(Variant::COLOR, "modulate", "", Color(1.0, 1.0, 1.0, 1.0)); tile_data_modulate_editor->setup_property_editor(Variant::COLOR, "modulate", "", Color(1.0, 1.0, 1.0, 1.0));
tile_data_modulate_editor->connect("needs_redraw", tile_atlas_control_unscaled, "update"); tile_data_modulate_editor->connect("needs_redraw", tile_atlas_control_unscaled, "update");
tile_data_modulate_editor->connect("needs_redraw", alternative_tiles_control_unscaled, "update")); tile_data_modulate_editor->connect("needs_redraw", alternative_tiles_control_unscaled, "update");
tile_data_editors["modulate"] = tile_data_modulate_editor; tile_data_editors["modulate"] = tile_data_modulate_editor;
} }
@ -709,7 +711,7 @@ void RTileSetAtlasSourceEditor::_update_tile_data_editors() {
tile_data_collision_editor->hide(); tile_data_collision_editor->hide();
tile_data_collision_editor->set_physics_layer(i); tile_data_collision_editor->set_physics_layer(i);
tile_data_collision_editor->connect("needs_redraw", tile_atlas_control_unscaled, "update"); tile_data_collision_editor->connect("needs_redraw", tile_atlas_control_unscaled, "update");
tile_data_collision_editor->connect("needs_redraw", calternative_tiles_control_unscaled, "update"); tile_data_collision_editor->connect("needs_redraw", alternative_tiles_control_unscaled, "update");
tile_data_editors[vformat("physics_layer_%d", i)] = tile_data_collision_editor; tile_data_editors[vformat("physics_layer_%d", i)] = tile_data_collision_editor;
} }
} }
@ -917,14 +919,17 @@ void RTileSetAtlasSourceEditor::_update_atlas_view() {
button->add_style_override("hover", memnew(StyleBoxEmpty)); button->add_style_override("hover", memnew(StyleBoxEmpty));
button->add_style_override("focus", memnew(StyleBoxEmpty)); button->add_style_override("focus", memnew(StyleBoxEmpty));
button->add_style_override("pressed", memnew(StyleBoxEmpty)); button->add_style_override("pressed", memnew(StyleBoxEmpty));
button->connect("pressed", callable_mp(tile_set_atlas_source, &RTileSetAtlasSource::create_alternative_tile), varray(tile_id, RTileSetSource::INVALID_TILE_ALTERNATIVE)); Vector<Variant> varr;
varr.push_back(Vector2(tile_id));
varr.push_back(RTileSetSource::INVALID_TILE_ALTERNATIVE);
button->connect("pressed", tile_set_atlas_source, "create_alternative_tile", varr);
button->set_rect(Rect2(Vector2(pos.x, pos.y + (y_increment - texture_region_base_size.y) / 2.0), Vector2(texture_region_base_size_min, texture_region_base_size_min))); button->set_rect(Rect2(Vector2(pos.x, pos.y + (y_increment - texture_region_base_size.y) / 2.0), Vector2(texture_region_base_size_min, texture_region_base_size_min)));
button->set_expand_icon(true); button->set_expand_icon(true);
pos.y += y_increment; pos.y += y_increment;
} }
} }
tile_atlas_view->set_padding(Side::SIDE_RIGHT, texture_region_base_size_min); tile_atlas_view->set_padding(RTileAtlasView::SIDE_RIGHT, texture_region_base_size_min);
// Redraw everything. // Redraw everything.
tile_atlas_control->update(); tile_atlas_control->update();
@ -1318,8 +1323,8 @@ void RTileSetAtlasSourceEditor::_end_dragging() {
case DRAG_TYPE_CREATE_TILES: case DRAG_TYPE_CREATE_TILES:
undo_redo->create_action(TTR("Create tiles")); undo_redo->create_action(TTR("Create tiles"));
for (Set<Vector2i>::Element *E = drag_modified_tiles.front(); E; E = E->next()) { for (Set<Vector2i>::Element *E = drag_modified_tiles.front(); E; E = E->next()) {
undo_redo->add_do_method(tile_set_atlas_source, "create_tile", E->get()); undo_redo->add_do_method(tile_set_atlas_source, "create_tile", Vector2(E->get()));
undo_redo->add_undo_method(tile_set_atlas_source, "remove_tile", E->get()); undo_redo->add_undo_method(tile_set_atlas_source, "remove_tile", Vector2(E->get()));
} }
undo_redo->commit_action(); undo_redo->commit_action();
break; break;