feat: updated engine version to 4.4-rc1
This commit is contained in:
Sara
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -31,7 +31,6 @@
|
|||
#include "path_2d_editor_plugin.h"
|
||||
|
||||
#include "canvas_item_editor_plugin.h"
|
||||
#include "core/io/file_access.h"
|
||||
#include "core/os/keyboard.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_settings.h"
|
||||
|
|
@ -42,14 +41,15 @@
|
|||
|
||||
void Path2DEditor::_notification(int p_what) {
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_ENTER_TREE:
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
curve_edit->set_icon(get_editor_theme_icon(SNAME("CurveEdit")));
|
||||
curve_edit_curve->set_icon(get_editor_theme_icon(SNAME("CurveCurve")));
|
||||
curve_create->set_icon(get_editor_theme_icon(SNAME("CurveCreate")));
|
||||
curve_del->set_icon(get_editor_theme_icon(SNAME("CurveDelete")));
|
||||
curve_close->set_icon(get_editor_theme_icon(SNAME("CurveClose")));
|
||||
curve_clear_points->set_icon(get_editor_theme_icon(SNAME("Clear")));
|
||||
curve_edit->set_button_icon(get_editor_theme_icon(SNAME("CurveEdit")));
|
||||
curve_edit_curve->set_button_icon(get_editor_theme_icon(SNAME("CurveCurve")));
|
||||
curve_create->set_button_icon(get_editor_theme_icon(SNAME("CurveCreate")));
|
||||
curve_del->set_button_icon(get_editor_theme_icon(SNAME("CurveDelete")));
|
||||
curve_close->set_button_icon(get_editor_theme_icon(SNAME("CurveClose")));
|
||||
curve_clear_points->set_button_icon(get_editor_theme_icon(SNAME("Clear")));
|
||||
|
||||
create_curve_button->set_button_icon(get_editor_theme_icon(SNAME("Curve2D")));
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
|
@ -70,6 +70,11 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
|
|||
return false;
|
||||
}
|
||||
|
||||
Viewport *vp = node->get_viewport();
|
||||
if (vp && !vp->is_visible_subviewport()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (node->get_curve().is_null()) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -78,10 +83,11 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
|
|||
|
||||
Ref<InputEventMouseButton> mb = p_event;
|
||||
if (mb.is_valid()) {
|
||||
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
|
||||
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_screen_transform();
|
||||
|
||||
Vector2 gpoint = mb->get_position();
|
||||
Vector2 cpoint = node->to_local(canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(mb->get_position())));
|
||||
Vector2 cpoint = canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(gpoint));
|
||||
cpoint = node->to_local(node->get_viewport()->get_popup_base_transform().affine_inverse().xform(cpoint));
|
||||
|
||||
if (mb->is_pressed() && action == ACTION_NONE) {
|
||||
Ref<Curve2D> curve = node->get_curve();
|
||||
|
|
@ -197,12 +203,7 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
|
|||
const Vector2 new_point = xform.affine_inverse().xform(gpoint2);
|
||||
curve->add_point(new_point, Vector2(0, 0), Vector2(0, 0), insertion_point + 1);
|
||||
|
||||
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
|
||||
undo_redo->create_action(TTR("Split Curve"));
|
||||
undo_redo->add_do_method(curve.ptr(), "add_point", new_point, Vector2(0, 0), Vector2(0, 0), insertion_point + 1);
|
||||
undo_redo->add_undo_method(curve.ptr(), "remove_point", insertion_point + 1);
|
||||
|
||||
action = ACTION_MOVING_NEW_POINT;
|
||||
action = ACTION_MOVING_NEW_POINT_FROM_SPLIT;
|
||||
action_point = insertion_point + 1;
|
||||
moving_from = curve->get_point_position(action_point);
|
||||
moving_screen_from = gpoint2;
|
||||
|
|
@ -245,6 +246,16 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
|
|||
undo_redo->commit_action(false);
|
||||
} break;
|
||||
|
||||
case ACTION_MOVING_NEW_POINT_FROM_SPLIT: {
|
||||
undo_redo->create_action(TTR("Split Curve"));
|
||||
undo_redo->add_do_method(curve.ptr(), "add_point", Vector2(), Vector2(), Vector2(), action_point);
|
||||
undo_redo->add_do_method(curve.ptr(), "set_point_position", action_point, cpoint);
|
||||
undo_redo->add_undo_method(curve.ptr(), "remove_point", action_point);
|
||||
undo_redo->add_do_method(canvas_item_editor, "update_viewport");
|
||||
undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
|
||||
undo_redo->commit_action(false);
|
||||
} break;
|
||||
|
||||
case ACTION_MOVING_IN: {
|
||||
if (original_mouse_pos != gpoint) {
|
||||
undo_redo->create_action(TTR("Move In-Control in Curve"));
|
||||
|
|
@ -291,11 +302,11 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
|
|||
// Handle Edge Follow
|
||||
bool old_edge = on_edge;
|
||||
|
||||
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
|
||||
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_screen_transform();
|
||||
Vector2 gpoint = mm->get_position();
|
||||
|
||||
Ref<Curve2D> curve = node->get_curve();
|
||||
if (curve == nullptr) {
|
||||
if (curve.is_null()) {
|
||||
return true;
|
||||
}
|
||||
if (curve->get_point_count() < 2) {
|
||||
|
|
@ -336,9 +347,10 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
|
|||
|
||||
if (action != ACTION_NONE) {
|
||||
// Handle point/control movement.
|
||||
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
|
||||
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_screen_transform();
|
||||
Vector2 gpoint = mm->get_position();
|
||||
Vector2 cpoint = node->get_global_transform().affine_inverse().xform(canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(mm->get_position())));
|
||||
Vector2 cpoint = canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(gpoint));
|
||||
cpoint = node->to_local(node->get_viewport()->get_popup_base_transform().affine_inverse().xform(cpoint));
|
||||
|
||||
Ref<Curve2D> curve = node->get_curve();
|
||||
|
||||
|
|
@ -350,7 +362,8 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
|
|||
break;
|
||||
|
||||
case ACTION_MOVING_POINT:
|
||||
case ACTION_MOVING_NEW_POINT: {
|
||||
case ACTION_MOVING_NEW_POINT:
|
||||
case ACTION_MOVING_NEW_POINT_FROM_SPLIT: {
|
||||
curve->set_point_position(action_point, cpoint);
|
||||
} break;
|
||||
|
||||
|
|
@ -384,7 +397,12 @@ void Path2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
|
|||
return;
|
||||
}
|
||||
|
||||
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
|
||||
Viewport *vp = node->get_viewport();
|
||||
if (vp && !vp->is_visible_subviewport()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_screen_transform();
|
||||
|
||||
const Ref<Texture2D> path_sharp_handle = get_editor_theme_icon(SNAME("EditorPathSharpHandle"));
|
||||
const Ref<Texture2D> path_smooth_handle = get_editor_theme_icon(SNAME("EditorPathSmoothHandle"));
|
||||
|
|
@ -444,6 +462,16 @@ void Path2DEditor::_node_visibility_changed() {
|
|||
}
|
||||
|
||||
canvas_item_editor->update_viewport();
|
||||
_update_toolbar();
|
||||
}
|
||||
|
||||
void Path2DEditor::_update_toolbar() {
|
||||
if (!node) {
|
||||
return;
|
||||
}
|
||||
bool has_curve = node->get_curve().is_valid();
|
||||
toolbar->set_visible(has_curve);
|
||||
create_curve_button->set_visible(!has_curve);
|
||||
}
|
||||
|
||||
void Path2DEditor::edit(Node *p_path2d) {
|
||||
|
|
@ -457,6 +485,7 @@ void Path2DEditor::edit(Node *p_path2d) {
|
|||
|
||||
if (p_path2d) {
|
||||
node = Object::cast_to<Path2D>(p_path2d);
|
||||
_update_toolbar();
|
||||
|
||||
if (!node->is_connected(SceneStringName(visibility_changed), callable_mp(this, &Path2DEditor::_node_visibility_changed))) {
|
||||
node->connect(SceneStringName(visibility_changed), callable_mp(this, &Path2DEditor::_node_visibility_changed));
|
||||
|
|
@ -468,10 +497,12 @@ void Path2DEditor::edit(Node *p_path2d) {
|
|||
}
|
||||
node = nullptr;
|
||||
}
|
||||
|
||||
canvas_item_editor->update_viewport();
|
||||
}
|
||||
|
||||
void Path2DEditor::_bind_methods() {
|
||||
//ClassDB::bind_method(D_METHOD("_menu_option"),&Path2DEditor::_menu_option);
|
||||
ClassDB::bind_method(D_METHOD("_update_toolbar"), &Path2DEditor::_update_toolbar);
|
||||
ClassDB::bind_method(D_METHOD("_clear_curve_points"), &Path2DEditor::_clear_curve_points);
|
||||
ClassDB::bind_method(D_METHOD("_restore_curve_points"), &Path2DEditor::_restore_curve_points);
|
||||
}
|
||||
|
|
@ -573,6 +604,10 @@ void Path2DEditor::_cancel_current_action() {
|
|||
curve->remove_point(curve->get_point_count() - 1);
|
||||
} break;
|
||||
|
||||
case ACTION_MOVING_NEW_POINT_FROM_SPLIT: {
|
||||
curve->remove_point(action_point);
|
||||
} break;
|
||||
|
||||
case ACTION_MOVING_IN: {
|
||||
curve->set_point_in(action_point, moving_from);
|
||||
curve->set_point_out(action_point, mirror_handle_length ? -moving_from : (-moving_from.normalized() * orig_out_length));
|
||||
|
|
@ -591,6 +626,21 @@ void Path2DEditor::_cancel_current_action() {
|
|||
action = ACTION_NONE;
|
||||
}
|
||||
|
||||
void Path2DEditor::_create_curve() {
|
||||
ERR_FAIL_NULL(node);
|
||||
|
||||
Ref<Curve2D> new_curve;
|
||||
new_curve.instantiate();
|
||||
|
||||
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
|
||||
undo_redo->create_action(TTR("Create Curve in Path2D"));
|
||||
undo_redo->add_do_property(node, "curve", new_curve);
|
||||
undo_redo->add_undo_property(node, "curve", Ref<Curve2D>());
|
||||
undo_redo->add_do_method(this, "_update_toolbar");
|
||||
undo_redo->add_undo_method(this, "_update_toolbar");
|
||||
undo_redo->commit_action();
|
||||
}
|
||||
|
||||
void Path2DEditor::_confirm_clear_points() {
|
||||
if (!node || node->get_curve().is_null()) {
|
||||
return;
|
||||
|
|
@ -638,73 +688,81 @@ void Path2DEditor::_restore_curve_points(Path2D *p_path2d, const PackedVector2Ar
|
|||
}
|
||||
|
||||
Path2DEditor::Path2DEditor() {
|
||||
toolbar = memnew(HBoxContainer);
|
||||
|
||||
curve_edit = memnew(Button);
|
||||
curve_edit->set_theme_type_variation("FlatButton");
|
||||
curve_edit->set_theme_type_variation(SceneStringName(FlatButton));
|
||||
curve_edit->set_toggle_mode(true);
|
||||
curve_edit->set_pressed(true);
|
||||
curve_edit->set_focus_mode(Control::FOCUS_NONE);
|
||||
curve_edit->set_tooltip_text(TTR("Select Points") + "\n" + TTR("Shift+Drag: Select Control Points") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Click: Add Point") + "\n" + TTR("Left Click: Split Segment (in curve)") + "\n" + TTR("Right Click: Delete Point"));
|
||||
curve_edit->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_EDIT));
|
||||
add_child(curve_edit);
|
||||
toolbar->add_child(curve_edit);
|
||||
|
||||
curve_edit_curve = memnew(Button);
|
||||
curve_edit_curve->set_theme_type_variation("FlatButton");
|
||||
curve_edit_curve->set_theme_type_variation(SceneStringName(FlatButton));
|
||||
curve_edit_curve->set_toggle_mode(true);
|
||||
curve_edit_curve->set_focus_mode(Control::FOCUS_NONE);
|
||||
curve_edit_curve->set_tooltip_text(TTR("Select Control Points (Shift+Drag)"));
|
||||
curve_edit_curve->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_EDIT_CURVE));
|
||||
add_child(curve_edit_curve);
|
||||
toolbar->add_child(curve_edit_curve);
|
||||
|
||||
curve_create = memnew(Button);
|
||||
curve_create->set_theme_type_variation("FlatButton");
|
||||
curve_create->set_theme_type_variation(SceneStringName(FlatButton));
|
||||
curve_create->set_toggle_mode(true);
|
||||
curve_create->set_focus_mode(Control::FOCUS_NONE);
|
||||
curve_create->set_tooltip_text(TTR("Add Point (in empty space)") + "\n" + TTR("Right Click: Delete Point"));
|
||||
curve_create->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_CREATE));
|
||||
add_child(curve_create);
|
||||
toolbar->add_child(curve_create);
|
||||
|
||||
curve_del = memnew(Button);
|
||||
curve_del->set_theme_type_variation("FlatButton");
|
||||
curve_del->set_theme_type_variation(SceneStringName(FlatButton));
|
||||
curve_del->set_toggle_mode(true);
|
||||
curve_del->set_focus_mode(Control::FOCUS_NONE);
|
||||
curve_del->set_tooltip_text(TTR("Delete Point"));
|
||||
curve_del->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_DELETE));
|
||||
add_child(curve_del);
|
||||
toolbar->add_child(curve_del);
|
||||
|
||||
curve_close = memnew(Button);
|
||||
curve_close->set_theme_type_variation("FlatButton");
|
||||
curve_close->set_theme_type_variation(SceneStringName(FlatButton));
|
||||
curve_close->set_focus_mode(Control::FOCUS_NONE);
|
||||
curve_close->set_tooltip_text(TTR("Close Curve"));
|
||||
curve_close->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_CLOSE));
|
||||
add_child(curve_close);
|
||||
toolbar->add_child(curve_close);
|
||||
|
||||
curve_clear_points = memnew(Button);
|
||||
curve_clear_points->set_theme_type_variation("FlatButton");
|
||||
curve_clear_points->set_theme_type_variation(SceneStringName(FlatButton));
|
||||
curve_clear_points->set_focus_mode(Control::FOCUS_NONE);
|
||||
curve_clear_points->set_tooltip_text(TTR("Clear Points"));
|
||||
curve_clear_points->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_confirm_clear_points));
|
||||
add_child(curve_clear_points);
|
||||
toolbar->add_child(curve_clear_points);
|
||||
|
||||
clear_points_dialog = memnew(ConfirmationDialog);
|
||||
clear_points_dialog->set_title(TTR("Please Confirm..."));
|
||||
clear_points_dialog->set_text(TTR("Remove all curve points?"));
|
||||
clear_points_dialog->connect(SceneStringName(confirmed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_CLEAR_POINTS));
|
||||
add_child(clear_points_dialog);
|
||||
|
||||
PopupMenu *menu;
|
||||
toolbar->add_child(clear_points_dialog);
|
||||
|
||||
handle_menu = memnew(MenuButton);
|
||||
handle_menu->set_flat(false);
|
||||
handle_menu->set_theme_type_variation("FlatMenuButton");
|
||||
handle_menu->set_text(TTR("Options"));
|
||||
add_child(handle_menu);
|
||||
toolbar->add_child(handle_menu);
|
||||
|
||||
menu = handle_menu->get_popup();
|
||||
PopupMenu *menu = handle_menu->get_popup();
|
||||
menu->add_check_item(TTR("Mirror Handle Angles"));
|
||||
menu->set_item_checked(HANDLE_OPTION_ANGLE, mirror_handle_angle);
|
||||
menu->add_check_item(TTR("Mirror Handle Lengths"));
|
||||
menu->set_item_checked(HANDLE_OPTION_LENGTH, mirror_handle_length);
|
||||
menu->connect(SceneStringName(id_pressed), callable_mp(this, &Path2DEditor::_handle_option_pressed));
|
||||
|
||||
add_child(toolbar);
|
||||
|
||||
create_curve_button = memnew(Button);
|
||||
create_curve_button->set_text(TTR("Create Curve"));
|
||||
create_curve_button->hide();
|
||||
add_child(create_curve_button);
|
||||
create_curve_button->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_create_curve));
|
||||
}
|
||||
|
||||
void Path2DEditorPlugin::edit(Object *p_object) {
|
||||
|
|
@ -718,7 +776,6 @@ bool Path2DEditorPlugin::handles(Object *p_object) const {
|
|||
void Path2DEditorPlugin::make_visible(bool p_visible) {
|
||||
if (p_visible) {
|
||||
path2d_editor->show();
|
||||
|
||||
} else {
|
||||
path2d_editor->hide();
|
||||
path2d_editor->edit(nullptr);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue