godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a6b20c1816
godot/editor/plugins/path_2d_editor_plugin.cpp

622 lines
24 KiB
C++
Raw Normal View History

GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/*************************************************************************/
/* path_2d_editor_plugin.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
Use HTTPS URL for Godot's website in the headers
2017-08-27 12:16:55 +00:00
/* https://godotengine.org */
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/*************************************************************************/
Update copyright statements to 2022 Happy new year to the wonderful Godot community!
2022-01-03 20:27:34 +00:00
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
Add missing copyright headers and fix formatting Using `misc/scripts/fix_headers.py` on all Godot files. Some missing header guards were added, and the header inclusion order was fixed in the Bullet module.
2018-01-04 23:50:27 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
#include "path_2d_editor_plugin.h"
#include "canvas_item_editor_plugin.h"
Core: Move DirAccess and FileAccess to `core/io` File handling APIs are typically considered part of I/O, and we did have most `FileAccess` implementations in `core/io` already.
2021-06-11 12:51:48 +00:00
#include "core/io/file_access.h"
Make core/ includes absolute, remove subfolders from include path This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
2018-09-11 16:13:45 +00:00
#include "core/os/keyboard.h"
Cleans up headers included in editor_node.h
2019-12-24 07:17:23 +00:00
#include "editor/editor_scale.h"
Refactoring: rename tools/editor/ to editor/ The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful.
2017-03-05 13:21:25 +00:00
#include "editor/editor_settings.h"
Dead code tells no tales
2017-08-27 19:07:15 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void Path2DEditor::_notification(int p_what) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
switch (p_what) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case NOTIFICATION_READY: {
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 11:26:56 +00:00
//button_create->set_icon( get_icon("Edit","EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//button_edit->set_icon( get_icon("MovePoint","EditorIcons"));
//set_pressed_button(button_edit);
//button_edit->set_pressed(true);
} break;
Renamed fixed_process to physics_process
2017-09-30 14:19:07 +00:00
case NOTIFICATION_PHYSICS_PROCESS: {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
}
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 12:29:06 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void Path2DEditor::_node_removed(Node *p_node) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_node == node) {
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
node = nullptr;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
hide();
}
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!node) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return false;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!node->is_visible_in_tree()) {
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
return false;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!node->get_curve().is_valid()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return false;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Rename polygon editor settings for better display in the Editor Settings
2021-08-23 15:59:19 +00:00
real_t grab_threshold = EDITOR_GET("editors/polygon_editor/point_grab_radius");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
Ref<InputEventMouseButton> mb = p_event;
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (mb.is_valid()) {
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
Vector2 gpoint = mb->get_position();
Use get_global_* functions instead of using transforms.
2021-08-14 08:16:57 +00:00
Vector2 cpoint = node->to_local(canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(mb->get_position())));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (mb->is_pressed() && action == ACTION_NONE) {
Ref<Curve2D> curve = node->get_curve();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
for (int i = 0; i < curve->get_point_count(); i++) {
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
real_t dist_to_p = gpoint.distance_to(xform.xform(curve->get_point_position(i)));
real_t dist_to_p_out = gpoint.distance_to(xform.xform(curve->get_point_position(i) + curve->get_point_out(i)));
real_t dist_to_p_in = gpoint.distance_to(xform.xform(curve->get_point_position(i) + curve->get_point_in(i)));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
// Check for point movement start (for point + in/out controls).
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (mb->get_button_index() == MouseButton::LEFT) {
Rename "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
if (mode == MODE_EDIT && !mb->is_shift_pressed() && dist_to_p < grab_threshold) {
Fix moving path controls in edit mode. The previous code would never trigger the subsequent conditionals (for moving the control points) when in EDIT_MODE because the point conditionals were nested instead of being a conjunction.
2017-05-28 00:56:20 +00:00
// Points can only be moved in edit mode.
action = ACTION_MOVING_POINT;
action_point = i;
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
moving_from = curve->get_point_position(i);
Fix moving path controls in edit mode. The previous code would never trigger the subsequent conditionals (for moving the control points) when in EDIT_MODE because the point conditionals were nested instead of being a conjunction.
2017-05-28 00:56:20 +00:00
moving_screen_from = gpoint;
return true;
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
} else if (mode == MODE_EDIT || mode == MODE_EDIT_CURVE) {
// In/out controls can be moved in multiple modes.
if (dist_to_p_out < grab_threshold && i < (curve->get_point_count() - 1)) {
action = ACTION_MOVING_OUT;
action_point = i;
moving_from = curve->get_point_out(i);
moving_screen_from = gpoint;
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
orig_in_length = curve->get_point_in(action_point).length();
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
return true;
} else if (dist_to_p_in < grab_threshold && i > 0) {
action = ACTION_MOVING_IN;
action_point = i;
moving_from = curve->get_point_in(i);
moving_screen_from = gpoint;
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
orig_out_length = curve->get_point_out(action_point).length();
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
return true;
}
Add the ability to delete bezier path handles.
2016-10-27 06:18:18 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
// Check for point deletion.
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if ((mb->get_button_index() == MouseButton::RIGHT && mode == MODE_EDIT) || (mb->get_button_index() == MouseButton::LEFT && mode == MODE_DELETE)) {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (dist_to_p < grab_threshold) {
undo_redo->create_action(TTR("Remove Point from Curve"));
undo_redo->add_do_method(curve.ptr(), "remove_point", i);
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
undo_redo->add_undo_method(curve.ptr(), "add_point", curve->get_point_position(i), curve->get_point_in(i), curve->get_point_out(i), i);
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
undo_redo->add_do_method(canvas_item_editor, "update_viewport");
undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
undo_redo->commit_action();
return true;
} else if (dist_to_p_out < grab_threshold) {
undo_redo->create_action(TTR("Remove Out-Control from Curve"));
undo_redo->add_do_method(curve.ptr(), "set_point_out", i, Vector2());
undo_redo->add_undo_method(curve.ptr(), "set_point_out", i, curve->get_point_out(i));
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
undo_redo->add_do_method(canvas_item_editor, "update_viewport");
undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
undo_redo->commit_action();
return true;
} else if (dist_to_p_in < grab_threshold) {
undo_redo->create_action(TTR("Remove In-Control from Curve"));
undo_redo->add_do_method(curve.ptr(), "set_point_in", i, Vector2());
undo_redo->add_undo_method(curve.ptr(), "set_point_in", i, curve->get_point_in(i));
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
undo_redo->add_do_method(canvas_item_editor, "update_viewport");
undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
undo_redo->commit_action();
return true;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
}
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
// Check for point creation.
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT && ((mb->is_command_pressed() && mode == MODE_EDIT) || mode == MODE_CREATE)) {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Ref<Curve2D> curve = node->get_curve();
Move point in Path2D edtitor now respect snap configure; Press Alt when moving point to activate view base snapping; Path2D editor inherits from HBoxContainer now"
2014-04-03 08:19:06 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
undo_redo->create_action(TTR("Add Point to Curve"));
undo_redo->add_do_method(curve.ptr(), "add_point", cpoint);
undo_redo->add_undo_method(curve.ptr(), "remove_point", curve->get_point_count());
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
undo_redo->add_do_method(canvas_item_editor, "update_viewport");
undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
undo_redo->commit_action();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
action = ACTION_MOVING_POINT;
action_point = curve->get_point_count() - 1;
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
moving_from = curve->get_point_position(action_point);
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
moving_screen_from = gpoint;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
canvas_item_editor->update_viewport();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
return true;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
// Check for segment split.
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT && mode == MODE_EDIT && on_edge) {
Add -Wshadow=local to warnings and fix reported issues. Fixes #25316.
2019-02-12 20:10:08 +00:00
Vector2 gpoint2 = mb->get_position();
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
Ref<Curve2D> curve = node->get_curve();
int insertion_point = -1;
Add -Wshadow=local to warnings and fix reported issues. Fixes #25316.
2019-02-12 20:10:08 +00:00
float mbLength = curve->get_closest_offset(xform.affine_inverse().xform(gpoint2));
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
int len = curve->get_point_count();
for (int i = 0; i < len - 1; i++) {
float compareLength = curve->get_closest_offset(curve->get_point_position(i + 1));
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (mbLength >= curve->get_closest_offset(curve->get_point_position(i)) && mbLength <= compareLength) {
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
insertion_point = i;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
}
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (insertion_point == -1) {
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
insertion_point = curve->get_point_count() - 2;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
undo_redo->create_action(TTR("Split Curve"));
Add -Wshadow=local to warnings and fix reported issues. Fixes #25316.
2019-02-12 20:10:08 +00:00
undo_redo->add_do_method(curve.ptr(), "add_point", xform.affine_inverse().xform(gpoint2), Vector2(0, 0), Vector2(0, 0), insertion_point + 1);
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
undo_redo->add_undo_method(curve.ptr(), "remove_point", insertion_point + 1);
undo_redo->add_do_method(canvas_item_editor, "update_viewport");
undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
undo_redo->commit_action();
action = ACTION_MOVING_POINT;
action_point = insertion_point + 1;
moving_from = curve->get_point_position(action_point);
Add -Wshadow=local to warnings and fix reported issues. Fixes #25316.
2019-02-12 20:10:08 +00:00
moving_screen_from = gpoint2;
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
canvas_item_editor->update_viewport();
on_edge = false;
return true;
}
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
// Check for point movement completion.
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (!mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT && action != ACTION_NONE) {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Ref<Curve2D> curve = node->get_curve();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Vector2 new_pos = moving_from + xform.affine_inverse().basis_xform(gpoint - moving_screen_from);
switch (action) {
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
case ACTION_NONE:
// N/A, handled in above condition.
break;
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case ACTION_MOVING_POINT: {
undo_redo->create_action(TTR("Move Point in Curve"));
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
undo_redo->add_do_method(curve.ptr(), "set_point_position", action_point, cpoint);
undo_redo->add_undo_method(curve.ptr(), "set_point_position", action_point, moving_from);
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
undo_redo->add_do_method(canvas_item_editor, "update_viewport");
undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
undo_redo->commit_action();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case ACTION_MOVING_IN: {
undo_redo->create_action(TTR("Move In-Control in Curve"));
undo_redo->add_do_method(curve.ptr(), "set_point_in", action_point, new_pos);
undo_redo->add_undo_method(curve.ptr(), "set_point_in", action_point, moving_from);
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
if (mirror_handle_angle) {
undo_redo->add_do_method(curve.ptr(), "set_point_out", action_point, mirror_handle_length ? -new_pos : (-new_pos.normalized() * orig_out_length));
undo_redo->add_undo_method(curve.ptr(), "set_point_out", action_point, mirror_handle_length ? -moving_from : (-moving_from.normalized() * orig_out_length));
}
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
undo_redo->add_do_method(canvas_item_editor, "update_viewport");
undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
undo_redo->commit_action();
} break;
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
case ACTION_MOVING_OUT: {
undo_redo->create_action(TTR("Move Out-Control in Curve"));
undo_redo->add_do_method(curve.ptr(), "set_point_out", action_point, new_pos);
undo_redo->add_undo_method(curve.ptr(), "set_point_out", action_point, moving_from);
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
if (mirror_handle_angle) {
undo_redo->add_do_method(curve.ptr(), "set_point_in", action_point, mirror_handle_length ? -new_pos : (-new_pos.normalized() * orig_in_length));
undo_redo->add_undo_method(curve.ptr(), "set_point_in", action_point, mirror_handle_length ? -moving_from : (-moving_from.normalized() * orig_in_length));
}
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
undo_redo->add_do_method(canvas_item_editor, "update_viewport");
undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
undo_redo->commit_action();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
action = ACTION_NONE;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
return true;
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Ref<InputEventMouseMotion> mm = p_event;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (mm.is_valid()) {
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
if (action == ACTION_NONE && mode == MODE_EDIT) {
// Handle Edge Follow
bool old_edge = on_edge;
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
Vector2 gpoint = mm->get_position();
Ref<Curve2D> curve = node->get_curve();
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (curve == nullptr) {
Style: clang-format: Disable AllowShortIfStatementsOnASingleLine Part of #33027, also discussed in #29848. Enforcing the use of brackets even on single line statements would be preferred, but `clang-format` doesn't have this functionality yet.
2020-05-10 10:56:01 +00:00
return true;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
if (curve->get_point_count() < 2) {
Style: clang-format: Disable AllowShortIfStatementsOnASingleLine Part of #33027, also discussed in #29848. Enforcing the use of brackets even on single line statements would be preferred, but `clang-format` doesn't have this functionality yet.
2020-05-10 10:56:01 +00:00
return true;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
// Find edge
edge_point = xform.xform(curve->get_closest_point(xform.affine_inverse().xform(mm->get_position())));
on_edge = false;
if (edge_point.distance_to(gpoint) <= grab_threshold) {
on_edge = true;
}
// However, if near a control point or its in-out handles then not on edge
int len = curve->get_point_count();
for (int i = 0; i < len; i++) {
Vector2 pp = curve->get_point_position(i);
Vector2 p = xform.xform(pp);
if (p.distance_to(gpoint) <= grab_threshold) {
on_edge = false;
break;
}
p = xform.xform(pp + curve->get_point_in(i));
if (p.distance_to(gpoint) <= grab_threshold) {
on_edge = false;
break;
}
p = xform.xform(pp + curve->get_point_out(i));
if (p.distance_to(gpoint) <= grab_threshold) {
on_edge = false;
break;
}
}
if (on_edge || old_edge != on_edge) {
canvas_item_editor->update_viewport();
return true;
}
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
if (action != ACTION_NONE) {
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
// Handle point/control movement.
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 08:54:24 +00:00
Vector2 gpoint = mm->get_position();
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 20:33:25 +00:00
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())));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Ref<Curve2D> curve = node->get_curve();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
Vector2 new_pos = moving_from + xform.affine_inverse().basis_xform(gpoint - moving_screen_from);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
switch (action) {
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
case ACTION_NONE:
// N/A, handled in above condition.
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
case ACTION_MOVING_POINT: {
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
curve->set_point_position(action_point, cpoint);
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
case ACTION_MOVING_IN: {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
curve->set_point_in(action_point, new_pos);
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (mirror_handle_angle) {
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
curve->set_point_out(action_point, mirror_handle_length ? -new_pos : (-new_pos.normalized() * orig_out_length));
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix 2d path editor controls. Fixes #502. This appears to have been broken due to a merge conflict after the InputEvents changes.
2017-05-21 21:10:10 +00:00
case ACTION_MOVING_OUT: {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
curve->set_point_out(action_point, new_pos);
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (mirror_handle_angle) {
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
curve->set_point_in(action_point, mirror_handle_length ? -new_pos : (-new_pos.normalized() * orig_in_length));
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
canvas_item_editor->update_viewport();
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 15:38:03 +00:00
return true;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
return false;
}
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 20:33:25 +00:00
Fixes drawing of the 2D plugins on the 3D view
2018-09-18 18:00:07 +00:00
void Path2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!node || !node->is_visible_in_tree() || !node->get_curve().is_valid()) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Improve the appearance of 2D path editors - Add new handle icons for path/polygon editors - Add smooth path point icons and curve tangent icons - Use a gray color for tangent lines in the Path2D and Path editors - Use antialiasing for Path2D lines
2019-08-18 20:18:57 +00:00
Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
Optimize StringName usage * Added a new macro SNAME() that constructs and caches a local stringname. * Subsequent usages use the cached version. * Since these use a global static variable, a second refcounter of static usages need to be kept for cleanup time. * Replaced all theme usages by this new macro. * Replace all signal emission usages by this new macro. * Replace all call_deferred usages by this new macro. This is part of ongoing work to optimize GUI and the editor.
2021-07-17 21:22:52 +00:00
const Ref<Texture2D> path_sharp_handle = get_theme_icon(SNAME("EditorPathSharpHandle"), SNAME("EditorIcons"));
const Ref<Texture2D> path_smooth_handle = get_theme_icon(SNAME("EditorPathSmoothHandle"), SNAME("EditorIcons"));
Improve the appearance of 2D path editors - Add new handle icons for path/polygon editors - Add smooth path point icons and curve tangent icons - Use a gray color for tangent lines in the Path2D and Path editors - Use antialiasing for Path2D lines
2019-08-18 20:18:57 +00:00
// Both handle icons must be of the same size
const Size2 handle_size = path_sharp_handle->get_size();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Optimize StringName usage * Added a new macro SNAME() that constructs and caches a local stringname. * Subsequent usages use the cached version. * Since these use a global static variable, a second refcounter of static usages need to be kept for cleanup time. * Replaced all theme usages by this new macro. * Replace all signal emission usages by this new macro. * Replace all call_deferred usages by this new macro. This is part of ongoing work to optimize GUI and the editor.
2021-07-17 21:22:52 +00:00
const Ref<Texture2D> curve_handle = get_theme_icon(SNAME("EditorCurveHandle"), SNAME("EditorIcons"));
Improve the appearance of 2D path editors - Add new handle icons for path/polygon editors - Add smooth path point icons and curve tangent icons - Use a gray color for tangent lines in the Path2D and Path editors - Use antialiasing for Path2D lines
2019-08-18 20:18:57 +00:00
const Size2 curve_handle_size = curve_handle->get_size();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Ref<Curve2D> curve = node->get_curve();
int len = curve->get_point_count();
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
Control *vpc = canvas_item_editor->get_viewport_control();
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
for (int i = 0; i < len; i++) {
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
Vector2 point = xform.xform(curve->get_point_position(i));
Improve the appearance of 2D path editors - Add new handle icons for path/polygon editors - Add smooth path point icons and curve tangent icons - Use a gray color for tangent lines in the Path2D and Path editors - Use antialiasing for Path2D lines
2019-08-18 20:18:57 +00:00
// Determines the point icon to be used
bool smooth = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (i < len - 1) {
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
Vector2 pointout = xform.xform(curve->get_point_position(i) + curve->get_point_out(i));
Improve the appearance of 2D path editors - Add new handle icons for path/polygon editors - Add smooth path point icons and curve tangent icons - Use a gray color for tangent lines in the Path2D and Path editors - Use antialiasing for Path2D lines
2019-08-18 20:18:57 +00:00
if (point != pointout) {
smooth = true;
// Draw the line with a dark and light color to be visible on all backgrounds
Bugfixes and ability to better specify filter and repeat modes everywhere. Removes antialiased flag for draw_* methods.
2019-06-25 01:24:07 +00:00
vpc->draw_line(point, pointout, Color(0, 0, 0, 0.5), Math::round(EDSCALE));
vpc->draw_line(point, pointout, Color(1, 1, 1, 0.5), Math::round(EDSCALE));
Improve the appearance of 2D path editors - Add new handle icons for path/polygon editors - Add smooth path point icons and curve tangent icons - Use a gray color for tangent lines in the Path2D and Path editors - Use antialiasing for Path2D lines
2019-08-18 20:18:57 +00:00
vpc->draw_texture_rect(curve_handle, Rect2(pointout - curve_handle_size * 0.5, curve_handle_size), false, Color(1, 1, 1, 0.75));
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (i > 0) {
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
Vector2 pointin = xform.xform(curve->get_point_position(i) + curve->get_point_in(i));
Improve the appearance of 2D path editors - Add new handle icons for path/polygon editors - Add smooth path point icons and curve tangent icons - Use a gray color for tangent lines in the Path2D and Path editors - Use antialiasing for Path2D lines
2019-08-18 20:18:57 +00:00
if (point != pointin) {
smooth = true;
// Draw the line with a dark and light color to be visible on all backgrounds
Bugfixes and ability to better specify filter and repeat modes everywhere. Removes antialiased flag for draw_* methods.
2019-06-25 01:24:07 +00:00
vpc->draw_line(point, pointin, Color(0, 0, 0, 0.5), Math::round(EDSCALE));
vpc->draw_line(point, pointin, Color(1, 1, 1, 0.5), Math::round(EDSCALE));
Improve the appearance of 2D path editors - Add new handle icons for path/polygon editors - Add smooth path point icons and curve tangent icons - Use a gray color for tangent lines in the Path2D and Path editors - Use antialiasing for Path2D lines
2019-08-18 20:18:57 +00:00
vpc->draw_texture_rect(curve_handle, Rect2(pointin - curve_handle_size * 0.5, curve_handle_size), false, Color(1, 1, 1, 0.75));
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Improve the appearance of 2D path editors - Add new handle icons for path/polygon editors - Add smooth path point icons and curve tangent icons - Use a gray color for tangent lines in the Path2D and Path editors - Use antialiasing for Path2D lines
2019-08-18 20:18:57 +00:00
vpc->draw_texture_rect(
smooth ? path_smooth_handle : path_sharp_handle,
Rect2(point - handle_size * 0.5, handle_size),
false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
if (on_edge) {
Optimize StringName usage * Added a new macro SNAME() that constructs and caches a local stringname. * Subsequent usages use the cached version. * Since these use a global static variable, a second refcounter of static usages need to be kept for cleanup time. * Replaced all theme usages by this new macro. * Replace all signal emission usages by this new macro. * Replace all call_deferred usages by this new macro. This is part of ongoing work to optimize GUI and the editor.
2021-07-17 21:22:52 +00:00
Ref<Texture2D> add_handle = get_theme_icon(SNAME("EditorHandleAdd"), SNAME("EditorIcons"));
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
p_overlay->draw_texture(add_handle, edge_point - add_handle->get_size() * 0.5);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
void Path2DEditor::_node_visibility_changed() {
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!node) {
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
canvas_item_editor->update_viewport();
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
void Path2DEditor::edit(Node *p_path2d) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!canvas_item_editor) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
canvas_item_editor = CanvasItemEditor::get_singleton();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
if (p_path2d) {
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
node = Object::cast_to<Path2D>(p_path2d);
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!node->is_connected("visibility_changed", callable_mp(this, &Path2DEditor::_node_visibility_changed))) {
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 17:28:45 +00:00
node->connect("visibility_changed", callable_mp(this, &Path2DEditor::_node_visibility_changed));
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Fixed delete path2d node will crash editor
2014-04-02 17:28:16 +00:00
// node may have been deleted at this point
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (node && node->is_connected("visibility_changed", callable_mp(this, &Path2DEditor::_node_visibility_changed))) {
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 17:28:45 +00:00
node->disconnect("visibility_changed", callable_mp(this, &Path2DEditor::_node_visibility_changed));
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
node = nullptr;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
void Path2DEditor::_bind_methods() {
Rename the _MD macro to D_METHOD This new name also makes its purpose a little clearer This is a step towards fixing #56
2017-02-13 11:47:24 +00:00
//ClassDB::bind_method(D_METHOD("_menu_option"),&Path2DEditor::_menu_option);
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
}
void Path2DEditor::_mode_selected(int p_mode) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
if (p_mode == MODE_CREATE) {
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
curve_create->set_pressed(true);
curve_edit->set_pressed(false);
curve_edit_curve->set_pressed(false);
curve_del->set_pressed(false);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
} else if (p_mode == MODE_EDIT) {
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
curve_create->set_pressed(false);
curve_edit->set_pressed(true);
curve_edit_curve->set_pressed(false);
curve_del->set_pressed(false);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
} else if (p_mode == MODE_EDIT_CURVE) {
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
curve_create->set_pressed(false);
curve_edit->set_pressed(false);
curve_edit_curve->set_pressed(true);
curve_del->set_pressed(false);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
} else if (p_mode == MODE_DELETE) {
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
curve_create->set_pressed(false);
curve_edit->set_pressed(false);
curve_edit_curve->set_pressed(false);
curve_del->set_pressed(true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
} else if (p_mode == ACTION_CLOSE) {
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
//?
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
if (!node->get_curve().is_valid()) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
if (node->get_curve()->get_point_count() < 3) {
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 13:37:49 +00:00
Vector2 begin = node->get_curve()->get_point_position(0);
Vector2 end = node->get_curve()->get_point_position(node->get_curve()->get_point_count() - 1);
Use is_equal_approx in more places
2021-07-16 17:19:55 +00:00
if (begin.is_equal_approx(end)) {
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
return;
Style: Enforce braces around if blocks and loops Using clang-tidy's `readability-braces-around-statements`. https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
2020-05-14 14:41:43 +00:00
}
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
undo_redo->create_action(TTR("Remove Point from Curve"));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
undo_redo->add_do_method(node->get_curve().ptr(), "add_point", begin);
undo_redo->add_undo_method(node->get_curve().ptr(), "remove_point", node->get_curve()->get_point_count());
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
undo_redo->add_do_method(canvas_item_editor, "update_viewport");
undo_redo->add_undo_method(canvas_item_editor, "update_viewport");
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
undo_redo->commit_action();
return;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
mode = Mode(p_mode);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
void Path2DEditor::_handle_option_pressed(int p_option) {
PopupMenu *pm;
pm = handle_menu->get_popup();
switch (p_option) {
case HANDLE_OPTION_ANGLE: {
bool is_checked = pm->is_item_checked(HANDLE_OPTION_ANGLE);
mirror_handle_angle = !is_checked;
pm->set_item_checked(HANDLE_OPTION_ANGLE, mirror_handle_angle);
pm->set_item_disabled(HANDLE_OPTION_LENGTH, !mirror_handle_angle);
} break;
case HANDLE_OPTION_LENGTH: {
bool is_checked = pm->is_item_checked(HANDLE_OPTION_LENGTH);
mirror_handle_length = !is_checked;
pm->set_item_checked(HANDLE_OPTION_LENGTH, mirror_handle_length);
} break;
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Path2DEditor::Path2DEditor(EditorNode *p_editor) {
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
canvas_item_editor = nullptr;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
editor = p_editor;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
undo_redo = editor->get_undo_redo();
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
mirror_handle_angle = true;
mirror_handle_length = true;
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
on_edge = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
mode = MODE_EDIT;
action = ACTION_NONE;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
base_hb = memnew(HBoxContainer);
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
CanvasItemEditor::get_singleton()->add_control_to_menu_panel(base_hb);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
sep = memnew(VSeparator);
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
base_hb->add_child(sep);
Remove ToolButton in favor of Button ToolButton has no redeeming differences with Button; it's just a Button with the Flat property enabled by default. Removing it avoids some confusion when creating GUIs. Existing ToolButtons will be converted to Buttons, but the Flat property won't be enabled automatically. This closes https://github.com/godotengine/godot-proposals/issues/1081.
2020-06-19 18:49:04 +00:00
curve_edit = memnew(Button);
curve_edit->set_flat(true);
Optimize StringName usage * Added a new macro SNAME() that constructs and caches a local stringname. * Subsequent usages use the cached version. * Since these use a global static variable, a second refcounter of static usages need to be kept for cleanup time. * Replaced all theme usages by this new macro. * Replace all signal emission usages by this new macro. * Replace all call_deferred usages by this new macro. This is part of ongoing work to optimize GUI and the editor.
2021-07-17 21:22:52 +00:00
curve_edit->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveEdit"), SNAME("EditorIcons")));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
curve_edit->set_toggle_mode(true);
curve_edit->set_focus_mode(Control::FOCUS_NONE);
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
curve_edit->set_tooltip(TTR("Select Points") + "\n" + TTR("Shift+Drag: Select Control Points") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD) + TTR("Click: Add Point") + "\n" + TTR("Left Click: Split Segment (in curve)") + "\n" + TTR("Right Click: Delete Point"));
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 17:28:45 +00:00
curve_edit->connect("pressed", callable_mp(this, &Path2DEditor::_mode_selected), varray(MODE_EDIT));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
base_hb->add_child(curve_edit);
Remove ToolButton in favor of Button ToolButton has no redeeming differences with Button; it's just a Button with the Flat property enabled by default. Removing it avoids some confusion when creating GUIs. Existing ToolButtons will be converted to Buttons, but the Flat property won't be enabled automatically. This closes https://github.com/godotengine/godot-proposals/issues/1081.
2020-06-19 18:49:04 +00:00
curve_edit_curve = memnew(Button);
curve_edit_curve->set_flat(true);
Optimize StringName usage * Added a new macro SNAME() that constructs and caches a local stringname. * Subsequent usages use the cached version. * Since these use a global static variable, a second refcounter of static usages need to be kept for cleanup time. * Replaced all theme usages by this new macro. * Replace all signal emission usages by this new macro. * Replace all call_deferred usages by this new macro. This is part of ongoing work to optimize GUI and the editor.
2021-07-17 21:22:52 +00:00
curve_edit_curve->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveCurve"), SNAME("EditorIcons")));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
curve_edit_curve->set_toggle_mode(true);
curve_edit_curve->set_focus_mode(Control::FOCUS_NONE);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
curve_edit_curve->set_tooltip(TTR("Select Control Points (Shift+Drag)"));
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 17:28:45 +00:00
curve_edit_curve->connect("pressed", callable_mp(this, &Path2DEditor::_mode_selected), varray(MODE_EDIT_CURVE));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
base_hb->add_child(curve_edit_curve);
Remove ToolButton in favor of Button ToolButton has no redeeming differences with Button; it's just a Button with the Flat property enabled by default. Removing it avoids some confusion when creating GUIs. Existing ToolButtons will be converted to Buttons, but the Flat property won't be enabled automatically. This closes https://github.com/godotengine/godot-proposals/issues/1081.
2020-06-19 18:49:04 +00:00
curve_create = memnew(Button);
curve_create->set_flat(true);
Optimize StringName usage * Added a new macro SNAME() that constructs and caches a local stringname. * Subsequent usages use the cached version. * Since these use a global static variable, a second refcounter of static usages need to be kept for cleanup time. * Replaced all theme usages by this new macro. * Replace all signal emission usages by this new macro. * Replace all call_deferred usages by this new macro. This is part of ongoing work to optimize GUI and the editor.
2021-07-17 21:22:52 +00:00
curve_create->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveCreate"), SNAME("EditorIcons")));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
curve_create->set_toggle_mode(true);
curve_create->set_focus_mode(Control::FOCUS_NONE);
Fixed an issue with the Path2D plugin editor not supporting the capability to split curves as its toolbar buttons originally advertised.
2018-12-01 20:45:54 +00:00
curve_create->set_tooltip(TTR("Add Point (in empty space)"));
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 17:28:45 +00:00
curve_create->connect("pressed", callable_mp(this, &Path2DEditor::_mode_selected), varray(MODE_CREATE));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
base_hb->add_child(curve_create);
Remove ToolButton in favor of Button ToolButton has no redeeming differences with Button; it's just a Button with the Flat property enabled by default. Removing it avoids some confusion when creating GUIs. Existing ToolButtons will be converted to Buttons, but the Flat property won't be enabled automatically. This closes https://github.com/godotengine/godot-proposals/issues/1081.
2020-06-19 18:49:04 +00:00
curve_del = memnew(Button);
curve_del->set_flat(true);
Optimize StringName usage * Added a new macro SNAME() that constructs and caches a local stringname. * Subsequent usages use the cached version. * Since these use a global static variable, a second refcounter of static usages need to be kept for cleanup time. * Replaced all theme usages by this new macro. * Replace all signal emission usages by this new macro. * Replace all call_deferred usages by this new macro. This is part of ongoing work to optimize GUI and the editor.
2021-07-17 21:22:52 +00:00
curve_del->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveDelete"), SNAME("EditorIcons")));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
curve_del->set_toggle_mode(true);
curve_del->set_focus_mode(Control::FOCUS_NONE);
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-18 22:08:12 +00:00
curve_del->set_tooltip(TTR("Delete Point"));
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 17:28:45 +00:00
curve_del->connect("pressed", callable_mp(this, &Path2DEditor::_mode_selected), varray(MODE_DELETE));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
base_hb->add_child(curve_del);
Remove ToolButton in favor of Button ToolButton has no redeeming differences with Button; it's just a Button with the Flat property enabled by default. Removing it avoids some confusion when creating GUIs. Existing ToolButtons will be converted to Buttons, but the Flat property won't be enabled automatically. This closes https://github.com/godotengine/godot-proposals/issues/1081.
2020-06-19 18:49:04 +00:00
curve_close = memnew(Button);
curve_close->set_flat(true);
Optimize StringName usage * Added a new macro SNAME() that constructs and caches a local stringname. * Subsequent usages use the cached version. * Since these use a global static variable, a second refcounter of static usages need to be kept for cleanup time. * Replaced all theme usages by this new macro. * Replace all signal emission usages by this new macro. * Replace all call_deferred usages by this new macro. This is part of ongoing work to optimize GUI and the editor.
2021-07-17 21:22:52 +00:00
curve_close->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("CurveClose"), SNAME("EditorIcons")));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
curve_close->set_focus_mode(Control::FOCUS_NONE);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
curve_close->set_tooltip(TTR("Close Curve"));
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 17:28:45 +00:00
curve_close->connect("pressed", callable_mp(this, &Path2DEditor::_mode_selected), varray(ACTION_CLOSE));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
base_hb->add_child(curve_close);
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
PopupMenu *menu;
handle_menu = memnew(MenuButton);
handle_menu->set_text(TTR("Options"));
base_hb->add_child(handle_menu);
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);
Signals: Port connect calls to use callable_mp Remove now unnecessary bindings of signal callbacks in the public API. There might be some false positives that need rebinding if they were meant to be public. No regular expressions were harmed in the making of this commit. (Nah, just kidding.)
2020-02-21 17:28:45 +00:00
menu->connect("id_pressed", callable_mp(this, &Path2DEditor::_handle_option_pressed));
Added option to 2D and 3D curve editor to mirror curve tangent handles both in angle and/or length
2018-05-01 10:13:29 +00:00
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
base_hb->hide();
curve_edit->set_pressed(true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void Path2DEditorPlugin::edit(Object *p_object) {
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 20:58:51 +00:00
path2d_editor->edit(Object::cast_to<Node>(p_object));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
bool Path2DEditorPlugin::handles(Object *p_object) const {
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant. All usages of "type" to refer to classes were renamed to "class" ClassDB has been exposed to GDScript. OBJ_TYPE() macro is now GDCLASS()
2017-01-03 02:03:46 +00:00
return p_object->is_class("Path2D");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void Path2DEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
path2d_editor->show();
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
path2d_editor->base_hb->show();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
path2d_editor->hide();
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 14:49:27 +00:00
path2d_editor->base_hb->hide();
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
path2d_editor->edit(nullptr);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Path2DEditorPlugin::Path2DEditorPlugin(EditorNode *p_node) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
editor = p_node;
path2d_editor = memnew(Path2DEditor(p_node));
Move point in Path2D edtitor now respect snap configure; Press Alt when moving point to activate view base snapping; Path2D editor inherits from HBoxContainer now"
2014-04-03 08:19:06 +00:00
CanvasItemEditor::get_singleton()->add_control_to_menu_panel(path2d_editor);
Fix #244 no path2d handles visible
2014-04-02 15:00:53 +00:00
path2d_editor->hide();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 15:44:50 +00:00
Path2DEditorPlugin::~Path2DEditorPlugin() {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Reference in New Issue Copy Permalink