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

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

5945 lines
233 KiB
C++
Raw Normal View History

One Copyright Update to rule them all As many open source projects have started doing it, we're removing the current year from the copyright notice, so that we don't need to bump it every year. It seems like only the first year of publication is technically relevant for copyright notices, and even that seems to be something that many companies stopped listing altogether (in a version controlled codebase, the commits are a much better source of date of publication than a hardcoded copyright statement). We also now list Godot Engine contributors first as we're collectively the current maintainers of the project, and we clarify that the "exclusive" copyright of the co-founders covers the timespan before opensourcing (their further contributions are included as part of Godot Engine contributors). Also fixed "cf." Frenchism - it's meant as "refer to / see".
2023-01-05 12:25:55 +00:00
/**************************************************************************/
/* canvas_item_editor_plugin.cpp */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* 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 "canvas_item_editor_plugin.h"
Style: Cleanups, added headers, renamed files Made sure files in core/ and tools/ have a proper Godot license header when written by us. Also renamed aabb.{cpp,h} and object_type_db.{cpp,h} to rect3.{cpp,h} and class_db.{cpp,h} respectively. Also added a proper header to core/io/base64.{c,h} after clarifying the licensing with the original author (public domain).
2017-01-16 07:04:19 +00:00
Reorganized core/ directory, it was too fatty already -Removed FuncRef, since Callable makes it obsolete -Removed int_types.h as its obsolete in c++11+ -Changed color names code
2020-11-07 22:33:38 +00:00
#include "core/config/project_settings.h"
Rename InputFilter back to Input It changed name as part of the DisplayServer and input refactoring in #37317, with the rationale that input no longer goes through the main loop, so the previous Input singleton now only does filtering. But the gains in consistency are quite limited in the renaming, and it breaks compatibility for all scripts and tutorials that access the Input singleton via the scripting language. A temporary option was suggested to keep the scripting singleton named `Input` even if its type is `InputFilter`, but that adds inconsistency and breaks C#. Fixes godotengine/godot-proposals#639. Fixes #37319. Fixes #37690.
2020-04-28 13:19:37 +00:00
#include "core/input/input.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"
Huge Debugger/EditorDebugger refactor.
2020-02-07 01:52:05 +00:00
#include "editor/debugger/editor_debugger_node.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_node.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"
Improve compilation speed (forward declarations/includes cleanup)
2022-02-12 01:46:22 +00:00
#include "editor/editor_toaster.h"
Add per-scene UndoRedo
2022-03-25 17:06:46 +00:00
#include "editor/editor_undo_redo_manager.h"
Use forward-declarations in big editor classes
2022-11-19 11:45:49 +00:00
#include "editor/editor_zoom_widget.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/plugins/animation_player_editor_plugin.h"
#include "editor/plugins/script_editor_plugin.h"
Improve compilation speed (forward declarations/includes cleanup)
2022-02-12 01:46:22 +00:00
#include "editor/scene_tree_dock.h"
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
#include "scene/2d/cpu_particles_2d.h"
Rename more 2D and 3D nodes to follow convention Rename editor plugins to match the new node names.
2020-03-27 07:44:44 +00:00
#include "scene/2d/gpu_particles_2d.h"
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
#include "scene/2d/light_2d.h"
#include "scene/2d/polygon_2d.h"
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 19:46:32 +00:00
#include "scene/2d/skeleton_2d.h"
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
#include "scene/2d/sprite_2d.h"
Scene: Ensure classes match their header filename Also drop some unused files. Renamed: - `scene/2d/navigation2d.h` -> `navigation_2d.h` - `scene/2d/screen_button.h` -> `touch_screen_button.h` - `scene/3d/scenario_fx.h` -> `world_environment.h` - `scene/audio/audio_player.h` -> `audio_stream_player.h` - `scene/resources/bit_mask.h` -> `bit_map.h` - `scene/resources/color_ramp.h` -> `gradient.h` - `scene/resources/shape_line_2d.h` -> `line_shape_2d.h` - `scene/resources/scene_format_text.h` -> `resource_format_text.h` - `scene/resources/sky_box.h` -> `sky.h` Dropped: - `scene/resources/bounds.h`
2019-02-12 16:18:13 +00:00
#include "scene/2d/touch_screen_button.h"
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
#include "scene/gui/flow_container.h"
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
#include "scene/gui/grid_container.h"
Finished transition of Patch9Rect to NinePatchRect
2017-10-24 05:59:04 +00:00
#include "scene/gui/nine_patch_rect.h"
Remove excessive `editor/property_editor.h` includes
2022-08-01 14:04:35 +00:00
#include "scene/gui/separator.h"
Use forward-declarations in big editor classes
2022-11-19 11:45:49 +00:00
#include "scene/gui/split_container.h"
Rename ViewportContainer to SubViewportContainer
2020-04-01 18:28:09 +00:00
#include "scene/gui/subviewport_container.h"
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
#include "scene/gui/view_panner.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 "scene/main/canvas_layer.h"
Added a Window node, and made it the scene root. Still a lot of work to do.
2020-03-04 01:51:12 +00:00
#include "scene/main/window.h"
CanvasItemEditorPlugin: Avoid selecting items from instanced scenes - This behaviour is only applied to click selection. Rect selection and List selection can still select these items
2016-04-07 10:59:50 +00:00
#include "scene/resources/packed_scene.h"
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
2D Editor: modified zoom increment to the twelveth root of two - properly visit power of 2 factors (50%, 100%, 200%...) - index based zoom values to prevent floating point issues - Fix 2d editor not able to reach min and max zoom values
2020-03-15 18:13:07 +00:00
// Min and Max are power of two in order to play nicely with successive increment.
// That way, we can naturally reach a 100% zoom from boundaries.
Change some math macros to constexpr Changes `MAX`, `MIN`, `ABS`, `CLAMP` and `SIGN`.
2022-03-08 14:10:48 +00:00
constexpr real_t MIN_ZOOM = 1. / 128;
constexpr real_t MAX_ZOOM = 128;
Some optimizations and limits for extreme zoom in and out in editor, fixes #5820
2016-07-21 13:06:38 +00:00
Removed unused variables, add some constants numbers
2019-12-10 04:13:02 +00:00
#define RULER_WIDTH (15 * EDSCALE)
Change some math macros to constexpr Changes `MAX`, `MIN`, `ABS`, `CLAMP` and `SIGN`.
2022-03-08 14:10:48 +00:00
constexpr real_t SCALE_HANDLE_DISTANCE = 25;
constexpr real_t MOVE_HANDLE_DISTANCE = 25;
Implements rulers
2017-08-29 19:50:18 +00:00
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
class SnapDialog : public ConfirmationDialog {
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
GDCLASS(SnapDialog, ConfirmationDialog);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
friend class CanvasItemEditor;
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
SpinBox *grid_offset_x;
SpinBox *grid_offset_y;
SpinBox *grid_step_x;
remove trailing whitespace
2016-03-08 23:00:52 +00:00
SpinBox *grid_step_y;
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
SpinBox *primary_grid_steps;
remove trailing whitespace
2016-03-08 23:00:52 +00:00
SpinBox *rotation_offset;
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
SpinBox *rotation_step;
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
SpinBox *scale_step;
remove trailing whitespace
2016-03-08 23:00:52 +00:00
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
public:
Some code changed with Clang-Tidy
2019-06-26 13:08:25 +00:00
SnapDialog() {
Increase grid size limit
2019-10-07 20:59:51 +00:00
const int SPIN_BOX_GRID_RANGE = 16384;
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
const int SPIN_BOX_ROTATION_RANGE = 360;
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
const real_t SPIN_BOX_SCALE_MIN = 0.01;
const real_t SPIN_BOX_SCALE_MAX = 100;
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
Label *label;
VBoxContainer *container;
GridContainer *child_container;
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
set_title(TTR("Configure Snap"));
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
container = memnew(VBoxContainer);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
add_child(container);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
child_container = memnew(GridContainer);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->set_columns(3);
container->add_child(child_container);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
label = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
label->set_text(TTR("Grid Offset:"));
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->add_child(label);
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
grid_offset_x = memnew(SpinBox);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
grid_offset_x->set_min(-SPIN_BOX_GRID_RANGE);
grid_offset_x->set_max(SPIN_BOX_GRID_RANGE);
Increase grid size limit
2019-10-07 20:59:51 +00:00
grid_offset_x->set_allow_lesser(true);
grid_offset_x->set_allow_greater(true);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
grid_offset_x->set_suffix("px");
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
grid_offset_x->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Allow selecting SpinBox & LineEdit text when focus enters
2022-10-16 12:37:35 +00:00
grid_offset_x->set_select_all_on_focus(true);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->add_child(grid_offset_x);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
grid_offset_y = memnew(SpinBox);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
grid_offset_y->set_min(-SPIN_BOX_GRID_RANGE);
grid_offset_y->set_max(SPIN_BOX_GRID_RANGE);
Increase grid size limit
2019-10-07 20:59:51 +00:00
grid_offset_y->set_allow_lesser(true);
grid_offset_y->set_allow_greater(true);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
grid_offset_y->set_suffix("px");
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
grid_offset_y->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Allow selecting SpinBox & LineEdit text when focus enters
2022-10-16 12:37:35 +00:00
grid_offset_y->set_select_all_on_focus(true);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->add_child(grid_offset_y);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
label = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
label->set_text(TTR("Grid Step:"));
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->add_child(label);
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
grid_step_x = memnew(SpinBox);
CanvasItemEditor Fix snapping grid misalignment Resolves: #70186 See: #65101
2022-12-23 15:05:25 +00:00
grid_step_x->set_min(1);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
grid_step_x->set_max(SPIN_BOX_GRID_RANGE);
Increase grid size limit
2019-10-07 20:59:51 +00:00
grid_step_x->set_allow_greater(true);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
grid_step_x->set_suffix("px");
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
grid_step_x->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Allow selecting SpinBox & LineEdit text when focus enters
2022-10-16 12:37:35 +00:00
grid_step_x->set_select_all_on_focus(true);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->add_child(grid_step_x);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
grid_step_y = memnew(SpinBox);
CanvasItemEditor Fix snapping grid misalignment Resolves: #70186 See: #65101
2022-12-23 15:05:25 +00:00
grid_step_y->set_min(1);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
grid_step_y->set_max(SPIN_BOX_GRID_RANGE);
Increase grid size limit
2019-10-07 20:59:51 +00:00
grid_step_y->set_allow_greater(true);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
grid_step_y->set_suffix("px");
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
grid_step_y->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Allow selecting SpinBox & LineEdit text when focus enters
2022-10-16 12:37:35 +00:00
grid_step_y->set_select_all_on_focus(true);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->add_child(grid_step_y);
Improve the primary line setting display in the Configure Snap dialog This merges the "steps" suffix into the SpinBox using its `suffix` property.
2019-10-30 21:02:37 +00:00
child_container = memnew(GridContainer);
child_container->set_columns(2);
container->add_child(child_container);
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
label = memnew(Label);
Improve the primary line setting display in the Configure Snap dialog This merges the "steps" suffix into the SpinBox using its `suffix` property.
2019-10-30 21:02:37 +00:00
label->set_text(TTR("Primary Line Every:"));
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
child_container->add_child(label);
primary_grid_steps = memnew(SpinBox);
primary_grid_steps->set_min(0);
primary_grid_steps->set_step(1);
primary_grid_steps->set_max(100);
primary_grid_steps->set_allow_greater(true);
Improve the primary line setting display in the Configure Snap dialog This merges the "steps" suffix into the SpinBox using its `suffix` property.
2019-10-30 21:02:37 +00:00
primary_grid_steps->set_suffix(TTR("steps"));
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
primary_grid_steps->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Allow selecting SpinBox & LineEdit text when focus enters
2022-10-16 12:37:35 +00:00
primary_grid_steps->set_select_all_on_focus(true);
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
child_container->add_child(primary_grid_steps);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
container->add_child(memnew(HSeparator));
Improve the primary line setting display in the Configure Snap dialog This merges the "steps" suffix into the SpinBox using its `suffix` property.
2019-10-30 21:02:37 +00:00
// We need to create another GridContainer with the same column count,
// so we can put an HSeparator above
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
child_container = memnew(GridContainer);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->set_columns(2);
container->add_child(child_container);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
label = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
label->set_text(TTR("Rotation Offset:"));
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->add_child(label);
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
rotation_offset = memnew(SpinBox);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
rotation_offset->set_min(-SPIN_BOX_ROTATION_RANGE);
rotation_offset->set_max(SPIN_BOX_ROTATION_RANGE);
rotation_offset->set_suffix("deg");
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
rotation_offset->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Allow selecting SpinBox & LineEdit text when focus enters
2022-10-16 12:37:35 +00:00
rotation_offset->set_select_all_on_focus(true);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->add_child(rotation_offset);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
label = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
label->set_text(TTR("Rotation Step:"));
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->add_child(label);
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
rotation_step = memnew(SpinBox);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
rotation_step->set_min(-SPIN_BOX_ROTATION_RANGE);
rotation_step->set_max(SPIN_BOX_ROTATION_RANGE);
rotation_step->set_suffix("deg");
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
rotation_step->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Allow selecting SpinBox & LineEdit text when focus enters
2022-10-16 12:37:35 +00:00
rotation_step->set_select_all_on_focus(true);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
child_container->add_child(rotation_step);
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
container->add_child(memnew(HSeparator));
child_container = memnew(GridContainer);
child_container->set_columns(2);
container->add_child(child_container);
label = memnew(Label);
label->set_text(TTR("Scale Step:"));
child_container->add_child(label);
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
scale_step = memnew(SpinBox);
scale_step->set_min(SPIN_BOX_SCALE_MIN);
scale_step->set_max(SPIN_BOX_SCALE_MAX);
scale_step->set_allow_greater(true);
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
scale_step->set_h_size_flags(Control::SIZE_EXPAND_FILL);
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
scale_step->set_step(0.01f);
Allow selecting SpinBox & LineEdit text when focus enters
2022-10-16 12:37:35 +00:00
scale_step->set_select_all_on_focus(true);
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
child_container->add_child(scale_step);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
}
remove trailing whitespace
2016-03-08 23:00:52 +00:00
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
void set_fields(const Point2 p_grid_offset, const Point2 p_grid_step, const int p_primary_grid_steps, const real_t p_rotation_offset, const real_t p_rotation_step, const real_t p_scale_step) {
-Conversion of most properties to a simpler syntax, easier to use by script -Modified help to display properties GDScript can still not make use of them, though.
2017-01-04 04:16:14 +00:00
grid_offset_x->set_value(p_grid_offset.x);
grid_offset_y->set_value(p_grid_offset.y);
grid_step_x->set_value(p_grid_step.x);
grid_step_y->set_value(p_grid_step.y);
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
primary_grid_steps->set_value(p_primary_grid_steps);
Rename `str2var` to `str_to_var` and similar Affects the Math class, a good chunk of the audio code, and a lot of other miscellaneous classes, too. - `var2str` -> `var_to_str` - `str2var` -> `str_to_var` - `bytes2var` -> `bytes_to_var` - `bytes2var_with_objects` -> `bytes_to_var_with_objects` - `var2bytes` -> `var_to_bytes` - `var2bytes_with_objects` -> `var_to_bytes_with_objects` - `linear2db` -> `linear_to_db` - `db2linear` -> `db_to_linear` - `deg2rad` -> `deg_to_rad` - `rad2deg` -> `rad_to_deg` - `dict2inst` -> `dict_to_inst` - `inst2dict` -> `inst_to_dict`
2022-08-13 15:45:42 +00:00
rotation_offset->set_value(Math::rad_to_deg(p_rotation_offset));
rotation_step->set_value(Math::rad_to_deg(p_rotation_step));
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
scale_step->set_value(p_scale_step);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
}
remove trailing whitespace
2016-03-08 23:00:52 +00:00
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
void get_fields(Point2 &p_grid_offset, Point2 &p_grid_step, int &p_primary_grid_steps, real_t &p_rotation_offset, real_t &p_rotation_step, real_t &p_scale_step) {
Implements rulers
2017-08-29 19:50:18 +00:00
p_grid_offset = Point2(grid_offset_x->get_value(), grid_offset_y->get_value());
p_grid_step = Point2(grid_step_x->get_value(), grid_step_y->get_value());
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
p_primary_grid_steps = int(primary_grid_steps->get_value());
Rename `str2var` to `str_to_var` and similar Affects the Math class, a good chunk of the audio code, and a lot of other miscellaneous classes, too. - `var2str` -> `var_to_str` - `str2var` -> `str_to_var` - `bytes2var` -> `bytes_to_var` - `bytes2var_with_objects` -> `bytes_to_var_with_objects` - `var2bytes` -> `var_to_bytes` - `var2bytes_with_objects` -> `var_to_bytes_with_objects` - `linear2db` -> `linear_to_db` - `db2linear` -> `db_to_linear` - `deg2rad` -> `deg_to_rad` - `rad2deg` -> `rad_to_deg` - `dict2inst` -> `dict_to_inst` - `inst2dict` -> `inst_to_dict`
2022-08-13 15:45:42 +00:00
p_rotation_offset = Math::deg_to_rad(rotation_offset->get_value());
p_rotation_step = Math::deg_to_rad(rotation_step->get_value());
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
p_scale_step = scale_step->get_value();
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
}
};
Use get_cursor_shape for identifying the cursor shape in CanvasItemEditor get_cursor_shape() is used in cases where a Control displays different cursors in different areas. There is no need to set the default cursor shape on every mouse move event.
2022-04-06 06:42:47 +00:00
bool CanvasItemEditor::_is_node_locked(const Node *p_node) const {
Cleanup metadata usage
2022-04-01 18:30:23 +00:00
return p_node->get_meta("_edit_lock_", false);
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
}
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
bool CanvasItemEditor::_is_node_movable(const Node *p_node, bool p_popup_warning) {
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
if (_is_node_locked(p_node)) {
return false;
}
if (Object::cast_to<Control>(p_node) && Object::cast_to<Container>(p_node->get_parent())) {
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
if (p_popup_warning) {
Move container warning to the toaster
2021-11-23 15:17:19 +00:00
EditorToaster::get_singleton()->popup_str("Children of a container get their position and size determined only by their parent.", EditorToaster::SEVERITY_WARNING);
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
}
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
return false;
}
return true;
Made children of Containers not selectable. Made children of Containers not selectable.
2018-09-21 23:30:49 +00:00
}
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
void CanvasItemEditor::_snap_if_closer_float(
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
const real_t p_value,
real_t &r_current_snap, SnapTarget &r_current_snap_target,
const real_t p_target_value, const SnapTarget p_snap_target,
const real_t p_radius) {
const real_t radius = p_radius / zoom;
const real_t dist = Math::abs(p_value - p_target_value);
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
if ((p_radius < 0 || dist < radius) && (r_current_snap_target == SNAP_TARGET_NONE || dist < Math::abs(r_current_snap - p_value))) {
r_current_snap = p_target_value;
r_current_snap_target = p_snap_target;
}
}
void CanvasItemEditor::_snap_if_closer_point(
Point2 p_value,
Point2 &r_current_snap, SnapTarget (&r_current_snap_target)[2],
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
Point2 p_target_value, const SnapTarget p_snap_target,
const real_t rotation,
const real_t p_radius) {
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
Transform2D rot_trans = Transform2D(rotation, Point2());
p_value = rot_trans.inverse().xform(p_value);
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
p_target_value = rot_trans.inverse().xform(p_target_value);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
r_current_snap = rot_trans.inverse().xform(r_current_snap);
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
_snap_if_closer_float(
p_value.x,
r_current_snap.x,
r_current_snap_target[0],
p_target_value.x,
p_snap_target,
p_radius);
_snap_if_closer_float(
p_value.y,
r_current_snap.y,
r_current_snap_target[1],
p_target_value.y,
p_snap_target,
p_radius);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
r_current_snap = rot_trans.xform(r_current_snap);
}
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
void CanvasItemEditor::_snap_other_nodes(
const Point2 p_value,
const Transform2D p_transform_to_snap,
Point2 &r_current_snap, SnapTarget (&r_current_snap_target)[2],
const SnapTarget p_snap_target, List<const CanvasItem *> p_exceptions,
const Node *p_current) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
const CanvasItem *ci = Object::cast_to<CanvasItem>(p_current);
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
// Check if the element is in the exception
bool exception = false;
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (const CanvasItem *&E : p_exceptions) {
if (E == p_current) {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
exception = true;
break;
}
};
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci && !exception) {
Transform2D ci_transform = ci->get_global_transform_with_canvas();
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
if (fmod(ci_transform.get_rotation() - p_transform_to_snap.get_rotation(), (real_t)360.0) == 0.0) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->_edit_use_rect()) {
Point2 begin = ci_transform.xform(ci->_edit_get_rect().get_position());
Point2 end = ci_transform.xform(ci->_edit_get_rect().get_position() + ci->_edit_get_rect().get_size());
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
_snap_if_closer_point(p_value, r_current_snap, r_current_snap_target, begin, p_snap_target, ci_transform.get_rotation());
_snap_if_closer_point(p_value, r_current_snap, r_current_snap_target, end, p_snap_target, ci_transform.get_rotation());
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
} else {
Point2 position = ci_transform.xform(Point2());
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
_snap_if_closer_point(p_value, r_current_snap, r_current_snap_target, position, p_snap_target, ci_transform.get_rotation());
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
}
}
for (int i = 0; i < p_current->get_child_count(); i++) {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
_snap_other_nodes(p_value, p_transform_to_snap, r_current_snap, r_current_snap_target, p_snap_target, p_exceptions, p_current->get_child(i));
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
}
}
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, unsigned int p_forced_modes, const CanvasItem *p_self_canvas_item, List<CanvasItem *> p_other_nodes_exceptions) {
snap_target[0] = SNAP_TARGET_NONE;
snap_target[1] = SNAP_TARGET_NONE;
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
bool is_snap_active = smart_snap_active ^ Input::get_singleton()->is_key_pressed(Key::CTRL);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
// Smart snap using the canvas position
Vector2 output = p_target;
real_t rotation = 0.0;
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
if (p_self_canvas_item) {
rotation = p_self_canvas_item->get_global_transform_with_canvas().get_rotation();
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Parent sides and center
Enable snapping in 2D when control key pressed
2018-03-27 15:30:39 +00:00
if ((is_snap_active && snap_node_parent && (p_modes & SNAP_NODE_PARENT)) || (p_forced_modes & SNAP_NODE_PARENT)) {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
if (const Control *c = Object::cast_to<Control>(p_self_canvas_item)) {
Point2 begin = p_self_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(0, 0)));
Point2 end = p_self_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(1, 1)));
_snap_if_closer_point(p_target, output, snap_target, begin, SNAP_TARGET_PARENT, rotation);
_snap_if_closer_point(p_target, output, snap_target, (begin + end) / 2.0, SNAP_TARGET_PARENT, rotation);
_snap_if_closer_point(p_target, output, snap_target, end, SNAP_TARGET_PARENT, rotation);
} else if (const CanvasItem *parent_ci = Object::cast_to<CanvasItem>(p_self_canvas_item->get_parent())) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
if (parent_ci->_edit_use_rect()) {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
Point2 begin = p_self_canvas_item->get_transform().affine_inverse().xform(parent_ci->_edit_get_rect().get_position());
Point2 end = p_self_canvas_item->get_transform().affine_inverse().xform(parent_ci->_edit_get_rect().get_position() + parent_ci->_edit_get_rect().get_size());
_snap_if_closer_point(p_target, output, snap_target, begin, SNAP_TARGET_PARENT, rotation);
_snap_if_closer_point(p_target, output, snap_target, (begin + end) / 2.0, SNAP_TARGET_PARENT, rotation);
_snap_if_closer_point(p_target, output, snap_target, end, SNAP_TARGET_PARENT, rotation);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
} else {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
Point2 position = p_self_canvas_item->get_transform().affine_inverse().xform(Point2());
_snap_if_closer_point(p_target, output, snap_target, position, SNAP_TARGET_PARENT, rotation);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Self anchors
Enable snapping in 2D when control key pressed
2018-03-27 15:30:39 +00:00
if ((is_snap_active && snap_node_anchors && (p_modes & SNAP_NODE_ANCHORS)) || (p_forced_modes & SNAP_NODE_ANCHORS)) {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
if (const Control *c = Object::cast_to<Control>(p_self_canvas_item)) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
Point2 begin = p_self_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(c->get_anchor(SIDE_LEFT), c->get_anchor(SIDE_TOP))));
Point2 end = p_self_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(c->get_anchor(SIDE_RIGHT), c->get_anchor(SIDE_BOTTOM))));
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
_snap_if_closer_point(p_target, output, snap_target, begin, SNAP_TARGET_SELF_ANCHORS, rotation);
_snap_if_closer_point(p_target, output, snap_target, end, SNAP_TARGET_SELF_ANCHORS, rotation);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Self sides
Enable snapping in 2D when control key pressed
2018-03-27 15:30:39 +00:00
if ((is_snap_active && snap_node_sides && (p_modes & SNAP_NODE_SIDES)) || (p_forced_modes & SNAP_NODE_SIDES)) {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
if (p_self_canvas_item->_edit_use_rect()) {
Point2 begin = p_self_canvas_item->get_global_transform_with_canvas().xform(p_self_canvas_item->_edit_get_rect().get_position());
Point2 end = p_self_canvas_item->get_global_transform_with_canvas().xform(p_self_canvas_item->_edit_get_rect().get_position() + p_self_canvas_item->_edit_get_rect().get_size());
_snap_if_closer_point(p_target, output, snap_target, begin, SNAP_TARGET_SELF, rotation);
_snap_if_closer_point(p_target, output, snap_target, end, SNAP_TARGET_SELF, rotation);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
}
Implement guides
2017-10-18 21:55:02 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Self center
Enable snapping in 2D when control key pressed
2018-03-27 15:30:39 +00:00
if ((is_snap_active && snap_node_center && (p_modes & SNAP_NODE_CENTER)) || (p_forced_modes & SNAP_NODE_CENTER)) {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
if (p_self_canvas_item->_edit_use_rect()) {
Add Get Center Method for Rect2/Rect2i and AABB.
2021-09-20 18:48:52 +00:00
Point2 center = p_self_canvas_item->get_global_transform_with_canvas().xform(p_self_canvas_item->_edit_get_rect().get_center());
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
_snap_if_closer_point(p_target, output, snap_target, center, SNAP_TARGET_SELF, rotation);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
} else {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
Point2 position = p_self_canvas_item->get_global_transform_with_canvas().xform(Point2());
_snap_if_closer_point(p_target, output, snap_target, position, SNAP_TARGET_SELF, rotation);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
Implement guides
2017-10-18 21:55:02 +00:00
}
// Other nodes sides
Enable snapping in 2D when control key pressed
2018-03-27 15:30:39 +00:00
if ((is_snap_active && snap_other_nodes && (p_modes & SNAP_OTHER_NODES)) || (p_forced_modes & SNAP_OTHER_NODES)) {
Remove redundant Variant-types initializations
2022-11-14 17:21:06 +00:00
Transform2D to_snap_transform;
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
List<const CanvasItem *> exceptions = List<const CanvasItem *>();
Use const references where possible for List range iterators
2021-07-24 13:46:25 +00:00
for (const CanvasItem *E : p_other_nodes_exceptions) {
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
exceptions.push_back(E);
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
}
if (p_self_canvas_item) {
exceptions.push_back(p_self_canvas_item);
to_snap_transform = p_self_canvas_item->get_global_transform_with_canvas();
}
_snap_other_nodes(
p_target, to_snap_transform,
output, snap_target,
SNAP_TARGET_OTHER_NODE,
exceptions,
get_tree()->get_edited_scene_root());
Implement guides
2017-10-18 21:55:02 +00:00
}
Enable snapping in 2D when control key pressed
2018-03-27 15:30:39 +00:00
if (((is_snap_active && snap_guides && (p_modes & SNAP_GUIDES)) || (p_forced_modes & SNAP_GUIDES)) && fmod(rotation, (real_t)360.0) == 0.0) {
Cleanup metadata usage
2022-04-01 18:30:23 +00:00
// Guides.
if (Node *scene = EditorNode::get_singleton()->get_edited_scene()) {
Array vguides = scene->get_meta("_edit_vertical_guides_", Array());
Implement guides
2017-10-18 21:55:02 +00:00
for (int i = 0; i < vguides.size(); i++) {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
_snap_if_closer_float(p_target.x, output.x, snap_target[0], vguides[i], SNAP_TARGET_GUIDE);
Implement guides
2017-10-18 21:55:02 +00:00
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
Cleanup metadata usage
2022-04-01 18:30:23 +00:00
Array hguides = scene->get_meta("_edit_horizontal_guides_", Array());
Implement guides
2017-10-18 21:55:02 +00:00
for (int i = 0; i < hguides.size(); i++) {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
_snap_if_closer_float(p_target.y, output.y, snap_target[1], hguides[i], SNAP_TARGET_GUIDE);
Implement guides
2017-10-18 21:55:02 +00:00
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
}
}
Move grid snapping to an independent button
2019-10-10 17:41:45 +00:00
if (((grid_snap_active && (p_modes & SNAP_GRID)) || (p_forced_modes & SNAP_GRID)) && fmod(rotation, (real_t)360.0) == 0.0) {
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
// Grid
Point2 offset = grid_offset;
if (snap_relative) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
List<CanvasItem *> selection = _get_edited_canvas_items();
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
if (selection.size() == 1 && Object::cast_to<Node2D>(selection[0])) {
offset = Object::cast_to<Node2D>(selection[0])->get_global_position();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
} else if (selection.size() > 0) {
offset = _get_encompassing_rect_from_list(selection).position;
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
}
}
Point2 grid_output;
Rename Math::stepify to snapped
2020-12-21 18:02:57 +00:00
grid_output.x = Math::snapped(p_target.x - offset.x, grid_step.x * Math::pow(2.0, grid_step_multiplier)) + offset.x;
grid_output.y = Math::snapped(p_target.y - offset.y, grid_step.y * Math::pow(2.0, grid_step_multiplier)) + offset.y;
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
_snap_if_closer_point(p_target, output, snap_target, grid_output, SNAP_TARGET_GRID, 0.0, -1.0);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
}
if (((snap_pixel && (p_modes & SNAP_PIXEL)) || (p_forced_modes & SNAP_PIXEL)) && rotation == 0.0) {
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
// Pixel
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
output = output.snapped(Size2(1, 1));
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
}
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
snap_transform = Transform2D(rotation, output);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
return output;
}
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t CanvasItemEditor::snap_angle(real_t p_target, real_t p_start) const {
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (((smart_snap_active || snap_rotation) ^ Input::get_singleton()->is_key_pressed(Key::CTRL)) && snap_rotation_step != 0) {
Made snap relative work on rotation as well
2020-03-07 16:47:24 +00:00
if (snap_relative) {
Rename Math::stepify to snapped
2020-12-21 18:02:57 +00:00
return Math::snapped(p_target - snap_rotation_offset, snap_rotation_step) + snap_rotation_offset + (p_start - (int)(p_start / snap_rotation_step) * snap_rotation_step);
Made snap relative work on rotation as well
2020-03-07 16:47:24 +00:00
} else {
Rename Math::stepify to snapped
2020-12-21 18:02:57 +00:00
return Math::snapped(p_target - snap_rotation_offset, snap_rotation_step) + snap_rotation_offset;
Made snap relative work on rotation as well
2020-03-07 16:47:24 +00:00
}
} else {
return p_target;
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
}
[Input] Add extra `shortcut_input` input processing step to process Unicode character input with Alt / Ctrl modifiers, after processing of shortcuts.
2022-01-11 13:59:52 +00:00
void CanvasItemEditor::shortcut_input(const Ref<InputEvent> &p_ev) {
Fix crashes in *_input functions
2021-04-05 06:52:21 +00:00
ERR_FAIL_COND(p_ev.is_null());
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<InputEventKey> k = p_ev;
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 (!is_visible_in_tree()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +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
}
Implement missing ShortCuts in CanvasItemEditor
2016-07-15 19:22:01 +00:00
Add is_valid() check for InputEventKey in CanvasItemEditor.
2020-09-17 01:46:04 +00:00
if (k.is_valid()) {
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (k->get_keycode() == Key::CTRL || k->get_keycode() == Key::ALT || k->get_keycode() == Key::SHIFT) {
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Add is_valid() check for InputEventKey in CanvasItemEditor.
2020-09-17 01:46:04 +00:00
}
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
if (k->is_pressed() && !k->is_ctrl_pressed() && !k->is_echo() && (grid_snap_active || _is_grid_visible())) {
if (multiply_grid_step_shortcut.is_valid() && multiply_grid_step_shortcut->matches_event(p_ev)) {
Add is_valid() check for InputEventKey in CanvasItemEditor.
2020-09-17 01:46:04 +00:00
// Multiply the grid size
grid_step_multiplier = MIN(grid_step_multiplier + 1, 12);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
} else if (divide_grid_step_shortcut.is_valid() && divide_grid_step_shortcut->matches_event(p_ev)) {
Add is_valid() check for InputEventKey in CanvasItemEditor.
2020-09-17 01:46:04 +00:00
// Divide the grid size
Point2 new_grid_step = grid_step * Math::pow(2.0, grid_step_multiplier - 1);
if (new_grid_step.x >= 1.0 && new_grid_step.y >= 1.0) {
grid_step_multiplier--;
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
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
}
made changing pivot simpler in 2D nodes (just press v with mouse over position)
2015-06-12 16:53:18 +00:00
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Object *CanvasItemEditor::_get_editor_data(Object *p_what) {
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
CanvasItem *ci = Object::cast_to<CanvasItem>(p_what);
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 (!ci) {
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
return nullptr;
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
return memnew(CanvasItemEditorSelectedItem);
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
void CanvasItemEditor::_keying_changed() {
Implemented SkeletonEditorGizmo Co-authored-by: Lyuma <xn.lyuma@gmail.com>
2021-02-04 08:20:26 +00:00
if (AnimationPlayerEditor::get_singleton()->get_track_editor()->is_visible_in_tree()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
animation_hb->show();
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
} else {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
animation_hb->hide();
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
}
Implement guides
2017-10-18 21:55:02 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Rect2 CanvasItemEditor::_get_encompassing_rect_from_list(List<CanvasItem *> p_list) {
Rename empty() to is_empty()
2020-12-15 12:04:21 +00:00
ERR_FAIL_COND_V(p_list.is_empty(), Rect2());
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Handles the first element
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = p_list.front()->get();
Rect2 rect = Rect2(ci->get_global_transform_with_canvas().xform(ci->_edit_get_rect().get_center()), Size2());
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
// Expand with the other ones
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci2 : p_list) {
Transform2D xform = ci2->get_global_transform_with_canvas();
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Rect2 current_rect = ci2->_edit_get_rect();
Fixes bugs on the 2D editor scrollable area
2018-07-29 21:09:59 +00:00
rect.expand_to(xform.xform(current_rect.position));
rect.expand_to(xform.xform(current_rect.position + Vector2(current_rect.size.x, 0)));
rect.expand_to(xform.xform(current_rect.position + current_rect.size));
rect.expand_to(xform.xform(current_rect.position + Vector2(0, current_rect.size.y)));
Implements rulers
2017-08-29 19:50:18 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return rect;
}
Implement guides
2017-10-18 21:55:02 +00:00
Fixes bugs on the 2D editor scrollable area
2018-07-29 21:09:59 +00:00
void CanvasItemEditor::_expand_encompassing_rect_using_children(Rect2 &r_rect, const Node *p_node, bool &r_first, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, bool include_locked_nodes) {
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 (!p_node) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +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 (Object::cast_to<Viewport>(p_node)) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +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
}
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
const CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
use Snap / Snap (Pixels) now save to scene file Previously, only Use Pixel Snap would save to the scene. Tested and working for me, on Linux.
2014-04-24 01:43:02 +00:00
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci && !ci->is_set_as_top_level()) {
_expand_encompassing_rect_using_children(r_rect, p_node->get_child(i), r_first, p_parent_xform * ci->get_transform(), p_canvas_xform);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
} else {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
const CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
_expand_encompassing_rect_using_children(r_rect, p_node->get_child(i), r_first, Transform2D(), cl ? cl->get_transform() : p_canvas_xform);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Add show bones checkable menu item
2016-09-07 09:10:00 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci && ci->is_visible_in_tree() && (include_locked_nodes || !_is_node_locked(ci))) {
Fix that Top Level CanvasItems are unselectable in editor Previously the parent Transform2D was included in the calculation
2022-03-17 14:03:23 +00:00
Transform2D xform = p_canvas_xform;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (!ci->is_set_as_top_level()) {
Fix that Top Level CanvasItems are unselectable in editor Previously the parent Transform2D was included in the calculation
2022-03-17 14:03:23 +00:00
xform *= p_parent_xform;
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
xform *= ci->get_transform();
Rect2 rect = ci->_edit_get_rect();
Fixes bugs on the 2D editor scrollable area
2018-07-29 21:09:59 +00:00
if (r_first) {
Add Get Center Method for Rect2/Rect2i and AABB.
2021-09-20 18:48:52 +00:00
r_rect = Rect2(xform.xform(rect.get_center()), Size2());
Fixes bugs on the 2D editor scrollable area
2018-07-29 21:09:59 +00:00
r_first = false;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
Fixes bugs on the 2D editor scrollable area
2018-07-29 21:09:59 +00:00
r_rect.expand_to(xform.xform(rect.position));
r_rect.expand_to(xform.xform(rect.position + Point2(rect.size.x, 0)));
r_rect.expand_to(xform.xform(rect.position + Point2(0, rect.size.y)));
r_rect.expand_to(xform.xform(rect.position + rect.size));
Add show bones checkable menu item
2016-09-07 09:10:00 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
Rect2 CanvasItemEditor::_get_encompassing_rect(const Node *p_node) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Rect2 rect;
bool first = true;
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
_expand_encompassing_rect_using_children(rect, p_node, first);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return rect;
CanvasItemEditorPlugin: Avoid selecting items from instanced scenes - This behaviour is only applied to click selection. Rect selection and List selection can still select these items
2016-04-07 10:59:50 +00:00
}
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<_SelectResult> &r_items, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
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 (!p_node) {
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +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 (Object::cast_to<Viewport>(p_node)) {
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +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
}
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
Rename polygon editor settings for better display in the Editor Settings
2021-08-23 15:59:19 +00:00
const real_t grab_distance = EDITOR_GET("editors/polygon_editor/point_grab_radius");
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
Fixes several selection problems in the 2D editor
2018-05-03 22:27:37 +00:00
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci) {
if (!ci->is_set_as_top_level()) {
_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, p_parent_xform * ci->get_transform(), p_canvas_xform);
Fixes selection of toplevel CanvasItems in the editor
2018-09-19 09:05:24 +00:00
} else {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, ci->get_transform(), p_canvas_xform);
Fixes selection of toplevel CanvasItems in the editor
2018-09-19 09:05:24 +00:00
}
Fixes several selection problems in the 2D editor
2018-05-03 22:27:37 +00:00
} else {
CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, Transform2D(), cl ? cl->get_transform() : p_canvas_xform);
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
}
Fixes several selection problems in the 2D editor
2018-05-03 22:27:37 +00:00
}
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci && ci->is_visible_in_tree()) {
Fix that Top Level CanvasItems are unselectable in editor Previously the parent Transform2D was included in the calculation
2022-03-17 14:03:23 +00:00
Transform2D xform = p_canvas_xform;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (!ci->is_set_as_top_level()) {
Fix that Top Level CanvasItems are unselectable in editor Previously the parent Transform2D was included in the calculation
2022-03-17 14:03:23 +00:00
xform *= p_parent_xform;
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
xform = (xform * ci->get_transform()).affine_inverse();
Fixes Node2D selection not adapting to editor zoom level
2019-01-24 19:43:11 +00:00
const real_t local_grab_distance = xform.basis_xform(Vector2(grab_distance, 0)).length() / zoom;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->_edit_is_selected_on_click(xform.xform(p_pos), local_grab_distance)) {
Node2D *node = Object::cast_to<Node2D>(ci);
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
Fixes several selection problems in the 2D editor
2018-05-03 22:27:37 +00:00
_SelectResult res;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
res.item = ci;
Fixes several selection problems in the 2D editor
2018-05-03 22:27:37 +00:00
res.z_index = node ? node->get_z_index() : 0;
res.has_z = node;
r_items.push_back(res);
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
}
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix selectable locked items
2020-02-10 23:01:10 +00:00
void CanvasItemEditor::_get_canvas_items_at_pos(const Point2 &p_pos, Vector<_SelectResult> &r_items, bool p_allow_locked) {
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
Node *scene = EditorNode::get_singleton()->get_edited_scene();
Fixes locks and groups on 2d editor
2018-04-24 19:55:28 +00:00
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
_find_canvas_items_at_pos(p_pos, scene, r_items);
Fixes locks and groups on 2d editor
2018-04-24 19:55:28 +00:00
//Remove invalid results
for (int i = 0; i < r_items.size(); i++) {
Node *node = r_items[i].item;
Fixes several selection problems in the 2D editor
2018-05-03 22:27:37 +00:00
// Make sure the selected node is in the current scene, or editable
Prevent selecting hidden nodes in 3D and Canvas Item editors
2021-02-21 08:19:48 +00:00
if (node && node != get_tree()->get_edited_scene_root()) {
node = scene->get_deepest_editable_node(node);
}
Fixes locks and groups on 2d editor
2018-04-24 19:55:28 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(node);
Fix selectable locked items
2020-02-10 23:01:10 +00:00
if (!p_allow_locked) {
Include locked nodes on selection list
2020-02-10 12:59:24 +00:00
// Replace the node by the group if grouped
while (node && node != scene->get_parent()) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci_tmp = Object::cast_to<CanvasItem>(node);
if (ci_tmp && node->has_meta("_edit_group_")) {
ci = ci_tmp;
Include locked nodes on selection list
2020-02-10 12:59:24 +00:00
}
node = node->get_parent();
Fixes locks and groups on 2d editor
2018-04-24 19:55:28 +00:00
}
}
Fixes hovered Nodes2D display in the editor (remove duplicates)
2018-05-15 07:37:23 +00:00
// Check if the canvas item is already in the list (for groups or scenes)
bool duplicate = false;
for (int j = 0; j < i; j++) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (r_items[j].item == ci) {
Fixes hovered Nodes2D display in the editor (remove duplicates)
2018-05-15 07:37:23 +00:00
duplicate = true;
break;
}
}
Fixes locks and groups on 2d editor
2018-04-24 19:55:28 +00:00
//Remove the item if invalid
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (!ci || duplicate || (ci != scene && ci->get_owner() != scene && !scene->is_editable_instance(ci->get_owner())) || (!p_allow_locked && _is_node_locked(ci))) {
Rename `remove()` to `remove_at()` when removing by index
2021-07-03 22:17:03 +00:00
r_items.remove_at(i);
Fixes locks and groups on 2d editor
2018-04-24 19:55:28 +00:00
i--;
} else {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
r_items.write[i].item = ci;
Fixes locks and groups on 2d editor
2018-04-24 19:55:28 +00:00
}
}
}
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
void CanvasItemEditor::_find_canvas_items_in_rect(const Rect2 &p_rect, Node *p_node, List<CanvasItem *> *r_items, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
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 (!p_node) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +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 (Object::cast_to<Viewport>(p_node)) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +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
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
Node *scene = EditorNode::get_singleton()->get_edited_scene();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Prevent selecting hidden nodes in 3D and Canvas Item editors
2021-02-21 08:19:48 +00:00
bool editable = p_node == scene || p_node->get_owner() == scene || p_node == scene->get_deepest_editable_node(p_node);
Cleanup metadata usage
2022-04-01 18:30:23 +00:00
bool lock_children = p_node->get_meta("_edit_group_", false);
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
bool locked = _is_node_locked(p_node);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Fixes several selection problems in the 2D editor
2018-05-03 22:27:37 +00:00
if (!lock_children || !editable) {
Prevent to select children if selection lock or instanced scene Fix #7086
2016-11-12 13:43:31 +00:00
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci) {
if (!ci->is_set_as_top_level()) {
_find_canvas_items_in_rect(p_rect, p_node->get_child(i), r_items, p_parent_xform * ci->get_transform(), p_canvas_xform);
Fixes selection of toplevel CanvasItems in the editor
2018-09-19 09:05:24 +00:00
} else {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
_find_canvas_items_in_rect(p_rect, p_node->get_child(i), r_items, ci->get_transform(), p_canvas_xform);
Fixes selection of toplevel CanvasItems in the editor
2018-09-19 09:05:24 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
} else {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
_find_canvas_items_in_rect(p_rect, p_node->get_child(i), r_items, Transform2D(), cl ? cl->get_transform() : p_canvas_xform);
Prevent to select children if selection lock or instanced scene Fix #7086
2016-11-12 13:43:31 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci && ci->is_visible_in_tree() && !locked && editable) {
Fix that Top Level CanvasItems are unselectable in editor Previously the parent Transform2D was included in the calculation
2022-03-17 14:03:23 +00:00
Transform2D xform = p_canvas_xform;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (!ci->is_set_as_top_level()) {
Fix that Top Level CanvasItems are unselectable in editor Previously the parent Transform2D was included in the calculation
2022-03-17 14:03:23 +00:00
xform *= p_parent_xform;
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
xform *= ci->get_transform();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->_edit_use_rect()) {
Rect2 rect = ci->_edit_get_rect();
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
if (p_rect.has_point(xform.xform(rect.position)) &&
p_rect.has_point(xform.xform(rect.position + Vector2(rect.size.x, 0))) &&
p_rect.has_point(xform.xform(rect.position + Vector2(rect.size.x, rect.size.y))) &&
p_rect.has_point(xform.xform(rect.position + Vector2(0, rect.size.y)))) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
r_items->push_back(ci);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
}
} else {
if (p_rect.has_point(xform.xform(Point2()))) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
r_items->push_back(ci);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
bool CanvasItemEditor::_select_click_on_item(CanvasItem *item, Point2 p_click_pos, bool p_append) {
Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item. Added some comments Removed commented code or useless ones
2017-07-18 18:17:55 +00:00
bool still_selected = true;
Fix multi-selection doesn't correctly show in the inspector
2021-04-13 10:09:53 +00:00
if (p_append && !editor_selection->get_selected_node_list().is_empty()) {
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
if (editor_selection->is_selected(item)) {
Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item. Added some comments Removed commented code or useless ones
2017-07-18 18:17:55 +00:00
// Already in the selection, remove it from the selected nodes
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
editor_selection->remove_node(item);
Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item. Added some comments Removed commented code or useless ones
2017-07-18 18:17:55 +00:00
still_selected = false;
Fix multi-selection doesn't correctly show in the inspector
2021-04-13 10:09:53 +00:00
if (editor_selection->get_selected_node_list().size() == 1) {
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
EditorNode::get_singleton()->push_item(editor_selection->get_selected_node_list()[0]);
Fix multi-selection doesn't correctly show in the inspector
2021-04-13 10:09:53 +00:00
}
Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item. Added some comments Removed commented code or useless ones
2017-07-18 18:17:55 +00:00
} else {
// Add the item to the selection
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
editor_selection->add_node(item);
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
}
} else {
if (!editor_selection->is_selected(item)) {
Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item. Added some comments Removed commented code or useless ones
2017-07-18 18:17:55 +00:00
// Select a new one and clear previous selection
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
editor_selection->clear();
editor_selection->add_node(item);
Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item. Added some comments Removed commented code or useless ones
2017-07-18 18:17:55 +00:00
// Reselect
Removes editor_hint from SceneTree
2017-08-18 23:02:56 +00:00
if (Engine::get_singleton()->is_editor_hint()) {
Cancel drag when selection changes
2019-11-19 15:02:04 +00:00
selected_from_canvas = true;
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
EditorNode::get_singleton()->edit_node(item);
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
}
}
Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item. Added some comments Removed commented code or useless ones
2017-07-18 18:17:55 +00:00
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item. Added some comments Removed commented code or useless ones
2017-07-18 18:17:55 +00:00
return still_selected;
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
}
Use get_cursor_shape for identifying the cursor shape in CanvasItemEditor get_cursor_shape() is used in cases where a Control displays different cursors in different areas. There is no need to set the default cursor shape on every mouse move event.
2022-04-06 06:42:47 +00:00
List<CanvasItem *> CanvasItemEditor::_get_edited_canvas_items(bool retrieve_locked, bool remove_canvas_item_if_parent_in_selection) const {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
List<CanvasItem *> selection;
Use range iterators for `Map`
2021-08-09 20:13:42 +00:00
for (const KeyValue<Node *, Object *> &E : editor_selection->get_selection()) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(E.key);
if (ci && ci->is_visible_in_tree() && ci->get_viewport() == EditorNode::get_singleton()->get_scene_root() && (retrieve_locked || !_is_node_locked(ci))) {
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(ci);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (se) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
selection.push_back(ci);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (remove_canvas_item_if_parent_in_selection) {
List<CanvasItem *> filtered_selection;
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (CanvasItem *E : selection) {
if (!selection.find(E->get_parent())) {
filtered_selection.push_back(E);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
}
return filtered_selection;
} else {
return selection;
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Vector2 CanvasItemEditor::_anchor_to_position(const Control *p_control, Vector2 anchor) {
ERR_FAIL_COND_V(!p_control, Vector2());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Transform2D parent_transform = p_control->get_transform().affine_inverse();
Fixes the bad calculation of margin & anchors when child of Node2D
2018-05-05 14:59:00 +00:00
Rect2 parent_rect = p_control->get_parent_anchorable_rect();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
if (p_control->is_layout_rtl()) {
return parent_transform.xform(parent_rect.position + Vector2(parent_rect.size.x - parent_rect.size.x * anchor.x, parent_rect.size.y * anchor.y));
} else {
return parent_transform.xform(parent_rect.position + Vector2(parent_rect.size.x * anchor.x, parent_rect.size.y * anchor.y));
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
Add anchor visualization
2017-07-10 22:14:22 +00:00
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
Vector2 CanvasItemEditor::_position_to_anchor(const Control *p_control, Vector2 position) {
Make anchors draggable
2017-07-29 14:57:32 +00:00
ERR_FAIL_COND_V(!p_control, Vector2());
Fixes the bad calculation of margin & anchors when child of Node2D
2018-05-05 14:59:00 +00:00
Rect2 parent_rect = p_control->get_parent_anchorable_rect();
Remove redundant Variant-types initializations
2022-11-14 17:21:06 +00:00
Vector2 output;
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
if (p_control->is_layout_rtl()) {
output.x = (parent_rect.size.x == 0) ? 0.0 : (parent_rect.size.x - p_control->get_transform().xform(position).x - parent_rect.position.x) / parent_rect.size.x;
} else {
output.x = (parent_rect.size.x == 0) ? 0.0 : (p_control->get_transform().xform(position).x - parent_rect.position.x) / parent_rect.size.x;
}
Fix error when dragging anchors with parent's size == 0
2020-09-27 15:44:06 +00:00
output.y = (parent_rect.size.y == 0) ? 0.0 : (p_control->get_transform().xform(position).y - parent_rect.position.y) / parent_rect.size.y;
return output;
Make anchors draggable
2017-07-29 14:57:32 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
void CanvasItemEditor::_save_canvas_item_state(List<CanvasItem *> p_canvas_items, bool save_bones) {
Show the transform operation numbers in 2D
2022-07-05 11:06:12 +00:00
original_transform = Transform2D();
bool transform_stored = false;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : p_canvas_items) {
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(ci);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (se) {
Show the transform operation numbers in 2D
2022-07-05 11:06:12 +00:00
if (!transform_stored) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
original_transform = ci->get_global_transform();
Show the transform operation numbers in 2D
2022-07-05 11:06:12 +00:00
transform_stored = true;
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
se->undo_state = ci->_edit_get_state();
se->pre_drag_xform = ci->get_global_transform_with_canvas();
if (ci->_edit_use_rect()) {
se->pre_drag_rect = ci->_edit_get_rect();
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
} else {
se->pre_drag_rect = Rect2();
}
Make anchors draggable
2017-07-29 14:57:32 +00:00
}
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
void CanvasItemEditor::_restore_canvas_item_state(List<CanvasItem *> p_canvas_items, bool restore_bones) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : drag_selection) {
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(ci);
ci->_edit_set_state(se->undo_state);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
void CanvasItemEditor::_commit_canvas_item_state(List<CanvasItem *> p_canvas_items, String action_name, bool commit_bones) {
Commit CanvasItem state only if it changed
2021-01-03 16:24:10 +00:00
List<CanvasItem *> modified_canvas_items;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : p_canvas_items) {
Dictionary old_state = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(ci)->undo_state;
Dictionary new_state = ci->_edit_get_state();
Commit CanvasItem state only if it changed
2021-01-03 16:24:10 +00:00
if (old_state.hash() != new_state.hash()) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
modified_canvas_items.push_back(ci);
Commit CanvasItem state only if it changed
2021-01-03 16:24:10 +00:00
}
}
if (modified_canvas_items.is_empty()) {
return;
}
Add EditorUndoRedoManager singleton
2022-12-23 22:53:16 +00:00
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
Commit CanvasItem state only if it changed
2021-01-03 16:24:10 +00:00
undo_redo->create_action(action_name);
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : modified_canvas_items) {
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(ci);
Fix crashes when manipulating nodes in editor
2021-03-07 14:14:24 +00:00
if (se) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
undo_redo->add_do_method(ci, "_edit_set_state", ci->_edit_get_state());
undo_redo->add_undo_method(ci, "_edit_set_state", se->undo_state);
Fix crashes when manipulating nodes in editor
2021-03-07 14:14:24 +00:00
if (commit_bones) {
Use const references where possible for List range iterators
2021-07-24 13:46:25 +00:00
for (const Dictionary &F : se->pre_drag_bones_undo_state) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
ci = Object::cast_to<CanvasItem>(ci->get_parent());
undo_redo->add_do_method(ci, "_edit_set_state", ci->_edit_get_state());
undo_redo->add_undo_method(ci, "_edit_set_state", F);
Fix crashes when manipulating nodes in editor
2021-03-07 14:14:24 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_do_method(viewport, "queue_redraw");
undo_redo->add_undo_method(viewport, "queue_redraw");
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
undo_redo->commit_action();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
void CanvasItemEditor::_snap_changed() {
Fix some issues found by cppcheck.
2022-04-05 10:40:26 +00:00
static_cast<SnapDialog *>(snap_dialog)->get_fields(grid_offset, grid_step, primary_grid_steps, snap_rotation_offset, snap_rotation_step, snap_scale_step);
Implement shortcuts to multiply/divide the grid step
2017-08-31 19:54:42 +00:00
grid_step_multiplier = 0;
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
}
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
void CanvasItemEditor::_selection_result_pressed(int p_result) {
Revert "Reordering emitted signals in PopupMenu" and fix editor selection issue in the safer way.
2023-02-24 19:17:05 +00:00
if (selection_results_menu.size() <= p_result) {
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +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
}
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
Revert "Reordering emitted signals in PopupMenu" and fix editor selection issue in the safer way.
2023-02-24 19:17:05 +00:00
CanvasItem *item = selection_results_menu[p_result].item;
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +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 (item) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
_select_click_on_item(item, Point2(), selection_menu_additive_selection);
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
}
Revert "Reordering emitted signals in PopupMenu" and fix editor selection issue in the safer way.
2023-02-24 19:17:05 +00:00
selection_results_menu.clear();
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
}
void CanvasItemEditor::_selection_menu_hide() {
selection_results.clear();
selection_menu->clear();
Added `reset_size` method to `Control` and `Window` classes
2021-11-20 08:04:57 +00:00
selection_menu->reset_size();
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
}
Allow to create a node at specific position
2020-08-24 23:32:58 +00:00
void CanvasItemEditor::_add_node_pressed(int p_result) {
Improve 2D editor's right-click menu
2022-01-18 15:35:12 +00:00
List<Node *> nodes_to_move;
switch (p_result) {
case ADD_NODE: {
SceneTreeDock::get_singleton()->open_add_child_dialog();
} break;
case ADD_INSTANCE: {
SceneTreeDock::get_singleton()->open_instance_child_dialog();
} break;
case ADD_PASTE: {
nodes_to_move = SceneTreeDock::get_singleton()->paste_nodes();
[[fallthrough]];
}
case ADD_MOVE: {
Code simplifications CanvasItemEditor: - p_result == ADD_MOVE is always true in this switch-clause - both parts of the if-else-clause do the same thing and simplified an affine_inverse call ControlEditorToolbar: - private function ControlEditorToolbar::_anchor_to_position is used nowhere. Looks like copy and paste from CanvasItemEditor::_anchor_to_position ScrollContainer: - screen_is_touchscreen is always true, because otherwise the function already returned TextLine: - both parts of the if-else-clause do the same thing and simplified return statement
2022-11-03 22:57:07 +00:00
nodes_to_move = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list();
Improve 2D editor's right-click menu
2022-01-18 15:35:12 +00:00
if (nodes_to_move.is_empty()) {
return;
}
Add EditorUndoRedoManager singleton
2022-12-23 22:53:16 +00:00
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
Improve 2D editor's right-click menu
2022-01-18 15:35:12 +00:00
undo_redo->create_action(TTR("Move Node(s) to Position"));
for (Node *node : nodes_to_move) {
CanvasItem *ci = Object::cast_to<CanvasItem>(node);
if (ci) {
Transform2D xform = ci->get_global_transform_with_canvas().affine_inverse() * ci->get_transform();
undo_redo->add_do_method(ci, "_edit_set_position", xform.xform(node_create_position));
undo_redo->add_undo_method(ci, "_edit_set_position", ci->_edit_get_position());
}
}
undo_redo->commit_action();
_reset_create_position();
} break;
Allow to create a node at specific position
2020-08-24 23:32:58 +00:00
}
}
void CanvasItemEditor::_node_created(Node *p_node) {
if (node_create_position == Point2()) {
return;
}
CanvasItem *c = Object::cast_to<CanvasItem>(p_node);
if (c) {
Transform2D xform = c->get_global_transform_with_canvas().affine_inverse() * c->get_transform();
c->_edit_set_position(xform.xform(node_create_position));
}
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
call_deferred(SNAME("_reset_create_position")); // Defer the call in case more than one node is added.
Allow to create a node at specific position
2020-08-24 23:32:58 +00:00
}
void CanvasItemEditor::_reset_create_position() {
node_create_position = Point2();
}
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
bool CanvasItemEditor::_is_grid_visible() const {
switch (grid_visibility) {
case GRID_VISIBILITY_SHOW:
return true;
case GRID_VISIBILITY_SHOW_WHEN_SNAPPING:
return grid_snap_active;
case GRID_VISIBILITY_HIDE:
return false;
}
ERR_FAIL_V_MSG(true, "Unexpected grid_visibility value");
}
void CanvasItemEditor::_prepare_grid_menu() {
for (int i = GRID_VISIBILITY_SHOW; i <= GRID_VISIBILITY_HIDE; i++) {
grid_menu->set_item_checked(i, i == grid_visibility);
}
}
void CanvasItemEditor::_on_grid_menu_id_pressed(int p_id) {
switch (p_id) {
case GRID_VISIBILITY_SHOW:
case GRID_VISIBILITY_SHOW_WHEN_SNAPPING:
case GRID_VISIBILITY_HIDE:
grid_visibility = (GridVisibility)p_id;
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
view_menu->get_popup()->hide();
return;
}
// Toggle grid: go to the least restrictive option possible.
if (grid_snap_active) {
switch (grid_visibility) {
case GRID_VISIBILITY_SHOW:
case GRID_VISIBILITY_SHOW_WHEN_SNAPPING:
grid_visibility = GRID_VISIBILITY_HIDE;
break;
case GRID_VISIBILITY_HIDE:
grid_visibility = GRID_VISIBILITY_SHOW_WHEN_SNAPPING;
break;
}
} else {
switch (grid_visibility) {
case GRID_VISIBILITY_SHOW:
grid_visibility = GRID_VISIBILITY_SHOW_WHEN_SNAPPING;
break;
case GRID_VISIBILITY_SHOW_WHEN_SNAPPING:
case GRID_VISIBILITY_HIDE:
grid_visibility = GRID_VISIBILITY_SHOW;
break;
}
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_event) {
Add EditorUndoRedoManager singleton
2022-12-23 22:53:16 +00:00
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
Implement guides
2017-10-18 21:55:02 +00:00
Ref<InputEventMouseButton> b = p_event;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Ref<InputEventMouseMotion> m = p_event;
if (drag_type == DRAG_NONE) {
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
if (show_guides && show_rulers && EditorNode::get_singleton()->get_edited_scene()) {
Transform2D xform = viewport_scrollable->get_transform() * transform;
// Retrieve the guide lists
Cleanup metadata usage
2022-04-01 18:30:23 +00:00
Array vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_", Array());
Array hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_", Array());
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
// Hover over guides
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t minimum = 1e20;
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
is_hovering_h_guide = false;
is_hovering_v_guide = false;
if (m.is_valid() && m->get_position().x < RULER_WIDTH) {
// Check if we are hovering an existing horizontal guide
for (int i = 0; i < hguides.size(); i++) {
if (ABS(xform.xform(Point2(0, hguides[i])).y - m->get_position().y) < MIN(minimum, 8)) {
is_hovering_h_guide = true;
is_hovering_v_guide = false;
break;
}
Implement guides
2017-10-18 21:55:02 +00:00
}
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
} else if (m.is_valid() && m->get_position().y < RULER_WIDTH) {
// Check if we are hovering an existing vertical guide
for (int i = 0; i < vguides.size(); i++) {
if (ABS(xform.xform(Point2(vguides[i], 0)).x - m->get_position().x) < MIN(minimum, 8)) {
is_hovering_v_guide = true;
is_hovering_h_guide = false;
break;
}
Implement guides
2017-10-18 21:55:02 +00:00
}
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
}
// Start dragging a guide
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed()) {
Implement guides
2017-10-18 21:55:02 +00:00
// Press button
if (b->get_position().x < RULER_WIDTH && b->get_position().y < RULER_WIDTH) {
// Drag a new double guide
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_type = DRAG_DOUBLE_GUIDE;
dragged_guide_index = -1;
return true;
Implement guides
2017-10-18 21:55:02 +00:00
} else if (b->get_position().x < RULER_WIDTH) {
// Check if we drag an existing horizontal guide
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
dragged_guide_index = -1;
Implement guides
2017-10-18 21:55:02 +00:00
for (int i = 0; i < hguides.size(); i++) {
if (ABS(xform.xform(Point2(0, hguides[i])).y - b->get_position().y) < MIN(minimum, 8)) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
dragged_guide_index = i;
Implement guides
2017-10-18 21:55:02 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (dragged_guide_index >= 0) {
Implement guides
2017-10-18 21:55:02 +00:00
// Drag an existing horizontal guide
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_type = DRAG_H_GUIDE;
Implement guides
2017-10-18 21:55:02 +00:00
} else {
// Drag a new vertical guide
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_type = DRAG_V_GUIDE;
Implement guides
2017-10-18 21:55:02 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
Implement guides
2017-10-18 21:55:02 +00:00
} else if (b->get_position().y < RULER_WIDTH) {
// Check if we drag an existing vertical guide
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
dragged_guide_index = -1;
Implement guides
2017-10-18 21:55:02 +00:00
for (int i = 0; i < vguides.size(); i++) {
if (ABS(xform.xform(Point2(vguides[i], 0)).x - b->get_position().x) < MIN(minimum, 8)) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
dragged_guide_index = i;
Implement guides
2017-10-18 21:55:02 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (dragged_guide_index >= 0) {
Implement guides
2017-10-18 21:55:02 +00:00
// Drag an existing vertical guide
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_type = DRAG_V_GUIDE;
Implement guides
2017-10-18 21:55:02 +00:00
} else {
// Drag a new vertical guide
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_type = DRAG_H_GUIDE;
Implement guides
2017-10-18 21:55:02 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_from = xform.affine_inverse().xform(b->get_position());
return true;
Implement guides
2017-10-18 21:55:02 +00:00
}
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
if (drag_type == DRAG_DOUBLE_GUIDE || drag_type == DRAG_V_GUIDE || drag_type == DRAG_H_GUIDE) {
// Move the guide
if (m.is_valid()) {
Transform2D xform = viewport_scrollable->get_transform() * transform;
drag_to = xform.affine_inverse().xform(m->get_position());
Implement guides
2017-10-18 21:55:02 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
dragged_guide_pos = xform.xform(snap_point(drag_to, SNAP_GRID | SNAP_PIXEL | SNAP_OTHER_NODES));
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
// Release confirms the guide move
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && !b->is_pressed()) {
Implement guides
2017-10-18 21:55:02 +00:00
if (show_guides && EditorNode::get_singleton()->get_edited_scene()) {
Transform2D xform = viewport_scrollable->get_transform() * transform;
Fix typos in code and docs with codespell Using v1.11.0 from https://github.com/lucasdemarchi/codespell
2018-01-18 20:37:17 +00:00
// Retrieve the guide lists
Cleanup metadata usage
2022-04-01 18:30:23 +00:00
Array vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_", Array());
Array hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_", Array());
Implement guides
2017-10-18 21:55:02 +00:00
Point2 edited = snap_point(xform.affine_inverse().xform(b->get_position()), SNAP_GRID | SNAP_PIXEL | SNAP_OTHER_NODES);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_V_GUIDE) {
Implement guides
2017-10-18 21:55:02 +00:00
Array prev_vguides = vguides.duplicate();
if (b->get_position().x > RULER_WIDTH) {
// Adds a new vertical guide
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (dragged_guide_index >= 0) {
vguides[dragged_guide_index] = edited.x;
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
undo_redo->create_action(TTR("Move Vertical Guide"));
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", vguides);
undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", prev_vguides);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_undo_method(viewport, "queue_redraw");
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->commit_action();
} else {
vguides.push_back(edited.x);
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
undo_redo->create_action(TTR("Create Vertical Guide"));
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", vguides);
undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", prev_vguides);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_undo_method(viewport, "queue_redraw");
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->commit_action();
}
} else {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (dragged_guide_index >= 0) {
Rename `remove()` to `remove_at()` when removing by index
2021-07-03 22:17:03 +00:00
vguides.remove_at(dragged_guide_index);
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
undo_redo->create_action(TTR("Remove Vertical Guide"));
Rename empty() to is_empty()
2020-12-15 12:04:21 +00:00
if (vguides.is_empty()) {
clear_meta when clearing guides with the ruler
2019-12-06 01:19:54 +00:00
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "remove_meta", "_edit_vertical_guides_");
} else {
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", vguides);
}
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", prev_vguides);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_undo_method(viewport, "queue_redraw");
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->commit_action();
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
} else if (drag_type == DRAG_H_GUIDE) {
Implement guides
2017-10-18 21:55:02 +00:00
Array prev_hguides = hguides.duplicate();
if (b->get_position().y > RULER_WIDTH) {
// Adds a new horizontal guide
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (dragged_guide_index >= 0) {
hguides[dragged_guide_index] = edited.y;
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
undo_redo->create_action(TTR("Move Horizontal Guide"));
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", hguides);
undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", prev_hguides);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_undo_method(viewport, "queue_redraw");
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->commit_action();
} else {
hguides.push_back(edited.y);
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
undo_redo->create_action(TTR("Create Horizontal Guide"));
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", hguides);
undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", prev_hguides);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_undo_method(viewport, "queue_redraw");
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->commit_action();
}
} else {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (dragged_guide_index >= 0) {
Rename `remove()` to `remove_at()` when removing by index
2021-07-03 22:17:03 +00:00
hguides.remove_at(dragged_guide_index);
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
undo_redo->create_action(TTR("Remove Horizontal Guide"));
Rename empty() to is_empty()
2020-12-15 12:04:21 +00:00
if (hguides.is_empty()) {
clear_meta when clearing guides with the ruler
2019-12-06 01:19:54 +00:00
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "remove_meta", "_edit_horizontal_guides_");
} else {
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", hguides);
}
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", prev_hguides);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_undo_method(viewport, "queue_redraw");
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->commit_action();
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
} else if (drag_type == DRAG_DOUBLE_GUIDE) {
Implement guides
2017-10-18 21:55:02 +00:00
Array prev_hguides = hguides.duplicate();
Array prev_vguides = vguides.duplicate();
if (b->get_position().x > RULER_WIDTH && b->get_position().y > RULER_WIDTH) {
// Adds a new horizontal guide a new vertical guide
vguides.push_back(edited.x);
hguides.push_back(edited.y);
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
undo_redo->create_action(TTR("Create Horizontal and Vertical Guides"));
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", vguides);
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", hguides);
undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", prev_vguides);
undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", prev_hguides);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_undo_method(viewport, "queue_redraw");
Implement guides
2017-10-18 21:55:02 +00:00
undo_redo->commit_action();
}
}
}
Hide smart snapping line when guideline dragging ends
2022-03-12 06:37:20 +00:00
snap_target[0] = SNAP_TARGET_NONE;
snap_target[1] = SNAP_TARGET_NONE;
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
Fixes keybord directionnal keys not moving nodes in the 2D editor
2017-10-29 21:00:03 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return false;
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 20:33:25 +00:00
}
Make it so that 2D viewport does not pan while editing tilemaps Fixes #30875
2019-07-28 14:00:05 +00:00
bool CanvasItemEditor::_gui_input_zoom_or_pan(const Ref<InputEvent> &p_event, bool p_already_accepted) {
Fix 2D Pan Tool
2022-01-24 21:19:50 +00:00
panner->set_force_drag(tool == TOOL_PAN);
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
bool panner_active = panner->gui_input(p_event, warped_panning ? viewport->get_global_rect() : Rect2());
if (panner->is_panning() != pan_pressed) {
pan_pressed = panner->is_panning();
}
Fixes 2d editor panning not working
2018-04-22 21:27:46 +00:00
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
if (panner_active) {
return true;
Fixes 2d editor panning not working
2018-04-22 21:27:46 +00:00
}
Ref<InputEventKey> k = p_event;
if (k.is_valid()) {
Improve 2D editor zoom logic - Add 1-5 shortcuts to zoom between 100% and 1600% quickly (similar to GIMP). - When holding down Alt, go through integer zoom values if above 100% or fractional zoom values with integer denominators if below 100% (50%, ~33.3%, 25%, …).
2021-04-27 22:54:59 +00:00
if (k->is_pressed()) {
Shortcut: Rename `shortcut` property to `event` Having a property which has the same name as its class leads to confusing situations (e.g. `BaseButton` has a `shortcut` property of type `Shortcut` which has a `shortcut` property of type `InputEvent`). Also renames `is_event` to `matches_event`, and `is_valid` to `has_valid_event` to better reflect what the methods check.
2021-08-03 15:27:45 +00:00
if (ED_GET_SHORTCUT("canvas_item_editor/zoom_3.125_percent")->matches_event(p_event)) {
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
_shortcut_zoom_set(1.0 / 32.0);
Shortcut: Rename `shortcut` property to `event` Having a property which has the same name as its class leads to confusing situations (e.g. `BaseButton` has a `shortcut` property of type `Shortcut` which has a `shortcut` property of type `InputEvent`). Also renames `is_event` to `matches_event`, and `is_valid` to `has_valid_event` to better reflect what the methods check.
2021-08-03 15:27:45 +00:00
} else if (ED_GET_SHORTCUT("canvas_item_editor/zoom_6.25_percent")->matches_event(p_event)) {
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
_shortcut_zoom_set(1.0 / 16.0);
Shortcut: Rename `shortcut` property to `event` Having a property which has the same name as its class leads to confusing situations (e.g. `BaseButton` has a `shortcut` property of type `Shortcut` which has a `shortcut` property of type `InputEvent`). Also renames `is_event` to `matches_event`, and `is_valid` to `has_valid_event` to better reflect what the methods check.
2021-08-03 15:27:45 +00:00
} else if (ED_GET_SHORTCUT("canvas_item_editor/zoom_12.5_percent")->matches_event(p_event)) {
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
_shortcut_zoom_set(1.0 / 8.0);
Shortcut: Rename `shortcut` property to `event` Having a property which has the same name as its class leads to confusing situations (e.g. `BaseButton` has a `shortcut` property of type `Shortcut` which has a `shortcut` property of type `InputEvent`). Also renames `is_event` to `matches_event`, and `is_valid` to `has_valid_event` to better reflect what the methods check.
2021-08-03 15:27:45 +00:00
} else if (ED_GET_SHORTCUT("canvas_item_editor/zoom_25_percent")->matches_event(p_event)) {
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
_shortcut_zoom_set(1.0 / 4.0);
Shortcut: Rename `shortcut` property to `event` Having a property which has the same name as its class leads to confusing situations (e.g. `BaseButton` has a `shortcut` property of type `Shortcut` which has a `shortcut` property of type `InputEvent`). Also renames `is_event` to `matches_event`, and `is_valid` to `has_valid_event` to better reflect what the methods check.
2021-08-03 15:27:45 +00:00
} else if (ED_GET_SHORTCUT("canvas_item_editor/zoom_50_percent")->matches_event(p_event)) {
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
_shortcut_zoom_set(1.0 / 2.0);
Shortcut: Rename `shortcut` property to `event` Having a property which has the same name as its class leads to confusing situations (e.g. `BaseButton` has a `shortcut` property of type `Shortcut` which has a `shortcut` property of type `InputEvent`). Also renames `is_event` to `matches_event`, and `is_valid` to `has_valid_event` to better reflect what the methods check.
2021-08-03 15:27:45 +00:00
} else if (ED_GET_SHORTCUT("canvas_item_editor/zoom_100_percent")->matches_event(p_event)) {
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
_shortcut_zoom_set(1.0);
Shortcut: Rename `shortcut` property to `event` Having a property which has the same name as its class leads to confusing situations (e.g. `BaseButton` has a `shortcut` property of type `Shortcut` which has a `shortcut` property of type `InputEvent`). Also renames `is_event` to `matches_event`, and `is_valid` to `has_valid_event` to better reflect what the methods check.
2021-08-03 15:27:45 +00:00
} else if (ED_GET_SHORTCUT("canvas_item_editor/zoom_200_percent")->matches_event(p_event)) {
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
_shortcut_zoom_set(2.0);
Shortcut: Rename `shortcut` property to `event` Having a property which has the same name as its class leads to confusing situations (e.g. `BaseButton` has a `shortcut` property of type `Shortcut` which has a `shortcut` property of type `InputEvent`). Also renames `is_event` to `matches_event`, and `is_valid` to `has_valid_event` to better reflect what the methods check.
2021-08-03 15:27:45 +00:00
} else if (ED_GET_SHORTCUT("canvas_item_editor/zoom_400_percent")->matches_event(p_event)) {
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
_shortcut_zoom_set(4.0);
Shortcut: Rename `shortcut` property to `event` Having a property which has the same name as its class leads to confusing situations (e.g. `BaseButton` has a `shortcut` property of type `Shortcut` which has a `shortcut` property of type `InputEvent`). Also renames `is_event` to `matches_event`, and `is_valid` to `has_valid_event` to better reflect what the methods check.
2021-08-03 15:27:45 +00:00
} else if (ED_GET_SHORTCUT("canvas_item_editor/zoom_800_percent")->matches_event(p_event)) {
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
_shortcut_zoom_set(8.0);
Shortcut: Rename `shortcut` property to `event` Having a property which has the same name as its class leads to confusing situations (e.g. `BaseButton` has a `shortcut` property of type `Shortcut` which has a `shortcut` property of type `InputEvent`). Also renames `is_event` to `matches_event`, and `is_valid` to `has_valid_event` to better reflect what the methods check.
2021-08-03 15:27:45 +00:00
} else if (ED_GET_SHORTCUT("canvas_item_editor/zoom_1600_percent")->matches_event(p_event)) {
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
_shortcut_zoom_set(16.0);
Improve 2D editor zoom logic - Add 1-5 shortcuts to zoom between 100% and 1600% quickly (similar to GIMP). - When holding down Alt, go through integer zoom values if above 100% or fractional zoom values with integer denominators if below 100% (50%, ~33.3%, 25%, …).
2021-04-27 22:54:59 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 12:38:15 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return false;
}
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
Add gesture to ViewPanner and simplify a bit its API
2023-01-19 16:50:51 +00:00
void CanvasItemEditor::_pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
view_offset.x -= p_scroll_vec.x / zoom;
view_offset.y -= p_scroll_vec.y / zoom;
update_viewport();
}
Add gesture to ViewPanner and simplify a bit its API
2023-01-19 16:50:51 +00:00
void CanvasItemEditor::_zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputEvent> p_event) {
Ref<InputEventMouseButton> mb = p_event;
if (mb.is_valid()) {
// Special behvior for scroll events, as the zoom_by_increment method can smartly end up on powers of two.
int increment = p_zoom_factor > 1.0 ? 1 : -1;
zoom_widget->set_zoom_by_increments(increment, mb->is_alt_pressed());
} else {
zoom_widget->set_zoom(zoom_widget->get_zoom() * p_zoom_factor);
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
}
Add gesture to ViewPanner and simplify a bit its API
2023-01-19 16:50:51 +00:00
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
_zoom_on_position(zoom_widget->get_zoom(), p_origin);
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
bool CanvasItemEditor::_gui_input_pivot(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseMotion> m = p_event;
Ref<InputEventMouseButton> b = p_event;
Ref<InputEventKey> k = p_event;
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Drag the pivot (in pivot mode / with V key)
if (drag_type == DRAG_NONE) {
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if ((b.is_valid() && b->is_pressed() && b->get_button_index() == MouseButton::LEFT && tool == TOOL_EDIT_PIVOT) ||
Use BitField<> in core type masks * All core types masks are now correctly marked as bitfields. * The enum hacks in MouseButtonMask and many other types are gone. This ensures that binders to other languages non C++ can actually implement type safe bitmasks. * Most bitmask operations replaced by functions in BitField<> * Key is still a problem because its enum and mask at the same time. While it kind of works in C++, this most likely can't be implemented safely in other languages and will have to be changed at some point. Mostly left as-is. * Documentation and API dump updated to reflect bitfields in core types.
2023-01-07 23:55:54 +00:00
(k.is_valid() && k->is_pressed() && !k->is_echo() && k->get_keycode() == Key::V && tool == TOOL_SELECT && k->get_modifiers_mask().is_empty())) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
List<CanvasItem *> selection = _get_edited_canvas_items();
// Filters the selection with nodes that allow setting the pivot
drag_selection = List<CanvasItem *>();
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : selection) {
if (ci->_edit_use_pivot()) {
drag_selection.push_back(ci);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Start dragging if we still have nodes
if (drag_selection.size() > 0) {
Fixes improper undo state for pivot setting After setting the pivot of a node, if you undo.... it will not revert the pivot to the previous state.
2019-11-05 13:59:03 +00:00
_save_canvas_item_state(drag_selection);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_from = transform.affine_inverse().xform((b.is_valid()) ? b->get_position() : viewport->get_local_mouse_position());
Vector2 new_pos;
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
if (drag_selection.size() == 1) {
new_pos = snap_point(drag_from, SNAP_NODE_SIDES | SNAP_NODE_CENTER | SNAP_NODE_ANCHORS | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, 0, drag_selection[0]);
} else {
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
new_pos = snap_point(drag_from, SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, 0, nullptr, drag_selection);
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : drag_selection) {
ci->_edit_set_pivot(ci->get_global_transform_with_canvas().affine_inverse().xform(new_pos));
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_type = DRAG_PIVOT;
}
return true;
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_PIVOT) {
// Move the pivot
if (m.is_valid()) {
drag_to = transform.affine_inverse().xform(m->get_position());
_restore_canvas_item_state(drag_selection);
Vector2 new_pos;
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 (drag_selection.size() == 1) {
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
new_pos = snap_point(drag_to, SNAP_NODE_SIDES | SNAP_NODE_CENTER | SNAP_NODE_ANCHORS | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, 0, drag_selection[0]);
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
} else {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
new_pos = snap_point(drag_to, SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL);
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 MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : drag_selection) {
ci->_edit_set_pivot(ci->get_global_transform_with_canvas().affine_inverse().xform(new_pos));
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
return true;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Confirm the pivot move
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
if (drag_selection.size() >= 1 &&
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
((b.is_valid() && !b->is_pressed() && b->get_button_index() == MouseButton::LEFT && tool == TOOL_EDIT_PIVOT) ||
(k.is_valid() && !k->is_pressed() && k->get_keycode() == Key::V))) {
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
_commit_canvas_item_state(
drag_selection,
vformat(
TTR("Set CanvasItem \"%s\" Pivot Offset to (%d, %d)"),
drag_selection[0]->get_name(),
drag_selection[0]->_edit_get_pivot().x,
drag_selection[0]->_edit_get_pivot().y));
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Cancel a drag
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::RIGHT && b->is_pressed()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
_restore_canvas_item_state(drag_selection);
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
}
return false;
}
bool CanvasItemEditor::_gui_input_rotate(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> b = p_event;
Ref<InputEventMouseMotion> m = p_event;
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Start rotation
if (drag_type == DRAG_NONE) {
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed()) {
Fix key mapping changes when moving from macOS to other platform Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
2022-09-02 09:37:48 +00:00
if ((b->is_command_or_control_pressed() && !b->is_alt_pressed() && tool == TOOL_SELECT) || tool == TOOL_ROTATE) {
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
List<CanvasItem *> selection = _get_edited_canvas_items();
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
// Remove not movable nodes
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (CanvasItem *E : selection) {
if (!_is_node_movable(E, true)) {
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
selection.erase(E);
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
}
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
}
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
drag_selection = selection;
if (drag_selection.size() > 0) {
drag_type = DRAG_ROTATE;
drag_from = transform.affine_inverse().xform(b->get_position());
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = drag_selection[0];
if (ci->_edit_use_pivot()) {
drag_rotation_center = ci->get_global_transform_with_canvas().xform(ci->_edit_get_pivot());
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
} else {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
drag_rotation_center = ci->get_global_transform_with_canvas().get_origin();
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
}
_save_canvas_item_state(drag_selection);
return true;
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
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_ROTATE) {
// Rotate the node
if (m.is_valid()) {
_restore_canvas_item_state(drag_selection);
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : drag_selection) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_to = transform.affine_inverse().xform(m->get_position());
Fix issue regarding rotation Canvas items will now rotate correctly no matter what their global scale happens to be.
2020-01-07 02:43:22 +00:00
//Rotate the opposite way if the canvas item's compounded scale has an uneven number of negative elements
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
bool opposite = (ci->get_global_transform().get_scale().sign().dot(ci->get_transform().get_scale().sign()) == 0);
ci->_edit_set_rotation(snap_angle(ci->_edit_get_rotation() + (opposite ? -1 : 1) * (drag_from - drag_rotation_center).angle_to(drag_to - drag_rotation_center), ci->_edit_get_rotation()));
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
return true;
}
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Confirms the node rotation
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && !b->is_pressed()) {
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
if (drag_selection.size() != 1) {
_commit_canvas_item_state(
drag_selection,
vformat(TTR("Rotate %d CanvasItems"), drag_selection.size()),
true);
} else {
_commit_canvas_item_state(
drag_selection,
vformat(TTR("Rotate CanvasItem \"%s\" to %d degrees"),
drag_selection[0]->get_name(),
Rename `str2var` to `str_to_var` and similar Affects the Math class, a good chunk of the audio code, and a lot of other miscellaneous classes, too. - `var2str` -> `var_to_str` - `str2var` -> `str_to_var` - `bytes2var` -> `bytes_to_var` - `bytes2var_with_objects` -> `bytes_to_var_with_objects` - `var2bytes` -> `var_to_bytes` - `var2bytes_with_objects` -> `var_to_bytes_with_objects` - `linear2db` -> `linear_to_db` - `db2linear` -> `db_to_linear` - `deg2rad` -> `deg_to_rad` - `rad2deg` -> `rad_to_deg` - `dict2inst` -> `dict_to_inst` - `inst2dict` -> `inst_to_dict`
2022-08-13 15:45:42 +00:00
Math::rad_to_deg(drag_selection[0]->_edit_get_rotation())),
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
true);
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
if (key_auto_insert_button->is_pressed()) {
_insert_animation_keys(false, true, false, true);
}
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Cancel a drag
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::RIGHT && b->is_pressed()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
_restore_canvas_item_state(drag_selection);
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
}
return false;
}
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
bool CanvasItemEditor::_gui_input_open_scene_on_double_click(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> b = p_event;
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Open a sub-scene on double-click
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed() && b->is_double_click() && tool == TOOL_SELECT) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
List<CanvasItem *> selection = _get_edited_canvas_items();
if (selection.size() == 1) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = selection[0];
if (!ci->get_scene_file_path().is_empty() && ci != EditorNode::get_singleton()->get_edited_scene()) {
EditorNode::get_singleton()->open_request(ci->get_scene_file_path());
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
}
}
return false;
}
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
bool CanvasItemEditor::_gui_input_anchors(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> b = p_event;
Ref<InputEventMouseMotion> m = p_event;
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Starts anchor dragging if needed
if (drag_type == DRAG_NONE) {
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed() && tool == TOOL_SELECT) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
List<CanvasItem *> selection = _get_edited_canvas_items();
if (selection.size() == 1) {
Control *control = Object::cast_to<Control>(selection[0]);
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
if (control && _is_node_movable(control)) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Vector2 anchor_pos[4];
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
anchor_pos[0] = Vector2(control->get_anchor(SIDE_LEFT), control->get_anchor(SIDE_TOP));
anchor_pos[1] = Vector2(control->get_anchor(SIDE_RIGHT), control->get_anchor(SIDE_TOP));
anchor_pos[2] = Vector2(control->get_anchor(SIDE_RIGHT), control->get_anchor(SIDE_BOTTOM));
anchor_pos[3] = Vector2(control->get_anchor(SIDE_LEFT), control->get_anchor(SIDE_BOTTOM));
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Rect2 anchor_rects[4];
for (int i = 0; i < 4; i++) {
anchor_pos[i] = (transform * control->get_global_transform_with_canvas()).xform(_anchor_to_position(control, anchor_pos[i]));
anchor_rects[i] = Rect2(anchor_pos[i], anchor_handle->get_size());
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
if (control->is_layout_rtl()) {
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
anchor_rects[i].position -= anchor_handle->get_size() * Vector2(real_t(i == 1 || i == 2), real_t(i <= 1));
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
} else {
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
anchor_rects[i].position -= anchor_handle->get_size() * Vector2(real_t(i == 0 || i == 3), real_t(i <= 1));
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +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 some issues found by cppcheck.
2022-04-05 10:40:26 +00:00
const DragType dragger[] = {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
DRAG_ANCHOR_TOP_LEFT,
DRAG_ANCHOR_TOP_RIGHT,
DRAG_ANCHOR_BOTTOM_RIGHT,
DRAG_ANCHOR_BOTTOM_LEFT,
};
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
for (int i = 0; i < 4; i++) {
if (anchor_rects[i].has_point(b->get_position())) {
if ((anchor_pos[0] == anchor_pos[2]) && (anchor_pos[0].distance_to(b->get_position()) < anchor_handle->get_size().length() / 3.0)) {
drag_type = DRAG_ANCHOR_ALL;
} else {
drag_type = dragger[i];
}
drag_from = transform.affine_inverse().xform(b->get_position());
drag_selection = List<CanvasItem *>();
drag_selection.push_back(control);
_save_canvas_item_state(drag_selection);
return true;
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
}
}
}
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_ANCHOR_TOP_LEFT || drag_type == DRAG_ANCHOR_TOP_RIGHT || drag_type == DRAG_ANCHOR_BOTTOM_RIGHT || drag_type == DRAG_ANCHOR_BOTTOM_LEFT || drag_type == DRAG_ANCHOR_ALL) {
// Drag the anchor
if (m.is_valid()) {
_restore_canvas_item_state(drag_selection);
Control *control = Object::cast_to<Control>(drag_selection[0]);
Make anchors draggable
2017-07-29 14:57:32 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_to = transform.affine_inverse().xform(m->get_position());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Transform2D xform = control->get_global_transform_with_canvas().affine_inverse();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Point2 previous_anchor;
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
previous_anchor.x = (drag_type == DRAG_ANCHOR_TOP_LEFT || drag_type == DRAG_ANCHOR_BOTTOM_LEFT) ? control->get_anchor(SIDE_LEFT) : control->get_anchor(SIDE_RIGHT);
previous_anchor.y = (drag_type == DRAG_ANCHOR_TOP_LEFT || drag_type == DRAG_ANCHOR_TOP_RIGHT) ? control->get_anchor(SIDE_TOP) : control->get_anchor(SIDE_BOTTOM);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
previous_anchor = xform.affine_inverse().xform(_anchor_to_position(control, previous_anchor));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
Vector2 new_anchor = xform.xform(snap_point(previous_anchor + (drag_to - drag_from), SNAP_GRID | SNAP_OTHER_NODES, SNAP_NODE_PARENT | SNAP_NODE_SIDES | SNAP_NODE_CENTER, control));
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
new_anchor = _position_to_anchor(control, new_anchor).snapped(Vector2(0.001, 0.001));
Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item. Added some comments Removed commented code or useless ones
2017-07-18 18:17:55 +00:00
Rename "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
bool use_single_axis = m->is_shift_pressed();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Vector2 drag_vector = xform.xform(drag_to) - xform.xform(drag_from);
bool use_y = Math::abs(drag_vector.y) > Math::abs(drag_vector.x);
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
switch (drag_type) {
case DRAG_ANCHOR_TOP_LEFT:
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 (!use_single_axis || !use_y) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
control->set_anchor(SIDE_LEFT, new_anchor.x, false, 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
}
if (!use_single_axis || use_y) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
control->set_anchor(SIDE_TOP, new_anchor.y, false, 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
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
break;
case DRAG_ANCHOR_TOP_RIGHT:
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 (!use_single_axis || !use_y) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
control->set_anchor(SIDE_RIGHT, new_anchor.x, false, 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
}
if (!use_single_axis || use_y) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
control->set_anchor(SIDE_TOP, new_anchor.y, false, 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
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
break;
case DRAG_ANCHOR_BOTTOM_RIGHT:
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 (!use_single_axis || !use_y) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
control->set_anchor(SIDE_RIGHT, new_anchor.x, false, 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
}
if (!use_single_axis || use_y) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
control->set_anchor(SIDE_BOTTOM, new_anchor.y, false, 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
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
break;
case DRAG_ANCHOR_BOTTOM_LEFT:
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 (!use_single_axis || !use_y) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
control->set_anchor(SIDE_LEFT, new_anchor.x, false, 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
}
if (!use_single_axis || use_y) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
control->set_anchor(SIDE_BOTTOM, new_anchor.y, false, 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
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
break;
case DRAG_ANCHOR_ALL:
Small fixes to static analyzer bugs
2019-04-04 20:00:16 +00:00
if (!use_single_axis || !use_y) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
control->set_anchor(SIDE_LEFT, new_anchor.x, false, true);
control->set_anchor(SIDE_RIGHT, new_anchor.x, false, true);
Small fixes to static analyzer bugs
2019-04-04 20:00:16 +00:00
}
if (!use_single_axis || use_y) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
control->set_anchor(SIDE_TOP, new_anchor.y, false, true);
control->set_anchor(SIDE_BOTTOM, new_anchor.y, false, true);
Small fixes to static analyzer bugs
2019-04-04 20:00:16 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
break;
default:
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Confirms new anchor position
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (drag_selection.size() >= 1 && b.is_valid() && b->get_button_index() == MouseButton::LEFT && !b->is_pressed()) {
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
_commit_canvas_item_state(
drag_selection,
vformat(TTR("Move CanvasItem \"%s\" Anchor"), drag_selection[0]->get_name()));
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
Attempt to resolve #4673
2017-08-08 10:13:17 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Cancel a drag
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::RIGHT && b->is_pressed()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
_restore_canvas_item_state(drag_selection);
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
Replaced the hard-to-understand _select by _select_click_on_empty_area and _select_click_on_item. Added some comments Removed commented code or useless ones
2017-07-18 18:17:55 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return false;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
bool CanvasItemEditor::_gui_input_resize(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> b = 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
Ref<InputEventMouseMotion> m = p_event;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Drag resize handles
if (drag_type == DRAG_NONE) {
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed() && tool == TOOL_SELECT) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
List<CanvasItem *> selection = _get_edited_canvas_items();
if (selection.size() == 1) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = selection[0];
if (ci->_edit_use_rect() && _is_node_movable(ci)) {
Rect2 rect = ci->_edit_get_rect();
Transform2D xform = transform * ci->get_global_transform_with_canvas();
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
Fix some issues found by cppcheck.
2022-04-05 10:40:26 +00:00
const Vector2 endpoints[4] = {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
xform.xform(rect.position),
xform.xform(rect.position + Vector2(rect.size.x, 0)),
xform.xform(rect.position + rect.size),
xform.xform(rect.position + Vector2(0, rect.size.y))
};
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Fix some issues found by cppcheck.
2022-04-05 10:40:26 +00:00
const DragType dragger[] = {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
DRAG_TOP_LEFT,
DRAG_TOP,
DRAG_TOP_RIGHT,
DRAG_RIGHT,
DRAG_BOTTOM_RIGHT,
DRAG_BOTTOM,
DRAG_BOTTOM_LEFT,
DRAG_LEFT
};
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
DragType resize_drag = DRAG_NONE;
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t radius = (select_handle->get_size().width / 2) * 1.5;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
for (int i = 0; i < 4; i++) {
int prev = (i + 3) % 4;
int next = (i + 1) % 4;
Vector2 ofs = ((endpoints[i] - endpoints[prev]).normalized() + ((endpoints[i] - endpoints[next]).normalized())).normalized();
ofs *= (select_handle->get_size().width / 2);
ofs += endpoints[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
if (ofs.distance_to(b->get_position()) < radius) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
resize_drag = dragger[i * 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
}
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
ofs = (endpoints[i] + endpoints[next]) / 2;
Rename Vector2.tangent() to Vector2.orthogonal()
2020-12-06 18:16:06 +00:00
ofs += (endpoints[next] - endpoints[i]).orthogonal().normalized() * (select_handle->get_size().width / 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
if (ofs.distance_to(b->get_position()) < radius) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
resize_drag = dragger[i * 2 + 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
}
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
}
Implement warped mouse panning for 2D & 3D editors Enabled by default as in Blender, but can be disabled separately for 2D & 3D; the core functionality is in Input so this could be reused or even exposed to scripts in the future
2017-03-22 20:18:47 +00:00
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
if (resize_drag != DRAG_NONE) {
drag_type = resize_drag;
drag_from = transform.affine_inverse().xform(b->get_position());
drag_selection = List<CanvasItem *>();
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
drag_selection.push_back(ci);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
_save_canvas_item_state(drag_selection);
return true;
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_LEFT || drag_type == DRAG_RIGHT || drag_type == DRAG_TOP || drag_type == DRAG_BOTTOM ||
drag_type == DRAG_TOP_LEFT || drag_type == DRAG_TOP_RIGHT || drag_type == DRAG_BOTTOM_LEFT || drag_type == DRAG_BOTTOM_RIGHT) {
// Resize the node
if (m.is_valid()) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = drag_selection[0];
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(ci);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
//Reset state
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
ci->_edit_set_state(se->undo_state);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Rename "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
bool uniform = m->is_shift_pressed();
bool symmetric = m->is_alt_pressed();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Rect2 local_rect = ci->_edit_get_rect();
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t aspect = local_rect.get_size().y / local_rect.get_size().x;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Point2 current_begin = local_rect.get_position();
Point2 current_end = local_rect.get_position() + local_rect.get_size();
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Point2 max_begin = (symmetric) ? (current_begin + current_end - ci->_edit_get_minimum_size()) / 2.0 : current_end - ci->_edit_get_minimum_size();
Point2 min_end = (symmetric) ? (current_begin + current_end + ci->_edit_get_minimum_size()) / 2.0 : current_begin + ci->_edit_get_minimum_size();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Point2 center = (current_begin + current_end) / 2.0;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_to = transform.affine_inverse().xform(m->get_position());
Ability to rotate controls using tool, closes #3800
2016-06-27 13:47:51 +00:00
Code simplifications CanvasItemEditor: - p_result == ADD_MOVE is always true in this switch-clause - both parts of the if-else-clause do the same thing and simplified an affine_inverse call ControlEditorToolbar: - private function ControlEditorToolbar::_anchor_to_position is used nowhere. Looks like copy and paste from CanvasItemEditor::_anchor_to_position ScrollContainer: - screen_is_touchscreen is always true, because otherwise the function already returned TextLine: - both parts of the if-else-clause do the same thing and simplified return statement
2022-11-03 22:57:07 +00:00
Transform2D xform = ci->get_global_transform_with_canvas();
Ability to rotate controls using tool, closes #3800
2016-06-27 13:47:51 +00:00
Fix editor drawing snapping lines for wrong edge/corner when resizing elements with smart snapping enabled fixes #32342
2020-01-20 06:49:18 +00:00
Point2 drag_to_snapped_begin;
Point2 drag_to_snapped_end;
Code simplifications CanvasItemEditor: - p_result == ADD_MOVE is always true in this switch-clause - both parts of the if-else-clause do the same thing and simplified an affine_inverse call ControlEditorToolbar: - private function ControlEditorToolbar::_anchor_to_position is used nowhere. Looks like copy and paste from CanvasItemEditor::_anchor_to_position ScrollContainer: - screen_is_touchscreen is always true, because otherwise the function already returned TextLine: - both parts of the if-else-clause do the same thing and simplified return statement
2022-11-03 22:57:07 +00:00
drag_to_snapped_end = snap_point(xform.xform(current_end) + (drag_to - drag_from), SNAP_NODE_ANCHORS | SNAP_NODE_PARENT | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, 0, ci);
drag_to_snapped_begin = snap_point(xform.xform(current_begin) + (drag_to - drag_from), SNAP_NODE_ANCHORS | SNAP_NODE_PARENT | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, 0, ci);
Fix editor drawing snapping lines for wrong edge/corner when resizing elements with smart snapping enabled fixes #32342
2020-01-20 06:49:18 +00:00
Code simplifications CanvasItemEditor: - p_result == ADD_MOVE is always true in this switch-clause - both parts of the if-else-clause do the same thing and simplified an affine_inverse call ControlEditorToolbar: - private function ControlEditorToolbar::_anchor_to_position is used nowhere. Looks like copy and paste from CanvasItemEditor::_anchor_to_position ScrollContainer: - screen_is_touchscreen is always true, because otherwise the function already returned TextLine: - both parts of the if-else-clause do the same thing and simplified return statement
2022-11-03 22:57:07 +00:00
Point2 drag_begin = xform.affine_inverse().xform(drag_to_snapped_begin);
Point2 drag_end = xform.affine_inverse().xform(drag_to_snapped_end);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Horizontal resize
if (drag_type == DRAG_LEFT || drag_type == DRAG_TOP_LEFT || drag_type == DRAG_BOTTOM_LEFT) {
current_begin.x = MIN(drag_begin.x, max_begin.x);
} else if (drag_type == DRAG_RIGHT || drag_type == DRAG_TOP_RIGHT || drag_type == DRAG_BOTTOM_RIGHT) {
current_end.x = MAX(drag_end.x, min_end.x);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Vertical resize
if (drag_type == DRAG_TOP || drag_type == DRAG_TOP_LEFT || drag_type == DRAG_TOP_RIGHT) {
current_begin.y = MIN(drag_begin.y, max_begin.y);
} else if (drag_type == DRAG_BOTTOM || drag_type == DRAG_BOTTOM_LEFT || drag_type == DRAG_BOTTOM_RIGHT) {
current_end.y = MAX(drag_end.y, min_end.y);
}
Use shift to move anchors on a single axis
2017-08-31 21:27:05 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Uniform resize
if (uniform) {
if (drag_type == DRAG_LEFT || drag_type == DRAG_RIGHT) {
current_end.y = current_begin.y + aspect * (current_end.x - current_begin.x);
} else if (drag_type == DRAG_TOP || drag_type == DRAG_BOTTOM) {
current_end.x = current_begin.x + (current_end.y - current_begin.y) / aspect;
} else {
if (aspect >= 1.0) {
if (drag_type == DRAG_TOP_LEFT || drag_type == DRAG_TOP_RIGHT) {
current_begin.y = current_end.y - aspect * (current_end.x - current_begin.x);
Use shift to move anchors on a single axis
2017-08-31 21:27:05 +00:00
} else {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
current_end.y = current_begin.y + aspect * (current_end.x - current_begin.x);
}
} else {
if (drag_type == DRAG_TOP_LEFT || drag_type == DRAG_BOTTOM_LEFT) {
current_begin.x = current_end.x - (current_end.y - current_begin.y) / aspect;
} else {
current_end.x = current_begin.x + (current_end.y - current_begin.y) / aspect;
Use shift to move anchors on a single axis
2017-08-31 21:27:05 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
Use shift to move anchors on a single axis
2017-08-31 21:27:05 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Symmetric resize
if (symmetric) {
if (drag_type == DRAG_LEFT || drag_type == DRAG_TOP_LEFT || drag_type == DRAG_BOTTOM_LEFT) {
current_end.x = 2.0 * center.x - current_begin.x;
} else if (drag_type == DRAG_RIGHT || drag_type == DRAG_TOP_RIGHT || drag_type == DRAG_BOTTOM_RIGHT) {
current_begin.x = 2.0 * center.x - current_end.x;
}
if (drag_type == DRAG_TOP || drag_type == DRAG_TOP_LEFT || drag_type == DRAG_TOP_RIGHT) {
current_end.y = 2.0 * center.y - current_begin.y;
} else if (drag_type == DRAG_BOTTOM || drag_type == DRAG_BOTTOM_LEFT || drag_type == DRAG_BOTTOM_RIGHT) {
current_begin.y = 2.0 * center.y - current_end.y;
}
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
ci->_edit_set_rect(Rect2(current_begin, current_end - current_begin));
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Confirm resize
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (drag_selection.size() >= 1 && b.is_valid() && b->get_button_index() == MouseButton::LEFT && !b->is_pressed()) {
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
const Node2D *node2d = Object::cast_to<Node2D>(drag_selection[0]);
if (node2d) {
// Extends from Node2D.
// Node2D doesn't have an actual stored rect size, unlike Controls.
_commit_canvas_item_state(
drag_selection,
vformat(
TTR("Scale Node2D \"%s\" to (%s, %s)"),
drag_selection[0]->get_name(),
Rename Math::stepify to snapped
2020-12-21 18:02:57 +00:00
Math::snapped(drag_selection[0]->_edit_get_scale().x, 0.01),
Math::snapped(drag_selection[0]->_edit_get_scale().y, 0.01)),
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
true);
} else {
// Extends from Control.
_commit_canvas_item_state(
drag_selection,
vformat(
TTR("Resize Control \"%s\" to (%d, %d)"),
drag_selection[0]->get_name(),
drag_selection[0]->_edit_get_rect().size.x,
drag_selection[0]->_edit_get_rect().size.y),
true);
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
if (key_auto_insert_button->is_pressed()) {
_insert_animation_keys(false, false, true, true);
}
Clean snapping lines after resize
2019-09-25 14:56:44 +00:00
snap_target[0] = SNAP_TARGET_NONE;
snap_target[1] = SNAP_TARGET_NONE;
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Cancel a drag
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::RIGHT && b->is_pressed()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
_restore_canvas_item_state(drag_selection);
Clean snapping lines after resize
2019-09-25 14:56:44 +00:00
snap_target[0] = SNAP_TARGET_NONE;
snap_target[1] = SNAP_TARGET_NONE;
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
}
return false;
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 21:30:54 +00:00
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
bool CanvasItemEditor::_gui_input_scale(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> b = p_event;
Ref<InputEventMouseMotion> m = p_event;
// Drag resize handles
if (drag_type == DRAG_NONE) {
replace the use of CTRL by CMD_OR_CTRL in three places where using CTRL prevented the use of the functionality on mac on Mac CTRL + Left click = Right click therefore when a functionality needs CTRL + Left click it is not possible on mac. It then forcibly needs to be CMD on mac
2023-01-15 17:41:37 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed() && ((b->is_alt_pressed() && b->is_command_or_control_pressed()) || tool == TOOL_SCALE)) {
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
List<CanvasItem *> selection = _get_edited_canvas_items();
if (selection.size() == 1) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = selection[0];
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (_is_node_movable(ci)) {
Transform2D xform = transform * ci->get_global_transform_with_canvas();
Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized();
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
Transform2D simple_xform = viewport->get_transform() * unscaled_transform;
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
drag_type = DRAG_SCALE_BOTH;
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
if (show_transformation_gizmos) {
Size2 scale_factor = Size2(SCALE_HANDLE_DISTANCE, SCALE_HANDLE_DISTANCE);
Rect2 x_handle_rect = Rect2(scale_factor.x * EDSCALE, -5 * EDSCALE, 10 * EDSCALE, 10 * EDSCALE);
if (x_handle_rect.has_point(simple_xform.affine_inverse().xform(b->get_position()))) {
drag_type = DRAG_SCALE_X;
}
Changed transformation handles y arrow to match positive y
2019-11-12 10:05:34 +00:00
Rect2 y_handle_rect = Rect2(-5 * EDSCALE, scale_factor.y * EDSCALE, 10 * EDSCALE, 10 * EDSCALE);
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
if (y_handle_rect.has_point(simple_xform.affine_inverse().xform(b->get_position()))) {
drag_type = DRAG_SCALE_Y;
}
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
}
drag_from = transform.affine_inverse().xform(b->get_position());
drag_selection = List<CanvasItem *>();
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
drag_selection.push_back(ci);
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
_save_canvas_item_state(drag_selection);
return true;
}
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
}
}
}
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
if (drag_type == DRAG_SCALE_BOTH || drag_type == DRAG_SCALE_X || drag_type == DRAG_SCALE_Y) {
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
// Resize the node
if (m.is_valid()) {
Fixes 2D IK
2018-09-20 20:33:49 +00:00
_restore_canvas_item_state(drag_selection);
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = drag_selection[0];
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
drag_to = transform.affine_inverse().xform(m->get_position());
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Transform2D parent_xform = ci->get_global_transform_with_canvas() * ci->get_transform().affine_inverse();
Transform2D unscaled_transform = (transform * parent_xform * ci->_edit_get_transform()).orthonormalized();
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
Transform2D simple_xform = (viewport->get_transform() * unscaled_transform).affine_inverse() * transform;
Rename "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
bool uniform = m->is_shift_pressed();
replace the use of CTRL by CMD_OR_CTRL in three places where using CTRL prevented the use of the functionality on mac on Mac CTRL + Left click = Right click therefore when a functionality needs CTRL + Left click it is not possible on mac. It then forcibly needs to be CMD on mac
2023-01-15 17:41:37 +00:00
bool is_ctrl = m->is_ctrl_pressed();
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
Point2 drag_from_local = simple_xform.xform(drag_from);
Point2 drag_to_local = simple_xform.xform(drag_to);
Point2 offset = drag_to_local - drag_from_local;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Size2 scale = ci->_edit_get_scale();
Relative scale snapping 2D
2020-04-12 09:19:19 +00:00
Size2 original_scale = scale;
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t ratio = scale.y / scale.x;
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
if (drag_type == DRAG_SCALE_BOTH) {
Size2 scale_factor = drag_to_local / drag_from_local;
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
if (uniform) {
Fixes uniform scaling issues (for real this time)
2018-11-06 20:51:48 +00:00
scale *= (scale_factor.x + scale_factor.y) / 2.0;
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
} else {
scale *= scale_factor;
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
}
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
} else {
Size2 scale_factor = Vector2(offset.x, -offset.y) / SCALE_HANDLE_DISTANCE;
Size2 parent_scale = parent_xform.get_scale();
scale_factor *= Vector2(1.0 / parent_scale.x, 1.0 / parent_scale.y);
Relative scale snapping 2D
2020-04-12 09:19:19 +00:00
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
if (drag_type == DRAG_SCALE_X) {
scale.x += scale_factor.x;
if (uniform) {
scale.y = scale.x * ratio;
}
} else if (drag_type == DRAG_SCALE_Y) {
Changed transformation handles y arrow to match positive y
2019-11-12 10:05:34 +00:00
scale.y -= scale_factor.y;
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
if (uniform) {
scale.x = scale.y / ratio;
}
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
}
}
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
if (snap_scale && !is_ctrl) {
Relative scale snapping 2D
2020-04-12 09:19:19 +00:00
if (snap_relative) {
scale.x = original_scale.x * (roundf((scale.x / original_scale.x) / snap_scale_step) * snap_scale_step);
scale.y = original_scale.y * (roundf((scale.y / original_scale.y) / snap_scale_step) * snap_scale_step);
} else {
scale.x = roundf(scale.x / snap_scale_step) * snap_scale_step;
scale.y = roundf(scale.y / snap_scale_step) * snap_scale_step;
}
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
ci->_edit_set_scale(scale);
Add both X and Y scale in the scale editor
2018-09-20 13:22:35 +00:00
return true;
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
}
// Confirm resize
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && !b->is_pressed()) {
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
if (drag_selection.size() != 1) {
_commit_canvas_item_state(
drag_selection,
vformat(TTR("Scale %d CanvasItems"), drag_selection.size()),
true);
} else {
_commit_canvas_item_state(
drag_selection,
vformat(TTR("Scale CanvasItem \"%s\" to (%s, %s)"),
drag_selection[0]->get_name(),
Rename Math::stepify to snapped
2020-12-21 18:02:57 +00:00
Math::snapped(drag_selection[0]->_edit_get_scale().x, 0.01),
Math::snapped(drag_selection[0]->_edit_get_scale().y, 0.01)),
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
true);
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
if (key_auto_insert_button->is_pressed()) {
_insert_animation_keys(false, false, true, true);
}
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
return true;
}
// Cancel a drag
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::RIGHT && b->is_pressed()) {
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
_restore_canvas_item_state(drag_selection);
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
return true;
}
}
return false;
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
bool CanvasItemEditor::_gui_input_move(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> b = p_event;
Ref<InputEventMouseMotion> m = p_event;
Ref<InputEventKey> k = p_event;
Make anchors draggable
2017-07-29 14:57:32 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_NONE) {
//Start moving the nodes
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed()) {
replace the use of CTRL by CMD_OR_CTRL in three places where using CTRL prevented the use of the functionality on mac on Mac CTRL + Left click = Right click therefore when a functionality needs CTRL + Left click it is not possible on mac. It then forcibly needs to be CMD on mac
2023-01-15 17:41:37 +00:00
if ((b->is_alt_pressed() && !b->is_command_or_control_pressed()) || tool == TOOL_MOVE) {
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
List<CanvasItem *> selection = _get_edited_canvas_items();
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
Prevent multiple Controls moving inside container
2020-07-19 21:13:08 +00:00
drag_selection.clear();
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
for (int i = 0; i < selection.size(); i++) {
Prevent multiple Controls moving inside container
2020-07-19 21:13:08 +00:00
if (_is_node_movable(selection[i], true)) {
drag_selection.push_back(selection[i]);
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
}
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
}
if (selection.size() > 0) {
drag_type = DRAG_MOVE;
Added movement handles to 2D
2019-11-08 14:48:26 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = selection[0];
Transform2D parent_xform = ci->get_global_transform_with_canvas() * ci->get_transform().affine_inverse();
Transform2D unscaled_transform = (transform * parent_xform * ci->_edit_get_transform()).orthonormalized();
Added movement handles to 2D
2019-11-08 14:48:26 +00:00
Transform2D simple_xform = viewport->get_transform() * unscaled_transform;
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
if (show_transformation_gizmos) {
Size2 move_factor = Size2(MOVE_HANDLE_DISTANCE, MOVE_HANDLE_DISTANCE);
Rect2 x_handle_rect = Rect2(move_factor.x * EDSCALE, -5 * EDSCALE, 10 * EDSCALE, 10 * EDSCALE);
if (x_handle_rect.has_point(simple_xform.affine_inverse().xform(b->get_position()))) {
drag_type = DRAG_MOVE_X;
}
Changed transformation handles y arrow to match positive y
2019-11-12 10:05:34 +00:00
Rect2 y_handle_rect = Rect2(-5 * EDSCALE, move_factor.y * EDSCALE, 10 * EDSCALE, 10 * EDSCALE);
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
if (y_handle_rect.has_point(simple_xform.affine_inverse().xform(b->get_position()))) {
drag_type = DRAG_MOVE_Y;
}
Added movement handles to 2D
2019-11-08 14:48:26 +00:00
}
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
drag_from = transform.affine_inverse().xform(b->get_position());
_save_canvas_item_state(drag_selection);
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
Make anchors draggable
2017-07-29 14:57:32 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
}
Make anchors draggable
2017-07-29 14:57:32 +00:00
Added movement handles to 2D
2019-11-08 14:48:26 +00:00
if (drag_type == DRAG_MOVE || drag_type == DRAG_MOVE_X || drag_type == DRAG_MOVE_Y) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Move the nodes
if (m.is_valid()) {
_restore_canvas_item_state(drag_selection, true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_to = transform.affine_inverse().xform(m->get_position());
Point2 previous_pos;
Prevent warning spam to console when dragging a CanvasItem in container
2021-08-01 09:55:53 +00:00
if (!drag_selection.is_empty()) {
if (drag_selection.size() == 1) {
Transform2D xform = drag_selection[0]->get_global_transform_with_canvas() * drag_selection[0]->get_transform().affine_inverse();
previous_pos = xform.xform(drag_selection[0]->_edit_get_position());
} else {
previous_pos = _get_encompassing_rect_from_list(drag_selection).position;
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
Added movement handles to 2D
2019-11-08 14:48:26 +00:00
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
Point2 new_pos = snap_point(previous_pos + (drag_to - drag_from), SNAP_GRID | SNAP_GUIDES | SNAP_PIXEL | SNAP_NODE_PARENT | SNAP_NODE_ANCHORS | SNAP_OTHER_NODES, 0, nullptr, drag_selection);
Added movement handles to 2D
2019-11-08 14:48:26 +00:00
if (drag_type == DRAG_MOVE_X) {
new_pos.y = previous_pos.y;
} else if (drag_type == DRAG_MOVE_Y) {
new_pos.x = previous_pos.x;
}
Rename "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
bool single_axis = m->is_shift_pressed();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (single_axis) {
if (ABS(new_pos.x - previous_pos.x) > ABS(new_pos.y - previous_pos.y)) {
new_pos.y = previous_pos.y;
} else {
new_pos.x = previous_pos.x;
Fix uniform scaling of non-square CanvasItem nodes Fixes #3224. I chose the longest side of the original node (width vs height) as the "guiding direction" to handle the ever changing drag_vector and avoid issues when a component changes sign.
2016-01-05 23:13:07 +00:00
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : drag_selection) {
Transform2D xform = ci->get_global_transform_with_canvas().affine_inverse() * ci->get_transform();
ci->_edit_set_position(ci->_edit_get_position() + xform.xform(new_pos) - xform.xform(previous_pos));
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
return true;
}
Improved 2D snapping behavior Make snapping affect nodes created by drag & drop Make snapping for a single Node2D refer to its pivot Refactor duplicate drag setup code Replace one occurrence of the old set_pos by set_position
2017-03-22 23:47:51 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Confirm the move (only if it was moved)
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && !b->is_pressed() && b->get_button_index() == MouseButton::LEFT) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (transform.affine_inverse().xform(b->get_position()) != drag_from) {
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
if (drag_selection.size() != 1) {
_commit_canvas_item_state(
drag_selection,
vformat(TTR("Move %d CanvasItems"), drag_selection.size()),
true);
} else {
_commit_canvas_item_state(
drag_selection,
vformat(
TTR("Move CanvasItem \"%s\" to (%d, %d)"),
drag_selection[0]->get_name(),
drag_selection[0]->_edit_get_position().x,
drag_selection[0]->_edit_get_position().y),
true);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
if (key_auto_insert_button->is_pressed()) {
_insert_animation_keys(true, false, false, true);
}
Initialize snap_target and make sure it disappears
2019-09-20 20:26:26 +00:00
//Make sure smart snapping lines disappear.
snap_target[0] = SNAP_TARGET_NONE;
snap_target[1] = SNAP_TARGET_NONE;
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
// Cancel a drag
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::RIGHT && b->is_pressed()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
_restore_canvas_item_state(drag_selection, true);
Initialize snap_target and make sure it disappears
2019-09-20 20:26:26 +00:00
snap_target[0] = SNAP_TARGET_NONE;
snap_target[1] = SNAP_TARGET_NONE;
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
}
// Move the canvas items with the arrow keys
Allow to use arrow keys with TOOL_MOVE
2020-02-10 20:39:05 +00:00
if (k.is_valid() && k->is_pressed() && (tool == TOOL_SELECT || tool == TOOL_MOVE) &&
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
(k->get_keycode() == Key::UP || k->get_keycode() == Key::DOWN || k->get_keycode() == Key::LEFT || k->get_keycode() == Key::RIGHT)) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (!k->is_echo()) {
Editor: Resolve being able to move control nodes in containers using arrow keys Fixes #55260
2021-11-24 20:31:21 +00:00
// Start moving the canvas items with the keyboard, if they are movable
List<CanvasItem *> selection = _get_edited_canvas_items();
drag_selection.clear();
for (CanvasItem *item : selection) {
if (_is_node_movable(item, true)) {
drag_selection.push_back(item);
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_type = DRAG_KEY_MOVE;
drag_from = Vector2();
drag_to = Vector2();
_save_canvas_item_state(drag_selection, true);
}
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
if (drag_selection.size() > 0) {
_restore_canvas_item_state(drag_selection, true);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Rename "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
bool move_local_base = k->is_alt_pressed();
bool move_local_base_rotated = k->is_ctrl_pressed() || k->is_meta_pressed();
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
Vector2 dir;
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (k->get_keycode() == Key::UP) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
dir += Vector2(0, -1);
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
} else if (k->get_keycode() == Key::DOWN) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
dir += Vector2(0, 1);
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
} else if (k->get_keycode() == Key::LEFT) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
dir += Vector2(-1, 0);
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
} else if (k->get_keycode() == Key::RIGHT) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
dir += Vector2(1, 0);
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
}
Rename "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
if (k->is_shift_pressed()) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
dir *= grid_step * Math::pow(2.0, grid_step_multiplier);
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
}
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
drag_to += dir;
Rename "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
if (k->is_shift_pressed()) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
drag_to = drag_to.snapped(grid_step * Math::pow(2.0, grid_step_multiplier));
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 editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
Point2 previous_pos;
if (drag_selection.size() == 1) {
Transform2D xform = drag_selection[0]->get_global_transform_with_canvas() * drag_selection[0]->get_transform().affine_inverse();
previous_pos = xform.xform(drag_selection[0]->_edit_get_position());
} else {
previous_pos = _get_encompassing_rect_from_list(drag_selection).position;
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
Point2 new_pos;
if (drag_selection.size() == 1) {
Node2D *node_2d = Object::cast_to<Node2D>(drag_selection[0]);
if (node_2d && move_local_base_rotated) {
Add -Wshadow=local to warnings and fix reported issues. Fixes #25316.
2019-02-12 20:10:08 +00:00
Transform2D m2;
m2.rotate(node_2d->get_rotation());
new_pos += m2.xform(drag_to);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
} else if (move_local_base) {
new_pos += drag_to;
} else {
new_pos = previous_pos + (drag_to - drag_from);
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
} else {
new_pos = previous_pos + (drag_to - drag_from);
}
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 MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : drag_selection) {
Transform2D xform = ci->get_global_transform_with_canvas().affine_inverse() * ci->get_transform();
ci->_edit_set_position(ci->_edit_get_position() + xform.xform(new_pos) - xform.xform(previous_pos));
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
}
return true;
}
Fix moving 2D node with mouse after using arrow keys Fixes: #38894
2020-05-21 12:50:35 +00:00
if (k.is_valid() && !k->is_pressed() && drag_type == DRAG_KEY_MOVE && (tool == TOOL_SELECT || tool == TOOL_MOVE) &&
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
(k->get_keycode() == Key::UP || k->get_keycode() == Key::DOWN || k->get_keycode() == Key::LEFT || k->get_keycode() == Key::RIGHT)) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Confirm canvas items move by arrow keys
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if ((!Input::get_singleton()->is_key_pressed(Key::UP)) &&
(!Input::get_singleton()->is_key_pressed(Key::DOWN)) &&
(!Input::get_singleton()->is_key_pressed(Key::LEFT)) &&
(!Input::get_singleton()->is_key_pressed(Key::RIGHT))) {
Fix scene being modified when arrows are pressed with no node selected
2020-12-10 00:47:12 +00:00
if (drag_selection.size() > 1) {
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
_commit_canvas_item_state(
drag_selection,
vformat(TTR("Move %d CanvasItems"), drag_selection.size()),
true);
Fix scene being modified when arrows are pressed with no node selected
2020-12-10 00:47:12 +00:00
} else if (drag_selection.size() == 1) {
Improve undo log messages in the 2D editor for additional context Undo/redo log messages will now specify the modified node's name (or number of modified nodes if several were modified). On top of that, the new position/rotation/scale/pivot offset will also be mentioned in the message.
2020-09-21 20:49:30 +00:00
_commit_canvas_item_state(
drag_selection,
vformat(TTR("Move CanvasItem \"%s\" to (%d, %d)"),
drag_selection[0]->get_name(),
drag_selection[0]->_edit_get_position().x,
drag_selection[0]->_edit_get_position().y),
true);
}
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
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
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
return (k.is_valid() && (k->get_keycode() == Key::UP || k->get_keycode() == Key::DOWN || k->get_keycode() == Key::LEFT || k->get_keycode() == Key::RIGHT)); // Accept the key event in any case
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> b = p_event;
Ref<InputEventMouseMotion> m = p_event;
Ref<InputEventKey> k = p_event;
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_NONE) {
Update to only use select tool on button press It used to run the code twice, probably once on button press, once on button release.
2022-03-15 18:04:59 +00:00
if (b.is_valid() && b->is_pressed() &&
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
((b->get_button_index() == MouseButton::RIGHT && b->is_alt_pressed() && tool == TOOL_SELECT) ||
(b->get_button_index() == MouseButton::LEFT && tool == TOOL_LIST_SELECT))) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Popup the selection menu list
FIX to broken item select list (zoom and RMB) FIX to #17346. Compiled and tested.
2018-03-07 20:39:55 +00:00
Point2 click = transform.affine_inverse().xform(b->get_position());
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Fix wrong behavior of alt+rmb and list tool for locked nodes
2021-06-04 13:31:28 +00:00
_get_canvas_items_at_pos(click, selection_results, b->is_alt_pressed() && tool == TOOL_SELECT);
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (selection_results.size() == 1) {
CanvasItem *item = selection_results[0].item;
selection_results.clear();
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 "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
_select_click_on_item(item, click, b->is_shift_pressed());
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
Rename empty() to is_empty()
2020-12-15 12:04:21 +00:00
} else if (!selection_results.is_empty()) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
// Sorts items according the their z-index
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
selection_results.sort();
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
NodePath root_path = get_tree()->get_edited_scene_root()->get_path();
StringName root_name = root_path.get_name(root_path.get_name_count() - 1);
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
for (int i = 0; i < selection_results.size(); i++) {
CanvasItem *item = selection_results[i].item;
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
Texture refactor -Texture renamed to Texture2D -TextureLayered as base now inherits 2Darray, cubemap and cubemap array -Removed all references to flags in textures (they will go in the shader) -Texture3D gone for now (will come back later done properly) -Create base rasterizer for RenderDevice, RasterizerRD
2019-06-11 18:43:37 +00:00
Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(item, "Node");
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
String node_path = "/" + root_name + "/" + root_path.rel_path_to(item->get_path());
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
Include locked nodes on selection list
2020-02-10 12:59:24 +00:00
int locked = 0;
if (_is_node_locked(item)) {
locked = 1;
} else {
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
Node *scene = EditorNode::get_singleton()->get_edited_scene();
Include locked nodes on selection list
2020-02-10 12:59:24 +00:00
Node *node = item;
while (node && node != scene->get_parent()) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci_tmp = Object::cast_to<CanvasItem>(node);
if (ci_tmp && node->has_meta("_edit_group_")) {
Include locked nodes on selection list
2020-02-10 12:59:24 +00:00
locked = 2;
}
node = node->get_parent();
}
}
Remove redundant Variant-types initializations
2022-11-14 17:21:06 +00:00
String suffix;
Include locked nodes on selection list
2020-02-10 12:59:24 +00:00
if (locked == 1) {
suffix = " (" + TTR("Locked") + ")";
} else if (locked == 2) {
suffix = " (" + TTR("Grouped") + ")";
}
selection_menu->add_item((String)item->get_name() + suffix);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
selection_menu->set_item_icon(i, icon);
selection_menu->set_item_metadata(i, node_path);
selection_menu->set_item_tooltip(i, String(item->get_name()) + "\nType: " + item->get_class() + "\nPath: " + node_path);
}
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
Revert "Reordering emitted signals in PopupMenu" and fix editor selection issue in the safer way.
2023-02-24 19:17:05 +00:00
selection_results_menu = selection_results;
Rename "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
selection_menu_additive_selection = b->is_shift_pressed();
Fix selection list in 2D editor
2022-07-20 13:44:56 +00:00
selection_menu->set_position(viewport->get_screen_transform().xform(b->get_position()));
Fix bad popups offset in editor with single window off Co-authored-by: Gil Arasa Verge <gilarasaverge@gmail.com> Co-authored-by: Tomasz Chabora <kobewi4e@gmail.com>
2021-08-31 15:43:35 +00:00
selection_menu->reset_size();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
selection_menu->popup();
return true;
}
}
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
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->is_pressed() && b->get_button_index() == MouseButton::RIGHT) {
Improve 2D editor's right-click menu
2022-01-18 15:35:12 +00:00
add_node_menu->clear();
add_node_menu->add_icon_item(get_theme_icon(SNAME("Add"), SNAME("EditorIcons")), TTR("Add Node Here"), ADD_NODE);
add_node_menu->add_icon_item(get_theme_icon(SNAME("Instance"), SNAME("EditorIcons")), TTR("Instantiate Scene Here"), ADD_INSTANCE);
for (Node *node : SceneTreeDock::get_singleton()->get_node_clipboard()) {
if (Object::cast_to<CanvasItem>(node)) {
add_node_menu->add_icon_item(get_theme_icon(SNAME("ActionPaste"), SNAME("EditorIcons")), TTR("Paste Node(s) Here"), ADD_PASTE);
break;
}
}
for (Node *node : EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list()) {
if (Object::cast_to<CanvasItem>(node)) {
add_node_menu->add_icon_item(get_theme_icon(SNAME("ToolMove"), SNAME("EditorIcons")), TTR("Move Node(s) Here"), ADD_MOVE);
break;
}
}
Added `reset_size` method to `Control` and `Window` classes
2021-11-20 08:04:57 +00:00
add_node_menu->reset_size();
Fix 2D editor menu position
2022-04-08 15:09:40 +00:00
add_node_menu->set_position(viewport->get_screen_transform().xform(b->get_position()));
Allow to create a node at specific position
2020-08-24 23:32:58 +00:00
add_node_menu->popup();
Improve 2D editor's right-click menu
2022-01-18 15:35:12 +00:00
node_create_position = transform.affine_inverse().xform(b->get_position());
Allow to create a node at specific position
2020-08-24 23:32:58 +00:00
return true;
}
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && b->is_pressed() && tool == TOOL_SELECT && !panner->is_panning()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Single item selection
Point2 click = transform.affine_inverse().xform(b->get_position());
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
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
Node *scene = EditorNode::get_singleton()->get_edited_scene();
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 (!scene) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +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
}
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Find the item to select
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = nullptr;
In CanvasItemEditor, prioritize selected items
2018-03-04 13:05:58 +00:00
Fixes 2D bones selection
2019-01-09 19:55:04 +00:00
Vector<_SelectResult> selection = Vector<_SelectResult>();
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
// Retrieve the canvas items
_get_canvas_items_at_pos(click, selection);
Rename empty() to is_empty()
2020-12-15 12:04:21 +00:00
if (!selection.is_empty()) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
ci = selection[0].item;
Fix 2D selection
2018-09-11 18:58:01 +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 MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (!ci) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Start a box selection
Rename "Control" key to "Ctrl" and add "_pressed" suffix to all InputEventWithModifiers properties/methods
2021-04-24 20:33:50 +00:00
if (!b->is_shift_pressed()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Clear the selection if not additive
editor_selection->clear();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Fix box selection being cancelled immediately
2019-11-27 20:07:35 +00:00
selected_from_canvas = true;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_from = click;
drag_type = DRAG_BOX_SELECTION;
box_selecting_to = drag_from;
return true;
} else {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
bool still_selected = _select_click_on_item(ci, click, b->is_shift_pressed());
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Start dragging
if (still_selected) {
// Drag the node(s) if requested
Add threshold to dragging nodes with select to prevent accidental drags
2021-06-04 15:39:46 +00:00
drag_start_origin = click;
drag_type = DRAG_QUEUED;
}
// Select the item
return true;
}
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Add threshold to dragging nodes with select to prevent accidental drags
2021-06-04 15:39:46 +00:00
if (drag_type == DRAG_QUEUED) {
if (b.is_valid() && !b->is_pressed()) {
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Add threshold to dragging nodes with select to prevent accidental drags
2021-06-04 15:39:46 +00:00
return true;
}
if (m.is_valid()) {
Point2 click = transform.affine_inverse().xform(m->get_position());
Tweak editor select mode drag threshold for better usability - Use a smaller drag threshold (8 pixels instead of 10 pixels). - Scale the 2D editor drag threshold with the zoom to make it work the same regardless of the current zoom level.
2021-07-16 04:17:40 +00:00
bool movement_threshold_passed = drag_start_origin.distance_to(click) > (8 * MAX(1, EDSCALE)) / zoom;
Add threshold to dragging nodes with select to prevent accidental drags
2021-06-04 15:39:46 +00:00
if (m.is_valid() && movement_threshold_passed) {
List<CanvasItem *> selection2 = _get_edited_canvas_items();
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
Add threshold to dragging nodes with select to prevent accidental drags
2021-06-04 15:39:46 +00:00
drag_selection.clear();
for (int i = 0; i < selection2.size(); i++) {
if (_is_node_movable(selection2[i], true)) {
drag_selection.push_back(selection2[i]);
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
Add threshold to dragging nodes with select to prevent accidental drags
2021-06-04 15:39:46 +00:00
if (selection2.size() > 0) {
drag_type = DRAG_MOVE;
Fix offset in Viewport drag movement The initial offset was using the mouse position when the threshold was reached instead of the initial click position. This was adding the drag threshold distance as an extra offset to the final transformation. Now the offset is calculated from the initial click position.
2021-11-25 23:53:27 +00:00
drag_from = drag_start_origin;
Add threshold to dragging nodes with select to prevent accidental drags
2021-06-04 15:39:46 +00:00
_save_canvas_item_state(drag_selection);
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
}
}
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_BOX_SELECTION) {
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && !b->is_pressed() && b->get_button_index() == MouseButton::LEFT) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Confirms box selection
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
Node *scene = EditorNode::get_singleton()->get_edited_scene();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (scene) {
List<CanvasItem *> selitems;
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Point2 bsfrom = drag_from;
Point2 bsto = box_selecting_to;
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 (bsfrom.x > bsto.x) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
SWAP(bsfrom.x, bsto.x);
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 (bsfrom.y > bsto.y) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
SWAP(bsfrom.y, bsto.y);
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
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
_find_canvas_items_in_rect(Rect2(bsfrom, bsto - bsfrom), scene, &selitems);
Fix multi-selection doesn't correctly show in the inspector
2021-04-13 10:09:53 +00:00
if (selitems.size() == 1 && editor_selection->get_selected_node_list().is_empty()) {
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
EditorNode::get_singleton()->push_item(selitems[0]);
Fix multi-selection doesn't correctly show in the inspector
2021-04-13 10:09:53 +00:00
}
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (CanvasItem *E : selitems) {
editor_selection->add_node(E);
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
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +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
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
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
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->is_pressed() && b->get_button_index() == MouseButton::RIGHT) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Cancel box selection
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
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
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (m.is_valid()) {
// Update box selection
box_selecting_to = transform.affine_inverse().xform(m->get_position());
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
return true;
}
}
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
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (k.is_valid() && k->is_pressed() && k->get_keycode() == Key::ESCAPE && drag_type == DRAG_NONE && tool == TOOL_SELECT) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Unselect everything
editor_selection->clear();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
return false;
}
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
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
bool CanvasItemEditor::_gui_input_ruler_tool(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 (tool != TOOL_RULER) {
Reset ruler tool when switching tools with shortcuts Fixes: #37056
2020-03-15 09:35:53 +00:00
ruler_tool_active = false;
Add 2D ruler tool
2019-08-30 20:49:47 +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
}
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
Ref<InputEventMouseButton> b = p_event;
Ref<InputEventMouseMotion> m = p_event;
Point2 previous_origin = ruler_tool_origin;
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 (!ruler_tool_active) {
Fix ruler origin is moving with zoom
2019-10-24 19:19:11 +00:00
ruler_tool_origin = snap_point(viewport->get_local_mouse_position() / zoom + view_offset);
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
}
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
if (b.is_valid() && b->get_button_index() == MouseButton::LEFT) {
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
if (b->is_pressed()) {
ruler_tool_active = true;
} else {
ruler_tool_active = false;
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
return true;
}
Make Ruler Tool depend on grid snap only
2019-10-24 20:31:19 +00:00
if (m.is_valid() && (ruler_tool_active || (grid_snap_active && previous_origin != ruler_tool_origin))) {
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
return true;
}
return false;
}
Displays node icon on hover
2018-03-12 22:32:25 +00:00
bool CanvasItemEditor::_gui_input_hover(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseMotion> m = p_event;
if (m.is_valid()) {
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
Point2 click = transform.affine_inverse().xform(m->get_position());
Displays node icon on hover
2018-03-12 22:32:25 +00:00
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
// Checks if the hovered items changed, redraw the viewport if so
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
Vector<_SelectResult> hovering_results_items;
_get_canvas_items_at_pos(click, hovering_results_items);
hovering_results_items.sort();
// Compute the nodes names and icon position
Vector<_HoverResult> hovering_results_tmp;
for (int i = 0; i < hovering_results_items.size(); i++) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = hovering_results_items[i].item;
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->_edit_use_rect()) {
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
continue;
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
}
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
_HoverResult hover_result;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
hover_result.position = ci->get_global_transform_with_canvas().get_origin();
hover_result.icon = EditorNode::get_singleton()->get_object_icon(ci);
hover_result.name = ci->get_name();
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
hovering_results_tmp.push_back(hover_result);
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
// Check if changed, if so, redraw.
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
bool changed = false;
if (hovering_results_tmp.size() == hovering_results.size()) {
for (int i = 0; i < hovering_results_tmp.size(); i++) {
_HoverResult a = hovering_results_tmp[i];
_HoverResult b = hovering_results[i];
if (a.icon != b.icon || a.name != b.name || a.position != b.position) {
changed = true;
break;
}
Displays node icon on hover
2018-03-12 22:32:25 +00:00
}
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
} else {
changed = true;
}
Displays node icon on hover
2018-03-12 22:32:25 +00:00
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
if (changed) {
hovering_results = hovering_results_tmp;
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Displays node icon on hover
2018-03-12 22:32:25 +00:00
}
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
return true;
Displays node icon on hover
2018-03-12 22:32:25 +00:00
}
return false;
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
bool accepted = false;
Improve the anchors and margin workflow
2019-03-31 16:53:24 +00:00
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
Ref<InputEventMouseButton> mb = p_event;
bool release_lmb = (mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT); // Required to properly release some stuff (e.g. selection box) while panning.
Unify usage of GLOBAL/EDITOR_GET
2022-10-18 14:43:37 +00:00
if (EDITOR_GET("editors/panning/simple_panning") || !pan_pressed || release_lmb) {
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
accepted = true;
if (_gui_input_rulers_and_guides(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Rulers and guides");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
} else if (EditorNode::get_singleton()->get_editor_plugins_over()->forward_gui_input(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Plugin");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
} else if (_gui_input_open_scene_on_double_click(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Open scene on double click");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
} else if (_gui_input_scale(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Set scale");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
} else if (_gui_input_pivot(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Set pivot");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
} else if (_gui_input_resize(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Resize");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
} else if (_gui_input_rotate(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Rotate");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
} else if (_gui_input_move(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Move");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
} else if (_gui_input_anchors(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Anchors");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
} else if (_gui_input_select(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Selection");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
} else if (_gui_input_ruler_tool(p_event)) {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Measure");
Allow panning while moving a node
2019-04-07 14:43:21 +00:00
} else {
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
// print_line("Not accepted");
Fix MSVC warning C4706: assignment within conditional expression Part of #66537.
2022-09-28 13:59:08 +00:00
accepted = false;
Allow panning while moving a node
2019-04-07 14:43:21 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
Make it so that 2D viewport does not pan while editing tilemaps Fixes #30875
2019-07-28 14:00:05 +00:00
accepted = (_gui_input_zoom_or_pan(p_event, accepted) || accepted);
Allow panning while moving a node
2019-04-07 14:43:21 +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 (accepted) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
accept_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
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Displays node icon on hover
2018-03-12 22:32:25 +00:00
// Handles the mouse hovering
_gui_input_hover(p_event);
Use get_cursor_shape for identifying the cursor shape in CanvasItemEditor get_cursor_shape() is used in cases where a Control displays different cursors in different areas. There is no need to set the default cursor shape on every mouse move event.
2022-04-06 06:42:47 +00:00
if (mb.is_valid()) {
// Update the default cursor.
_update_cursor();
}
Request immediate refresh of cursor in 2D editor while using shortcuts Fixes: #37333
2020-03-26 20:35:12 +00:00
// Grab focus
Remove get_focus_owner() from Control, replaced by get_viewport()->gui_get_focus_owner()
2022-02-03 10:59:32 +00:00
if (!viewport->has_focus() && (!get_viewport()->gui_get_focus_owner() || !get_viewport()->gui_get_focus_owner()->is_text_field())) {
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
viewport->call_deferred(SNAME("grab_focus"));
Request immediate refresh of cursor in 2D editor while using shortcuts Fixes: #37333
2020-03-26 20:35:12 +00:00
}
}
void CanvasItemEditor::_update_cursor() {
Use get_cursor_shape for identifying the cursor shape in CanvasItemEditor get_cursor_shape() is used in cases where a Control displays different cursors in different areas. There is no need to set the default cursor shape on every mouse move event.
2022-04-06 06:42:47 +00:00
// Choose the correct default cursor.
CursorShape c = CURSOR_ARROW;
switch (tool) {
case TOOL_MOVE:
c = CURSOR_MOVE;
break;
case TOOL_EDIT_PIVOT:
c = CURSOR_CROSS;
break;
case TOOL_PAN:
c = CURSOR_DRAG;
break;
case TOOL_RULER:
c = CURSOR_CROSS;
break;
default:
break;
}
if (pan_pressed) {
c = CURSOR_DRAG;
}
set_default_cursor_shape(c);
}
Control::CursorShape CanvasItemEditor::get_cursor_shape(const Point2 &p_pos) const {
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
// Compute an eventual rotation of the cursor
Fix some issues found by cppcheck.
2022-04-05 10:40:26 +00:00
const CursorShape rotation_array[4] = { CURSOR_HSIZE, CURSOR_BDIAGSIZE, CURSOR_VSIZE, CURSOR_FDIAGSIZE };
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
int rotation_array_index = 0;
List<CanvasItem *> selection = _get_edited_canvas_items();
if (selection.size() == 1) {
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
const double angle = Math::fposmod((double)selection[0]->get_global_transform_with_canvas().get_rotation(), Math_PI);
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
if (angle > Math_PI * 7.0 / 8.0) {
rotation_array_index = 0;
} else if (angle > Math_PI * 5.0 / 8.0) {
rotation_array_index = 1;
} else if (angle > Math_PI * 3.0 / 8.0) {
rotation_array_index = 2;
} else if (angle > Math_PI * 1.0 / 8.0) {
rotation_array_index = 3;
} else {
rotation_array_index = 0;
}
Fixed node scaling arrows being wrong Patch for #21755. Node scaling arrows pointed the wrong way when nodes were rotated. Ammend: made math cleaner. Simplified expression Changes suggested by Aaron Franke Co-authored-by: Aaron Franke <arnfranke@yahoo.com>
2020-08-06 16:56:56 +00:00
}
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
// Choose the correct cursor
Use get_cursor_shape for identifying the cursor shape in CanvasItemEditor get_cursor_shape() is used in cases where a Control displays different cursors in different areas. There is no need to set the default cursor shape on every mouse move event.
2022-04-06 06:42:47 +00:00
CursorShape c = get_default_cursor_shape();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
switch (drag_type) {
case DRAG_LEFT:
case DRAG_RIGHT:
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
c = rotation_array[rotation_array_index];
break;
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
case DRAG_V_GUIDE:
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
c = CURSOR_HSIZE;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
break;
case DRAG_TOP:
case DRAG_BOTTOM:
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
c = rotation_array[(rotation_array_index + 2) % 4];
break;
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
case DRAG_H_GUIDE:
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
c = CURSOR_VSIZE;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
break;
case DRAG_TOP_LEFT:
case DRAG_BOTTOM_RIGHT:
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
c = rotation_array[(rotation_array_index + 3) % 4];
break;
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
case DRAG_DOUBLE_GUIDE:
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
c = CURSOR_FDIAGSIZE;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
break;
case DRAG_TOP_RIGHT:
case DRAG_BOTTOM_LEFT:
Fix scale cursor rotation and handle diagonal ones
2020-10-01 10:19:45 +00:00
c = rotation_array[(rotation_array_index + 1) % 4];
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
break;
Fixes 2D nodes lock not working
2018-09-09 20:17:47 +00:00
case DRAG_MOVE:
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
c = CURSOR_MOVE;
break;
default:
break;
}
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +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 (is_hovering_h_guide) {
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
c = CURSOR_VSIZE;
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
} else if (is_hovering_v_guide) {
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
c = CURSOR_HSIZE;
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
}
Use resize cursors when hovering or dragging guides in the 2D editor This also tweaks the casing in undo/redo action names for consistency. This closes #30550. Co-authored-by: Emmanuel Barroga <emmanuelbarroga@gmail.com>
2019-07-13 15:16:32 +00:00
Improve editor panning and remove RMB panning
2021-10-06 12:11:33 +00:00
if (pan_pressed) {
c = CURSOR_DRAG;
}
Use get_cursor_shape for identifying the cursor shape in CanvasItemEditor get_cursor_shape() is used in cases where a Control displays different cursors in different areas. There is no need to set the default cursor shape on every mouse move event.
2022-04-06 06:42:47 +00:00
return c;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
void CanvasItemEditor::_draw_text_at_position(Point2 p_position, String p_string, Side p_side) {
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
Color color = get_theme_color(SNAME("font_color"), SNAME("Editor"));
Visual tweaks. Updated icons Updated some color
2017-09-21 00:29:52 +00:00
color.a = 0.8;
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<Font> font = get_theme_font(SNAME("font"), SNAME("Label"));
int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Label"));
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
Size2 text_size = font->get_string_size(p_string, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
Displays margins values when moving the node
2017-08-17 22:42:49 +00:00
switch (p_side) {
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
case SIDE_LEFT:
Displays margins values when moving the node
2017-08-17 22:42:49 +00:00
p_position += Vector2(-text_size.x - 5, text_size.y / 2);
break;
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
case SIDE_TOP:
Displays margins values when moving the node
2017-08-17 22:42:49 +00:00
p_position += Vector2(-text_size.x / 2, -5);
break;
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
case SIDE_RIGHT:
Displays margins values when moving the node
2017-08-17 22:42:49 +00:00
p_position += Vector2(5, text_size.y / 2);
break;
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
case SIDE_BOTTOM:
Displays margins values when moving the node
2017-08-17 22:42:49 +00:00
p_position += Vector2(-text_size.x / 2, text_size.y + 5);
break;
}
align to horizontal_alignment, valign to vertical_alignment, related
2021-11-25 02:58:47 +00:00
viewport->draw_string(font, p_position, p_string, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, color);
Displays margins values when moving the node
2017-08-17 22:42:49 +00:00
}
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
void CanvasItemEditor::_draw_margin_at_position(int p_value, Point2 p_position, Side p_side) {
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
String str = TS->format_number(vformat("%d " + TTR("px"), p_value));
Displays margins values when moving the node
2017-08-17 22:42:49 +00:00
if (p_value != 0) {
_draw_text_at_position(p_position, str, p_side);
}
}
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
void CanvasItemEditor::_draw_percentage_at_position(real_t p_value, Point2 p_position, Side p_side) {
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
String str = TS->format_number(vformat("%.1f ", p_value * 100.0)) + TS->percent_sign();
Displays percentages when dragging anchors
2017-08-02 16:33:06 +00:00
if (p_value != 0) {
Displays margins values when moving the node
2017-08-17 22:42:49 +00:00
_draw_text_at_position(p_position, str, p_side);
Displays percentages when dragging anchors
2017-08-02 16:33:06 +00:00
}
}
Implement guides
2017-10-18 21:55:02 +00:00
void CanvasItemEditor::_draw_focus() {
// Draw the focus around the base viewport
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (viewport->has_focus()) {
Make the focus outline translucent for editor viewports This makes the focus outline less distracting on the 2D and 3D editor viewports.
2021-05-08 23:56:22 +00:00
get_theme_stylebox(SNAME("FocusViewport"), SNAME("EditorStyles"))->draw(viewport->get_canvas_item(), Rect2(Point2(), viewport->get_size()));
Implement guides
2017-10-18 21:55:02 +00:00
}
}
void CanvasItemEditor::_draw_guides() {
Unify usage of GLOBAL/EDITOR_GET
2022-10-18 14:43:37 +00:00
Color guide_color = EDITOR_GET("editors/2d/guides_color");
Implement guides
2017-10-18 21:55:02 +00:00
Transform2D xform = viewport_scrollable->get_transform() * transform;
Cleanup metadata usage
2022-04-01 18:30:23 +00:00
// Guides already there.
if (Node *scene = EditorNode::get_singleton()->get_edited_scene()) {
Array vguides = scene->get_meta("_edit_vertical_guides_", Array());
Implement guides
2017-10-18 21:55:02 +00:00
for (int i = 0; i < vguides.size(); 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
if (drag_type == DRAG_V_GUIDE && i == dragged_guide_index) {
Implement guides
2017-10-18 21:55:02 +00:00
continue;
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
}
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t x = xform.xform(Point2(vguides[i], 0)).x;
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(Point2(x, 0), Point2(x, viewport->get_size().y), guide_color, Math::round(EDSCALE));
Implement guides
2017-10-18 21:55:02 +00:00
}
Cleanup metadata usage
2022-04-01 18:30:23 +00:00
Array hguides = scene->get_meta("_edit_horizontal_guides_", Array());
Implement guides
2017-10-18 21:55:02 +00:00
for (int i = 0; i < hguides.size(); 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
if (drag_type == DRAG_H_GUIDE && i == dragged_guide_index) {
Implement guides
2017-10-18 21:55:02 +00:00
continue;
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
}
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t y = xform.xform(Point2(0, hguides[i])).y;
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(Point2(0, y), Point2(viewport->get_size().x, y), guide_color, Math::round(EDSCALE));
Implement guides
2017-10-18 21:55:02 +00:00
}
}
Cleanup metadata usage
2022-04-01 18:30:23 +00:00
// Dragged guide.
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
Color text_color = get_theme_color(SNAME("font_color"), SNAME("Editor"));
Add outline to dragged guide text
2021-02-25 22:44:36 +00:00
Color outline_color = text_color.inverted();
const float outline_size = 2;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_DOUBLE_GUIDE || drag_type == DRAG_V_GUIDE) {
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
String str = TS->format_number(vformat("%d px", Math::round(xform.affine_inverse().xform(dragged_guide_pos).x)));
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<Font> font = get_theme_font(SNAME("bold"), SNAME("EditorFonts"));
Fix "2D Polygon indices are barely visible on bright background" (#38009) Co-authored-by: Ethan <epruhl102@gmail.com>
2023-01-04 03:42:53 +00:00
int font_size = 1.3 * get_theme_font_size(SNAME("bold_size"), SNAME("EditorFonts"));
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
Size2 text_size = font->get_string_size(str, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
viewport->draw_string_outline(font, Point2(dragged_guide_pos.x + 10, RULER_WIDTH + text_size.y / 2 + 10), str, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, Point2(dragged_guide_pos.x + 10, RULER_WIDTH + text_size.y / 2 + 10), str, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, text_color);
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(Point2(dragged_guide_pos.x, 0), Point2(dragged_guide_pos.x, viewport->get_size().y), guide_color, Math::round(EDSCALE));
Implement guides
2017-10-18 21:55:02 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_DOUBLE_GUIDE || drag_type == DRAG_H_GUIDE) {
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
String str = TS->format_number(vformat("%d px", Math::round(xform.affine_inverse().xform(dragged_guide_pos).y)));
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<Font> font = get_theme_font(SNAME("bold"), SNAME("EditorFonts"));
Fix "2D Polygon indices are barely visible on bright background" (#38009) Co-authored-by: Ethan <epruhl102@gmail.com>
2023-01-04 03:42:53 +00:00
int font_size = 1.3 * get_theme_font_size(SNAME("bold_size"), SNAME("EditorFonts"));
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
Size2 text_size = font->get_string_size(str, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
viewport->draw_string_outline(font, Point2(RULER_WIDTH + 10, dragged_guide_pos.y + text_size.y / 2 + 10), str, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, Point2(RULER_WIDTH + 10, dragged_guide_pos.y + text_size.y / 2 + 10), str, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, text_color);
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(Point2(0, dragged_guide_pos.y), Point2(viewport->get_size().x, dragged_guide_pos.y), guide_color, Math::round(EDSCALE));
Implement guides
2017-10-18 21:55:02 +00:00
}
}
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
void CanvasItemEditor::_draw_smart_snapping() {
Unify usage of GLOBAL/EDITOR_GET
2022-10-18 14:43:37 +00:00
Color line_color = EDITOR_GET("editors/2d/smart_snapping_line_color");
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
if (snap_target[0] != SNAP_TARGET_NONE && snap_target[0] != SNAP_TARGET_GRID) {
viewport->draw_set_transform_matrix(viewport->get_transform() * transform * snap_transform);
viewport->draw_line(Point2(0, -1.0e+10F), Point2(0, 1.0e+10F), line_color);
viewport->draw_set_transform_matrix(viewport->get_transform());
}
if (snap_target[1] != SNAP_TARGET_NONE && snap_target[1] != SNAP_TARGET_GRID) {
viewport->draw_set_transform_matrix(viewport->get_transform() * transform * snap_transform);
viewport->draw_line(Point2(-1.0e+10F, 0), Point2(1.0e+10F, 0), line_color);
viewport->draw_set_transform_matrix(viewport->get_transform());
}
}
Implements rulers
2017-08-29 19:50:18 +00:00
void CanvasItemEditor::_draw_rulers() {
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
Color bg_color = get_theme_color(SNAME("dark_color_2"), SNAME("Editor"));
Color graduation_color = get_theme_color(SNAME("font_color"), SNAME("Editor")).lerp(bg_color, 0.5);
Color font_color = get_theme_color(SNAME("font_color"), SNAME("Editor"));
Visual tweaks. Updated icons Updated some color
2017-09-21 00:29:52 +00:00
font_color.a = 0.8;
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<Font> font = get_theme_font(SNAME("rulers"), SNAME("EditorFonts"));
int font_size = get_theme_font_size(SNAME("rulers_size"), SNAME("EditorFonts"));
Implements rulers
2017-08-29 19:50:18 +00:00
// The rule transform
Remove redundant Variant-types initializations
2022-11-14 17:21:06 +00:00
Transform2D ruler_transform;
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
if (grid_snap_active || _is_grid_visible()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
List<CanvasItem *> selection = _get_edited_canvas_items();
if (snap_relative && selection.size() > 0) {
rename translate(d) to translate(d)_local in Transform 2D/3D
2022-07-16 09:47:54 +00:00
ruler_transform.translate_local(_get_encompassing_rect_from_list(selection).position);
Implement shortcuts to multiply/divide the grid step
2017-08-31 19:54:42 +00:00
ruler_transform.scale_basis(grid_step * Math::pow(2.0, grid_step_multiplier));
Implements rulers
2017-08-29 19:50:18 +00:00
} else {
rename translate(d) to translate(d)_local in Transform 2D/3D
2022-07-16 09:47:54 +00:00
ruler_transform.translate_local(grid_offset);
Implement shortcuts to multiply/divide the grid step
2017-08-31 19:54:42 +00:00
ruler_transform.scale_basis(grid_step * Math::pow(2.0, grid_step_multiplier));
Implements rulers
2017-08-29 19:50:18 +00:00
}
while ((transform * ruler_transform).get_scale().x < 50 || (transform * ruler_transform).get_scale().y < 50) {
ruler_transform.scale_basis(Point2(2, 2));
}
} else {
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t basic_rule = 100;
Implements rulers
2017-08-29 19:50:18 +00:00
for (int i = 0; basic_rule * zoom > 100; i++) {
basic_rule /= (i % 2) ? 5.0 : 2.0;
}
for (int i = 0; basic_rule * zoom < 100; i++) {
basic_rule *= (i % 2) ? 2.0 : 5.0;
}
ruler_transform.scale(Size2(basic_rule, basic_rule));
}
// Subdivisions
int major_subdivision = 2;
Remove redundant Variant-types initializations
2022-11-14 17:21:06 +00:00
Transform2D major_subdivide;
Implements rulers
2017-08-29 19:50:18 +00:00
major_subdivide.scale(Size2(1.0 / major_subdivision, 1.0 / major_subdivision));
int minor_subdivision = 5;
Remove redundant Variant-types initializations
2022-11-14 17:21:06 +00:00
Transform2D minor_subdivide;
Implements rulers
2017-08-29 19:50:18 +00:00
minor_subdivide.scale(Size2(1.0 / minor_subdivision, 1.0 / minor_subdivision));
// First and last graduations to draw (in the ruler space)
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Point2 first = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(Point2(RULER_WIDTH, RULER_WIDTH));
Implements rulers
2017-08-29 19:50:18 +00:00
Point2 last = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(viewport->get_size());
// Draw top ruler
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
viewport->draw_rect(Rect2(Point2(RULER_WIDTH, 0), Size2(viewport->get_size().x, RULER_WIDTH)), bg_color);
Implements rulers
2017-08-29 19:50:18 +00:00
for (int i = Math::ceil(first.x); i < last.x; i++) {
Use integer text position in scroll container, TextEdit and canvas editor, to ensure sharp text rendering. Use integer font align/advance with any font scaling, to ensure sharp text rendering.
2020-12-17 11:22:04 +00:00
Point2 position = (transform * ruler_transform * major_subdivide * minor_subdivide).xform(Point2(i, 0)).round();
Implements rulers
2017-08-29 19:50:18 +00:00
if (i % (major_subdivision * minor_subdivision) == 0) {
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(Point2(position.x, 0), Point2(position.x, RULER_WIDTH), graduation_color, Math::round(EDSCALE));
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t val = (ruler_transform * major_subdivide * minor_subdivide).xform(Point2(i, 0)).x;
align to horizontal_alignment, valign to vertical_alignment, related
2021-11-25 02:58:47 +00:00
viewport->draw_string(font, Point2(position.x + 2, font->get_height(font_size)), TS->format_number(vformat(((int)val == val) ? "%d" : "%.1f", val)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
Implements rulers
2017-08-29 19:50:18 +00:00
} else {
if (i % minor_subdivision == 0) {
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(Point2(position.x, RULER_WIDTH * 0.33), Point2(position.x, RULER_WIDTH), graduation_color, Math::round(EDSCALE));
Implements rulers
2017-08-29 19:50:18 +00:00
} else {
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(Point2(position.x, RULER_WIDTH * 0.75), Point2(position.x, RULER_WIDTH), graduation_color, Math::round(EDSCALE));
Implements rulers
2017-08-29 19:50:18 +00:00
}
}
}
// Draw left ruler
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
viewport->draw_rect(Rect2(Point2(0, RULER_WIDTH), Size2(RULER_WIDTH, viewport->get_size().y)), bg_color);
Implements rulers
2017-08-29 19:50:18 +00:00
for (int i = Math::ceil(first.y); i < last.y; i++) {
Use integer text position in scroll container, TextEdit and canvas editor, to ensure sharp text rendering. Use integer font align/advance with any font scaling, to ensure sharp text rendering.
2020-12-17 11:22:04 +00:00
Point2 position = (transform * ruler_transform * major_subdivide * minor_subdivide).xform(Point2(0, i)).round();
Implements rulers
2017-08-29 19:50:18 +00:00
if (i % (major_subdivision * minor_subdivision) == 0) {
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(Point2(0, position.y), Point2(RULER_WIDTH, position.y), graduation_color, Math::round(EDSCALE));
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t val = (ruler_transform * major_subdivide * minor_subdivide).xform(Point2(0, i)).y;
Place the ruler text vertically
2018-09-27 14:50:40 +00:00
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
Transform2D text_xform = Transform2D(-Math_PI / 2.0, Point2(font->get_height(font_size), position.y - 2));
Place the ruler text vertically
2018-09-27 14:50:40 +00:00
viewport->draw_set_transform_matrix(viewport->get_transform() * text_xform);
align to horizontal_alignment, valign to vertical_alignment, related
2021-11-25 02:58:47 +00:00
viewport->draw_string(font, Point2(), TS->format_number(vformat(((int)val == val) ? "%d" : "%.1f", val)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
Place the ruler text vertically
2018-09-27 14:50:40 +00:00
viewport->draw_set_transform_matrix(viewport->get_transform());
Implements rulers
2017-08-29 19:50:18 +00:00
} else {
if (i % minor_subdivision == 0) {
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(Point2(RULER_WIDTH * 0.33, position.y), Point2(RULER_WIDTH, position.y), graduation_color, Math::round(EDSCALE));
Implements rulers
2017-08-29 19:50:18 +00:00
} else {
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(Point2(RULER_WIDTH * 0.75, position.y), Point2(RULER_WIDTH, position.y), graduation_color, Math::round(EDSCALE));
Implements rulers
2017-08-29 19:50:18 +00:00
}
}
}
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
// Draw the top left corner
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
viewport->draw_rect(Rect2(Point2(), Size2(RULER_WIDTH, RULER_WIDTH)), graduation_color);
Implements rulers
2017-08-29 19:50:18 +00:00
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
void CanvasItemEditor::_draw_grid() {
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
if (_is_grid_visible()) {
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
// Draw the grid
Implements rulers
2017-08-29 19:50:18 +00:00
Vector2 real_grid_offset;
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
const List<CanvasItem *> selection = _get_edited_canvas_items();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (snap_relative && selection.size() > 0) {
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
const Vector2 topleft = _get_encompassing_rect_from_list(selection).position;
Fix compilation on Visual Studio 2013 (#10219).
2017-10-19 16:41:36 +00:00
real_grid_offset.x = fmod(topleft.x, grid_step.x * (real_t)Math::pow(2.0, grid_step_multiplier));
real_grid_offset.y = fmod(topleft.y, grid_step.y * (real_t)Math::pow(2.0, grid_step_multiplier));
Change the grid offset when the snap is set as relative
2017-07-25 19:09:32 +00:00
} else {
Implements rulers
2017-08-29 19:50:18 +00:00
real_grid_offset = grid_offset;
Change the grid offset when the snap is set as relative
2017-07-25 19:09:32 +00:00
}
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
// Draw a "primary" line every several lines to make measurements easier.
// The step is configurable in the Configure Snap dialog.
Unify usage of GLOBAL/EDITOR_GET
2022-10-18 14:43:37 +00:00
const Color secondary_grid_color = EDITOR_GET("editors/2d/grid_color");
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
const Color primary_grid_color =
Color(secondary_grid_color.r, secondary_grid_color.g, secondary_grid_color.b, secondary_grid_color.a * 2.5);
const Size2 viewport_size = viewport->get_size();
const Transform2D xform = transform.affine_inverse();
int last_cell = 0;
Implements rulers
2017-08-29 19:50:18 +00:00
if (grid_step.x != 0) {
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
for (int i = 0; i < viewport_size.width; i++) {
const int cell =
Math::fast_ftoi(Math::floor((xform.xform(Vector2(i, 0)).x - real_grid_offset.x) / (grid_step.x * Math::pow(2.0, grid_step_multiplier))));
if (i == 0) {
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
last_cell = cell;
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
}
if (last_cell != cell) {
Color grid_color;
if (primary_grid_steps == 0) {
grid_color = secondary_grid_color;
} else {
grid_color = cell % primary_grid_steps == 0 ? primary_grid_color : secondary_grid_color;
}
viewport->draw_line(Point2(i, 0), Point2(i, viewport_size.height), grid_color, Math::round(EDSCALE));
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
last_cell = cell;
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Implements rulers
2017-08-29 19:50:18 +00:00
if (grid_step.y != 0) {
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
for (int i = 0; i < viewport_size.height; i++) {
const int cell =
Math::fast_ftoi(Math::floor((xform.xform(Vector2(0, i)).y - real_grid_offset.y) / (grid_step.y * Math::pow(2.0, grid_step_multiplier))));
if (i == 0) {
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
last_cell = cell;
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
}
if (last_cell != cell) {
Color grid_color;
if (primary_grid_steps == 0) {
grid_color = secondary_grid_color;
} else {
grid_color = cell % primary_grid_steps == 0 ? primary_grid_color : secondary_grid_color;
}
viewport->draw_line(Point2(0, i), Point2(viewport_size.width, i), grid_color, Math::round(EDSCALE));
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
last_cell = cell;
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
void CanvasItemEditor::_draw_ruler_tool() {
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 (tool != TOOL_RULER) {
Add 2D ruler tool
2019-08-30 20:49:47 +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
}
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
if (ruler_tool_active) {
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
Color ruler_primary_color = get_theme_color(SNAME("accent_color"), SNAME("Editor"));
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
Color ruler_secondary_color = ruler_primary_color;
ruler_secondary_color.a = 0.5;
Fix ruler origin is moving with zoom
2019-10-24 19:19:11 +00:00
Point2 begin = (ruler_tool_origin - view_offset) * zoom;
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
Point2 end = snap_point(viewport->get_local_mouse_position() / zoom + view_offset) * zoom - view_offset * zoom;
Point2 corner = Point2(begin.x, end.y);
Vector2 length_vector = (begin - end).abs() / zoom;
Fix ruler lines rendering on top of text
2022-08-22 12:14:35 +00:00
const real_t horizontal_angle_rad = length_vector.angle();
const real_t vertical_angle_rad = Math_PI / 2.0 - horizontal_angle_rad;
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<Font> font = get_theme_font(SNAME("bold"), SNAME("EditorFonts"));
Fix "2D Polygon indices are barely visible on bright background" (#38009) Co-authored-by: Ethan <epruhl102@gmail.com>
2023-01-04 03:42:53 +00:00
int font_size = 1.3 * get_theme_font_size(SNAME("bold_size"), SNAME("EditorFonts"));
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
Color font_color = get_theme_color(SNAME("font_color"), SNAME("Editor"));
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
Color font_secondary_color = font_color;
Add outline to ruler tool
2020-11-27 16:23:44 +00:00
font_secondary_color.set_v(font_secondary_color.get_v() > 0.5 ? 0.7 : 0.3);
Color outline_color = font_color.inverted();
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
float text_height = font->get_height(font_size);
Add outline to ruler tool
2020-11-27 16:23:44 +00:00
Fix "2D Polygon indices are barely visible on bright background" (#38009) Co-authored-by: Ethan <epruhl102@gmail.com>
2023-01-04 03:42:53 +00:00
const float outline_size = 4;
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
const float text_width = 76;
Add angle to ruler tool
2019-10-06 14:19:13 +00:00
const float angle_text_width = 54;
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
Point2 text_pos = (begin + end) / 2 - Vector2(text_width / 2, text_height / 2);
text_pos.x = CLAMP(text_pos.x, text_width / 2, viewport->get_rect().size.x - text_width * 1.5);
text_pos.y = CLAMP(text_pos.y, text_height * 1.5, viewport->get_rect().size.y - text_height * 1.5);
Show mouse position when clicking ruler tool
2021-11-06 23:00:52 +00:00
Fix ruler lines rendering on top of text
2022-08-22 12:14:35 +00:00
// Draw lines.
viewport->draw_line(begin, end, ruler_primary_color, Math::round(EDSCALE * 3));
bool draw_secondary_lines = !(Math::is_equal_approx(begin.y, corner.y) || Math::is_equal_approx(end.x, corner.x));
if (draw_secondary_lines) {
viewport->draw_line(begin, corner, ruler_secondary_color, Math::round(EDSCALE));
viewport->draw_line(corner, end, ruler_secondary_color, Math::round(EDSCALE));
// Angle arcs.
int arc_point_count = 8;
real_t arc_radius_max_length_percent = 0.1;
real_t ruler_length = length_vector.length() * zoom;
real_t arc_max_radius = 50.0;
real_t arc_line_width = 2.0;
const Vector2 end_to_begin = (end - begin);
real_t arc_1_start_angle = end_to_begin.x < 0
? (end_to_begin.y < 0 ? 3.0 * Math_PI / 2.0 - vertical_angle_rad : Math_PI / 2.0)
: (end_to_begin.y < 0 ? 3.0 * Math_PI / 2.0 : Math_PI / 2.0 - vertical_angle_rad);
real_t arc_1_end_angle = arc_1_start_angle + vertical_angle_rad;
// Constrain arc to triangle height & max size.
real_t arc_1_radius = MIN(MIN(arc_radius_max_length_percent * ruler_length, ABS(end_to_begin.y)), arc_max_radius);
real_t arc_2_start_angle = end_to_begin.x < 0
? (end_to_begin.y < 0 ? 0.0 : -horizontal_angle_rad)
: (end_to_begin.y < 0 ? Math_PI - horizontal_angle_rad : Math_PI);
real_t arc_2_end_angle = arc_2_start_angle + horizontal_angle_rad;
// Constrain arc to triangle width & max size.
real_t arc_2_radius = MIN(MIN(arc_radius_max_length_percent * ruler_length, ABS(end_to_begin.x)), arc_max_radius);
viewport->draw_arc(begin, arc_1_radius, arc_1_start_angle, arc_1_end_angle, arc_point_count, ruler_primary_color, Math::round(EDSCALE * arc_line_width));
viewport->draw_arc(end, arc_2_radius, arc_2_start_angle, arc_2_end_angle, arc_point_count, ruler_primary_color, Math::round(EDSCALE * arc_line_width));
}
// Draw text.
Show mouse position when clicking ruler tool
2021-11-06 23:00:52 +00:00
if (begin.is_equal_approx(end)) {
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
viewport->draw_string_outline(font, text_pos, (String)ruler_tool_origin, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, text_pos, (String)ruler_tool_origin, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
Show mouse position when clicking ruler tool
2021-11-06 23:00:52 +00:00
Ref<Texture2D> position_icon = get_theme_icon(SNAME("EditorPosition"), SNAME("EditorIcons"));
viewport->draw_texture(get_theme_icon(SNAME("EditorPosition"), SNAME("EditorIcons")), (ruler_tool_origin - view_offset) * zoom - position_icon->get_size() / 2);
return;
}
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
viewport->draw_string_outline(font, text_pos, TS->format_number(vformat("%.1f px", length_vector.length())), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, text_pos, TS->format_number(vformat("%.1f px", length_vector.length())), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
if (draw_secondary_lines) {
Add arcs to indicate angle being measured by ruler
2019-10-15 15:47:58 +00:00
const int horizontal_angle = round(180 * horizontal_angle_rad / Math_PI);
const int vertical_angle = round(180 * vertical_angle_rad / Math_PI);
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
Point2 text_pos2 = text_pos;
text_pos2.x = begin.x < text_pos.x ? MIN(text_pos.x - text_width, begin.x - text_width / 2) : MAX(text_pos.x + text_width, begin.x - text_width / 2);
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
viewport->draw_string_outline(font, text_pos2, TS->format_number(vformat("%.1f px", length_vector.y)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, text_pos2, TS->format_number(vformat("%.1f px", length_vector.y)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_secondary_color);
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
Remove redundant Variant-types initializations
2022-11-14 17:21:06 +00:00
Point2 v_angle_text_pos;
Add angle to ruler tool
2019-10-06 14:19:13 +00:00
v_angle_text_pos.x = CLAMP(begin.x - angle_text_width / 2, angle_text_width / 2, viewport->get_rect().size.x - angle_text_width);
v_angle_text_pos.y = begin.y < end.y ? MIN(text_pos2.y - 2 * text_height, begin.y - text_height * 0.5) : MAX(text_pos2.y + text_height * 3, begin.y + text_height * 1.5);
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
viewport->draw_string_outline(font, v_angle_text_pos, TS->format_number(vformat(String::utf8("%d°"), vertical_angle)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, v_angle_text_pos, TS->format_number(vformat(String::utf8("%d°"), vertical_angle)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_secondary_color);
Add angle to ruler tool
2019-10-06 14:19:13 +00:00
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
text_pos2 = text_pos;
text_pos2.y = end.y < text_pos.y ? MIN(text_pos.y - text_height * 2, end.y - text_height / 2) : MAX(text_pos.y + text_height * 2, end.y - text_height / 2);
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
viewport->draw_string_outline(font, text_pos2, TS->format_number(vformat("%.1f px", length_vector.x)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, text_pos2, TS->format_number(vformat("%.1f px", length_vector.x)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_secondary_color);
Add angle to ruler tool
2019-10-06 14:19:13 +00:00
Remove redundant Variant-types initializations
2022-11-14 17:21:06 +00:00
Point2 h_angle_text_pos;
Add angle to ruler tool
2019-10-06 14:19:13 +00:00
h_angle_text_pos.x = CLAMP(end.x - angle_text_width / 2, angle_text_width / 2, viewport->get_rect().size.x - angle_text_width);
if (begin.y < end.y) {
h_angle_text_pos.y = end.y + text_height * 1.5;
if (ABS(text_pos2.x - h_angle_text_pos.x) < text_width) {
Make Ruler Tool depend on grid snap only
2019-10-24 20:31:19 +00:00
int height_multiplier = 1.5 + (int)grid_snap_active;
Add angle to ruler tool
2019-10-06 14:19:13 +00:00
h_angle_text_pos.y = MAX(text_pos.y + height_multiplier * text_height, MAX(end.y + text_height * 1.5, text_pos2.y + height_multiplier * text_height));
}
} else {
h_angle_text_pos.y = end.y - text_height * 0.5;
if (ABS(text_pos2.x - h_angle_text_pos.x) < text_width) {
Make Ruler Tool depend on grid snap only
2019-10-24 20:31:19 +00:00
int height_multiplier = 1 + (int)grid_snap_active;
Add angle to ruler tool
2019-10-06 14:19:13 +00:00
h_angle_text_pos.y = MIN(text_pos.y - height_multiplier * text_height, MIN(end.y - text_height * 0.5, text_pos2.y - height_multiplier * text_height));
}
}
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
viewport->draw_string_outline(font, h_angle_text_pos, TS->format_number(vformat(String::utf8("%d°"), horizontal_angle)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, h_angle_text_pos, TS->format_number(vformat(String::utf8("%d°"), horizontal_angle)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_secondary_color);
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
}
Make Ruler Tool depend on grid snap only
2019-10-24 20:31:19 +00:00
if (grid_snap_active) {
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
text_pos = (begin + end) / 2 + Vector2(-text_width / 2, text_height / 2);
text_pos.x = CLAMP(text_pos.x, text_width / 2, viewport->get_rect().size.x - text_width * 1.5);
text_pos.y = CLAMP(text_pos.y, text_height * 2.5, viewport->get_rect().size.y - text_height / 2);
if (draw_secondary_lines) {
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
viewport->draw_string_outline(font, text_pos, TS->format_number(vformat("%.2f " + TTR("units"), (length_vector / grid_step).length())), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, text_pos, TS->format_number(vformat("%.2f " + TTR("units"), (length_vector / grid_step).length())), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
Point2 text_pos2 = text_pos;
text_pos2.x = begin.x < text_pos.x ? MIN(text_pos.x - text_width, begin.x - text_width / 2) : MAX(text_pos.x + text_width, begin.x - text_width / 2);
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
viewport->draw_string_outline(font, text_pos2, TS->format_number(vformat("%d " + TTR("units"), roundf(length_vector.y / grid_step.y))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, text_pos2, TS->format_number(vformat("%d " + TTR("units"), roundf(length_vector.y / grid_step.y))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_secondary_color);
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
text_pos2 = text_pos;
text_pos2.y = end.y < text_pos.y ? MIN(text_pos.y - text_height * 2, end.y + text_height / 2) : MAX(text_pos.y + text_height * 2, end.y + text_height / 2);
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
viewport->draw_string_outline(font, text_pos2, TS->format_number(vformat("%d " + TTR("units"), roundf(length_vector.x / grid_step.x))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, text_pos2, TS->format_number(vformat("%d " + TTR("units"), roundf(length_vector.x / grid_step.x))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_secondary_color);
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
} else {
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
viewport->draw_string_outline(font, text_pos, TS->format_number(vformat("%d " + TTR("units"), roundf((length_vector / grid_step).length()))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, outline_size, outline_color);
viewport->draw_string(font, text_pos, TS->format_number(vformat("%d " + TTR("units"), roundf((length_vector / grid_step).length()))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
}
}
} else {
Make Ruler Tool depend on grid snap only
2019-10-24 20:31:19 +00:00
if (grid_snap_active) {
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> position_icon = get_theme_icon(SNAME("EditorPosition"), SNAME("EditorIcons"));
viewport->draw_texture(get_theme_icon(SNAME("EditorPosition"), SNAME("EditorIcons")), (ruler_tool_origin - view_offset) * zoom - position_icon->get_size() / 2);
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
}
}
}
Improve the anchors and margin workflow
2019-03-31 16:53:24 +00:00
void CanvasItemEditor::_draw_control_anchors(Control *control) {
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Transform2D xform = transform * control->get_global_transform_with_canvas();
RID ci = viewport->get_canvas_item();
Improve the anchors and margin workflow
2019-03-31 16:53:24 +00:00
if (tool == TOOL_SELECT && !Object::cast_to<Container>(control->get_parent())) {
// Compute the anchors
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t anchors_values[4];
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
anchors_values[0] = control->get_anchor(SIDE_LEFT);
anchors_values[1] = control->get_anchor(SIDE_TOP);
anchors_values[2] = control->get_anchor(SIDE_RIGHT);
anchors_values[3] = control->get_anchor(SIDE_BOTTOM);
Improve the anchors and margin workflow
2019-03-31 16:53:24 +00:00
Vector2 anchors_pos[4];
for (int i = 0; i < 4; i++) {
Vector2 value = Vector2((i % 2 == 0) ? anchors_values[i] : anchors_values[(i + 1) % 4], (i % 2 == 1) ? anchors_values[i] : anchors_values[(i + 1) % 4]);
anchors_pos[i] = xform.xform(_anchor_to_position(control, value));
}
// Draw the anchors handles
Rect2 anchor_rects[4];
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
if (control->is_layout_rtl()) {
anchor_rects[0] = Rect2(anchors_pos[0] - Vector2(0.0, anchor_handle->get_size().y), Point2(-anchor_handle->get_size().x, anchor_handle->get_size().y));
anchor_rects[1] = Rect2(anchors_pos[1] - anchor_handle->get_size(), anchor_handle->get_size());
anchor_rects[2] = Rect2(anchors_pos[2] - Vector2(anchor_handle->get_size().x, 0.0), Point2(anchor_handle->get_size().x, -anchor_handle->get_size().y));
anchor_rects[3] = Rect2(anchors_pos[3], -anchor_handle->get_size());
} else {
anchor_rects[0] = Rect2(anchors_pos[0] - anchor_handle->get_size(), anchor_handle->get_size());
anchor_rects[1] = Rect2(anchors_pos[1] - Vector2(0.0, anchor_handle->get_size().y), Point2(-anchor_handle->get_size().x, anchor_handle->get_size().y));
anchor_rects[2] = Rect2(anchors_pos[2], -anchor_handle->get_size());
anchor_rects[3] = Rect2(anchors_pos[3] - Vector2(anchor_handle->get_size().x, 0.0), Point2(anchor_handle->get_size().x, -anchor_handle->get_size().y));
}
Improve the anchors and margin workflow
2019-03-31 16:53:24 +00:00
for (int i = 0; i < 4; i++) {
anchor_handle->draw_rect(ci, anchor_rects[i]);
}
}
}
void CanvasItemEditor::_draw_control_helpers(Control *control) {
Transform2D xform = transform * control->get_global_transform_with_canvas();
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
if (tool == TOOL_SELECT && show_helpers && !Object::cast_to<Container>(control->get_parent())) {
// Draw the helpers
Color color_base = Color(0.8, 0.8, 0.8, 0.5);
Improve the anchors and margin workflow
2019-03-31 16:53:24 +00:00
// Compute the anchors
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t anchors_values[4];
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
anchors_values[0] = control->get_anchor(SIDE_LEFT);
anchors_values[1] = control->get_anchor(SIDE_TOP);
anchors_values[2] = control->get_anchor(SIDE_RIGHT);
anchors_values[3] = control->get_anchor(SIDE_BOTTOM);
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Vector2 anchors[4];
Vector2 anchors_pos[4];
for (int i = 0; i < 4; i++) {
anchors[i] = Vector2((i % 2 == 0) ? anchors_values[i] : anchors_values[(i + 1) % 4], (i % 2 == 1) ? anchors_values[i] : anchors_values[(i + 1) % 4]);
anchors_pos[i] = xform.xform(_anchor_to_position(control, anchors[i]));
}
// Get which anchor is dragged
int dragged_anchor = -1;
switch (drag_type) {
case DRAG_ANCHOR_ALL:
case DRAG_ANCHOR_TOP_LEFT:
dragged_anchor = 0;
break;
case DRAG_ANCHOR_TOP_RIGHT:
dragged_anchor = 1;
break;
case DRAG_ANCHOR_BOTTOM_RIGHT:
dragged_anchor = 2;
break;
case DRAG_ANCHOR_BOTTOM_LEFT:
dragged_anchor = 3;
break;
default:
break;
}
if (dragged_anchor >= 0) {
// Draw the 4 lines when dragged
Color color_snapped = Color(0.64, 0.93, 0.67, 0.5);
Vector2 corners_pos[4];
for (int i = 0; i < 4; i++) {
corners_pos[i] = xform.xform(_anchor_to_position(control, Vector2((i == 0 || i == 3) ? ANCHOR_BEGIN : ANCHOR_END, (i <= 1) ? ANCHOR_BEGIN : ANCHOR_END)));
}
Vector2 line_starts[4];
Vector2 line_ends[4];
for (int i = 0; i < 4; i++) {
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t anchor_val = (i >= 2) ? ANCHOR_END - anchors_values[i] : anchors_values[i];
[Core] Rename linear_interpolate to lerp
2020-03-16 09:07:33 +00:00
line_starts[i] = corners_pos[i].lerp(corners_pos[(i + 1) % 4], anchor_val);
line_ends[i] = corners_pos[(i + 3) % 4].lerp(corners_pos[(i + 2) % 4], anchor_val);
Fix some issues found by cppcheck.
2022-04-05 10:40:26 +00:00
bool anchor_snapped = anchors_values[i] == 0.0 || anchors_values[i] == 0.5 || anchors_values[i] == 1.0;
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
viewport->draw_line(line_starts[i], line_ends[i], anchor_snapped ? color_snapped : color_base, (i == dragged_anchor || (i + 3) % 4 == dragged_anchor) ? 2 : 1);
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
}
// Display the percentages next to the lines
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t percent_val;
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
percent_val = anchors_values[(dragged_anchor + 2) % 4] - anchors_values[dragged_anchor];
percent_val = (dragged_anchor >= 2) ? -percent_val : percent_val;
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
_draw_percentage_at_position(percent_val, (anchors_pos[dragged_anchor] + anchors_pos[(dragged_anchor + 1) % 4]) / 2, (Side)((dragged_anchor + 1) % 4));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
percent_val = anchors_values[(dragged_anchor + 3) % 4] - anchors_values[(dragged_anchor + 1) % 4];
percent_val = ((dragged_anchor + 1) % 4 >= 2) ? -percent_val : percent_val;
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
_draw_percentage_at_position(percent_val, (anchors_pos[dragged_anchor] + anchors_pos[(dragged_anchor + 3) % 4]) / 2, (Side)(dragged_anchor));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
percent_val = anchors_values[(dragged_anchor + 1) % 4];
percent_val = ((dragged_anchor + 1) % 4 >= 2) ? ANCHOR_END - percent_val : percent_val;
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
_draw_percentage_at_position(percent_val, (line_starts[dragged_anchor] + anchors_pos[dragged_anchor]) / 2, (Side)(dragged_anchor));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
percent_val = anchors_values[dragged_anchor];
percent_val = (dragged_anchor >= 2) ? ANCHOR_END - percent_val : percent_val;
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
_draw_percentage_at_position(percent_val, (line_ends[(dragged_anchor + 1) % 4] + anchors_pos[dragged_anchor]) / 2, (Side)((dragged_anchor + 1) % 4));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
}
// Draw the margin values and the node width/height when dragging control side
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
const real_t ratio = 0.33;
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Transform2D parent_transform = xform * control->get_transform().affine_inverse();
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t node_pos_in_parent[4];
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Rect2 parent_rect = control->get_parent_anchorable_rect();
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
node_pos_in_parent[0] = control->get_anchor(SIDE_LEFT) * parent_rect.size.width + control->get_offset(SIDE_LEFT) + parent_rect.position.x;
node_pos_in_parent[1] = control->get_anchor(SIDE_TOP) * parent_rect.size.height + control->get_offset(SIDE_TOP) + parent_rect.position.y;
node_pos_in_parent[2] = control->get_anchor(SIDE_RIGHT) * parent_rect.size.width + control->get_offset(SIDE_RIGHT) + parent_rect.position.x;
node_pos_in_parent[3] = control->get_anchor(SIDE_BOTTOM) * parent_rect.size.height + control->get_offset(SIDE_BOTTOM) + parent_rect.position.y;
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Point2 start, end;
switch (drag_type) {
case DRAG_LEFT:
case DRAG_TOP_LEFT:
case DRAG_BOTTOM_LEFT:
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
_draw_margin_at_position(control->get_size().width, parent_transform.xform(Vector2((node_pos_in_parent[0] + node_pos_in_parent[2]) / 2, node_pos_in_parent[3])) + Vector2(0, 5), SIDE_BOTTOM);
Replace FALLTHROUGH macro by C++17 [[fallthrough]] This attribute is now part of the standard we target so we no longer need compiler-specific hacks. Also enables -Wimplicit-fallthrough for Clang now that we can properly support it. It's already on by default for GCC's -Wextra. Fixes new warnings raised by Clang's -Wimplicit-fallthrough.
2020-02-22 19:47:50 +00:00
[[fallthrough]];
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
case DRAG_MOVE:
start = Vector2(node_pos_in_parent[0], Math::lerp(node_pos_in_parent[1], node_pos_in_parent[3], ratio));
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
end = start - Vector2(control->get_offset(SIDE_LEFT), 0);
_draw_margin_at_position(control->get_offset(SIDE_LEFT), parent_transform.xform((start + end) / 2), SIDE_TOP);
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(parent_transform.xform(start), parent_transform.xform(end), color_base, Math::round(EDSCALE));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
break;
default:
break;
}
switch (drag_type) {
case DRAG_RIGHT:
case DRAG_TOP_RIGHT:
case DRAG_BOTTOM_RIGHT:
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
_draw_margin_at_position(control->get_size().width, parent_transform.xform(Vector2((node_pos_in_parent[0] + node_pos_in_parent[2]) / 2, node_pos_in_parent[3])) + Vector2(0, 5), SIDE_BOTTOM);
Replace FALLTHROUGH macro by C++17 [[fallthrough]] This attribute is now part of the standard we target so we no longer need compiler-specific hacks. Also enables -Wimplicit-fallthrough for Clang now that we can properly support it. It's already on by default for GCC's -Wextra. Fixes new warnings raised by Clang's -Wimplicit-fallthrough.
2020-02-22 19:47:50 +00:00
[[fallthrough]];
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
case DRAG_MOVE:
start = Vector2(node_pos_in_parent[2], Math::lerp(node_pos_in_parent[3], node_pos_in_parent[1], ratio));
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
end = start - Vector2(control->get_offset(SIDE_RIGHT), 0);
_draw_margin_at_position(control->get_offset(SIDE_RIGHT), parent_transform.xform((start + end) / 2), SIDE_BOTTOM);
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(parent_transform.xform(start), parent_transform.xform(end), color_base, Math::round(EDSCALE));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
break;
default:
break;
}
switch (drag_type) {
case DRAG_TOP:
case DRAG_TOP_LEFT:
case DRAG_TOP_RIGHT:
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
_draw_margin_at_position(control->get_size().height, parent_transform.xform(Vector2(node_pos_in_parent[2], (node_pos_in_parent[1] + node_pos_in_parent[3]) / 2)) + Vector2(5, 0), SIDE_RIGHT);
Replace FALLTHROUGH macro by C++17 [[fallthrough]] This attribute is now part of the standard we target so we no longer need compiler-specific hacks. Also enables -Wimplicit-fallthrough for Clang now that we can properly support it. It's already on by default for GCC's -Wextra. Fixes new warnings raised by Clang's -Wimplicit-fallthrough.
2020-02-22 19:47:50 +00:00
[[fallthrough]];
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
case DRAG_MOVE:
start = Vector2(Math::lerp(node_pos_in_parent[0], node_pos_in_parent[2], ratio), node_pos_in_parent[1]);
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
end = start - Vector2(0, control->get_offset(SIDE_TOP));
_draw_margin_at_position(control->get_offset(SIDE_TOP), parent_transform.xform((start + end) / 2), SIDE_LEFT);
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(parent_transform.xform(start), parent_transform.xform(end), color_base, Math::round(EDSCALE));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
break;
default:
break;
}
switch (drag_type) {
case DRAG_BOTTOM:
case DRAG_BOTTOM_LEFT:
case DRAG_BOTTOM_RIGHT:
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
_draw_margin_at_position(control->get_size().height, parent_transform.xform(Vector2(node_pos_in_parent[2], (node_pos_in_parent[1] + node_pos_in_parent[3]) / 2) + Vector2(5, 0)), SIDE_RIGHT);
Replace FALLTHROUGH macro by C++17 [[fallthrough]] This attribute is now part of the standard we target so we no longer need compiler-specific hacks. Also enables -Wimplicit-fallthrough for Clang now that we can properly support it. It's already on by default for GCC's -Wextra. Fixes new warnings raised by Clang's -Wimplicit-fallthrough.
2020-02-22 19:47:50 +00:00
[[fallthrough]];
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
case DRAG_MOVE:
start = Vector2(Math::lerp(node_pos_in_parent[2], node_pos_in_parent[0], ratio), node_pos_in_parent[3]);
Rename Control margin to offset
2020-12-22 16:24:29 +00:00
end = start - Vector2(0, control->get_offset(SIDE_BOTTOM));
_draw_margin_at_position(control->get_offset(SIDE_BOTTOM), parent_transform.xform((start + end) / 2), SIDE_RIGHT);
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_line(parent_transform.xform(start), parent_transform.xform(end), color_base, Math::round(EDSCALE));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
break;
default:
break;
}
switch (drag_type) {
//Draw the ghost rect if the node if rotated/scaled
case DRAG_LEFT:
case DRAG_TOP_LEFT:
case DRAG_TOP:
case DRAG_TOP_RIGHT:
case DRAG_RIGHT:
case DRAG_BOTTOM_RIGHT:
case DRAG_BOTTOM:
case DRAG_BOTTOM_LEFT:
case DRAG_MOVE:
if (control->get_rotation() != 0.0 || control->get_scale() != Vector2(1, 1)) {
Rect2 rect = Rect2(Vector2(node_pos_in_parent[0], node_pos_in_parent[1]), control->get_size());
Improve line drawing in the 2D editor - Use antialiasing (only visible when using the GLES3 renderer) - Scale line widths on hiDPI displays This also removes some debugging prints.
2019-07-08 23:49:43 +00:00
viewport->draw_rect(parent_transform.xform(rect), color_base, false, Math::round(EDSCALE));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
}
break;
default:
break;
}
}
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
void CanvasItemEditor::_draw_selection() {
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> pivot_icon = get_theme_icon(SNAME("EditorPivot"), SNAME("EditorIcons"));
Ref<Texture2D> position_icon = get_theme_icon(SNAME("EditorPosition"), SNAME("EditorIcons"));
Ref<Texture2D> previous_position_icon = get_theme_icon(SNAME("EditorPositionPrevious"), SNAME("EditorIcons"));
Display nodes without rect's position
2018-03-10 10:56:27 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
RID vp_ci = viewport->get_canvas_item();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Added selection outline to locked nodes.
2020-04-15 12:03:12 +00:00
List<CanvasItem *> selection = _get_edited_canvas_items(true, false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
bool single = selection.size() == 1;
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (CanvasItem *E : selection) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(E);
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(ci);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
bool item_locked = ci->has_meta("_edit_lock_");
Added selection outline to locked nodes.
2020-04-15 12:03:12 +00:00
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Draw the previous position if we are dragging the node
if (show_helpers &&
Fixes 2D nodes lock not working
2018-09-09 20:17:47 +00:00
(drag_type == DRAG_MOVE || drag_type == DRAG_ROTATE ||
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
drag_type == DRAG_LEFT || drag_type == DRAG_RIGHT || drag_type == DRAG_TOP || drag_type == DRAG_BOTTOM ||
drag_type == DRAG_TOP_LEFT || drag_type == DRAG_TOP_RIGHT || drag_type == DRAG_BOTTOM_LEFT || drag_type == DRAG_BOTTOM_RIGHT)) {
adds display of old bounding box as suggested by Zephilinox in issue #10936
2017-09-12 17:11:53 +00:00
const Transform2D pre_drag_xform = transform * se->pre_drag_xform;
const Color pre_drag_color = Color(0.4, 0.6, 1, 0.7);
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->_edit_use_rect()) {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
Vector2 pre_drag_endpoints[4] = {
pre_drag_xform.xform(se->pre_drag_rect.position),
pre_drag_xform.xform(se->pre_drag_rect.position + Vector2(se->pre_drag_rect.size.x, 0)),
pre_drag_xform.xform(se->pre_drag_rect.position + se->pre_drag_rect.size),
pre_drag_xform.xform(se->pre_drag_rect.position + Vector2(0, se->pre_drag_rect.size.y))
};
adds display of old bounding box as suggested by Zephilinox in issue #10936
2017-09-12 17:11:53 +00:00
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
for (int i = 0; i < 4; i++) {
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
viewport->draw_line(pre_drag_endpoints[i], pre_drag_endpoints[(i + 1) % 4], pre_drag_color, Math::round(2 * EDSCALE));
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
}
} else {
Display nodes without rect's position
2018-03-10 10:56:27 +00:00
viewport->draw_texture(previous_position_icon, (pre_drag_xform.xform(Point2()) - (previous_position_icon->get_size() / 2)).floor());
adds display of old bounding box as suggested by Zephilinox in issue #10936
2017-09-12 17:11:53 +00:00
}
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Transform2D xform = transform * ci->get_global_transform_with_canvas();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
// Draw the selected items position / surrounding boxes
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->_edit_use_rect()) {
Rect2 rect = ci->_edit_get_rect();
Fix some issues found by cppcheck.
2022-04-05 10:40:26 +00:00
const Vector2 endpoints[4] = {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
xform.xform(rect.position),
xform.xform(rect.position + Vector2(rect.size.x, 0)),
xform.xform(rect.position + rect.size),
xform.xform(rect.position + Vector2(0, rect.size.y))
};
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
Color c = Color(1, 0.6, 0.4, 0.7);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Added selection outline to locked nodes.
2020-04-15 12:03:12 +00:00
if (item_locked) {
c = Color(0.7, 0.7, 0.7, 0.7);
}
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
for (int i = 0; i < 4; i++) {
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
viewport->draw_line(endpoints[i], endpoints[(i + 1) % 4], c, Math::round(2 * EDSCALE));
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
}
} else {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized();
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Transform2D simple_xform = viewport->get_transform() * unscaled_transform;
viewport->draw_set_transform_matrix(simple_xform);
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
viewport->draw_texture(position_icon, -(position_icon->get_size() / 2));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
viewport->draw_set_transform_matrix(viewport->get_transform());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Added selection outline to locked nodes.
2020-04-15 12:03:12 +00:00
if (single && !item_locked && (tool == TOOL_SELECT || tool == TOOL_MOVE || tool == TOOL_SCALE || tool == TOOL_ROTATE || tool == TOOL_EDIT_PIVOT)) { //kind of sucks
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Draw the pivot
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->_edit_use_pivot()) {
Displays the pivot all the time and rotate the icon
2019-01-18 18:30:45 +00:00
// Draw the node's pivot
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized();
Displays the pivot all the time and rotate the icon
2019-01-18 18:30:45 +00:00
Transform2D simple_xform = viewport->get_transform() * unscaled_transform;
Fixes the pivot setting with control nodes
2019-01-27 14:51:45 +00:00
Displays the pivot all the time and rotate the icon
2019-01-18 18:30:45 +00:00
viewport->draw_set_transform_matrix(simple_xform);
Fixes the pivot setting with control nodes
2019-01-27 14:51:45 +00:00
viewport->draw_texture(pivot_icon, -(pivot_icon->get_size() / 2).floor());
Displays the pivot all the time and rotate the icon
2019-01-18 18:30:45 +00:00
viewport->draw_set_transform_matrix(viewport->get_transform());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Add anchor visualization
2017-07-10 22:14:22 +00:00
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
// Draw control-related helpers
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Control *control = Object::cast_to<Control>(ci);
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
if (control && _is_node_movable(control)) {
Improve the anchors and margin workflow
2019-03-31 16:53:24 +00:00
_draw_control_anchors(control);
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
_draw_control_helpers(control);
Ability to set rotation and scaling pivot for controls.
2017-07-06 20:42:44 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
// Draw the resize handles
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (tool == TOOL_SELECT && ci->_edit_use_rect() && _is_node_movable(ci)) {
Rect2 rect = ci->_edit_get_rect();
Fix more issues found by cppcheck.
2022-04-07 10:23:40 +00:00
const Vector2 endpoints[4] = {
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
xform.xform(rect.position),
xform.xform(rect.position + Vector2(rect.size.x, 0)),
xform.xform(rect.position + rect.size),
xform.xform(rect.position + Vector2(0, rect.size.y))
};
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
for (int i = 0; i < 4; i++) {
int prev = (i + 3) % 4;
int next = (i + 1) % 4;
Vector2 ofs = ((endpoints[i] - endpoints[prev]).normalized() + ((endpoints[i] - endpoints[next]).normalized())).normalized();
Removed unused variables, add some constants numbers
2019-12-10 04:13:02 +00:00
ofs *= Math_SQRT2 * (select_handle->get_size().width / 2);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
select_handle->draw(vp_ci, (endpoints[i] + ofs - (select_handle->get_size() / 2)).floor());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
ofs = (endpoints[i] + endpoints[next]) / 2;
Rename Vector2.tangent() to Vector2.orthogonal()
2020-12-06 18:16:06 +00:00
ofs += (endpoints[next] - endpoints[i]).orthogonal().normalized() * (select_handle->get_size().width / 2);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
select_handle->draw(vp_ci, (ofs - (select_handle->get_size() / 2)).floor());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Added movement handles to 2D
2019-11-08 14:48:26 +00:00
// Draw the move handles
replace the use of CTRL by CMD_OR_CTRL in three places where using CTRL prevented the use of the functionality on mac on Mac CTRL + Left click = Right click therefore when a functionality needs CTRL + Left click it is not possible on mac. It then forcibly needs to be CMD on mac
2023-01-15 17:41:37 +00:00
bool is_ctrl = Input::get_singleton()->is_key_pressed(Key::CMD_OR_CTRL);
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
bool is_alt = Input::get_singleton()->is_key_pressed(Key::ALT);
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
if (tool == TOOL_MOVE && show_transformation_gizmos) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (_is_node_movable(ci)) {
Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized();
Added movement handles to 2D
2019-11-08 14:48:26 +00:00
Transform2D simple_xform = viewport->get_transform() * unscaled_transform;
Size2 move_factor = Size2(MOVE_HANDLE_DISTANCE, MOVE_HANDLE_DISTANCE);
viewport->draw_set_transform_matrix(simple_xform);
Use List Initializations for Vectors.
2022-01-11 15:27:39 +00:00
Vector<Point2> points = {
Vector2(move_factor.x * EDSCALE, 5 * EDSCALE),
Vector2(move_factor.x * EDSCALE, -5 * EDSCALE),
Vector2((move_factor.x + 10) * EDSCALE, 0)
};
Added movement handles to 2D
2019-11-08 14:48:26 +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
viewport->draw_colored_polygon(points, get_theme_color(SNAME("axis_x_color"), SNAME("Editor")));
viewport->draw_line(Point2(), Point2(move_factor.x * EDSCALE, 0), get_theme_color(SNAME("axis_x_color"), SNAME("Editor")), Math::round(EDSCALE));
Added movement handles to 2D
2019-11-08 14:48:26 +00:00
points.clear();
Changed transformation handles y arrow to match positive y
2019-11-12 10:05:34 +00:00
points.push_back(Vector2(5 * EDSCALE, move_factor.y * EDSCALE));
points.push_back(Vector2(-5 * EDSCALE, move_factor.y * EDSCALE));
points.push_back(Vector2(0, (move_factor.y + 10) * EDSCALE));
Added movement handles to 2D
2019-11-08 14:48:26 +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
viewport->draw_colored_polygon(points, get_theme_color(SNAME("axis_y_color"), SNAME("Editor")));
viewport->draw_line(Point2(), Point2(0, move_factor.y * EDSCALE), get_theme_color(SNAME("axis_y_color"), SNAME("Editor")), Math::round(EDSCALE));
Added movement handles to 2D
2019-11-08 14:48:26 +00:00
viewport->draw_set_transform_matrix(viewport->get_transform());
}
}
// Draw the rescale handles
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
if (show_transformation_gizmos && ((is_alt && is_ctrl) || tool == TOOL_SCALE || drag_type == DRAG_SCALE_X || drag_type == DRAG_SCALE_Y)) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (_is_node_movable(ci)) {
Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized();
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
Transform2D simple_xform = viewport->get_transform() * unscaled_transform;
Size2 scale_factor = Size2(SCALE_HANDLE_DISTANCE, SCALE_HANDLE_DISTANCE);
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
bool uniform = Input::get_singleton()->is_key_pressed(Key::SHIFT);
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
Point2 offset = (simple_xform.affine_inverse().xform(drag_to) - simple_xform.affine_inverse().xform(drag_from)) * zoom;
if (drag_type == DRAG_SCALE_X) {
scale_factor.x += offset.x;
if (uniform) {
scale_factor.y += offset.x;
}
} else if (drag_type == DRAG_SCALE_Y) {
Changed transformation handles y arrow to match positive y
2019-11-12 10:05:34 +00:00
scale_factor.y += offset.y;
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
if (uniform) {
Changed transformation handles y arrow to match positive y
2019-11-12 10:05:34 +00:00
scale_factor.x += offset.y;
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
}
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
}
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
viewport->draw_set_transform_matrix(simple_xform);
Rect2 x_handle_rect = Rect2(scale_factor.x * EDSCALE, -5 * EDSCALE, 10 * EDSCALE, 10 * EDSCALE);
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
viewport->draw_rect(x_handle_rect, get_theme_color(SNAME("axis_x_color"), SNAME("Editor")));
viewport->draw_line(Point2(), Point2(scale_factor.x * EDSCALE, 0), get_theme_color(SNAME("axis_x_color"), SNAME("Editor")), Math::round(EDSCALE));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Changed transformation handles y arrow to match positive y
2019-11-12 10:05:34 +00:00
Rect2 y_handle_rect = Rect2(-5 * EDSCALE, scale_factor.y * EDSCALE, 10 * EDSCALE, 10 * EDSCALE);
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
viewport->draw_rect(y_handle_rect, get_theme_color(SNAME("axis_y_color"), SNAME("Editor")));
viewport->draw_line(Point2(), Point2(0, scale_factor.y * EDSCALE), get_theme_color(SNAME("axis_y_color"), SNAME("Editor")), Math::round(EDSCALE));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
viewport->draw_set_transform_matrix(viewport->get_transform());
}
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_BOX_SELECTION) {
// Draw the dragging box
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Point2 bsfrom = transform.xform(drag_from);
Point2 bsto = transform.xform(box_selecting_to);
Add an outline to box selection rectangles for better visibility This also refactors selection box color definitions to avoid repetition.
2019-08-15 20:17:08 +00:00
viewport->draw_rect(
Use the editor theme's accent color for 2D/3D selections and rotations
2019-03-29 13:19:44 +00:00
Rect2(bsfrom, bsto - bsfrom),
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
get_theme_color(SNAME("box_selection_fill_color"), SNAME("Editor")));
Add an outline to box selection rectangles for better visibility This also refactors selection box color definitions to avoid repetition.
2019-08-15 20:17:08 +00:00
viewport->draw_rect(
Rect2(bsfrom, bsto - bsfrom),
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
get_theme_color(SNAME("box_selection_stroke_color"), SNAME("Editor")),
Add an outline to box selection rectangles for better visibility This also refactors selection box color definitions to avoid repetition.
2019-08-15 20:17:08 +00:00
false,
Math::round(EDSCALE));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (drag_type == DRAG_ROTATE) {
// Draw the line when rotating a node
Use the editor theme's accent color for 2D/3D selections and rotations
2019-03-29 13:19:44 +00:00
viewport->draw_line(
transform.xform(drag_rotation_center),
transform.xform(drag_to),
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
get_theme_color(SNAME("accent_color"), SNAME("Editor")) * Color(1, 1, 1, 0.6),
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
Math::round(2 * EDSCALE));
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
}
void CanvasItemEditor::_draw_straight_line(Point2 p_from, Point2 p_to, Color p_color) {
// Draw a line going through the whole screen from a vector
RID ci = viewport->get_canvas_item();
Vector<Point2> points;
Point2 from = transform.xform(p_from);
Point2 to = transform.xform(p_to);
Size2 viewport_size = viewport->get_size();
if (to.x == from.x) {
// Vertical line
points.push_back(Point2(to.x, 0));
points.push_back(Point2(to.x, viewport_size.y));
} else if (to.y == from.y) {
// Horizontal line
points.push_back(Point2(0, to.y));
points.push_back(Point2(viewport_size.x, to.y));
} else {
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t y_for_zero_x = (to.y * from.x - from.y * to.x) / (from.x - to.x);
real_t x_for_zero_y = (to.x * from.y - from.x * to.y) / (from.y - to.y);
real_t y_for_viewport_x = ((to.y - from.y) * (viewport_size.x - from.x)) / (to.x - from.x) + from.y;
real_t x_for_viewport_y = ((to.x - from.x) * (viewport_size.y - from.y)) / (to.y - from.y) + from.x; // faux
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
//bool start_set = false;
if (y_for_zero_x >= 0 && y_for_zero_x <= viewport_size.y) {
points.push_back(Point2(0, y_for_zero_x));
}
if (x_for_zero_y >= 0 && x_for_zero_y <= viewport_size.x) {
points.push_back(Point2(x_for_zero_y, 0));
}
if (y_for_viewport_x >= 0 && y_for_viewport_x <= viewport_size.y) {
points.push_back(Point2(viewport_size.x, y_for_viewport_x));
}
if (x_for_viewport_y >= 0 && x_for_viewport_y <= viewport_size.x) {
points.push_back(Point2(x_for_viewport_y, viewport_size.y));
}
}
if (points.size() >= 2) {
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->canvas_item_add_line(ci, points[0], points[1], p_color);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
}
void CanvasItemEditor::_draw_axis() {
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
if (show_origin) {
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
_draw_straight_line(Point2(), Point2(1, 0), get_theme_color(SNAME("axis_x_color"), SNAME("Editor")) * Color(1, 1, 1, 0.75));
_draw_straight_line(Point2(), Point2(0, 1), get_theme_color(SNAME("axis_y_color"), SNAME("Editor")) * Color(1, 1, 1, 0.75));
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
if (show_viewport) {
RID ci = viewport->get_canvas_item();
Unify usage of GLOBAL/EDITOR_GET
2022-10-18 14:43:37 +00:00
Color area_axis_color = EDITOR_GET("editors/2d/viewport_border_color");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Unify usage of GLOBAL/EDITOR_GET
2022-10-18 14:43:37 +00:00
Size2 screen_size = Size2(GLOBAL_GET("display/window/size/viewport_width"), GLOBAL_GET("display/window/size/viewport_height"));
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
Vector2 screen_endpoints[4] = {
transform.xform(Vector2(0, 0)),
transform.xform(Vector2(screen_size.width, 0)),
transform.xform(Vector2(screen_size.width, screen_size.height)),
transform.xform(Vector2(0, screen_size.height))
};
for (int i = 0; i < 4; i++) {
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->canvas_item_add_line(ci, screen_endpoints[i], screen_endpoints[(i + 1) % 4], area_axis_color);
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Display nodes without rect's position
2018-03-10 10:56:27 +00:00
void CanvasItemEditor::_draw_invisible_nodes_positions(Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
Add missing NULL checks on CanvasItemEditor
2017-09-20 19:28:16 +00:00
ERR_FAIL_COND(!p_node);
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
Node *scene = EditorNode::get_singleton()->get_edited_scene();
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 (p_node != scene && p_node->get_owner() != scene && !scene->is_editable_instance(p_node->get_owner())) {
Display nodes without rect's position
2018-03-10 10:56: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
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
if (ci && !ci->is_visible_in_tree()) {
Display nodes without rect's position
2018-03-10 10:56: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
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
Display nodes without rect's position
2018-03-10 10:56:27 +00:00
Transform2D parent_xform = p_parent_xform;
Transform2D canvas_xform = p_canvas_xform;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci && !ci->is_set_as_top_level()) {
parent_xform = parent_xform * ci->get_transform();
Display nodes without rect's position
2018-03-10 10:56:27 +00:00
} else {
CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
parent_xform = Transform2D();
canvas_xform = cl ? cl->get_transform() : p_canvas_xform;
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
Display nodes without rect's position
2018-03-10 10:56:27 +00:00
_draw_invisible_nodes_positions(p_node->get_child(i), parent_xform, canvas_xform);
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci && !ci->_edit_use_rect() && (!editor_selection->is_selected(ci) || _is_node_locked(ci))) {
Display nodes without rect's position
2018-03-10 10:56:27 +00:00
Transform2D xform = transform * canvas_xform * parent_xform;
Displays node icon on hover
2018-03-12 22:32:25 +00:00
// Draw the node's position
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> position_icon = get_theme_icon(SNAME("EditorPositionUnselected"), SNAME("EditorIcons"));
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Transform2D unscaled_transform = (xform * ci->get_transform().affine_inverse() * ci->_edit_get_transform()).orthonormalized();
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
Transform2D simple_xform = viewport->get_transform() * unscaled_transform;
viewport->draw_set_transform_matrix(simple_xform);
Display nodes without rect's position
2018-03-10 10:56:27 +00:00
viewport->draw_texture(position_icon, -position_icon->get_size() / 2, Color(1.0, 1.0, 1.0, 0.5));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
viewport->draw_set_transform_matrix(viewport->get_transform());
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
}
Displays node icon on hover
2018-03-12 22:32:25 +00:00
}
void CanvasItemEditor::_draw_hover() {
List<Rect2> previous_rects;
for (int i = 0; i < hovering_results.size(); i++) {
Texture refactor -Texture renamed to Texture2D -TextureLayered as base now inherits 2Darray, cubemap and cubemap array -Removed all references to flags in textures (they will go in the shader) -Texture3D gone for now (will come back later done properly) -Create base rasterizer for RenderDevice, RasterizerRD
2019-06-11 18:43:37 +00:00
Ref<Texture2D> node_icon = hovering_results[i].icon;
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
String node_name = hovering_results[i].name;
Displays node icon on hover
2018-03-12 22:32:25 +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
Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Label"));
int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Label"));
Refactor Font configuration and import UI, and Font resources.
2022-05-09 09:47:10 +00:00
Size2 node_name_size = font->get_string_size(node_name, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size);
Displays node icon on hover
2018-03-12 22:32:25 +00:00
Size2 item_size = Size2(node_icon->get_size().x + 4 + node_name_size.x, MAX(node_icon->get_size().y, node_name_size.y - 3));
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
Point2 pos = transform.xform(hovering_results[i].position) - Point2(0, item_size.y) + (Point2(node_icon->get_size().x, -node_icon->get_size().y) / 4);
Misc. typos Found via `codespell -q 3 -I ../godot-word-whitelist.txt --skip="./thirdparty,*.po"`
2018-09-13 01:38:39 +00:00
// Rectify the position to avoid overlapping items
Use const references where possible for List range iterators
2021-07-24 13:46:25 +00:00
for (const Rect2 &E : previous_rects) {
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
if (E.intersects(Rect2(pos, item_size))) {
pos.y = E.get_position().y - item_size.y;
Displays node icon on hover
2018-03-12 22:32:25 +00:00
}
}
previous_rects.push_back(Rect2(pos, item_size));
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
// Draw icon
Displays node icon on hover
2018-03-12 22:32:25 +00:00
viewport->draw_texture(node_icon, pos, Color(1.0, 1.0, 1.0, 0.5));
Fixes a crash on draw_hover
2018-06-12 09:01:24 +00:00
// Draw name
align to horizontal_alignment, valign to vertical_alignment, related
2021-11-25 02:58:47 +00:00
viewport->draw_string(font, pos + Point2(node_icon->get_size().x + 4, item_size.y - 3), node_name, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(1.0, 1.0, 1.0, 0.5));
Display nodes without rect's position
2018-03-10 10:56:27 +00:00
}
}
Show the transform operation numbers in 2D
2022-07-05 11:06:12 +00:00
void CanvasItemEditor::_draw_transform_message() {
Fix drag_selection crash on scene close
2022-07-14 00:27:39 +00:00
if (drag_type == DRAG_NONE || drag_selection.is_empty() || !drag_selection.front()->get()) {
Show the transform operation numbers in 2D
2022-07-05 11:06:12 +00:00
return;
}
String transform_message;
Transform2D current_transform = drag_selection.front()->get()->get_global_transform();
double snap = EDITOR_GET("interface/inspector/default_float_step");
int snap_step_decimals = Math::range_step_decimals(snap);
#define FORMAT(value) (TS->format_number(String::num(value, snap_step_decimals)))
switch (drag_type) {
case DRAG_MOVE:
case DRAG_MOVE_X:
case DRAG_MOVE_Y: {
Vector2 delta = current_transform.get_origin() - original_transform.get_origin();
if (drag_type == DRAG_MOVE) {
transform_message = TTR("Moving:") + " (" + FORMAT(delta.x) + ", " + FORMAT(delta.y) + ") px";
} else if (drag_type == DRAG_MOVE_X) {
transform_message = TTR("Moving:") + " " + FORMAT(delta.x) + " px";
} else if (drag_type == DRAG_MOVE_Y) {
transform_message = TTR("Moving:") + " " + FORMAT(delta.y) + " px";
}
} break;
case DRAG_ROTATE: {
Rename `str2var` to `str_to_var` and similar Affects the Math class, a good chunk of the audio code, and a lot of other miscellaneous classes, too. - `var2str` -> `var_to_str` - `str2var` -> `str_to_var` - `bytes2var` -> `bytes_to_var` - `bytes2var_with_objects` -> `bytes_to_var_with_objects` - `var2bytes` -> `var_to_bytes` - `var2bytes_with_objects` -> `var_to_bytes_with_objects` - `linear2db` -> `linear_to_db` - `db2linear` -> `db_to_linear` - `deg2rad` -> `deg_to_rad` - `rad2deg` -> `rad_to_deg` - `dict2inst` -> `dict_to_inst` - `inst2dict` -> `inst_to_dict`
2022-08-13 15:45:42 +00:00
real_t delta = Math::rad_to_deg(current_transform.get_rotation() - original_transform.get_rotation());
Show the transform operation numbers in 2D
2022-07-05 11:06:12 +00:00
transform_message = TTR("Rotating:") + " " + FORMAT(delta) + String::utf8(" °");
} break;
case DRAG_SCALE_X:
case DRAG_SCALE_Y:
case DRAG_SCALE_BOTH: {
Vector2 original_scale = (Math::is_zero_approx(original_transform.get_scale().x) || Math::is_zero_approx(original_transform.get_scale().y)) ? Vector2(CMP_EPSILON, CMP_EPSILON) : original_transform.get_scale();
Vector2 delta = current_transform.get_scale() / original_scale;
if (drag_type == DRAG_SCALE_BOTH) {
transform_message = TTR("Scaling:") + String::utf8(" ×(") + FORMAT(delta.x) + ", " + FORMAT(delta.y) + ")";
} else if (drag_type == DRAG_SCALE_X) {
transform_message = TTR("Scaling:") + String::utf8(" ×") + FORMAT(delta.x);
} else if (drag_type == DRAG_SCALE_Y) {
transform_message = TTR("Scaling:") + String::utf8(" ×") + FORMAT(delta.y);
}
} break;
default:
break;
}
#undef FORMAT
if (transform_message.is_empty()) {
return;
}
Fix regressions from Font refactor Fixes `p_font.is_null()` errors due to incorrect resource type used. Fixes code editor font not set correctly, and OpenType features applied to the wrong font.
2022-07-07 12:11:08 +00:00
Ref<Font> font = get_theme_font(SNAME("font"), SNAME("Label"));
Show the transform operation numbers in 2D
2022-07-05 11:06:12 +00:00
int font_size = get_theme_font_size(SNAME("font_size"), SNAME("Label"));
Point2 msgpos = Point2(RULER_WIDTH + 5 * EDSCALE, viewport->get_size().y - 20 * EDSCALE);
viewport->draw_string(font, msgpos + Point2(1, 1), transform_message, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(0, 0, 0, 0.8));
viewport->draw_string(font, msgpos + Point2(-1, -1), transform_message, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(0, 0, 0, 0.8));
viewport->draw_string(font, msgpos, transform_message, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(1, 1, 1, 1));
}
Fixes issues with selectable children and locks
2018-03-08 20:12:49 +00:00
void CanvasItemEditor::_draw_locks_and_groups(Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
Add missing NULL checks on CanvasItemEditor
2017-09-20 19:28:16 +00:00
ERR_FAIL_COND(!p_node);
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
Node *scene = EditorNode::get_singleton()->get_edited_scene();
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 (p_node != scene && p_node->get_owner() != scene && !scene->is_editable_instance(p_node->get_owner())) {
Fixes issues with selectable children and locks
2018-03-08 20:12:49 +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 MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
if (ci && !ci->is_visible_in_tree()) {
Fixes issues with selectable children and locks
2018-03-08 20:12:49 +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
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
Fixes issues with selectable children and locks
2018-03-08 20:12:49 +00:00
Transform2D parent_xform = p_parent_xform;
Transform2D canvas_xform = p_canvas_xform;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci && !ci->is_set_as_top_level()) {
parent_xform = parent_xform * ci->get_transform();
Fixes issues with selectable children and locks
2018-03-08 20:12:49 +00:00
} else {
CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
parent_xform = Transform2D();
canvas_xform = cl ? cl->get_transform() : p_canvas_xform;
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
Fixes issues with selectable children and locks
2018-03-08 20:12:49 +00:00
_draw_locks_and_groups(p_node->get_child(i), parent_xform, canvas_xform);
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
RID viewport_ci = viewport->get_canvas_item();
if (ci) {
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t offset = 0;
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +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
Ref<Texture2D> lock = get_theme_icon(SNAME("LockViewport"), SNAME("EditorIcons"));
Added ability to hide edit lock and groups in editor view Added ability to hide edit lock and groups in editor view
2018-09-20 00:41:19 +00:00
if (p_node->has_meta("_edit_lock_") && show_edit_locks) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
lock->draw(viewport_ci, (transform * canvas_xform * parent_xform).xform(Point2(0, 0)) + Point2(offset, 0));
Fixes issues with selectable children and locks
2018-03-08 20:12:49 +00:00
offset += lock->get_size().x;
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +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
Ref<Texture2D> group = get_theme_icon(SNAME("GroupViewport"), SNAME("EditorIcons"));
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->has_meta("_edit_group_") && show_edit_locks) {
group->draw(viewport_ci, (transform * canvas_xform * parent_xform).xform(Point2(0, 0)) + Point2(offset, 0));
Fixes issues with selectable children and locks
2018-03-08 20:12:49 +00:00
//offset += group->get_size().x;
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
}
}
}
void CanvasItemEditor::_draw_viewport() {
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
// Update the transform
transform = Transform2D();
transform.scale_basis(Size2(zoom, zoom));
Rename Transform2D "elements" to "columns"
2022-04-24 21:59:24 +00:00
transform.columns[2] = -view_offset * zoom;
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
EditorNode::get_singleton()->get_scene_root()->set_global_canvas_transform(transform);
Fusion the lock/unlock and the group/ungroup buttons
2017-08-30 22:03:03 +00:00
// hide/show buttons depending on the selection
bool all_locked = true;
bool all_group = true;
Fix crash due to stale refs to node selection lists
2018-01-07 08:55:26 +00:00
List<Node *> selection = editor_selection->get_selected_node_list();
Rename empty() to is_empty()
2020-12-15 12:04:21 +00:00
if (selection.is_empty()) {
Fusion the lock/unlock and the group/ungroup buttons
2017-08-30 22:03:03 +00:00
all_locked = false;
all_group = false;
} else {
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (Node *E : selection) {
if (Object::cast_to<CanvasItem>(E) && !Object::cast_to<CanvasItem>(E)->has_meta("_edit_lock_")) {
Fusion the lock/unlock and the group/ungroup buttons
2017-08-30 22:03:03 +00:00
all_locked = false;
break;
}
}
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (Node *E : selection) {
if (Object::cast_to<CanvasItem>(E) && !Object::cast_to<CanvasItem>(E)->has_meta("_edit_group_")) {
Fusion the lock/unlock and the group/ungroup buttons
2017-08-30 22:03:03 +00:00
all_group = false;
break;
}
}
}
lock_button->set_visible(!all_locked);
Rename empty() to is_empty()
2020-12-15 12:04:21 +00:00
lock_button->set_disabled(selection.is_empty());
Fusion the lock/unlock and the group/ungroup buttons
2017-08-30 22:03:03 +00:00
unlock_button->set_visible(all_locked);
group_button->set_visible(!all_group);
Rename empty() to is_empty()
2020-12-15 12:04:21 +00:00
group_button->set_disabled(selection.is_empty());
Fusion the lock/unlock and the group/ungroup buttons
2017-08-30 22:03:03 +00:00
ungroup_button->set_visible(all_group);
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
_draw_grid();
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
_draw_ruler_tool();
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
_draw_axis();
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
if (EditorNode::get_singleton()->get_edited_scene()) {
_draw_locks_and_groups(EditorNode::get_singleton()->get_edited_scene());
_draw_invisible_nodes_positions(EditorNode::get_singleton()->get_edited_scene());
Display nodes without rect's position
2018-03-10 10:56:27 +00:00
}
Draw selected item on top of everything else
2020-09-27 16:47:38 +00:00
_draw_selection();
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
RID ci = viewport->get_canvas_item();
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RenderingServer::get_singleton()->canvas_item_add_set_transform(ci, Transform2D());
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
EditorPluginList *over_plugin_list = EditorNode::get_singleton()->get_editor_plugins_over();
Rename empty() to is_empty()
2020-12-15 12:04:21 +00:00
if (!over_plugin_list->is_empty()) {
Fixes drawing of the 2D plugins on the 3D view
2018-09-18 18:00:07 +00:00
over_plugin_list->forward_canvas_draw_over_viewport(viewport);
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
}
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
EditorPluginList *force_over_plugin_list = EditorNode::get_singleton()->get_editor_plugins_force_over();
Rename empty() to is_empty()
2020-12-15 12:04:21 +00:00
if (!force_over_plugin_list->is_empty()) {
Fixes drawing of the 2D plugins on the 3D view
2018-09-18 18:00:07 +00:00
force_over_plugin_list->forward_canvas_force_draw_over_viewport(viewport);
Universalize draw-over API for EditorPlugins - Now it is usable from both `CanvasItem` and `Spatial` editors. - `EditorPlugin` API changes: - `forward_draw_over_canvas()` becomes `forward_draw_over_viewport()`. - `update_canvas()` becomes `update_overlays()`, which now triggers the update of every overlay on top of any 2D or 3D viewports present. Also now it returns the number of such viewports, which is useful whenever you need to know the number of draw-over calls you'll get. - New: `[set/is]_force_draw_over_forwarding_enabled()` to force overlaying regardless it handles the current object type, in a similar fashion as `[set/is]_input_event_forwarding_always_enabled`. This kind of overlay is also on top of those for regular handled node types. - New: `forward_force_draw_over_canvas()`, which is the callback that gets called for plugins that enable forced overlaying.
2017-10-29 19:32:09 +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 (show_rulers) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
_draw_rulers();
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 (show_guides) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
_draw_guides();
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
}
Displays smart snapping guides when snapped
2019-04-05 08:18:21 +00:00
_draw_smart_snapping();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
_draw_focus();
Displays node icon on hover
2018-03-12 22:32:25 +00:00
_draw_hover();
Show the transform operation numbers in 2D
2022-07-05 11:06:12 +00:00
_draw_transform_message();
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
}
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
void CanvasItemEditor::update_viewport() {
_update_scrollbars();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
}
Edit TileMap only with TOOL_SELECT
2019-08-21 13:34:06 +00:00
void CanvasItemEditor::set_current_tool(Tool p_tool) {
_button_tool_select(p_tool);
}
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
void CanvasItemEditor::_update_editor_settings() {
select_button->set_icon(get_theme_icon(SNAME("ToolSelect"), SNAME("EditorIcons")));
list_select_button->set_icon(get_theme_icon(SNAME("ListSelect"), SNAME("EditorIcons")));
move_button->set_icon(get_theme_icon(SNAME("ToolMove"), SNAME("EditorIcons")));
scale_button->set_icon(get_theme_icon(SNAME("ToolScale"), SNAME("EditorIcons")));
rotate_button->set_icon(get_theme_icon(SNAME("ToolRotate"), SNAME("EditorIcons")));
smart_snap_button->set_icon(get_theme_icon(SNAME("Snap"), SNAME("EditorIcons")));
grid_snap_button->set_icon(get_theme_icon(SNAME("SnapGrid"), SNAME("EditorIcons")));
snap_config_menu->set_icon(get_theme_icon(SNAME("GuiTabMenuHl"), SNAME("EditorIcons")));
skeleton_menu->set_icon(get_theme_icon(SNAME("Bone"), SNAME("EditorIcons")));
override_camera_button->set_icon(get_theme_icon(SNAME("Camera2D"), SNAME("EditorIcons")));
pan_button->set_icon(get_theme_icon(SNAME("ToolPan"), SNAME("EditorIcons")));
ruler_button->set_icon(get_theme_icon(SNAME("Ruler"), SNAME("EditorIcons")));
pivot_button->set_icon(get_theme_icon(SNAME("EditPivot"), SNAME("EditorIcons")));
select_handle = get_theme_icon(SNAME("EditorHandle"), SNAME("EditorIcons"));
anchor_handle = get_theme_icon(SNAME("EditorControlAnchor"), SNAME("EditorIcons"));
lock_button->set_icon(get_theme_icon(SNAME("Lock"), SNAME("EditorIcons")));
unlock_button->set_icon(get_theme_icon(SNAME("Unlock"), SNAME("EditorIcons")));
group_button->set_icon(get_theme_icon(SNAME("Group"), SNAME("EditorIcons")));
ungroup_button->set_icon(get_theme_icon(SNAME("Ungroup"), SNAME("EditorIcons")));
key_loc_button->set_icon(get_theme_icon(SNAME("KeyPosition"), SNAME("EditorIcons")));
key_rot_button->set_icon(get_theme_icon(SNAME("KeyRotation"), SNAME("EditorIcons")));
key_scale_button->set_icon(get_theme_icon(SNAME("KeyScale"), SNAME("EditorIcons")));
key_insert_button->set_icon(get_theme_icon(SNAME("Key"), SNAME("EditorIcons")));
key_auto_insert_button->set_icon(get_theme_icon(SNAME("AutoKey"), SNAME("EditorIcons")));
// Use a different color for the active autokey icon to make them easier
// to distinguish from the other key icons at the top. On a light theme,
// the icon will be dark, so we need to lighten it before blending it
// with the red color.
const Color key_auto_color = EditorSettings::get_singleton()->is_dark_theme() ? Color(1, 1, 1) : Color(4.25, 4.25, 4.25);
key_auto_insert_button->add_theme_color_override("icon_pressed_color", key_auto_color.lerp(Color(1, 0, 0), 0.55));
animation_menu->set_icon(get_theme_icon(SNAME("GuiTabMenuHl"), SNAME("EditorIcons")));
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
context_menu_panel->add_theme_style_override("panel", get_theme_stylebox(SNAME("ContextualToolbar"), SNAME("EditorStyles")));
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
Unify usage of GLOBAL/EDITOR_GET
2022-10-18 14:43:37 +00:00
panner->setup((ViewPanner::ControlScheme)EDITOR_GET("editors/panning/2d_editor_panning_scheme").operator int(), ED_GET_SHORTCUT("canvas_item_editor/pan_view"), bool(EDITOR_GET("editors/panning/simple_panning")));
Add gesture to ViewPanner and simplify a bit its API
2023-01-19 16:50:51 +00:00
panner->set_scroll_speed(EDITOR_GET("editors/panning/2d_editor_pan_speed"));
Unify usage of GLOBAL/EDITOR_GET
2022-10-18 14:43:37 +00:00
warped_panning = bool(EDITOR_GET("editors/panning/warped_mouse_panning"));
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void CanvasItemEditor::_notification(int p_what) {
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
switch (p_what) {
case NOTIFICATION_PHYSICS_PROCESS: {
EditorNode::get_singleton()->get_scene_root()->set_snap_controls_to_pixels(GLOBAL_GET("gui/common/snap_controls_to_pixels"));
Restored auto snapping of controls to pixels, fixes #10847 and probably several more issues. Made it optional in the project settings but defaults to true.
2017-09-07 14:22:07 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
int nb_having_pivot = 0;
beautiful visual menu to change anchors will you dare to try it? :) because, I'd check previous commit msgs if I were you..
2015-08-24 04:00:39 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
// Update the viewport if the canvas_item changes
List<CanvasItem *> selection = _get_edited_canvas_items(true);
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
for (CanvasItem *ci : selection) {
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(ci);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
Rect2 rect;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->_edit_use_rect()) {
rect = ci->_edit_get_rect();
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
} else {
rect = Rect2();
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Transform2D xform = ci->get_transform();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
if (rect != se->prev_rect || xform != se->prev_xform) {
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
se->prev_rect = rect;
se->prev_xform = xform;
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Control *control = Object::cast_to<Control>(ci);
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
if (control) {
real_t anchors[4];
Vector2 pivot;
pivot = control->get_pivot_offset();
anchors[SIDE_LEFT] = control->get_anchor(SIDE_LEFT);
anchors[SIDE_RIGHT] = control->get_anchor(SIDE_RIGHT);
anchors[SIDE_TOP] = control->get_anchor(SIDE_TOP);
anchors[SIDE_BOTTOM] = control->get_anchor(SIDE_BOTTOM);
if (pivot != se->prev_pivot || anchors[SIDE_LEFT] != se->prev_anchors[SIDE_LEFT] || anchors[SIDE_RIGHT] != se->prev_anchors[SIDE_RIGHT] || anchors[SIDE_TOP] != se->prev_anchors[SIDE_TOP] || anchors[SIDE_BOTTOM] != se->prev_anchors[SIDE_BOTTOM]) {
se->prev_pivot = pivot;
se->prev_anchors[SIDE_LEFT] = anchors[SIDE_LEFT];
se->prev_anchors[SIDE_RIGHT] = anchors[SIDE_RIGHT];
se->prev_anchors[SIDE_TOP] = anchors[SIDE_TOP];
se->prev_anchors[SIDE_BOTTOM] = anchors[SIDE_BOTTOM];
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
}
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->_edit_use_pivot()) {
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
nb_having_pivot++;
}
sprite selection rectangle updates again (fixes issue 10936) sprite selection rectangle was not updating in real time when dragging or rotating sprites; undoing translation/rotation changes did not update sprite rectangles either.
2017-09-12 16:44:32 +00:00
}
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
// Activate / Deactivate the pivot tool
pivot_button->set_disabled(nb_having_pivot == 0);
// Update the viewport if bones changes
for (KeyValue<BoneKey, BoneList> &E : bone_list) {
Object *b = ObjectDB::get_instance(E.key.from);
if (!b) {
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
break;
Fix use of unitialized variables The second in my quest to make Godot 3.x compile with -Werror on GCC7
2017-09-01 20:33:39 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
Node2D *b2 = Object::cast_to<Node2D>(b);
if (!b2 || !b2->is_inside_tree()) {
continue;
}
Fixes some 2d bones display problems
2018-05-05 13:45:26 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
Transform2D global_xform = b2->get_global_transform();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
if (global_xform != E.value.xform) {
E.value.xform = global_xform;
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
}
Bone2D *bone = Object::cast_to<Bone2D>(b);
if (bone && bone->get_length() != E.value.length) {
E.value.length = bone->get_length();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
}
Polygon2D -=-=-=-=- Another gift for those who make 2D games: -Edit polygons, concave or convex, color them, texture them and uv-map them -Corresponding editor -Can have a custom pivot, so they are compatible with bones and IK
2014-07-07 20:44:21 +00:00
}
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
} break;
Polygon2D -=-=-=-=- Another gift for those who make 2D games: -Edit polygons, concave or convex, color them, texture them and uv-map them -Corresponding editor -Can have a custom pivot, so they are compatible with bones and IK
2014-07-07 20:44:21 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
case NOTIFICATION_ENTER_TREE: {
select_sb->set_texture(get_theme_icon(SNAME("EditorRect2D"), SNAME("EditorIcons")));
Clean-up, harmonize, and improve StyleBox API - Make all margin properties follow the same naming convention (their getter and setter too). - Remove a virtual counterpart of `get_style_margin` from API. - Allow to override `get_minimum_size` from scripting and remove `get_center_size`.
2023-01-19 16:14:09 +00:00
select_sb->set_texture_margin_all(4);
select_sb->set_content_margin_all(4);
Polygon2D -=-=-=-=- Another gift for those who make 2D games: -Edit polygons, concave or convex, color them, texture them and uv-map them -Corresponding editor -Can have a custom pivot, so they are compatible with bones and IK
2014-07-07 20:44:21 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
AnimationPlayerEditor::get_singleton()->get_track_editor()->connect("visibility_changed", callable_mp(this, &CanvasItemEditor::_keying_changed));
_keying_changed();
_update_editor_settings();
} break;
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 19:46:32 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
select_sb->set_texture(get_theme_icon(SNAME("EditorRect2D"), SNAME("EditorIcons")));
_update_editor_settings();
} break;
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 19:46:32 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
case NOTIFICATION_VISIBILITY_CHANGED: {
if (!is_visible() && override_camera_button->is_pressed()) {
EditorDebuggerNode *debugger = EditorDebuggerNode::get_singleton();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_NONE);
override_camera_button->set_pressed(false);
}
} break;
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Improve the anchors and margin workflow
2019-03-31 16:53:24 +00:00
void CanvasItemEditor::_selection_changed() {
Cancel drag when selection changes
2019-11-19 15:02:04 +00:00
if (!selected_from_canvas) {
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
Cancel drag when selection changes
2019-11-19 15:02:04 +00:00
}
selected_from_canvas = false;
Improve the anchors and margin workflow
2019-03-31 16:53:24 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void CanvasItemEditor::edit(CanvasItem *p_canvas_item) {
Fix handling of nulls in some editors
2023-01-22 22:37:56 +00:00
if (!p_canvas_item) {
return;
}
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
Array selection = editor_selection->get_selected_nodes();
Allow method binds to take Object subclasses as arguments This commit adds a condition to VariantCaster that casts Variants of type OBJECT to any type T, if T is derived from Object. This change enables a fair bit of code cleanup. First, the Variant implicit cast operators for Node and Control can be removed, which allows for some invalid includes to be removed. Second, helper methods in Tree whose sole purpose was to cast arguments to TreeItem * are no longer necessary. A few small changes also had to be made to other files, due to the changes cascading down all the includes.
2022-01-25 15:37:41 +00:00
if (selection.size() != 1 || Object::cast_to<Node>(selection[0]) != p_canvas_item) {
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
_reset_drag();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Allow the Container children selection but don't allow them to move
2018-10-16 18:35:51 +00:00
// Clear the selection
editor_selection->clear(); //_clear_canvas_items();
editor_selection->add_node(p_canvas_item);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void CanvasItemEditor::_update_scrollbars() {
updating_scroll = true;
Fix more instances of overlapping scrollbars
2020-01-14 01:49:17 +00:00
// Move the zoom buttons.
Fixed "Add Sprite..." label overlapping with zoom controls
2019-11-18 09:49:37 +00:00
Point2 controls_vb_begin = Point2(5, 5);
controls_vb_begin += (show_rulers) ? Point2(RULER_WIDTH, RULER_WIDTH) : Point2();
controls_vb->set_begin(controls_vb_begin);
Implements rulers
2017-08-29 19:50:18 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Size2 hmin = h_scroll->get_minimum_size();
Size2 vmin = v_scroll->get_minimum_size();
Fix more instances of overlapping scrollbars
2020-01-14 01:49:17 +00:00
// Get the visible frame.
Unify usage of GLOBAL/EDITOR_GET
2022-10-18 14:43:37 +00:00
Size2 screen_rect = Size2(GLOBAL_GET("display/window/size/viewport_width"), GLOBAL_GET("display/window/size/viewport_height"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Rect2 local_rect = Rect2(Point2(), viewport->get_size() - Size2(vmin.width, hmin.height));
Fix more instances of overlapping scrollbars
2020-01-14 01:49:17 +00:00
// Calculate scrollable area.
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Rect2 canvas_item_rect = Rect2(Point2(), screen_rect);
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
if (EditorNode::get_singleton()->is_inside_tree() && EditorNode::get_singleton()->get_edited_scene()) {
Rect2 content_rect = _get_encompassing_rect(EditorNode::get_singleton()->get_edited_scene());
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
canvas_item_rect.expand_to(content_rect.position);
canvas_item_rect.expand_to(content_rect.position + content_rect.size);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
canvas_item_rect.size += screen_rect * 2;
renamed all Rect2.pos to Rect2.position
2017-06-03 22:25:13 +00:00
canvas_item_rect.position -= screen_rect;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix more instances of overlapping scrollbars
2020-01-14 01:49:17 +00:00
// Constraints the view offset and updates the scrollbars.
Size2 size = viewport->get_size();
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
Point2 begin = canvas_item_rect.position;
Point2 end = canvas_item_rect.position + canvas_item_rect.size - local_rect.size / zoom;
Unify usage of GLOBAL/EDITOR_GET
2022-10-18 14:43:37 +00:00
bool constrain_editor_view = bool(EDITOR_GET("editors/2d/constrain_editor_view"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (canvas_item_rect.size.height <= (local_rect.size.y / zoom)) {
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t centered = -(size.y / 2) / zoom + screen_rect.y / 2;
Centers the 2D viewport in the editor
2019-06-26 21:03:02 +00:00
if (constrain_editor_view && ABS(centered - previous_update_view_offset.y) < ABS(centered - view_offset.y)) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
view_offset.y = previous_update_view_offset.y;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
v_scroll->hide();
} else {
Allow to remove 2D editor limits
2019-06-24 19:15:26 +00:00
if (constrain_editor_view && view_offset.y > end.y && view_offset.y > previous_update_view_offset.y) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
view_offset.y = MAX(end.y, previous_update_view_offset.y);
}
Allow to remove 2D editor limits
2019-06-24 19:15:26 +00:00
if (constrain_editor_view && view_offset.y < begin.y && view_offset.y < previous_update_view_offset.y) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
view_offset.y = MIN(begin.y, previous_update_view_offset.y);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
v_scroll->show();
v_scroll->set_min(MIN(view_offset.y, begin.y));
v_scroll->set_max(MAX(view_offset.y, end.y) + screen_rect.y);
v_scroll->set_page(screen_rect.y);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
if (canvas_item_rect.size.width <= (local_rect.size.x / zoom)) {
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t centered = -(size.x / 2) / zoom + screen_rect.x / 2;
Centers the 2D viewport in the editor
2019-06-26 21:03:02 +00:00
if (constrain_editor_view && ABS(centered - previous_update_view_offset.x) < ABS(centered - view_offset.x)) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
view_offset.x = previous_update_view_offset.x;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
h_scroll->hide();
} else {
Allow to remove 2D editor limits
2019-06-24 19:15:26 +00:00
if (constrain_editor_view && view_offset.x > end.x && view_offset.x > previous_update_view_offset.x) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
view_offset.x = MAX(end.x, previous_update_view_offset.x);
}
Allow to remove 2D editor limits
2019-06-24 19:15:26 +00:00
if (constrain_editor_view && view_offset.x < begin.x && view_offset.x < previous_update_view_offset.x) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
view_offset.x = MIN(begin.x, previous_update_view_offset.x);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
h_scroll->show();
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
h_scroll->set_min(MIN(view_offset.x, begin.x));
h_scroll->set_max(MAX(view_offset.x, end.x) + screen_rect.x);
h_scroll->set_page(screen_rect.x);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Fix more instances of overlapping scrollbars
2020-01-14 01:49:17 +00:00
// Move and resize the scrollbars, avoiding overlap.
[Complex Text Layouts] Refactor Font class, default themes and controls to use Text Server interface. Implement interface mirroring. Add TextLine and TextParagraph classes. Handle UTF-16 input on macOS and Windows.
2020-09-03 11:22:16 +00:00
if (is_layout_rtl()) {
v_scroll->set_begin(Point2(0, (show_rulers) ? RULER_WIDTH : 0));
v_scroll->set_end(Point2(vmin.width, size.height - (h_scroll->is_visible() ? hmin.height : 0)));
} else {
v_scroll->set_begin(Point2(size.width - vmin.width, (show_rulers) ? RULER_WIDTH : 0));
v_scroll->set_end(Point2(size.width, size.height - (h_scroll->is_visible() ? hmin.height : 0)));
}
Fix more instances of overlapping scrollbars
2020-01-14 01:49:17 +00:00
h_scroll->set_begin(Point2((show_rulers) ? RULER_WIDTH : 0, size.height - hmin.height));
h_scroll->set_end(Point2(size.width - (v_scroll->is_visible() ? vmin.width : 0), size.height));
// Calculate scrollable area.
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
v_scroll->set_value(view_offset.y);
h_scroll->set_value(view_offset.x);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
previous_update_view_offset = view_offset;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
updating_scroll = false;
}
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
void CanvasItemEditor::_update_scroll(real_t) {
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 (updating_scroll) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +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
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
view_offset.x = h_scroll->get_value();
view_offset.y = v_scroll->get_value();
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
void CanvasItemEditor::_zoom_on_position(real_t p_zoom, Point2 p_position) {
2D Editor: modified zoom increment to the twelveth root of two - properly visit power of 2 factors (50%, 100%, 200%...) - index based zoom values to prevent floating point issues - Fix 2d editor not able to reach min and max zoom values
2020-03-15 18:13:07 +00:00
p_zoom = CLAMP(p_zoom, MIN_ZOOM, MAX_ZOOM);
if (p_zoom == zoom) {
Fix zoom label not being updated
2021-08-25 16:53:40 +00:00
zoom_widget->set_zoom(p_zoom);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +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 zoom button not zooming on the screen center
2017-10-01 09:30:38 +00:00
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
real_t prev_zoom = zoom;
Fix zoom button not zooming on the screen center
2017-10-01 09:30:38 +00:00
zoom = p_zoom;
Editor 2D: Change pixel alignment strategy, fix jittering in high zoom Alignment of scene pixels on screen pixel ensure a crisp rendering of small features (such as text). Unfortunately, alignment of top left pixel on screen adds a lot of jittering when zooming at high zoom factor. This change allow to snap the top left scene pixel on the closest screen pixel (not only the top-left most), and we do so only when the scale factor is an integer.
2020-03-18 06:05:23 +00:00
view_offset += p_position / prev_zoom - p_position / zoom;
// We want to align in-scene pixels to screen pixels, this prevents blurry rendering
// in small details (texts, lines).
// This correction adds a jitter movement when zooming, so we correct only when the
// zoom factor is an integer. (in the other cases, all pixels won't be aligned anyway)
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
const real_t closest_zoom_factor = Math::round(zoom);
Editor 2D: Change pixel alignment strategy, fix jittering in high zoom Alignment of scene pixels on screen pixel ensure a crisp rendering of small features (such as text). Unfortunately, alignment of top left pixel on screen adds a lot of jittering when zooming at high zoom factor. This change allow to snap the top left scene pixel on the closest screen pixel (not only the top-left most), and we do so only when the scale factor is an integer.
2020-03-18 06:05:23 +00:00
if (Math::is_zero_approx(zoom - closest_zoom_factor)) {
// make sure scene pixel at view_offset is aligned on a screen pixel
Vector2 view_offset_int = view_offset.floor();
Vector2 view_offset_frac = view_offset - view_offset_int;
view_offset = view_offset_int + (view_offset_frac * closest_zoom_factor).round() / closest_zoom_factor;
}
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
Rework the TileSet resource and TileMap nodes: - Move most properties from TileMap to TileSet, - Make TileSet more flexible, supporting more feature (several collision layers, etc...), - Fusion both the TileMap and TileSet editor, - Implement TileSetSources, and thus a new way to index tiles in the TileSet, - Rework the TileSet and TileMap editors completely, - Implement an editor zoom widget (and use it in several places)
2021-05-07 13:41:39 +00:00
zoom_widget->set_zoom(zoom);
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
update_viewport();
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
}
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
void CanvasItemEditor::_update_zoom(real_t p_zoom) {
Rework the TileSet resource and TileMap nodes: - Move most properties from TileMap to TileSet, - Make TileSet more flexible, supporting more feature (several collision layers, etc...), - Fusion both the TileMap and TileSet editor, - Implement TileSetSources, and thus a new way to index tiles in the TileSet, - Rework the TileSet and TileMap editors completely, - Implement an editor zoom widget (and use it in several places)
2021-05-07 13:41:39 +00:00
_zoom_on_position(p_zoom, viewport_scrollable->get_size() / 2.0);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
}
Utilize mouse position when zooming with shortcuts in 2D editor
2022-02-15 08:48:55 +00:00
void CanvasItemEditor::_shortcut_zoom_set(real_t p_zoom) {
_zoom_on_position(p_zoom * MAX(1, EDSCALE), viewport->get_local_mouse_position());
}
Move grid snapping to an independent button
2019-10-10 17:41:45 +00:00
void CanvasItemEditor::_button_toggle_smart_snap(bool p_status) {
smart_snap_active = p_status;
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Move grid snapping to an independent button
2019-10-10 17:41:45 +00:00
}
void CanvasItemEditor::_button_toggle_grid_snap(bool p_status) {
grid_snap_active = p_status;
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
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
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
void CanvasItemEditor::_button_override_camera(bool p_pressed) {
Huge Debugger/EditorDebugger refactor.
2020-02-07 01:52:05 +00:00
EditorDebuggerNode *debugger = EditorDebuggerNode::get_singleton();
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
if (p_pressed) {
Threaded networking for editor debugger.
2020-02-24 05:21:15 +00:00
debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_2D);
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
} else {
Threaded networking for editor debugger.
2020-02-24 05:21:15 +00:00
debugger->set_camera_override(EditorDebuggerNode::OVERRIDE_NONE);
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
}
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
void CanvasItemEditor::_button_tool_select(int p_index) {
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
Button *tb[TOOL_MAX] = { select_button, list_select_button, move_button, scale_button, rotate_button, pivot_button, pan_button, ruler_button };
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
for (int i = 0; i < TOOL_MAX; i++) {
tb[i]->set_pressed(i == p_index);
}
tool = (Tool)p_index;
Request immediate refresh of cursor in 2D editor while using shortcuts Fixes: #37333
2020-03-26 20:35:12 +00:00
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Request immediate refresh of cursor in 2D editor while using shortcuts Fixes: #37333
2020-03-26 20:35:12 +00:00
_update_cursor();
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
void CanvasItemEditor::_insert_animation_keys(bool p_location, bool p_rotation, bool p_scale, bool p_on_existing) {
Replace most uses of Map by HashMap * Map is unnecessary and inefficient in almost every case. * Replaced by the new HashMap. * Renamed Map to RBMap and Set to RBSet for cases that still make sense (order matters) but use is discouraged. There were very few cases where replacing by HashMap was undesired because keeping the key order was intended. I tried to keep those (as RBMap) as much as possible, but might have missed some. Review appreciated!
2022-05-13 13:04:37 +00:00
const HashMap<Node *, Object *> &selection = editor_selection->get_selection();
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
Fixed missing call to AnimationTrackEditor::make_insert_queue
2022-06-12 14:02:09 +00:00
AnimationTrackEditor *te = AnimationPlayerEditor::get_singleton()->get_track_editor();
te->make_insert_queue();
Use range iterators for `Map`
2021-08-09 20:13:42 +00:00
for (const KeyValue<Node *, Object *> &E : selection) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(E.key);
if (!ci || !ci->is_visible_in_tree()) {
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
continue;
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
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
continue;
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
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (Object::cast_to<Node2D>(ci)) {
Node2D *n2d = Object::cast_to<Node2D>(ci);
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +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 (key_pos && p_location) {
Fixed missing call to AnimationTrackEditor::make_insert_queue
2022-06-12 14:02:09 +00:00
te->insert_node_value_key(n2d, "position", n2d->get_position(), p_on_existing);
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 (key_rot && p_rotation) {
Fixed missing call to AnimationTrackEditor::make_insert_queue
2022-06-12 14:02:09 +00:00
te->insert_node_value_key(n2d, "rotation", n2d->get_rotation(), p_on_existing);
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 (key_scale && p_scale) {
Fixed missing call to AnimationTrackEditor::make_insert_queue
2022-06-12 14:02:09 +00:00
te->insert_node_value_key(n2d, "scale", n2d->get_scale(), p_on_existing);
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
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
if (n2d->has_meta("_edit_bone_") && n2d->get_parent_item()) {
//look for an IK chain
List<Node2D *> ik_chain;
Node2D *n = Object::cast_to<Node2D>(n2d->get_parent_item());
bool has_chain = false;
while (n) {
ik_chain.push_back(n);
if (n->has_meta("_edit_ik_")) {
has_chain = true;
break;
}
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 (!n->get_parent_item()) {
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
break;
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
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
n = Object::cast_to<Node2D>(n->get_parent_item());
}
if (has_chain && ik_chain.size()) {
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (Node2D *&F : ik_chain) {
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 (key_pos) {
Fixed missing call to AnimationTrackEditor::make_insert_queue
2022-06-12 14:02:09 +00:00
te->insert_node_value_key(F, "position", F->get_position(), p_on_existing);
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 (key_rot) {
Fixed missing call to AnimationTrackEditor::make_insert_queue
2022-06-12 14:02:09 +00:00
te->insert_node_value_key(F, "rotation", F->get_rotation(), p_on_existing);
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 (key_scale) {
Fixed missing call to AnimationTrackEditor::make_insert_queue
2022-06-12 14:02:09 +00:00
te->insert_node_value_key(F, "scale", F->get_scale(), p_on_existing);
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
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
}
}
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
} else if (Object::cast_to<Control>(ci)) {
Control *ctrl = Object::cast_to<Control>(ci);
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +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 (key_pos) {
Remove rect_ prefix from control properties when keyframing
2022-08-05 13:30:17 +00:00
te->insert_node_value_key(ctrl, "position", ctrl->get_position(), p_on_existing);
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 (key_rot) {
Remove rect_ prefix from control properties when keyframing
2022-08-05 13:30:17 +00:00
te->insert_node_value_key(ctrl, "rotation", ctrl->get_rotation(), p_on_existing);
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 (key_scale) {
Remove rect_ prefix from control properties when keyframing
2022-08-05 13:30:17 +00:00
te->insert_node_value_key(ctrl, "size", ctrl->get_size(), p_on_existing);
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
}
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
}
}
Fixed missing call to AnimationTrackEditor::make_insert_queue
2022-06-12 14:02:09 +00:00
te->commit_insert_queue();
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
}
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
void CanvasItemEditor::_update_override_camera_button(bool p_game_running) {
if (p_game_running) {
override_camera_button->set_disabled(false);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
override_camera_button->set_tooltip_text(TTR("Project Camera Override\nOverrides the running project's camera with the editor viewport camera."));
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
} else {
override_camera_button->set_disabled(true);
override_camera_button->set_pressed(false);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
override_camera_button->set_tooltip_text(TTR("Project Camera Override\nNo project instance running. Run the project from the editor to use this feature."));
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void CanvasItemEditor::_popup_callback(int p_op) {
Add EditorUndoRedoManager singleton
2022-12-23 22:53:16 +00:00
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
last_option = MenuOption(p_op);
switch (p_op) {
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
case SHOW_ORIGIN: {
show_origin = !show_origin;
int idx = view_menu->get_popup()->get_item_index(SHOW_ORIGIN);
view_menu->get_popup()->set_item_checked(idx, show_origin);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
} break;
case SHOW_VIEWPORT: {
show_viewport = !show_viewport;
int idx = view_menu->get_popup()->get_item_index(SHOW_VIEWPORT);
view_menu->get_popup()->set_item_checked(idx, show_viewport);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
} break;
Added ability to hide edit lock and groups in editor view Added ability to hide edit lock and groups in editor view
2018-09-20 00:41:19 +00:00
case SHOW_EDIT_LOCKS: {
show_edit_locks = !show_edit_locks;
int idx = view_menu->get_popup()->get_item_index(SHOW_EDIT_LOCKS);
view_menu->get_popup()->set_item_checked(idx, show_edit_locks);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Added ability to hide edit lock and groups in editor view Added ability to hide edit lock and groups in editor view
2018-09-20 00:41:19 +00:00
} break;
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
case SHOW_TRANSFORMATION_GIZMOS: {
show_transformation_gizmos = !show_transformation_gizmos;
int idx = view_menu->get_popup()->get_item_index(SHOW_TRANSFORMATION_GIZMOS);
view_menu->get_popup()->set_item_checked(idx, show_transformation_gizmos);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
} break;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
case SNAP_USE_NODE_PARENT: {
snap_node_parent = !snap_node_parent;
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_NODE_PARENT);
smartsnap_config_popup->set_item_checked(idx, snap_node_parent);
} break;
case SNAP_USE_NODE_ANCHORS: {
snap_node_anchors = !snap_node_anchors;
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_NODE_ANCHORS);
smartsnap_config_popup->set_item_checked(idx, snap_node_anchors);
} break;
case SNAP_USE_NODE_SIDES: {
snap_node_sides = !snap_node_sides;
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_NODE_SIDES);
smartsnap_config_popup->set_item_checked(idx, snap_node_sides);
} break;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
case SNAP_USE_NODE_CENTER: {
snap_node_center = !snap_node_center;
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_NODE_CENTER);
smartsnap_config_popup->set_item_checked(idx, snap_node_center);
} break;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
case SNAP_USE_OTHER_NODES: {
snap_other_nodes = !snap_other_nodes;
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_OTHER_NODES);
smartsnap_config_popup->set_item_checked(idx, snap_other_nodes);
} break;
Implement guides
2017-10-18 21:55:02 +00:00
case SNAP_USE_GUIDES: {
snap_guides = !snap_guides;
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_GUIDES);
smartsnap_config_popup->set_item_checked(idx, snap_guides);
} break;
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
case SNAP_USE_ROTATION: {
snap_rotation = !snap_rotation;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_ROTATION);
snap_config_menu->get_popup()->set_item_checked(idx, snap_rotation);
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
} break;
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
case SNAP_USE_SCALE: {
snap_scale = !snap_scale;
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_SCALE);
snap_config_menu->get_popup()->set_item_checked(idx, snap_scale);
} break;
Renamed "snap to offset" to "snap relative". Better conveys meaning.
2015-02-20 12:21:59 +00:00
case SNAP_RELATIVE: {
snap_relative = !snap_relative;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_RELATIVE);
snap_config_menu->get_popup()->set_item_checked(idx, snap_relative);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case SNAP_USE_PIXEL: {
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
snap_pixel = !snap_pixel;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_PIXEL);
snap_config_menu->get_popup()->set_item_checked(idx, snap_pixel);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case SNAP_CONFIGURE: {
Fix some issues found by cppcheck.
2022-04-05 10:40:26 +00:00
static_cast<SnapDialog *>(snap_dialog)->set_fields(grid_offset, grid_step, primary_grid_steps, snap_rotation_offset, snap_rotation_step, snap_scale_step);
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
snap_dialog->popup_centered(Size2(220, 160) * EDSCALE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
Add show bones checkable menu item
2016-09-07 09:10:00 +00:00
case SKELETON_SHOW_BONES: {
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
List<Node *> selection = editor_selection->get_selected_node_list();
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (Node *E : selection) {
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
// Add children nodes so they are processed
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (int child = 0; child < E->get_child_count(); child++) {
selection.push_back(E->get_child(child));
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
}
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
Bone2D *bone_2d = Object::cast_to<Bone2D>(E);
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
if (!bone_2d || !bone_2d->is_inside_tree()) {
continue;
}
bone_2d->_editor_set_show_bone_gizmo(!bone_2d->_editor_get_show_bone_gizmo());
}
Add show bones checkable menu item
2016-09-07 09:10:00 +00:00
} break;
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
case SHOW_HELPERS: {
show_helpers = !show_helpers;
int idx = view_menu->get_popup()->get_item_index(SHOW_HELPERS);
view_menu->get_popup()->set_item_checked(idx, show_helpers);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
Implements rulers
2017-08-29 19:50:18 +00:00
case SHOW_RULERS: {
show_rulers = !show_rulers;
int idx = view_menu->get_popup()->get_item_index(SHOW_RULERS);
view_menu->get_popup()->set_item_checked(idx, show_rulers);
Fix the Frame Selection functionality
2023-01-12 13:04:02 +00:00
update_viewport();
Implements rulers
2017-08-29 19:50:18 +00:00
} break;
Implement guides
2017-10-18 21:55:02 +00:00
case SHOW_GUIDES: {
show_guides = !show_guides;
int idx = view_menu->get_popup()->get_item_index(SHOW_GUIDES);
view_menu->get_popup()->set_item_checked(idx, show_guides);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
Implement guides
2017-10-18 21:55:02 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case LOCK_SELECTED: {
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->create_action(TTR("Lock Selected"));
Fix crash due to stale refs to node selection lists
2018-01-07 08:55:26 +00:00
List<Node *> selection = editor_selection->get_selected_node_list();
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (Node *E : selection) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(E);
if (!ci || !ci->is_inside_tree()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
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 MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
continue;
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
}
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
undo_redo->add_do_method(ci, "set_meta", "_edit_lock_", true);
undo_redo->add_undo_method(ci, "remove_meta", "_edit_lock_");
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->add_do_method(this, "emit_signal", "item_lock_status_changed");
undo_redo->add_undo_method(this, "emit_signal", "item_lock_status_changed");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_do_method(viewport, "queue_redraw");
undo_redo->add_undo_method(viewport, "queue_redraw");
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->commit_action();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case UNLOCK_SELECTED: {
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->create_action(TTR("Unlock Selected"));
Fix crash due to stale refs to node selection lists
2018-01-07 08:55:26 +00:00
List<Node *> selection = editor_selection->get_selected_node_list();
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (Node *E : selection) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(E);
if (!ci || !ci->is_inside_tree()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
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 MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
continue;
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
}
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
undo_redo->add_do_method(ci, "remove_meta", "_edit_lock_");
undo_redo->add_undo_method(ci, "set_meta", "_edit_lock_", true);
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->add_do_method(this, "emit_signal", "item_lock_status_changed");
undo_redo->add_undo_method(this, "emit_signal", "item_lock_status_changed");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_do_method(viewport, "queue_redraw");
undo_redo->add_undo_method(viewport, "queue_redraw");
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->commit_action();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case GROUP_SELECTED: {
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->create_action(TTR("Group Selected"));
Fix crash due to stale refs to node selection lists
2018-01-07 08:55:26 +00:00
List<Node *> selection = editor_selection->get_selected_node_list();
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (Node *E : selection) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(E);
if (!ci || !ci->is_inside_tree()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
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 MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
continue;
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
}
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
undo_redo->add_do_method(ci, "set_meta", "_edit_group_", true);
undo_redo->add_undo_method(ci, "remove_meta", "_edit_group_");
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed");
undo_redo->add_undo_method(this, "emit_signal", "item_group_status_changed");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_do_method(viewport, "queue_redraw");
undo_redo->add_undo_method(viewport, "queue_redraw");
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->commit_action();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case UNGROUP_SELECTED: {
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->create_action(TTR("Ungroup Selected"));
Fix crash due to stale refs to node selection lists
2018-01-07 08:55:26 +00:00
List<Node *> selection = editor_selection->get_selected_node_list();
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
for (Node *E : selection) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(E);
if (!ci || !ci->is_inside_tree()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
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 MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
continue;
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
}
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
undo_redo->add_do_method(ci, "remove_meta", "_edit_group_");
undo_redo->add_undo_method(ci, "set_meta", "_edit_group_", true);
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed");
undo_redo->add_undo_method(this, "emit_signal", "item_group_status_changed");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_do_method(viewport, "queue_redraw");
undo_redo->add_undo_method(viewport, "queue_redraw");
Undo support for locking and grouping for both 2D and 3D
2019-04-26 17:23:50 +00:00
undo_redo->commit_action();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
beautiful visual menu to change anchors will you dare to try it? :) because, I'd check previous commit msgs if I were you..
2015-08-24 04:00:39 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case ANIM_INSERT_KEY:
case ANIM_INSERT_KEY_EXISTING: {
bool existing = p_op == ANIM_INSERT_KEY_EXISTING;
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
_insert_animation_keys(true, true, true, existing);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
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
case ANIM_INSERT_POS: {
key_pos = key_loc_button->is_pressed();
} break;
case ANIM_INSERT_ROT: {
-fixed key insert from editor window (#976)
2015-01-02 20:31:43 +00:00
key_rot = key_rot_button->is_pressed();
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
} break;
case ANIM_INSERT_SCALE: {
key_scale = key_scale_button->is_pressed();
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case ANIM_COPY_POSE: {
Style: Fix statements ending with ';;'
2017-01-14 17:03:38 +00:00
pose_clipboard.clear();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Replace most uses of Map by HashMap * Map is unnecessary and inefficient in almost every case. * Replaced by the new HashMap. * Renamed Map to RBMap and Set to RBSet for cases that still make sense (order matters) but use is discouraged. There were very few cases where replacing by HashMap was undesired because keeping the key order was intended. I tried to keep those (as RBMap) as much as possible, but might have missed some. Review appreciated!
2022-05-13 13:04:37 +00:00
const HashMap<Node *, Object *> &selection = editor_selection->get_selection();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Use range iterators for `Map`
2021-08-09 20:13:42 +00:00
for (const KeyValue<Node *, Object *> &E : selection) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(E.key);
if (!ci || !ci->is_visible_in_tree()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
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
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
continue;
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
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (Object::cast_to<Node2D>(ci)) {
Node2D *n2d = Object::cast_to<Node2D>(ci);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
PoseClipboard pc;
-Conversion of most properties to a simpler syntax, easier to use by script -Modified help to display properties GDScript can still not make use of them, though.
2017-01-04 04:16:14 +00:00
pc.pos = n2d->get_position();
pc.rot = n2d->get_rotation();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
pc.scale = n2d->get_scale();
Makes all Godot API's methods Lower Case
2017-08-07 10:17:31 +00:00
pc.id = n2d->get_instance_id();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
pose_clipboard.push_back(pc);
}
}
} break;
case ANIM_PASTE_POSE: {
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 (!pose_clipboard.size()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
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
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
undo_redo->create_action(TTR("Paste Pose"));
Use const references where possible for List range iterators
2021-07-24 13:46:25 +00:00
for (const PoseClipboard &E : pose_clipboard) {
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
Node2D *n2d = Object::cast_to<Node2D>(ObjectDB::get_instance(E.id));
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 (!n2d) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
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
}
Use C++ iterators for Lists in many situations
2021-07-16 03:45:57 +00:00
undo_redo->add_do_method(n2d, "set_position", E.pos);
undo_redo->add_do_method(n2d, "set_rotation", E.rot);
undo_redo->add_do_method(n2d, "set_scale", E.scale);
Rename [gs]et_pos to [gs]et_position for Controls Control set_pos -> set_position Control set_global_pos -> set_global_position [gs]et_mouse_pos -> [gs]et_mouse_position [gs]et_global_mouse_pos -> [gs]et_global_mouse_position fixes #8005
2017-03-29 15:29:38 +00:00
undo_redo->add_undo_method(n2d, "set_position", n2d->get_position());
Update some property names for animation keys. Added rect_rotation too. Fixes #9337
2017-06-24 09:39:57 +00:00
undo_redo->add_undo_method(n2d, "set_rotation", n2d->get_rotation());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
undo_redo->add_undo_method(n2d, "set_scale", n2d->get_scale());
}
undo_redo->commit_action();
} break;
case ANIM_CLEAR_POSE: {
Replace most uses of Map by HashMap * Map is unnecessary and inefficient in almost every case. * Replaced by the new HashMap. * Renamed Map to RBMap and Set to RBSet for cases that still make sense (order matters) but use is discouraged. There were very few cases where replacing by HashMap was undesired because keeping the key order was intended. I tried to keep those (as RBMap) as much as possible, but might have missed some. Review appreciated!
2022-05-13 13:04:37 +00:00
HashMap<Node *, Object *> &selection = editor_selection->get_selection();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Use range iterators for `Map`
2021-08-09 20:13:42 +00:00
for (const KeyValue<Node *, Object *> &E : selection) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(E.key);
if (!ci || !ci->is_visible_in_tree()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
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
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
continue;
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
}
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 19:41:50 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (Object::cast_to<Node2D>(ci)) {
Node2D *n2d = Object::cast_to<Node2D>(ci);
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 (key_pos) {
-Conversion of most properties to a simpler syntax, easier to use by script -Modified help to display properties GDScript can still not make use of them, though.
2017-01-04 04:16:14 +00:00
n2d->set_position(Vector2());
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 (key_rot) {
-Conversion of most properties to a simpler syntax, easier to use by script -Modified help to display properties GDScript can still not make use of them, though.
2017-01-04 04:16:14 +00:00
n2d->set_rotation(0);
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 (key_scale) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
n2d->set_scale(Vector2(1, 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
}
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
} else if (Object::cast_to<Control>(ci)) {
Control *ctrl = Object::cast_to<Control>(ci);
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 (key_pos) {
Rename [gs]et_pos to [gs]et_position for Controls Control set_pos -> set_position Control set_global_pos -> set_global_position [gs]et_mouse_pos -> [gs]et_mouse_position [gs]et_global_mouse_pos -> [gs]et_global_mouse_position fixes #8005
2017-03-29 15:29:38 +00:00
ctrl->set_position(Point2());
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
}
}
Added button/shortcut for removing all guides Added undo/redo Correctly added has_meta
2019-08-24 20:58:16 +00:00
} break;
case CLEAR_GUIDES: {
Fixes crash when clearing guides in empty scene
2019-12-05 07:20:50 +00:00
Node *const root = EditorNode::get_singleton()->get_edited_scene();
if (root && (root->has_meta("_edit_horizontal_guides_") || root->has_meta("_edit_vertical_guides_"))) {
Added button/shortcut for removing all guides Added undo/redo Correctly added has_meta
2019-08-24 20:58:16 +00:00
undo_redo->create_action(TTR("Clear Guides"));
Fixes crash when clearing guides in empty scene
2019-12-05 07:20:50 +00:00
if (root->has_meta("_edit_horizontal_guides_")) {
Array hguides = root->get_meta("_edit_horizontal_guides_");
Added button/shortcut for removing all guides Added undo/redo Correctly added has_meta
2019-08-24 20:58:16 +00:00
changed set_meta to remove_meta in CLEAR_GUIDES menu option
2019-12-04 21:16:22 +00:00
undo_redo->add_do_method(root, "remove_meta", "_edit_horizontal_guides_");
Fixes crash when clearing guides in empty scene
2019-12-05 07:20:50 +00:00
undo_redo->add_undo_method(root, "set_meta", "_edit_horizontal_guides_", hguides);
Added button/shortcut for removing all guides Added undo/redo Correctly added has_meta
2019-08-24 20:58:16 +00:00
}
Fixes crash when clearing guides in empty scene
2019-12-05 07:20:50 +00:00
if (root->has_meta("_edit_vertical_guides_")) {
Array vguides = root->get_meta("_edit_vertical_guides_");
Added button/shortcut for removing all guides Added undo/redo Correctly added has_meta
2019-08-24 20:58:16 +00:00
changed set_meta to remove_meta in CLEAR_GUIDES menu option
2019-12-04 21:16:22 +00:00
undo_redo->add_do_method(root, "remove_meta", "_edit_vertical_guides_");
Fixes crash when clearing guides in empty scene
2019-12-05 07:20:50 +00:00
undo_redo->add_undo_method(root, "set_meta", "_edit_vertical_guides_", vguides);
Added button/shortcut for removing all guides Added undo/redo Correctly added has_meta
2019-08-24 20:58:16 +00:00
}
Redraw 2d viewport when guides are cleared (cherry picked from commit 0c051f41b16af834ad8b1fb46682aeef16fc88d6)
2023-02-27 17:03:56 +00:00
undo_redo->add_do_method(viewport, "queue_redraw");
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
undo_redo->add_undo_method(viewport, "queue_redraw");
Added button/shortcut for removing all guides Added undo/redo Correctly added has_meta
2019-08-24 20:58:16 +00:00
undo_redo->commit_action();
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
Press F key in 2d editor to center view to selected node Press Ctrl+F to frame selected nodes in 2d editor Change Frame Selection hotkey in 2d editor from Ctrl to CMD for Mac compatability
2014-05-03 17:36:59 +00:00
case VIEW_CENTER_TO_SELECTION:
case VIEW_FRAME_TO_SELECTION: {
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
_focus_selection(p_op);
Press F key in 2d editor to center view to selected node Press Ctrl+F to frame selected nodes in 2d editor Change Frame Selection hotkey in 2d editor from Ctrl to CMD for Mac compatability
2014-05-03 17:36:59 +00:00
Ability to make CanvasLayers have pseudo 3D depth.
2019-04-05 13:24:54 +00:00
} break;
case PREVIEW_CANVAS_SCALE: {
bool preview = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(PREVIEW_CANVAS_SCALE));
preview = !preview;
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RS::get_singleton()->canvas_set_disable_scale(!preview);
Ability to make CanvasLayers have pseudo 3D depth.
2019-04-05 13:24:54 +00:00
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(PREVIEW_CANVAS_SCALE), preview);
Press F key in 2d editor to center view to selected node Press Ctrl+F to frame selected nodes in 2d editor Change Frame Selection hotkey in 2d editor from Ctrl to CMD for Mac compatability
2014-05-03 17:36:59 +00:00
} break;
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
case SKELETON_MAKE_BONES: {
Replace most uses of Map by HashMap * Map is unnecessary and inefficient in almost every case. * Replaced by the new HashMap. * Renamed Map to RBMap and Set to RBSet for cases that still make sense (order matters) but use is discouraged. There were very few cases where replacing by HashMap was undesired because keeping the key order was intended. I tried to keep those (as RBMap) as much as possible, but might have missed some. Review appreciated!
2022-05-13 13:04:37 +00:00
HashMap<Node *, Object *> &selection = editor_selection->get_selection();
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
Node *editor_root = EditorNode::get_singleton()->get_edited_scene()->get_tree()->get_edited_scene_root();
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
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
undo_redo->create_action(TTR("Create Custom Bone2D(s) from Node(s)"));
Use range iterators for `Map`
2021-08-09 20:13:42 +00:00
for (const KeyValue<Node *, Object *> &E : selection) {
Node2D *n2d = Object::cast_to<Node2D>(E.key);
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
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
Bone2D *new_bone = memnew(Bone2D);
String new_bone_name = n2d->get_name();
new_bone_name += "Bone2D";
new_bone->set_name(new_bone_name);
new_bone->set_transform(n2d->get_transform());
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
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
Node *n2d_parent = n2d->get_parent();
if (!n2d_parent) {
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
continue;
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
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
undo_redo->add_do_method(n2d_parent, "add_child", new_bone);
undo_redo->add_do_method(n2d_parent, "remove_child", n2d);
undo_redo->add_do_method(new_bone, "add_child", n2d);
undo_redo->add_do_method(n2d, "set_transform", Transform2D());
undo_redo->add_do_method(this, "_set_owner_for_node_and_children", new_bone, editor_root);
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
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
undo_redo->add_undo_method(new_bone, "remove_child", n2d);
undo_redo->add_undo_method(n2d_parent, "add_child", n2d);
undo_redo->add_undo_method(n2d, "set_transform", new_bone->get_transform());
undo_redo->add_undo_method(new_bone, "queue_free");
undo_redo->add_undo_method(this, "_set_owner_for_node_and_children", n2d, editor_root);
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
}
Add undo/redo to Node2D bone creation
2019-05-21 20:17:25 +00:00
undo_redo->commit_action();
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
} break;
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +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
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
void CanvasItemEditor::_set_owner_for_node_and_children(Node *p_node, Node *p_owner) {
p_node->set_owner(p_owner);
for (int i = 0; i < p_node->get_child_count(); i++) {
_set_owner_for_node_and_children(p_node->get_child(i), p_owner);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
void CanvasItemEditor::_focus_selection(int p_op) {
Vector2 center(0.f, 0.f);
Rect2 rect;
int count = 0;
Replace most uses of Map by HashMap * Map is unnecessary and inefficient in almost every case. * Replaced by the new HashMap. * Renamed Map to RBMap and Set to RBSet for cases that still make sense (order matters) but use is discouraged. There were very few cases where replacing by HashMap was undesired because keeping the key order was intended. I tried to keep those (as RBMap) as much as possible, but might have missed some. Review appreciated!
2022-05-13 13:04:37 +00:00
const HashMap<Node *, Object *> &selection = editor_selection->get_selection();
Use range iterators for `Map`
2021-08-09 20:13:42 +00:00
for (const KeyValue<Node *, Object *> &E : selection) {
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
CanvasItem *ci = Object::cast_to<CanvasItem>(E.key);
if (!ci) {
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
continue;
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 MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->get_viewport() != EditorNode::get_singleton()->get_scene_root()) {
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
continue;
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
}
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
// counting invisible items, for now
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
//if (!ci->is_visible_in_tree()) continue;
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
++count;
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
Rect2 item_rect;
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
if (ci->_edit_use_rect()) {
item_rect = ci->_edit_get_rect();
Remove the selection rect for nodes that do not require it
2018-03-08 20:35:41 +00:00
} else {
item_rect = Rect2();
}
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.
2022-09-29 09:53:28 +00:00
Vector2 pos = ci->get_global_transform().get_origin();
Vector2 scale = ci->get_global_transform().get_scale();
real_t angle = ci->get_global_transform().get_rotation();
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
Type renames: Matrix32 -> Transform2D Matrix3 -> Basis AABB -> Rect3 RawArray -> PoolByteArray IntArray -> PoolIntArray FloatArray -> PoolFloatArray Vector2Array -> PoolVector2Array Vector3Array -> PoolVector3Array ColorArray -> PoolColorArray
2017-01-11 03:52:51 +00:00
Transform2D t(angle, Vector2(0.f, 0.f));
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
item_rect = t.xform(item_rect);
renamed all Rect2.pos to Rect2.position
2017-06-03 22:25:13 +00:00
Rect2 canvas_item_rect(pos + scale * item_rect.position, scale * item_rect.size);
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
if (count == 1) {
rect = canvas_item_rect;
} else {
rect = rect.merge(canvas_item_rect);
}
Fix the Frame Selection functionality
2023-01-12 13:04:02 +00:00
}
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
Fix the Frame Selection functionality
2023-01-12 13:04:02 +00:00
if (p_op == VIEW_FRAME_TO_SELECTION && rect.size.x > CMP_EPSILON && rect.size.y > CMP_EPSILON) {
real_t scale_x = viewport->get_size().x / rect.size.x;
real_t scale_y = viewport->get_size().y / rect.size.y;
zoom = scale_x < scale_y ? scale_x : scale_y;
zoom *= 0.90;
zoom_widget->set_zoom(zoom);
viewport->queue_redraw(); // Redraw to update the global canvas transform after zoom changes.
call_deferred(SNAME("center_at"), rect.get_center()); // Defer because the updated transform is needed.
} else {
center_at(rect.get_center());
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
}
}
Clear drag_selection when drag ends
2022-07-14 12:51:47 +00:00
void CanvasItemEditor::_reset_drag() {
drag_type = DRAG_NONE;
drag_selection.clear();
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void CanvasItemEditor::_bind_methods() {
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
ClassDB::bind_method("_get_editor_data", &CanvasItemEditor::_get_editor_data);
Entirely removes BIND_VMETHOD in favor of GDVIRTUAL * `_gui_input`, `_input`, `_unhandled_input` and `_unhandled_key_input` are now regular C++ virutal functions. * Everything else converted to GDVIRTUAL * BIND_VMETHOD is gone, always use the new syntax from now on. Creating `_gui_input` method and using the binder to register events will no longer work, simply override the virtual function now.
2021-08-22 15:37:22 +00:00
Fix get_edited_scene_root error at starting editor Fix #15300
2018-01-04 18:55:43 +00:00
ClassDB::bind_method(D_METHOD("set_state"), &CanvasItemEditor::set_state);
Fixes viewport scrollbars not updating with plugins
2018-10-18 12:06:57 +00:00
ClassDB::bind_method(D_METHOD("update_viewport"), &CanvasItemEditor::update_viewport);
Fix the Frame Selection functionality
2023-01-12 13:04:02 +00:00
ClassDB::bind_method(D_METHOD("center_at", "position"), &CanvasItemEditor::center_at);
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
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
ClassDB::bind_method("_set_owner_for_node_and_children", &CanvasItemEditor::_set_owner_for_node_and_children);
Add lock and group icon to scene tree editor
2014-05-08 05:43:19 +00:00
ADD_SIGNAL(MethodInfo("item_lock_status_changed"));
ADD_SIGNAL(MethodInfo("item_group_status_changed"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Dictionary CanvasItemEditor::get_state() const {
Dictionary state;
Take the editor scale into account for 2D zoom operations The zoom level displayed is now relative to the editor scale. This means that with an editor scale of 200%, the 100% zoom level will actually be 200% as it's multiplied by the editor scale. This prevents things from looking too small when opening a project on an hiDPI display. This matches the behavior found in most image editors out there.
2020-01-04 17:43:52 +00:00
// Take the editor scale into account.
Clamp the editor scale to 1 for 2D zoom operations Some people set the editor scale below 1 to fit more content on screen, even if their display doesn't have a particularly low DPI. This closes #35059.
2020-01-13 11:13:35 +00:00
state["zoom"] = zoom / MAX(1, EDSCALE);
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
state["ofs"] = view_offset;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
state["grid_offset"] = grid_offset;
state["grid_step"] = grid_step;
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
state["primary_grid_steps"] = primary_grid_steps;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
state["snap_rotation_offset"] = snap_rotation_offset;
state["snap_rotation_step"] = snap_rotation_step;
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
state["snap_scale_step"] = snap_scale_step;
Move grid snapping to an independent button
2019-10-10 17:41:45 +00:00
state["smart_snap_active"] = smart_snap_active;
state["grid_snap_active"] = grid_snap_active;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
state["snap_node_parent"] = snap_node_parent;
state["snap_node_anchors"] = snap_node_anchors;
state["snap_node_sides"] = snap_node_sides;
state["snap_node_center"] = snap_node_center;
state["snap_other_nodes"] = snap_other_nodes;
state["snap_guides"] = snap_guides;
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
state["grid_visibility"] = grid_visibility;
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
state["show_origin"] = show_origin;
state["show_viewport"] = show_viewport;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
state["show_rulers"] = show_rulers;
state["show_guides"] = show_guides;
state["show_helpers"] = show_helpers;
Rework the TileSet resource and TileMap nodes: - Move most properties from TileMap to TileSet, - Make TileSet more flexible, supporting more feature (several collision layers, etc...), - Fusion both the TileMap and TileSet editor, - Implement TileSetSources, and thus a new way to index tiles in the TileSet, - Rework the TileSet and TileMap editors completely, - Implement an editor zoom widget (and use it in several places)
2021-05-07 13:41:39 +00:00
state["show_zoom_control"] = zoom_widget->is_visible();
Added ability to hide edit lock and groups in editor view Added ability to hide edit lock and groups in editor view
2018-09-20 00:41:19 +00:00
state["show_edit_locks"] = show_edit_locks;
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
state["show_transformation_gizmos"] = show_transformation_gizmos;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
state["snap_rotation"] = snap_rotation;
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
state["snap_scale"] = snap_scale;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
state["snap_relative"] = snap_relative;
state["snap_pixel"] = snap_pixel;
return state;
}
void CanvasItemEditor::set_state(const Dictionary &p_state) {
Fix canvas zoom controls lazy position update After hiding/showing rulers, zoom controls were kept at the wrong position until an update happened because of other reason.
2019-05-20 20:35:31 +00:00
bool update_scrollbars = false;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
Dictionary state = p_state;
if (state.has("zoom")) {
Take the editor scale into account for 2D zoom operations The zoom level displayed is now relative to the editor scale. This means that with an editor scale of 200%, the 100% zoom level will actually be 200% as it's multiplied by the editor scale. This prevents things from looking too small when opening a project on an hiDPI display. This matches the behavior found in most image editors out there.
2020-01-04 17:43:52 +00:00
// Compensate the editor scale, so that the editor scale can be changed
// and the zoom level will still be the same (relative to the editor scale).
Use real_t in editor plugins Also use const more often and delete dead code in CanvasItemEditor
2021-06-21 03:30:19 +00:00
zoom = real_t(p_state["zoom"]) * MAX(1, EDSCALE);
Rework the TileSet resource and TileMap nodes: - Move most properties from TileMap to TileSet, - Make TileSet more flexible, supporting more feature (several collision layers, etc...), - Fusion both the TileMap and TileSet editor, - Implement TileSetSources, and thus a new way to index tiles in the TileSet, - Rework the TileSet and TileMap editors completely, - Implement an editor zoom widget (and use it in several places)
2021-05-07 13:41:39 +00:00
zoom_widget->set_zoom(zoom);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
if (state.has("ofs")) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 14:12:16 +00:00
view_offset = p_state["ofs"];
previous_update_view_offset = view_offset;
Fix canvas zoom controls lazy position update After hiding/showing rulers, zoom controls were kept at the wrong position until an update happened because of other reason.
2019-05-20 20:35:31 +00:00
update_scrollbars = true;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
if (state.has("grid_offset")) {
grid_offset = state["grid_offset"];
}
if (state.has("grid_step")) {
grid_step = state["grid_step"];
}
Add primary grid lines to the 2D editor A "primary" line is drawn every 8 steps by default, which makes it easier to measure distances for snapping. This value can be configured in the Configure Snap dialog.
2019-10-15 08:23:38 +00:00
if (state.has("primary_grid_steps")) {
primary_grid_steps = state["primary_grid_steps"];
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (state.has("snap_rotation_step")) {
snap_rotation_step = state["snap_rotation_step"];
}
if (state.has("snap_rotation_offset")) {
snap_rotation_offset = state["snap_rotation_offset"];
}
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
if (state.has("snap_scale_step")) {
snap_scale_step = state["snap_scale_step"];
}
Move grid snapping to an independent button
2019-10-10 17:41:45 +00:00
if (state.has("smart_snap_active")) {
smart_snap_active = state["smart_snap_active"];
smart_snap_button->set_pressed(smart_snap_active);
}
if (state.has("grid_snap_active")) {
grid_snap_active = state["grid_snap_active"];
Small fixes to redundand code, copy paste bugs
2019-10-14 09:40:55 +00:00
grid_snap_button->set_pressed(grid_snap_active);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
if (state.has("snap_node_parent")) {
snap_node_parent = state["snap_node_parent"];
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_NODE_PARENT);
smartsnap_config_popup->set_item_checked(idx, snap_node_parent);
}
if (state.has("snap_node_anchors")) {
snap_node_anchors = state["snap_node_anchors"];
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_NODE_ANCHORS);
smartsnap_config_popup->set_item_checked(idx, snap_node_anchors);
}
if (state.has("snap_node_sides")) {
snap_node_sides = state["snap_node_sides"];
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_NODE_SIDES);
smartsnap_config_popup->set_item_checked(idx, snap_node_sides);
}
if (state.has("snap_node_center")) {
snap_node_center = state["snap_node_center"];
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_NODE_CENTER);
smartsnap_config_popup->set_item_checked(idx, snap_node_center);
}
if (state.has("snap_other_nodes")) {
snap_other_nodes = state["snap_other_nodes"];
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_OTHER_NODES);
smartsnap_config_popup->set_item_checked(idx, snap_other_nodes);
}
if (state.has("snap_guides")) {
snap_guides = state["snap_guides"];
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_GUIDES);
smartsnap_config_popup->set_item_checked(idx, snap_guides);
}
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
if (state.has("grid_visibility")) {
grid_visibility = (GridVisibility)(int)(state["grid_visibility"]);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
if (state.has("show_origin")) {
show_origin = state["show_origin"];
int idx = view_menu->get_popup()->get_item_index(SHOW_ORIGIN);
view_menu->get_popup()->set_item_checked(idx, show_origin);
}
if (state.has("show_viewport")) {
show_viewport = state["show_viewport"];
int idx = view_menu->get_popup()->get_item_index(SHOW_VIEWPORT);
view_menu->get_popup()->set_item_checked(idx, show_viewport);
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (state.has("show_rulers")) {
show_rulers = state["show_rulers"];
int idx = view_menu->get_popup()->get_item_index(SHOW_RULERS);
view_menu->get_popup()->set_item_checked(idx, show_rulers);
Fix canvas zoom controls lazy position update After hiding/showing rulers, zoom controls were kept at the wrong position until an update happened because of other reason.
2019-05-20 20:35:31 +00:00
update_scrollbars = true;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
if (state.has("show_guides")) {
show_guides = state["show_guides"];
int idx = view_menu->get_popup()->get_item_index(SHOW_GUIDES);
view_menu->get_popup()->set_item_checked(idx, show_guides);
}
if (state.has("show_helpers")) {
show_helpers = state["show_helpers"];
int idx = view_menu->get_popup()->get_item_index(SHOW_HELPERS);
view_menu->get_popup()->set_item_checked(idx, show_helpers);
}
Added ability to hide edit lock and groups in editor view Added ability to hide edit lock and groups in editor view
2018-09-20 00:41:19 +00:00
if (state.has("show_edit_locks")) {
show_edit_locks = state["show_edit_locks"];
int idx = view_menu->get_popup()->get_item_index(SHOW_EDIT_LOCKS);
view_menu->get_popup()->set_item_checked(idx, show_edit_locks);
}
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
if (state.has("show_transformation_gizmos")) {
show_transformation_gizmos = state["show_transformation_gizmos"];
int idx = view_menu->get_popup()->get_item_index(SHOW_TRANSFORMATION_GIZMOS);
view_menu->get_popup()->set_item_checked(idx, show_transformation_gizmos);
}
Remove ghost of canvas zoom controls during onion skinning
2019-05-20 20:36:34 +00:00
if (state.has("show_zoom_control")) {
// This one is not user-controllable, but instrumentable
Rework the TileSet resource and TileMap nodes: - Move most properties from TileMap to TileSet, - Make TileSet more flexible, supporting more feature (several collision layers, etc...), - Fusion both the TileMap and TileSet editor, - Implement TileSetSources, and thus a new way to index tiles in the TileSet, - Rework the TileSet and TileMap editors completely, - Implement an editor zoom widget (and use it in several places)
2021-05-07 13:41:39 +00:00
zoom_widget->set_visible(state["show_zoom_control"]);
Remove ghost of canvas zoom controls during onion skinning
2019-05-20 20:36:34 +00:00
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (state.has("snap_rotation")) {
snap_rotation = state["snap_rotation"];
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_ROTATION);
snap_config_menu->get_popup()->set_item_checked(idx, snap_rotation);
}
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
if (state.has("snap_scale")) {
snap_scale = state["snap_scale"];
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_SCALE);
snap_config_menu->get_popup()->set_item_checked(idx, snap_scale);
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
if (state.has("snap_relative")) {
snap_relative = state["snap_relative"];
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_RELATIVE);
snap_config_menu->get_popup()->set_item_checked(idx, snap_relative);
}
if (state.has("snap_pixel")) {
snap_pixel = state["snap_pixel"];
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_PIXEL);
snap_config_menu->get_popup()->set_item_checked(idx, snap_pixel);
}
Fix canvas zoom controls lazy position update After hiding/showing rulers, zoom controls were kept at the wrong position until an update happened because of other reason.
2019-05-20 20:35:31 +00:00
if (update_scrollbars) {
_update_scrollbars();
}
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
viewport->queue_redraw();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void CanvasItemEditor::add_control_to_menu_panel(Control *p_control) {
Add an overlay on editor to display error messages
2018-10-25 17:08:32 +00:00
ERR_FAIL_COND(!p_control);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
context_menu_hbox->add_child(p_control);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Add a function to remove controls from containers Closes #5968
2018-02-13 21:21:19 +00:00
void CanvasItemEditor::remove_control_from_menu_panel(Control *p_control) {
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
context_menu_hbox->remove_child(p_control);
Add a function to remove controls from containers Closes #5968
2018-02-13 21:21:19 +00:00
}
Allow showing both left and right side panels
2022-01-08 12:31:22 +00:00
void CanvasItemEditor::add_control_to_left_panel(Control *p_control) {
left_panel_split->add_child(p_control);
left_panel_split->move_child(p_control, 0);
}
void CanvasItemEditor::add_control_to_right_panel(Control *p_control) {
right_panel_split->add_child(p_control);
right_panel_split->move_child(p_control, 1);
}
void CanvasItemEditor::remove_control_from_left_panel(Control *p_control) {
left_panel_split->remove_child(p_control);
}
void CanvasItemEditor::remove_control_from_right_panel(Control *p_control) {
right_panel_split->remove_child(p_control);
Replace TileMapEditor floating tile palette with HSplitContainer.
2014-12-28 22:37:25 +00:00
}
2D shader progress
2015-01-11 23:52:42 +00:00
VSplitContainer *CanvasItemEditor::get_bottom_split() {
return bottom_split;
}
Double click on scene tree element to focus currently selected node In 3D it will focus in the first viewport Enable double click for trees
2016-07-28 19:37:52 +00:00
void CanvasItemEditor::focus_selection() {
_focus_selection(VIEW_CENTER_TO_SELECTION);
}
Fix the Frame Selection functionality
2023-01-12 13:04:02 +00:00
void CanvasItemEditor::center_at(const Point2 &p_pos) {
Vector2 offset = viewport->get_size() / 2 - EditorNode::get_singleton()->get_scene_root()->get_global_canvas_transform().xform(p_pos);
view_offset -= (offset / zoom).round();
update_viewport();
}
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
CanvasItemEditor::CanvasItemEditor() {
Clamp the editor scale to 1 for 2D zoom operations Some people set the editor scale below 1 to fit more content on screen, even if their display doesn't have a particularly low DPI. This closes #35059.
2020-01-13 11:13:35 +00:00
zoom = 1.0 / MAX(1, EDSCALE);
Fixed various uninitialised member variables in editor plugins.
2018-11-11 17:32:47 +00:00
view_offset = Point2(-150 - RULER_WIDTH, -95 - RULER_WIDTH);
previous_update_view_offset = view_offset; // Moves the view a little bit to the left so that (0,0) is visible. The values a relative to a 16/10 screen
Reorganize inspector layout workflow for Control nodes
2021-11-08 20:53:41 +00:00
Initialize snap_target and make sure it disappears
2019-09-20 20:26:26 +00:00
snap_target[0] = SNAP_TARGET_NONE;
snap_target[1] = SNAP_TARGET_NONE;
Fixed various uninitialised member variables in editor plugins.
2018-11-11 17:32:47 +00:00
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
editor_selection = EditorNode::get_singleton()->get_editor_selection();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
editor_selection->add_editor_plugin(this);
Rename `CanvasItem.update()` to `queue_redraw()` Affects a lot of classes. Very thoroughly checked signal connections and deferred calls to this method, add_do_method/add_undo_method calls, and so on. Also renames the internal `_update_callback()` to `_redraw_callback()` for consistency. Just a few comments have also been changed to say "redraw". In CPUParticles2D, there was a private variable with the same name. It has been renamed to `do_redraw`.
2022-08-13 21:21:24 +00:00
editor_selection->connect("selection_changed", callable_mp((CanvasItem *)this, &CanvasItem::queue_redraw));
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
editor_selection->connect("selection_changed", callable_mp(this, &CanvasItemEditor::_selection_changed));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Store panels and docks singletons in their own classes
2021-11-17 20:08:55 +00:00
SceneTreeDock::get_singleton()->connect("node_created", callable_mp(this, &CanvasItemEditor::_node_created));
SceneTreeDock::get_singleton()->connect("add_node_used", callable_mp(this, &CanvasItemEditor::_reset_create_position));
Allow to create a node at specific position
2020-08-24 23:32:58 +00:00
Fix camera override button not updating in 2D scenes Reconnect accidentally disconnected signal play_pressed to update the button and enable camera override after launching a project in the editor.
2022-12-30 21:46:24 +00:00
EditorNode::get_singleton()->call_deferred(SNAME("connect"), "play_pressed", callable_mp(this, &CanvasItemEditor::_update_override_camera_button).bind(true));
Port remaining connections to callable_mp
2020-12-06 15:09:18 +00:00
EditorNode::get_singleton()->call_deferred(SNAME("connect"), "stop_pressed", callable_mp(this, &CanvasItemEditor::_update_override_camera_button).bind(false));
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
// A fluid container for all toolbars.
HFlowContainer *main_flow = memnew(HFlowContainer);
add_child(main_flow);
// Main toolbars.
HBoxContainer *main_menu_hbox = memnew(HBoxContainer);
main_menu_hbox->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
main_flow->add_child(main_menu_hbox);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
2D shader progress
2015-01-11 23:52:42 +00:00
bottom_split = memnew(VSplitContainer);
add_child(bottom_split);
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
bottom_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
2D shader progress
2015-01-11 23:52:42 +00:00
Allow showing both left and right side panels
2022-01-08 12:31:22 +00:00
left_panel_split = memnew(HSplitContainer);
bottom_split->add_child(left_panel_split);
left_panel_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
right_panel_split = memnew(HSplitContainer);
left_panel_split->add_child(right_panel_split);
right_panel_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
Replace TileMapEditor floating tile palette with HSplitContainer.
2014-12-28 22:37:25 +00:00
Implements rulers
2017-08-29 19:50:18 +00:00
viewport_scrollable = memnew(Control);
Allow showing both left and right side panels
2022-01-08 12:31:22 +00:00
right_panel_split->add_child(viewport_scrollable);
Implements rulers
2017-08-29 19:50:18 +00:00
viewport_scrollable->set_mouse_filter(MOUSE_FILTER_PASS);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
viewport_scrollable->set_clip_contents(true);
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
viewport_scrollable->set_v_size_flags(Control::SIZE_EXPAND_FILL);
viewport_scrollable->set_h_size_flags(Control::SIZE_EXPAND_FILL);
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
viewport_scrollable->connect("draw", callable_mp(this, &CanvasItemEditor::_update_scrollbars));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Rename ViewportContainer to SubViewportContainer
2020-04-01 18:28:09 +00:00
SubViewportContainer *scene_tree = memnew(SubViewportContainer);
Implements rulers
2017-08-29 19:50:18 +00:00
viewport_scrollable->add_child(scene_tree);
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 19:51:56 +00:00
scene_tree->set_stretch(true);
Rename Control PRESET_WIDE to PRESET_FULL_RECT
2022-03-19 00:02:57 +00:00
scene_tree->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
scene_tree->add_child(EditorNode::get_singleton()->get_scene_root());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fixed "Add Sprite..." label overlapping with zoom controls
2019-11-18 09:49:37 +00:00
controls_vb = memnew(VBoxContainer);
controls_vb->set_begin(Point2(5, 5));
Define zoom shortcut before using it
2022-06-07 13:11:36 +00:00
// To ensure that scripts can parse the list of shortcuts correctly, we have to define
Allow using numpad for zoom shortcuts in the 2D/code editors This behavior is consistent with GIMP.
2022-08-10 13:07:47 +00:00
// those shortcuts one by one. Define shortcut before using it (by EditorZoomWidget).
ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_3.125_percent", TTR("Zoom to 3.125%"),
{ int32_t(KeyModifierMask::SHIFT | Key::KEY_5), int32_t(KeyModifierMask::SHIFT | Key::KP_5) });
ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_6.25_percent", TTR("Zoom to 6.25%"),
{ int32_t(KeyModifierMask::SHIFT | Key::KEY_4), int32_t(KeyModifierMask::SHIFT | Key::KP_4) });
ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_12.5_percent", TTR("Zoom to 12.5%"),
{ int32_t(KeyModifierMask::SHIFT | Key::KEY_3), int32_t(KeyModifierMask::SHIFT | Key::KP_3) });
ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_25_percent", TTR("Zoom to 25%"),
{ int32_t(KeyModifierMask::SHIFT | Key::KEY_2), int32_t(KeyModifierMask::SHIFT | Key::KP_2) });
ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_50_percent", TTR("Zoom to 50%"),
{ int32_t(KeyModifierMask::SHIFT | Key::KEY_1), int32_t(KeyModifierMask::SHIFT | Key::KP_1) });
ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_100_percent", TTR("Zoom to 100%"),
Fix key mapping changes when moving from macOS to other platform Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
2022-09-02 09:37:48 +00:00
{ int32_t(Key::KEY_1), int32_t(KeyModifierMask::CMD_OR_CTRL | Key::KEY_0), int32_t(Key::KP_1), int32_t(KeyModifierMask::CMD_OR_CTRL | Key::KP_0) });
Allow using numpad for zoom shortcuts in the 2D/code editors This behavior is consistent with GIMP.
2022-08-10 13:07:47 +00:00
ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_200_percent", TTR("Zoom to 200%"),
{ int32_t(Key::KEY_2), int32_t(Key::KP_2) });
ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_400_percent", TTR("Zoom to 400%"),
{ int32_t(Key::KEY_3), int32_t(Key::KP_3) });
ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_800_percent", TTR("Zoom to 800%"),
{ int32_t(Key::KEY_4), int32_t(Key::KP_4) });
ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_1600_percent", TTR("Zoom to 1600%"),
{ int32_t(Key::KEY_5), int32_t(Key::KP_5) });
Define zoom shortcut before using it
2022-06-07 13:11:36 +00:00
Fixes Hint label in 2D editor appearing at wrong position and pushes zoom controls
2022-01-27 05:07:54 +00:00
zoom_widget = memnew(EditorZoomWidget);
controls_vb->add_child(zoom_widget);
zoom_widget->set_anchors_and_offsets_preset(Control::PRESET_TOP_LEFT, Control::PRESET_MODE_MINSIZE, 2 * EDSCALE);
Fix zoom in/out keyboard shortcuts not working since the introduction of EditorZoomWidget. Add KP shortcuts to zoom in/out.
2022-03-24 13:03:43 +00:00
zoom_widget->set_shortcut_context(this);
Fixes Hint label in 2D editor appearing at wrong position and pushes zoom controls
2022-01-27 05:07:54 +00:00
zoom_widget->connect("zoom_changed", callable_mp(this, &CanvasItemEditor::_update_zoom));
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
panner.instantiate();
Add gesture to ViewPanner and simplify a bit its API
2023-01-19 16:50:51 +00:00
panner->set_callbacks(callable_mp(this, &CanvasItemEditor::_pan_callback), callable_mp(this, &CanvasItemEditor::_zoom_callback));
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
viewport = memnew(CanvasItemEditorViewport(this));
Implements rulers
2017-08-29 19:50:18 +00:00
viewport_scrollable->add_child(viewport);
viewport->set_mouse_filter(MOUSE_FILTER_PASS);
Rename Control PRESET_WIDE to PRESET_FULL_RECT
2022-03-19 00:02:57 +00:00
viewport->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
-All types have editable script now in properties -Changed clip to a property in Control which can be set by the user
2017-01-09 18:50:08 +00:00
viewport->set_clip_contents(true);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
viewport->set_focus_mode(FOCUS_ALL);
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
viewport->connect("draw", callable_mp(this, &CanvasItemEditor::_draw_viewport));
viewport->connect("gui_input", callable_mp(this, &CanvasItemEditor::_gui_input_viewport));
Add ViewPanner to 2D editor
2022-01-19 18:59:12 +00:00
viewport->connect("focus_exited", callable_mp(panner.ptr(), &ViewPanner::release_pan_key));
Implements rulers
2017-08-29 19:50:18 +00:00
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
h_scroll = memnew(HScrollBar);
viewport->add_child(h_scroll);
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
h_scroll->connect("value_changed", callable_mp(this, &CanvasItemEditor::_update_scroll));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
h_scroll->hide();
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
v_scroll = memnew(VScrollBar);
viewport->add_child(v_scroll);
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
v_scroll->connect("value_changed", callable_mp(this, &CanvasItemEditor::_update_scroll));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
v_scroll->hide();
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
Fixed "Add Sprite..." label overlapping with zoom controls
2019-11-18 09:49:37 +00:00
viewport->add_child(controls_vb);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
Improve the editor theme The editor theme now makes use of rounded corners and less borders to follow modern visual trends. The default theme's colors were also tweaked to make the blue hue more subtle (similar to the Arc theme, which was removed as a consequence). The Alien theme was replaced by a Breeze Dark theme, which should blend in well with the KDE theme.
2019-03-23 00:57:28 +00:00
// Add some margin to the left for better aesthetics.
// This prevents the first button's hover/pressed effect from "touching" the panel's border,
// which looks ugly.
Control *margin_left = memnew(Control);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(margin_left);
Improve the editor theme The editor theme now makes use of rounded corners and less borders to follow modern visual trends. The default theme's colors were also tweaked to make the blue hue more subtle (similar to the Arc theme, which was removed as a consequence). The Alien theme was replaced by a Breeze Dark theme, which should blend in well with the KDE theme.
2019-03-23 00:57:28 +00:00
margin_left->set_custom_minimum_size(Size2(2, 0) * EDSCALE);
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
select_button = memnew(Button);
select_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(select_button);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
select_button->set_toggle_mode(true);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
select_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_SELECT));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
select_button->set_pressed(true);
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
select_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/select_mode", TTR("Select Mode"), Key::Q));
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
select_button->set_shortcut_context(this);
Fix key mapping changes when moving from macOS to other platform Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
2022-09-02 09:37:48 +00:00
select_button->set_tooltip_text(keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Drag: Rotate selected node around pivot.") + "\n" + TTR("Alt+Drag: Move selected node.") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Alt+Drag: Scale selected node.") + "\n" + TTR("V: Set selected node's pivot position.") + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked.") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("RMB: Add node at position clicked."));
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(memnew(VSeparator));
Add a scale mode to the 2D editor
2018-09-10 12:39:46 +00:00
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
move_button = memnew(Button);
move_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(move_button);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
move_button->set_toggle_mode(true);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
move_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_MOVE));
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
move_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/move_mode", TTR("Move Mode"), Key::W));
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
move_button->set_shortcut_context(this);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
move_button->set_tooltip_text(TTR("Move Mode"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
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
rotate_button = memnew(Button);
rotate_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(rotate_button);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
rotate_button->set_toggle_mode(true);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
rotate_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_ROTATE));
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
rotate_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/rotate_mode", TTR("Rotate Mode"), Key::E));
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
rotate_button->set_shortcut_context(this);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
rotate_button->set_tooltip_text(TTR("Rotate Mode"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
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
scale_button = memnew(Button);
scale_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(scale_button);
Few unifications between canvas_item and spatial editors
2018-09-15 15:44:26 +00:00
scale_button->set_toggle_mode(true);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
scale_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_SCALE));
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
scale_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/scale_mode", TTR("Scale Mode"), Key::S));
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
scale_button->set_shortcut_context(this);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
scale_button->set_tooltip_text(TTR("Shift: Scale proportionally."));
Few unifications between canvas_item and spatial editors
2018-09-15 15:44:26 +00:00
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(memnew(VSeparator));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
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
list_select_button = memnew(Button);
list_select_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(list_select_button);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
list_select_button->set_toggle_mode(true);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
list_select_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_LIST_SELECT));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
list_select_button->set_tooltip_text(TTR("Show list of selectable nodes at position clicked."));
fixed and improved selection and list selection, closes #2852
2015-12-13 20:16:13 +00:00
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
pivot_button = memnew(Button);
pivot_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(pivot_button);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
pivot_button->set_toggle_mode(true);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
pivot_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_EDIT_PIVOT));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
pivot_button->set_tooltip_text(TTR("Click to change object's rotation pivot."));
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 12:38:15 +00:00
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
pan_button = memnew(Button);
pan_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(pan_button);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
pan_button->set_toggle_mode(true);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
pan_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_PAN));
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
pan_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/pan_mode", TTR("Pan Mode"), Key::G));
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
pan_button->set_shortcut_context(this);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
pan_button->set_tooltip_text(TTR("You can also use Pan View shortcut (Space by default) to pan in any mode."));
Add pan mode in 2d editor
2014-05-02 11:39:12 +00:00
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
ruler_button = memnew(Button);
ruler_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(ruler_button);
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
ruler_button->set_toggle_mode(true);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
ruler_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_RULER));
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
ruler_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/ruler_mode", TTR("Ruler Mode"), Key::R));
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
ruler_button->set_shortcut_context(this);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
ruler_button->set_tooltip_text(TTR("Ruler Mode"));
Add 2D ruler tool
2019-08-30 20:49:47 +00:00
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(memnew(VSeparator));
Add pan mode in 2d editor
2014-05-02 11:39:12 +00:00
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
smart_snap_button = memnew(Button);
smart_snap_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(smart_snap_button);
Move grid snapping to an independent button
2019-10-10 17:41:45 +00:00
smart_snap_button->set_toggle_mode(true);
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
smart_snap_button->connect("toggled", callable_mp(this, &CanvasItemEditor::_button_toggle_smart_snap));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
smart_snap_button->set_tooltip_text(TTR("Toggle smart snapping."));
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
smart_snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_smart_snap", TTR("Use Smart Snap"), KeyModifierMask::SHIFT | Key::S));
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
smart_snap_button->set_shortcut_context(this);
Move grid snapping to an independent button
2019-10-10 17:41:45 +00:00
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
grid_snap_button = memnew(Button);
grid_snap_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(grid_snap_button);
Move grid snapping to an independent button
2019-10-10 17:41:45 +00:00
grid_snap_button->set_toggle_mode(true);
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
grid_snap_button->connect("toggled", callable_mp(this, &CanvasItemEditor::_button_toggle_grid_snap));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
grid_snap_button->set_tooltip_text(TTR("Toggle grid snapping."));
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
grid_snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_grid_snap", TTR("Use Grid Snap"), KeyModifierMask::SHIFT | Key::G));
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
grid_snap_button->set_shortcut_context(this);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
snap_config_menu = memnew(MenuButton);
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
snap_config_menu->set_shortcut_context(this);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(snap_config_menu);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
snap_config_menu->set_h_size_flags(SIZE_SHRINK_END);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
snap_config_menu->set_tooltip_text(TTR("Snapping Options"));
Small ux improvement
2019-04-20 18:52:01 +00:00
snap_config_menu->set_switch_on_hover(true);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
PopupMenu *p = snap_config_menu->get_popup();
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
p->connect("id_pressed", callable_mp(this, &CanvasItemEditor::_popup_callback));
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
p->set_hide_on_checkable_item_selection(false);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_rotation_snap", TTR("Use Rotation Snap")), SNAP_USE_ROTATION);
Added snapping for scaling in 2D editor
2019-10-30 14:18:57 +00:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_scale_snap", TTR("Use Scale Snap")), SNAP_USE_SCALE);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_relative", TTR("Snap Relative")), SNAP_RELATIVE);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_pixel_snap", TTR("Use Pixel Snap")), SNAP_USE_PIXEL);
Improve wording of various messages and make casing more consistent This also adds the number of selected projects to the confirmation dialog that appears before removing projects.
2019-03-25 00:54:29 +00:00
p->add_submenu_item(TTR("Smart Snapping"), "SmartSnapping");
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
Reorganize various menus for consistency and conciseness - Clean up the recent scripts dialog to match the recent scenes dialog - Add "..." at the end of shortcuts that cause a modal dialog to appear This closes #31148.
2019-08-12 20:23:00 +00:00
p->add_separator();
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/configure_snap", TTR("Configure Snap...")), SNAP_CONFIGURE);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
smartsnap_config_popup = memnew(PopupMenu);
p->add_child(smartsnap_config_popup);
smartsnap_config_popup->set_name("SmartSnapping");
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
smartsnap_config_popup->connect("id_pressed", callable_mp(this, &CanvasItemEditor::_popup_callback));
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
smartsnap_config_popup->set_hide_on_checkable_item_selection(false);
Improve wording of various messages and make casing more consistent This also adds the number of selected projects to the confirmation dialog that appears before removing projects.
2019-03-25 00:54:29 +00:00
smartsnap_config_popup->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_node_parent", TTR("Snap to Parent")), SNAP_USE_NODE_PARENT);
smartsnap_config_popup->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_node_anchors", TTR("Snap to Node Anchor")), SNAP_USE_NODE_ANCHORS);
smartsnap_config_popup->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_node_sides", TTR("Snap to Node Sides")), SNAP_USE_NODE_SIDES);
smartsnap_config_popup->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_node_center", TTR("Snap to Node Center")), SNAP_USE_NODE_CENTER);
smartsnap_config_popup->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_other_nodes", TTR("Snap to Other Nodes")), SNAP_USE_OTHER_NODES);
smartsnap_config_popup->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_guides", TTR("Snap to Guides")), SNAP_USE_GUIDES);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(memnew(VSeparator));
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
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
lock_button = memnew(Button);
lock_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(lock_button);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
lock_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_popup_callback).bind(LOCK_SELECTED));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
lock_button->set_tooltip_text(TTR("Lock selected node, preventing selection and movement."));
Add keyboard shortcuts for grouping and locking nodes, change grid toggle - Locking nodes can now be done by pressing Ctrl + L, and unlocking with Ctrl + Shift + L. - Grouping nodes is now done by pressing Ctrl + G, and ungrouping with Ctrl + Shift + G (similar to Inkscape). - Toggling the grid is now done by pressing the `#` key (also similar to Inkscape). This change was needed as Ctrl + G now groups selected nodes. Different shortcuts are used for the lock/unlock and group/ungroup actions, so that the shortcuts are idempotent.
2021-06-30 21:09:26 +00:00
// Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused.
Fix key mapping changes when moving from macOS to other platform Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
2022-09-02 09:37:48 +00:00
lock_button->set_shortcut(ED_SHORTCUT("editor/lock_selected_nodes", TTR("Lock Selected Node(s)"), KeyModifierMask::CMD_OR_CTRL | Key::L));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
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
unlock_button = memnew(Button);
unlock_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(unlock_button);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
unlock_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_popup_callback).bind(UNLOCK_SELECTED));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
unlock_button->set_tooltip_text(TTR("Unlock selected node, allowing selection and movement."));
Add keyboard shortcuts for grouping and locking nodes, change grid toggle - Locking nodes can now be done by pressing Ctrl + L, and unlocking with Ctrl + Shift + L. - Grouping nodes is now done by pressing Ctrl + G, and ungrouping with Ctrl + Shift + G (similar to Inkscape). - Toggling the grid is now done by pressing the `#` key (also similar to Inkscape). This change was needed as Ctrl + G now groups selected nodes. Different shortcuts are used for the lock/unlock and group/ungroup actions, so that the shortcuts are idempotent.
2021-06-30 21:09:26 +00:00
// Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused.
Fix key mapping changes when moving from macOS to other platform Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
2022-09-02 09:37:48 +00:00
unlock_button->set_shortcut(ED_SHORTCUT("editor/unlock_selected_nodes", TTR("Unlock Selected Node(s)"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::L));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
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
group_button = memnew(Button);
group_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(group_button);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
group_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_popup_callback).bind(GROUP_SELECTED));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
group_button->set_tooltip_text(TTR("Make selected node's children not selectable."));
Add keyboard shortcuts for grouping and locking nodes, change grid toggle - Locking nodes can now be done by pressing Ctrl + L, and unlocking with Ctrl + Shift + L. - Grouping nodes is now done by pressing Ctrl + G, and ungrouping with Ctrl + Shift + G (similar to Inkscape). - Toggling the grid is now done by pressing the `#` key (also similar to Inkscape). This change was needed as Ctrl + G now groups selected nodes. Different shortcuts are used for the lock/unlock and group/ungroup actions, so that the shortcuts are idempotent.
2021-06-30 21:09:26 +00:00
// Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused.
Fix key mapping changes when moving from macOS to other platform Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
2022-09-02 09:37:48 +00:00
group_button->set_shortcut(ED_SHORTCUT("editor/group_selected_nodes", TTR("Group Selected Node(s)"), KeyModifierMask::CMD_OR_CTRL | Key::G));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
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
ungroup_button = memnew(Button);
ungroup_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(ungroup_button);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
ungroup_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_popup_callback).bind(UNGROUP_SELECTED));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
ungroup_button->set_tooltip_text(TTR("Make selected node's children selectable."));
Add keyboard shortcuts for grouping and locking nodes, change grid toggle - Locking nodes can now be done by pressing Ctrl + L, and unlocking with Ctrl + Shift + L. - Grouping nodes is now done by pressing Ctrl + G, and ungrouping with Ctrl + Shift + G (similar to Inkscape). - Toggling the grid is now done by pressing the `#` key (also similar to Inkscape). This change was needed as Ctrl + G now groups selected nodes. Different shortcuts are used for the lock/unlock and group/ungroup actions, so that the shortcuts are idempotent.
2021-06-30 21:09:26 +00:00
// Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused.
Fix key mapping changes when moving from macOS to other platform Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
2022-09-02 09:37:48 +00:00
ungroup_button->set_shortcut(ED_SHORTCUT("editor/ungroup_selected_nodes", TTR("Ungroup Selected Node(s)"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::G));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(memnew(VSeparator));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
skeleton_menu = memnew(MenuButton);
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
skeleton_menu->set_shortcut_context(this);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(skeleton_menu);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
skeleton_menu->set_tooltip_text(TTR("Skeleton Options"));
Small ux improvement
2019-04-20 18:52:01 +00:00
skeleton_menu->set_switch_on_hover(true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
p = skeleton_menu->get_popup();
Fix #7262 Disable PopupMenu hiding in snap settings of the TextureRegion editor and Edit menu of the scene
2017-04-14 11:49:50 +00:00
p->set_hide_on_checkable_item_selection(false);
New and improved IK system for Skeleton2D This PR and commit adds a new IK system for 2D with the Skeleton2D node that adds several new IK solvers, a way to control bones in a Skeleton2D node similar to that in Skeleton3D. It also adds additional changes and functionality. This work was sponsored by GSoC 2020 and TwistedTwigleg. Full list of changes: * Adds a SkeletonModifier2D resource * This resource is the base where all IK code is written and executed * Has a function for clamping angles, since it is so commonly used * Modifiers are unique when duplicated so it works with instancing * Adds a SkeletonModifierStack2D resource * This resource manages a series of SkeletonModification2Ds * This is what the Skeleton2D directly interfaces with to make IK possible * Adds SkeletonModifier2D resources for LookAt, CCDIK, FABRIK, Jiggle, and TwoBoneIK * Each modification is in its own file * There is also a SkeletonModifier2D resource that acts as a stack for using multiple stacks together * Adds a PhysicalBone2D node * Works similar to the PhysicalBone3D node, but uses a RigidBody2D node * Changes to Skeleton2D listed below: * Skeleton2D now holds a single SkeletonModificationStack2D for IK * Skeleton2D now has a local_pose_override, which overrides the Bone2D position similar to how the overrides work in Skeleton3D * Changes to Bone2D listed below: * The default_length property has been changed to length. Length is the length of the bone to its child bone node * New bone_angle property, which is the angle the bone has to its first child bone node * Bone2D caches its transform when not modified by IK for IK interpolation purposes * Bone2D draws its own editor gizmo, though this is stated to change in the future * Changes to CanvasItemEditor listed below: * Bone2D gizmo drawing code removed * The 2D IK code is removed. Now Bone2D is the only bone system for 2D * Transform2D now has a looking_at function for rotating to face a position * Two new node notifications: NOTIFICATION_EDITOR_PRE_SAVE and NOTIFICATION_EDITOR_POST_SAVE * These notifications only are called in the editor right before and after saving a scene * Needed for not saving the IK position when executing IK in the editor * Documentation for all the changes listed above.
2020-08-03 18:02:24 +00:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_show_bones", TTR("Show Bones")), SKELETON_SHOW_BONES);
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 19:46:32 +00:00
p->add_separator();
Fix key mapping changes when moving from macOS to other platform Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
2022-09-02 09:37:48 +00:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_make_bones", TTR("Make Bone2D Node(s) from Node(s)"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::B), SKELETON_MAKE_BONES);
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
p->connect("id_pressed", callable_mp(this, &CanvasItemEditor::_popup_callback));
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(memnew(VSeparator));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
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
override_camera_button = memnew(Button);
override_camera_button->set_flat(true);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(override_camera_button);
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
override_camera_button->connect("toggled", callable_mp(this, &CanvasItemEditor::_button_override_camera));
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
override_camera_button->set_toggle_mode(true);
override_camera_button->set_disabled(true);
_update_override_camera_button(false);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(memnew(VSeparator));
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 20:55:01 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
view_menu = memnew(MenuButton);
i18n: Misc fixes translation strings Adds some translator comments to solve some questions raised on Weblate.
2022-06-08 09:42:51 +00:00
// TRANSLATORS: Noun, name of the 2D/3D View menus.
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
view_menu->set_text(TTR("View"));
i18n: Misc fixes translation strings Adds some translator comments to solve some questions raised on Weblate.
2022-06-08 09:42:51 +00:00
view_menu->set_switch_on_hover(true);
view_menu->set_shortcut_context(this);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(view_menu);
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
view_menu->get_popup()->connect("id_pressed", callable_mp(this, &CanvasItemEditor::_popup_callback));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
p = view_menu->get_popup();
Small ux improvement
2019-04-20 18:52:01 +00:00
p->set_hide_on_checkable_item_selection(false);
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
grid_menu = memnew(PopupMenu);
grid_menu->connect("about_to_popup", callable_mp(this, &CanvasItemEditor::_prepare_grid_menu));
grid_menu->connect("id_pressed", callable_mp(this, &CanvasItemEditor::_on_grid_menu_id_pressed));
grid_menu->set_name("GridMenu");
grid_menu->add_radio_check_item(TTR("Show"), GRID_VISIBILITY_SHOW);
grid_menu->add_radio_check_item(TTR("Show When Snapping"), GRID_VISIBILITY_SHOW_WHEN_SNAPPING);
grid_menu->add_radio_check_item(TTR("Hide"), GRID_VISIBILITY_HIDE);
grid_menu->add_separator();
Fix key mapping changes when moving from macOS to other platform Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
2022-09-02 09:37:48 +00:00
grid_menu->add_shortcut(ED_SHORTCUT("canvas_item_editor/toggle_grid", TTR("Toggle Grid"), KeyModifierMask::CMD_OR_CTRL | Key::APOSTROPHE));
Separate 2D grid visibility and grid snap
2022-02-09 09:53:39 +00:00
p->add_child(grid_menu);
p->add_submenu_item(TTR("Grid"), "GridMenu");
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_helpers", TTR("Show Helpers"), Key::H), SHOW_HELPERS);
Remove Show Ruler shortcut (fixes #32639) Removed default shortcut because of the conflict mentioned in the issue. Command + Shift + T would conflict with Soft Reload Script, and this shortcut doesn't seem to be needed very often.
2019-10-08 21:26:21 +00:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_rulers", TTR("Show Rulers")), SHOW_RULERS);
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_guides", TTR("Show Guides"), Key::Y), SHOW_GUIDES);
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 08:52:13 +00:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_origin", TTR("Show Origin")), SHOW_ORIGIN);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_viewport", TTR("Show Viewport")), SHOW_VIEWPORT);
Added ability to hide edit lock and groups in editor view Added ability to hide edit lock and groups in editor view
2018-09-20 00:41:19 +00:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_edit_locks", TTR("Show Group And Lock Icons")), SHOW_EDIT_LOCKS);
Added options to disable movement/scaling handles in 2D
2019-11-10 09:07:13 +00:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_transformation_gizmos", TTR("Show Transformation Gizmos")), SHOW_TRANSFORMATION_GIZMOS);
Added ability to hide edit lock and groups in editor view Added ability to hide edit lock and groups in editor view
2018-09-20 00:41:19 +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
p->add_separator();
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/center_selection", TTR("Center Selection"), Key::F), VIEW_CENTER_TO_SELECTION);
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/frame_selection", TTR("Frame Selection"), KeyModifierMask::SHIFT | Key::F), VIEW_FRAME_TO_SELECTION);
Added button/shortcut for removing all guides Added undo/redo Correctly added has_meta
2019-08-24 20:58:16 +00:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/clear_guides", TTR("Clear Guides")), CLEAR_GUIDES);
Ability to make CanvasLayers have pseudo 3D depth.
2019-04-05 13:24:54 +00:00
p->add_separator();
Remove default shortcut for Preview Canvas Scale
2022-10-10 12:22:26 +00:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/preview_canvas_scale", TTR("Preview Canvas Scale")), PREVIEW_CANVAS_SCALE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
main_menu_hbox->add_child(memnew(VSeparator));
Highlight context menu items at the top of the 2D/3D viewports This makes it easier to notice that some menu items only appear when specific nodes are selected. This change applies to both 2D and 3D editors, including both plugin-based menus and the hardcoded 2D layout/animation contextual menus.
2020-02-03 19:07:21 +00:00
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
// Contextual toolbars.
context_menu_panel = memnew(PanelContainer);
context_menu_hbox = memnew(HBoxContainer);
context_menu_panel->add_child(context_menu_hbox);
main_flow->add_child(context_menu_panel);
Highlight context menu items at the top of the 2D/3D viewports This makes it easier to notice that some menu items only appear when specific nodes are selected. This change applies to both 2D and 3D editors, including both plugin-based menus and the hardcoded 2D layout/animation contextual menus.
2020-02-03 19:07:21 +00:00
Reorganize inspector layout workflow for Control nodes
2021-11-08 20:53:41 +00:00
// Animation controls.
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
animation_hb = memnew(HBoxContainer);
Use FlowContainer to handle toolbar overflow more gracefully
2022-07-20 01:00:25 +00:00
context_menu_hbox->add_child(animation_hb);
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
animation_hb->add_child(memnew(VSeparator));
animation_hb->hide();
Added and improved some icons, plus some other minor visual fixes.
2017-10-12 18:59:25 +00:00
key_loc_button = memnew(Button);
Highlight context menu items at the top of the 2D/3D viewports This makes it easier to notice that some menu items only appear when specific nodes are selected. This change applies to both 2D and 3D editors, including both plugin-based menus and the hardcoded 2D layout/animation contextual menus.
2020-02-03 19:07:21 +00:00
key_loc_button->set_flat(true);
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
key_loc_button->set_toggle_mode(true);
key_loc_button->set_pressed(true);
key_loc_button->set_focus_mode(FOCUS_NONE);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
key_loc_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_POS));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
key_loc_button->set_tooltip_text(TTR("Translation mask for inserting keys."));
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
animation_hb->add_child(key_loc_button);
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
Added and improved some icons, plus some other minor visual fixes.
2017-10-12 18:59:25 +00:00
key_rot_button = memnew(Button);
Highlight context menu items at the top of the 2D/3D viewports This makes it easier to notice that some menu items only appear when specific nodes are selected. This change applies to both 2D and 3D editors, including both plugin-based menus and the hardcoded 2D layout/animation contextual menus.
2020-02-03 19:07:21 +00:00
key_rot_button->set_flat(true);
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
key_rot_button->set_toggle_mode(true);
key_rot_button->set_pressed(true);
key_rot_button->set_focus_mode(FOCUS_NONE);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
key_rot_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_ROT));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
key_rot_button->set_tooltip_text(TTR("Rotation mask for inserting keys."));
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
animation_hb->add_child(key_rot_button);
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
Added and improved some icons, plus some other minor visual fixes.
2017-10-12 18:59:25 +00:00
key_scale_button = memnew(Button);
Highlight context menu items at the top of the 2D/3D viewports This makes it easier to notice that some menu items only appear when specific nodes are selected. This change applies to both 2D and 3D editors, including both plugin-based menus and the hardcoded 2D layout/animation contextual menus.
2020-02-03 19:07:21 +00:00
key_scale_button->set_flat(true);
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
key_scale_button->set_toggle_mode(true);
key_scale_button->set_focus_mode(FOCUS_NONE);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
key_scale_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_SCALE));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
key_scale_button->set_tooltip_text(TTR("Scale mask for inserting keys."));
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
animation_hb->add_child(key_scale_button);
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
Revert "Add new editor and default theme (WIP)" This reverts commit f045efe007cffb87238ee519b7f33d710814ded7.
2017-05-02 21:02:06 +00:00
key_insert_button = memnew(Button);
Highlight context menu items at the top of the 2D/3D viewports This makes it easier to notice that some menu items only appear when specific nodes are selected. This change applies to both 2D and 3D editors, including both plugin-based menus and the hardcoded 2D layout/animation contextual menus.
2020-02-03 19:07:21 +00:00
key_insert_button->set_flat(true);
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
key_insert_button->set_focus_mode(FOCUS_NONE);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
key_insert_button->connect("pressed", callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_KEY));
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
key_insert_button->set_tooltip_text(TTR("Insert keys (based on mask)."));
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
key_insert_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/anim_insert_key", TTR("Insert Key"), Key::INSERT));
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
key_insert_button->set_shortcut_context(this);
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
animation_hb->add_child(key_insert_button);
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
key_auto_insert_button = memnew(Button);
key_auto_insert_button->set_flat(true);
key_auto_insert_button->set_toggle_mode(true);
key_auto_insert_button->set_focus_mode(FOCUS_NONE);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
key_auto_insert_button->set_tooltip_text(TTR("Auto insert keys when objects are translated, rotated or scaled (based on mask).\nKeys are only added to existing tracks, no new tracks will be created.\nKeys must be inserted manually for the first time."));
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
key_auto_insert_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/anim_auto_insert_key", TTR("Auto Insert Key")));
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
key_auto_insert_button->set_shortcut_context(this);
Implement autokeying in Animation editor.
2019-04-15 03:49:03 +00:00
animation_hb->add_child(key_auto_insert_button);
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
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
animation_menu = memnew(MenuButton);
Implement new shortcuts system. unhandled_key_input changed to unhandled_button_input. Controls can set a 'shortcut_context' which they can then use to determine if their shortcuts should be triggered or not, based on if the viewport's focused GUI control is a child of their 'shortcut context'.
2020-09-17 01:40:00 +00:00
animation_menu->set_shortcut_context(this);
Rename `hint_tooltip` to `tooltip_text` & setget `hint_tooltip` -> `tooltip_text` `set_tooltip` -> `set_tooltip_text` `_get_tooltip` -> `get_tooltip_text` Updates documentation, too.
2022-08-25 10:42:17 +00:00
animation_menu->set_tooltip_text(TTR("Animation Key and Pose Options"));
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
animation_hb->add_child(animation_menu);
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
animation_menu->get_popup()->connect("id_pressed", callable_mp(this, &CanvasItemEditor::_popup_callback));
Small ux improvement
2019-04-20 18:52:01 +00:00
animation_menu->set_switch_on_hover(true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
p = animation_menu->get_popup();
Canvas item editor shortcuts
2016-06-29 20:02:26 +00:00
p->add_shortcut(ED_GET_SHORTCUT("canvas_item_editor/anim_insert_key"), ANIM_INSERT_KEY);
Fix key mapping changes when moving from macOS to other platform Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
2022-09-02 09:37:48 +00:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_insert_key_existing_tracks", TTR("Insert Key (Existing Tracks)"), KeyModifierMask::CMD_OR_CTRL + Key::INSERT), ANIM_INSERT_KEY_EXISTING);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
p->add_separator();
Canvas item editor shortcuts
2016-06-29 20:02:26 +00:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_copy_pose", TTR("Copy Pose")), ANIM_COPY_POSE);
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_paste_pose", TTR("Paste Pose")), ANIM_PASTE_POSE);
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_clear_pose", TTR("Clear Pose"), KeyModifierMask::SHIFT | Key::K), ANIM_CLEAR_POSE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Small fixes in some editor dialogs
2015-10-18 16:31:44 +00:00
snap_dialog = memnew(SnapDialog);
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
snap_dialog->connect("confirmed", callable_mp(this, &CanvasItemEditor::_snap_changed));
Better 2D Snapping Consolidated duplicate snapping functions into CanvasItemEditor. Allow non-square grids. Add grid origin offsets. Allow seperate toggling of grid display. Add rotation snapping. Add offset snapping.
2015-02-15 08:00:55 +00:00
add_child(snap_dialog);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
select_sb = Ref<StyleBoxTexture>(memnew(StyleBoxTexture));
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
selection_menu = memnew(PopupMenu);
add_child(selection_menu);
Popups are now windows also (broken!)
2020-03-12 12:37:40 +00:00
selection_menu->set_min_size(Vector2(100, 0));
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
selection_menu->connect("id_pressed", callable_mp(this, &CanvasItemEditor::_selection_result_pressed));
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
selection_menu->connect("popup_hide", callable_mp(this, &CanvasItemEditor::_selection_menu_hide), CONNECT_DEFERRED);
Added selection menu to spatial and canvas editors
2015-11-04 21:39:07 +00:00
Allow to create a node at specific position
2020-08-24 23:32:58 +00:00
add_node_menu = memnew(PopupMenu);
add_child(add_node_menu);
add_node_menu->connect("id_pressed", callable_mp(this, &CanvasItemEditor::_add_node_pressed));
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
multiply_grid_step_shortcut = ED_SHORTCUT("canvas_item_editor/multiply_grid_step", TTR("Multiply grid step by 2"), Key::KP_MULTIPLY);
divide_grid_step_shortcut = ED_SHORTCUT("canvas_item_editor/divide_grid_step", TTR("Divide grid step by 2"), Key::KP_DIVIDE);
Implement shortcuts to multiply/divide the grid step
2017-08-31 19:54:42 +00:00
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 20:52:41 +00:00
skeleton_menu->get_popup()->set_item_checked(skeleton_menu->get_popup()->get_item_index(SKELETON_SHOW_BONES), true);
Reorganize inspector layout workflow for Control nodes
2021-11-08 20:53:41 +00:00
// Store the singleton instance.
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
singleton = this;
Insert new key helper is back to 2D editor, missed it?
2016-02-09 19:09:29 +00:00
[Input] Add extra `shortcut_input` input processing step to process Unicode character input with Alt / Ctrl modifiers, after processing of shortcuts.
2022-01-11 13:59:52 +00:00
set_process_shortcut_input(true);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 07:58:35 +00:00
// Update the menus' checkboxes
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
call_deferred(SNAME("set_state"), get_state());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
CanvasItemEditor *CanvasItemEditor::singleton = nullptr;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void CanvasItemEditorPlugin::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
canvas_item_editor->edit(Object::cast_to<CanvasItem>(p_object));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
bool CanvasItemEditorPlugin::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("CanvasItem");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void CanvasItemEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
canvas_item_editor->show();
Renamed fixed_process to physics_process
2017-09-30 14:19:07 +00:00
canvas_item_editor->set_physics_process(true);
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
RenderingServer::get_singleton()->viewport_set_disable_2d(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), false);
Remove viewport_set_disable_environment in favor of viewport_set_environment_mode This allows us to set a default value inherited by child viewports and have child viewports set the value themselves which is needed for disabling the environment in the editor
2023-01-30 00:04:39 +00:00
RenderingServer::get_singleton()->viewport_set_environment_mode(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), RS::VIEWPORT_ENVIRONMENT_ENABLED);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
canvas_item_editor->hide();
Renamed fixed_process to physics_process
2017-09-30 14:19:07 +00:00
canvas_item_editor->set_physics_process(false);
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
RenderingServer::get_singleton()->viewport_set_disable_2d(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), true);
Remove viewport_set_disable_environment in favor of viewport_set_environment_mode This allows us to set a default value inherited by child viewports and have child viewports set the value themselves which is needed for disabling the environment in the editor
2023-01-30 00:04:39 +00:00
RenderingServer::get_singleton()->viewport_set_environment_mode(EditorNode::get_singleton()->get_scene_root()->get_viewport_rid(), RS::VIEWPORT_ENVIRONMENT_DISABLED);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Dictionary CanvasItemEditorPlugin::get_state() const {
return canvas_item_editor->get_state();
}
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 CanvasItemEditorPlugin::set_state(const Dictionary &p_state) {
canvas_item_editor->set_state(p_state);
}
Redraw 2D viewport when scene changes
2022-10-13 22:22:46 +00:00
void CanvasItemEditorPlugin::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE: {
connect("scene_changed", callable_mp((CanvasItem *)canvas_item_editor->get_viewport_control(), &CanvasItem::queue_redraw).unbind(1));
connect("scene_closed", callable_mp((CanvasItem *)canvas_item_editor->get_viewport_control(), &CanvasItem::queue_redraw).unbind(1));
} break;
}
}
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
CanvasItemEditorPlugin::CanvasItemEditorPlugin() {
canvas_item_editor = memnew(CanvasItemEditor);
-Property apply limits to V/H Splits in main editor window. Fixes #3567
2016-02-08 16:01:54 +00:00
canvas_item_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
Rename EditorInterface.get_editor_main_control to get_editor_main_screen
2022-09-06 23:30:54 +00:00
EditorNode::get_singleton()->get_main_screen_control()->add_child(canvas_item_editor);
Rename Control PRESET_WIDE to PRESET_FULL_RECT
2022-03-19 00:02:57 +00:00
canvas_item_editor->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
canvas_item_editor->hide();
}
CanvasItemEditorPlugin::~CanvasItemEditorPlugin() {
}
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
void CanvasItemEditorViewport::_on_mouse_exit() {
New API for visibility in both CanvasItem and Spatial visible (property) - access set_visible(bool) is_visible() is_visible_in_tree() - true when visible and parents visible show() hide() - for convenience
2017-01-13 13:45:50 +00:00
if (!selector->is_visible()) {
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
_remove_preview();
}
}
void CanvasItemEditorViewport::_on_select_type(Object *selected) {
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
CheckBox *check = Object::cast_to<CheckBox>(selected);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
String type = check->get_text();
Fixed theme update and some widgets.
2017-11-11 17:57:54 +00:00
selector->set_title(vformat(TTR("Add %s"), type));
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
label->set_text(vformat(TTR("Adding %s..."), type));
}
Remove preview when closing "change default type" dialog.
2017-11-12 09:50:06 +00:00
void CanvasItemEditorViewport::_on_change_type_confirmed() {
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 (!button_group->get_pressed_button()) {
Groundbreaking!! Godot resources can now be flagged to be local to the scene being edited! This means that each time this scene is instanced, the resource will be unique! As such, thanks to this, the following features were implemented: -ButtonGroup is no longer a control, it's now a resource local to the scene -ViewportTexture can be created from the editor and set to any object, making ViewportSprite and other kind of nodes obsolete!
2017-01-10 04:04:31 +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
}
Groundbreaking!! Godot resources can now be flagged to be local to the scene being edited! This means that each time this scene is instanced, the resource will be unique! As such, thanks to this, the following features were implemented: -ButtonGroup is no longer a control, it's now a resource local to the scene -ViewportTexture can be created from the editor and set to any object, making ViewportSprite and other kind of nodes obsolete!
2017-01-10 04:04:31 +00:00
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
CheckBox *check = Object::cast_to<CheckBox>(button_group->get_pressed_button());
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
default_texture_node_type = check->get_text();
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
_perform_drop_data();
selector->hide();
}
Remove preview when closing "change default type" dialog.
2017-11-12 09:50:06 +00:00
void CanvasItemEditorViewport::_on_change_type_closed() {
_remove_preview();
}
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
void CanvasItemEditorViewport::_create_preview(const Vector<String> &files) const {
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +00:00
bool add_preview = false;
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
for (int i = 0; i < files.size(); i++) {
String path = files[i];
Remove `RES` and `REF` typedefs in favor of spelled out `Ref<>` These typedefs don't save much typing compared to the full `Ref<Resource>` and `Ref<RefCounted>`, yet they sometimes introduce confusion among new contributors.
2022-05-02 23:43:50 +00:00
Ref<Resource> res = ResourceLoader::load(path);
Add checks after ResourceLoader::load()
2019-09-29 12:17:42 +00:00
ERR_FAIL_COND(res.is_null());
Texture refactor -Texture renamed to Texture2D -TextureLayered as base now inherits 2Darray, cubemap and cubemap array -Removed all references to flags in textures (they will go in the shader) -Texture3D gone for now (will come back later done properly) -Create base rasterizer for RenderDevice, RasterizerRD
2019-06-11 18:43:37 +00:00
Ref<Texture2D> texture = Ref<Texture2D>(Object::cast_to<Texture2D>(*res));
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
Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
if (texture != nullptr || scene != nullptr) {
Fix incorrect hint when drag-and-drop asset into scene
2022-11-28 13:08:05 +00:00
bool root_node_selected = EditorNode::get_singleton()->get_editor_selection()->is_selected(EditorNode::get_singleton()->get_edited_scene());
String desc = TTR("Drag and drop to add as child of current scene's root node.") + "\n" + TTR("Hold Ctrl when dropping to add as child of selected node.");
if (!root_node_selected) {
desc += "\n" + TTR("Hold Shift when dropping to add as sibling of selected node.");
}
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
if (texture != nullptr) {
Renamed 2D and 3D nodes to make their types explicit Fixes #30736.
2020-03-26 21:49:16 +00:00
Sprite2D *sprite = memnew(Sprite2D);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
sprite->set_texture(texture);
Merge remote-tracking branch 'origin/gles3' into gles3-on-master Various merge conflicts have been fixed manually and some mistakes might have been made - time will tell :)
2017-01-02 20:38:20 +00:00
sprite->set_modulate(Color(1, 1, 1, 0.7f));
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
preview_node->add_child(sprite);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
label->show();
label_desc->show();
Fix incorrect hint when drag-and-drop asset into scene
2022-11-28 13:08:05 +00:00
desc += "\n" + TTR("Hold Alt when dropping to add as a different node type.");
label_desc->set_text(desc);
Fix drag and drop on 2d viewport
2017-03-13 10:35:27 +00:00
} else {
if (scene.is_valid()) {
Rename `instance()`->`instantiate()` when it's a verb
2021-06-17 22:03:09 +00:00
Node *instance = scene->instantiate();
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
if (instance) {
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
preview_node->add_child(instance);
Make drag and drop into viewport add to root node by default When dragging and dropping a texture, mesh, or scene from the FileSystem into the 2D or 3D viewport, it will be added as a child of the current scene's root node.
2021-07-29 11:15:46 +00:00
label_desc->show();
Fix incorrect hint when drag-and-drop asset into scene
2022-11-28 13:08:05 +00:00
label_desc->set_text(desc);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
}
}
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +00:00
add_preview = true;
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
}
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +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 (add_preview) {
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
EditorNode::get_singleton()->get_scene_root()->add_child(preview_node);
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
}
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
void CanvasItemEditorViewport::_remove_preview() {
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
if (preview_node->get_parent()) {
for (int i = preview_node->get_child_count() - 1; i >= 0; i--) {
Node *node = preview_node->get_child(i);
Rename queue_delete => queue_free # Conflicts: # editor/plugins/tiles/tiles_editor_plugin.cpp
2022-10-24 21:07:02 +00:00
node->queue_free();
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
preview_node->remove_child(node);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
EditorNode::get_singleton()->get_scene_root()->remove_child(preview_node);
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
label->hide();
label_desc->hide();
}
}
bool CanvasItemEditorViewport::_cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node) {
Rename Node's `filename` property to `scene_file_path` for clarity
2021-09-30 14:30:55 +00:00
if (p_desired_node->get_scene_file_path() == p_target_scene_path) {
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
return true;
}
int childCount = p_desired_node->get_child_count();
for (int i = 0; i < childCount; i++) {
Node *child = p_desired_node->get_child(i);
if (_cyclical_dependency_exists(p_target_scene_path, child)) {
return true;
}
}
return false;
}
void CanvasItemEditorViewport::_create_nodes(Node *parent, Node *child, String &path, const Point2 &p_point) {
Name nodes added from drag & drop by `name_casing`
2021-07-29 04:26:34 +00:00
// Adjust casing according to project setting. The file name is expected to be in snake_case, but will work for others.
String name = path.get_file().get_basename();
Unify node casing adjustment
2022-08-18 11:47:05 +00:00
child->set_name(Node::adjust_name_casing(name));
Name nodes added from drag & drop by `name_casing`
2021-07-29 04:26:34 +00:00
Add EditorUndoRedoManager singleton
2022-12-23 22:53:16 +00:00
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
Remake resource thread safety and API * Ensures thread safety when resources are destroyed. * Simplified API by always forcing `ResourceCache::get_ref`, which needs less hacks and is fully thread safe. * Removed RWLock for resources because its not possible to use for the new logic. Should not be a problem. Supersedes #57533
2022-06-22 11:46:46 +00:00
Ref<Texture2D> texture = ResourceCache::get_ref(path);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
When drag'n'drop (lets say, picture in 2D mode), automatically create dragged resource as a root node if you haven't any yet.
2017-11-22 02:28:02 +00:00
if (parent) {
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->add_do_method(parent, "add_child", child, true);
undo_redo->add_do_method(child, "set_owner", EditorNode::get_singleton()->get_edited_scene());
undo_redo->add_do_reference(child);
undo_redo->add_undo_method(parent, "remove_child", child);
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
} else { // If no parent is selected, set as root node of the scene.
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->add_do_method(EditorNode::get_singleton(), "set_edited_scene", child);
undo_redo->add_do_method(child, "set_owner", EditorNode::get_singleton()->get_edited_scene());
undo_redo->add_do_reference(child);
undo_redo->add_undo_method(EditorNode::get_singleton(), "set_edited_scene", (Object *)nullptr);
When drag'n'drop (lets say, picture in 2D mode), automatically create dragged resource as a root node if you haven't any yet.
2017-11-22 02:28:02 +00:00
}
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
When drag'n'drop (lets say, picture in 2D mode), automatically create dragged resource as a root node if you haven't any yet.
2017-11-22 02:28:02 +00:00
if (parent) {
String new_name = parent->validate_child_name(child);
Huge Debugger/EditorDebugger refactor.
2020-02-07 01:52:05 +00:00
EditorDebuggerNode *ed = EditorDebuggerNode::get_singleton();
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->add_do_method(ed, "live_debug_create_node", EditorNode::get_singleton()->get_edited_scene()->get_path_to(parent), child->get_class(), new_name);
undo_redo->add_undo_method(ed, "live_debug_remove_node", NodePath(String(EditorNode::get_singleton()->get_edited_scene()->get_path_to(parent)) + "/" + new_name));
When drag'n'drop (lets say, picture in 2D mode), automatically create dragged resource as a root node if you haven't any yet.
2017-11-22 02:28:02 +00:00
}
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
Fix node types in image drag-and-drop and add node icons
2022-02-05 18:28:16 +00:00
if (Object::cast_to<TouchScreenButton>(child) || Object::cast_to<TextureButton>(child)) {
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->add_do_property(child, "texture_normal", texture);
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
} else {
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->add_do_property(child, "texture", texture);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
// make visible for certain node type
Refactor some object type checking code with `cast_to` Less stringly typed logic, and less String allocations and comparisons.
2022-02-06 13:12:19 +00:00
if (Object::cast_to<Control>(child)) {
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
Size2 texture_size = texture->get_size();
Adjust position and size for dropping texture.
2022-11-30 08:28:49 +00:00
undo_redo->add_do_property(child, "size", texture_size);
Fix node types in image drag-and-drop and add node icons
2022-02-05 18:28:16 +00:00
} else if (Object::cast_to<Polygon2D>(child)) {
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
Size2 texture_size = texture->get_size();
Use List Initializations for Vectors.
2022-01-11 15:27:39 +00:00
Vector<Vector2> list = {
Vector2(0, 0),
Vector2(texture_size.width, 0),
Vector2(texture_size.width, texture_size.height),
Vector2(0, texture_size.height)
};
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->add_do_property(child, "polygon", list);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
Fixes drag and drog of image files on scaled nodes
2018-11-16 15:55:28 +00:00
// Compute the global position
Transform2D xform = canvas_item_editor->get_canvas_transform();
Point2 target_position = xform.affine_inverse().xform(p_point);
Adjust position and size for dropping texture.
2022-11-30 08:28:49 +00:00
// Adjust position for Control and TouchScreenButton
if (Object::cast_to<Control>(child) || Object::cast_to<TouchScreenButton>(child)) {
target_position -= texture->get_size() / 2;
}
Improved 2D snapping behavior Make snapping affect nodes created by drag & drop Make snapping for a single Node2D refer to its pivot Refactor duplicate drag setup code Replace one occurrence of the old set_pos by set_position
2017-03-22 23:47:51 +00:00
// there's nothing to be used as source position so snapping will work as absolute if enabled
Fixes drag and drog of image files on scaled nodes
2018-11-16 15:55:28 +00:00
target_position = canvas_item_editor->snap_point(target_position);
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->add_do_method(child, "set_global_position", target_position);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
bool CanvasItemEditorViewport::_create_instance(Node *parent, String &path, const Point2 &p_point) {
Ref<PackedScene> sdata = ResourceLoader::load(path);
if (!sdata.is_valid()) { // invalid scene
return false;
}
Rename `instance()`->`instantiate()` when it's a verb
2021-06-17 22:03:09 +00:00
Node *instantiated_scene = sdata->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
Remove more instances of 'instance' being used as a verb
2022-11-15 23:13:39 +00:00
if (!instantiated_scene) { // Error on instantiation.
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
return false;
}
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
Remove more instances of 'instance' being used as a verb
2022-11-15 23:13:39 +00:00
if (!edited_scene->get_scene_file_path().is_empty()) { // Cyclic instantiation.
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
if (_cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
Rename `instance()`->`instantiate()` when it's a verb
2021-06-17 22:03:09 +00:00
memdelete(instantiated_scene);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
return false;
}
}
Rename Node's `filename` property to `scene_file_path` for clarity
2021-09-30 14:30:55 +00:00
instantiated_scene->set_scene_file_path(ProjectSettings::get_singleton()->localize_path(path));
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
Add EditorUndoRedoManager singleton
2022-12-23 22:53:16 +00:00
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->add_do_method(parent, "add_child", instantiated_scene, true);
undo_redo->add_do_method(instantiated_scene, "set_owner", edited_scene);
undo_redo->add_do_reference(instantiated_scene);
undo_redo->add_undo_method(parent, "remove_child", instantiated_scene);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
Rename `instance()`->`instantiate()` when it's a verb
2021-06-17 22:03:09 +00:00
String new_name = parent->validate_child_name(instantiated_scene);
Huge Debugger/EditorDebugger refactor.
2020-02-07 01:52:05 +00:00
EditorDebuggerNode *ed = EditorDebuggerNode::get_singleton();
Remove more instances of 'instance' being used as a verb
2022-11-15 23:13:39 +00:00
undo_redo->add_do_method(ed, "live_debug_instantiate_node", edited_scene->get_path_to(parent), path, new_name);
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->add_undo_method(ed, "live_debug_remove_node", NodePath(String(edited_scene->get_path_to(parent)) + "/" + new_name));
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
Fix 2D instance drop position
2022-02-20 21:36:14 +00:00
CanvasItem *instance_ci = Object::cast_to<CanvasItem>(instantiated_scene);
if (instance_ci) {
Fixes drag and drog of image files on scaled nodes
2018-11-16 15:55:28 +00:00
Vector2 target_pos = canvas_item_editor->get_canvas_transform().affine_inverse().xform(p_point);
target_pos = canvas_item_editor->snap_point(target_pos);
Fix 2D instance drop position
2022-02-20 21:36:14 +00:00
CanvasItem *parent_ci = Object::cast_to<CanvasItem>(parent);
if (parent_ci) {
target_pos = parent_ci->get_global_transform_with_canvas().affine_inverse().xform(target_pos);
CanvasItemEditor: Fix losing position for drag'n'dropped scenes Fixes #26549. Supersedes #36309.
2020-06-22 12:16:59 +00:00
}
Fix 2D instance drop position
2022-02-20 21:36:14 +00:00
// Preserve instance position of the original scene.
target_pos += instance_ci->_edit_get_position();
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->add_do_method(instantiated_scene, "set_position", target_pos);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
return true;
}
void CanvasItemEditorViewport::_perform_drop_data() {
_remove_preview();
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +00:00
// Without root dropping multiple files is not allowed
if (!target_node && selected_files.size() > 1) {
accept->set_text(TTR("Cannot instantiate multiple nodes without root."));
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
accept->popup_centered();
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +00:00
return;
}
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
Vector<String> error_files;
Add EditorUndoRedoManager singleton
2022-12-23 22:53:16 +00:00
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->create_action(TTR("Create Node"));
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
for (int i = 0; i < selected_files.size(); i++) {
String path = selected_files[i];
Remove `RES` and `REF` typedefs in favor of spelled out `Ref<>` These typedefs don't save much typing compared to the full `Ref<Resource>` and `Ref<RefCounted>`, yet they sometimes introduce confusion among new contributors.
2022-05-02 23:43:50 +00:00
Ref<Resource> res = ResourceLoader::load(path);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
if (res.is_null()) {
continue;
}
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
Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
if (scene != nullptr && scene.is_valid()) {
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +00:00
if (!target_node) {
// Without root node act the same as "Load Inherited Scene"
Error err = EditorNode::get_singleton()->load_scene(path, false, true);
if (err != OK) {
error_files.push_back(path);
}
} else {
bool success = _create_instance(target_node, path, drop_pos);
if (!success) {
error_files.push_back(path);
}
}
} else {
Texture refactor -Texture renamed to Texture2D -TextureLayered as base now inherits 2Darray, cubemap and cubemap array -Removed all references to flags in textures (they will go in the shader) -Texture3D gone for now (will come back later done properly) -Create base rasterizer for RenderDevice, RasterizerRD
2019-06-11 18:43:37 +00:00
Ref<Texture2D> texture = Ref<Texture2D>(Object::cast_to<Texture2D>(*res));
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
if (texture != nullptr && texture.is_valid()) {
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
Node *child = _make_texture_node_type(default_texture_node_type);
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +00:00
_create_nodes(target_node, child, path, drop_pos);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
}
}
Unify usage of undo_redo in editor
2022-08-29 10:10:32 +00:00
undo_redo->commit_action();
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
if (error_files.size() > 0) {
String files_str;
for (int i = 0; i < error_files.size(); i++) {
rename String.extension() -> String.get_extension() / String.basename() -> String.get_basename()
2017-01-14 03:51:09 +00:00
files_str += error_files[i].get_file().get_basename() + ",";
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
files_str = files_str.substr(0, files_str.length() - 1);
Remove more instances of 'instance' being used as a verb
2022-11-15 23:13:39 +00:00
accept->set_text(vformat(TTR("Error instantiating scene from %s"), files_str.get_data()));
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
accept->popup_centered();
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
}
bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Variant &p_data) const {
Dictionary d = p_data;
if (d.has("type")) {
if (String(d["type"]) == "files") {
Vector<String> files = d["files"];
Rename `instance()`->`instantiate()` when it's a verb
2021-06-17 22:03:09 +00:00
bool can_instantiate = false;
Refactor some object type checking code with `cast_to` Less stringly typed logic, and less String allocations and comparisons.
2022-02-06 13:12:19 +00:00
List<String> scene_extensions;
ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions);
List<String> texture_extensions;
ResourceLoader::get_recognized_extensions_for_type("Texture2D", &texture_extensions);
for (int i = 0; i < files.size(); i++) {
Cast dragged file extension name to lowercase, closes #68104
2022-11-01 07:58:04 +00:00
String extension = files[i].get_extension().to_lower();
Refactor some object type checking code with `cast_to` Less stringly typed logic, and less String allocations and comparisons.
2022-02-06 13:12:19 +00:00
// Check if dragged files with texture or scene extension can be created at least once.
Cast dragged file extension name to lowercase, closes #68104
2022-11-01 07:58:04 +00:00
if (texture_extensions.find(extension) || scene_extensions.find(extension)) {
Remove `RES` and `REF` typedefs in favor of spelled out `Ref<>` These typedefs don't save much typing compared to the full `Ref<Resource>` and `Ref<RefCounted>`, yet they sometimes introduce confusion among new contributors.
2022-05-02 23:43:50 +00:00
Ref<Resource> res = ResourceLoader::load(files[i]);
Refactor some object type checking code with `cast_to` Less stringly typed logic, and less String allocations and comparisons.
2022-02-06 13:12:19 +00:00
if (res.is_null()) {
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
continue;
}
Refactor some object type checking code with `cast_to` Less stringly typed logic, and less String allocations and comparisons.
2022-02-06 13:12:19 +00:00
Ref<PackedScene> scn = res;
if (scn.is_valid()) {
Node *instantiated_scene = scn->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
if (!instantiated_scene) {
continue;
}
memdelete(instantiated_scene);
Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.
2017-09-16 13:57:17 +00:00
}
Refactor some object type checking code with `cast_to` Less stringly typed logic, and less String allocations and comparisons.
2022-02-06 13:12:19 +00:00
can_instantiate = true;
break;
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
}
Rename `instance()`->`instantiate()` when it's a verb
2021-06-17 22:03:09 +00:00
if (can_instantiate) {
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
if (!preview_node->get_parent()) { // create preview only once
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
_create_preview(files);
}
Fixes drag and drog of image files on scaled nodes
2018-11-16 15:55:28 +00:00
Transform2D trans = canvas_item_editor->get_canvas_transform();
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
preview_node->set_position((p_point - trans.get_origin()) / trans.get_scale().x);
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
label->set_text(vformat(TTR("Adding %s..."), default_texture_node_type));
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
Rename `instance()`->`instantiate()` when it's a verb
2021-06-17 22:03:09 +00:00
return can_instantiate;
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
}
label->hide();
return false;
}
When drag'n'drop (lets say, picture in 2D mode), automatically create dragged resource as a root node if you haven't any yet.
2017-11-22 02:28:02 +00:00
void CanvasItemEditorViewport::_show_resource_type_selector() {
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +00:00
_remove_preview();
When drag'n'drop (lets say, picture in 2D mode), automatically create dragged resource as a root node if you haven't any yet.
2017-11-22 02:28:02 +00:00
List<BaseButton *> btn_list;
button_group->get_buttons(&btn_list);
for (int i = 0; i < btn_list.size(); i++) {
CheckBox *check = Object::cast_to<CheckBox>(btn_list[i]);
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
check->set_pressed(check->get_text() == default_texture_node_type);
When drag'n'drop (lets say, picture in 2D mode), automatically create dragged resource as a root node if you haven't any yet.
2017-11-22 02:28:02 +00:00
}
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
selector->set_title(vformat(TTR("Add %s"), default_texture_node_type));
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
selector->popup_centered();
When drag'n'drop (lets say, picture in 2D mode), automatically create dragged resource as a root node if you haven't any yet.
2017-11-22 02:28:02 +00:00
}
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +00:00
bool CanvasItemEditorViewport::_only_packed_scenes_selected() const {
for (int i = 0; i < selected_files.size(); ++i) {
if (ResourceLoader::load(selected_files[i])->get_class() != "PackedScene") {
return false;
}
}
return true;
}
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
void CanvasItemEditorViewport::drop_data(const Point2 &p_point, const Variant &p_data) {
Use "enum class" for input enums
2021-08-13 21:31:57 +00:00
bool is_shift = Input::get_singleton()->is_key_pressed(Key::SHIFT);
bool is_ctrl = Input::get_singleton()->is_key_pressed(Key::CTRL);
bool is_alt = Input::get_singleton()->is_key_pressed(Key::ALT);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
selected_files.clear();
Dictionary d = p_data;
if (d.has("type") && String(d["type"]) == "files") {
selected_files = d["files"];
}
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 (selected_files.size() == 0) {
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +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
}
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
List<Node *> selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list();
Node *root_node = EditorNode::get_singleton()->get_edited_scene();
Make drag and drop into viewport add to root node by default When dragging and dropping a texture, mesh, or scene from the FileSystem into the 2D or 3D viewport, it will be added as a child of the current scene's root node.
2021-07-29 11:15:46 +00:00
if (selected_nodes.size() > 0) {
Node *selected_node = selected_nodes[0];
target_node = root_node;
if (is_ctrl) {
target_node = selected_node;
} else if (is_shift && selected_node != root_node) {
target_node = selected_node->get_parent();
}
} else {
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
if (root_node) {
Make drag and drop into viewport add to root node by default When dragging and dropping a texture, mesh, or scene from the FileSystem into the 2D or 3D viewport, it will be added as a child of the current scene's root node.
2021-07-29 11:15:46 +00:00
target_node = root_node;
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
} else {
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
target_node = nullptr;
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
}
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
drop_pos = p_point;
- Fixes #15470 "Crash on drag and drop scene file on empty scene" - New: Allows for multiple files to be dragged over - Added error when multiple nodes are dropped in scene **without** scene root - Removed TTR: "This operation requires a single selected node.", "I see.." - Introduces TTR: "Can not instaniate multiple nodes without root." - Fixes "Can't add_child, already got a parent" error - Reduced multiple resource loading by casting - Make sure to not _show_resource_type_selector if only PackedScenes are being dropped
2018-01-09 06:05:15 +00:00
if (is_alt && !_only_packed_scenes_selected()) {
When drag'n'drop (lets say, picture in 2D mode), automatically create dragged resource as a root node if you haven't any yet.
2017-11-22 02:28:02 +00:00
_show_resource_type_selector();
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
} else {
_perform_drop_data();
}
}
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
Node *CanvasItemEditorViewport::_make_texture_node_type(String texture_node_type) {
Node *node = nullptr;
if (texture_node_type == "Sprite2D") {
node = memnew(Sprite2D);
} else if (texture_node_type == "PointLight2D") {
node = memnew(PointLight2D);
} else if (texture_node_type == "CPUParticles2D") {
node = memnew(CPUParticles2D);
} else if (texture_node_type == "GPUParticles2D") {
node = memnew(GPUParticles2D);
} else if (texture_node_type == "Polygon2D") {
node = memnew(Polygon2D);
} else if (texture_node_type == "TouchScreenButton") {
node = memnew(TouchScreenButton);
} else if (texture_node_type == "TextureRect") {
node = memnew(TextureRect);
} else if (texture_node_type == "TextureButton") {
node = memnew(TextureButton);
} else if (texture_node_type == "NinePatchRect") {
node = memnew(NinePatchRect);
}
return node;
}
Revert "Remove NOTIFICATION_ENTER_TREE when paired with NOTIFICATION_THEME_CHANGED" This reverts commit 4b817a565cab8af648c88cfc7ab6481e86ee3625. Fixes #64988. Fixes #64997. This caused several regressions (#64988, #64997, https://github.com/godotengine/godot/issues/64997#issuecomment-1229970605) which point at a flaw in the current logic: - `Control::NOTIFICATION_ENTER_TREE` triggers a *deferred* notification with `NOTIFCATION_THEME_CHANGED` as introduced in #62845. - Some classes use their `THEME_CHANGED` to cache theme items in member variables (e.g. `style_normal`, etc.), and use those member variables in `ENTER_TREE`, `READY`, `DRAW`, etc. Since the `THEME_CHANGE` notification is now deferred, they end up accessing invalid state and this can lead to not applying theme properly (e.g. for EditorHelp) or crashing (e.g. for EditorLog or CodeEdit). So we need to go back to the drawing board and see if `THEME_CHANGED` can be called earlier so that the previous logic still works? Or can we refactor all engine code to make sure that: - `ENTER_TREE` and similar do not depend on theme properties cached in member variables. - Or `THEME_CHANGE` does trigger a general UI update to make sure that any bad theme handling in `ENTER_TREE` and co. gets fixed when `THEME_CHANGE` does arrive for the first time. But that means having a temporary invalid (and possibly still crashing) state, and doing some computations twice which might be heavy (e.g. `EditorHelp::_update_doc()`).
2022-08-29 09:04:31 +00:00
void CanvasItemEditorViewport::_update_theme() {
List<BaseButton *> btn_list;
button_group->get_buttons(&btn_list);
for (int i = 0; i < btn_list.size(); i++) {
CheckBox *check = Object::cast_to<CheckBox>(btn_list[i]);
check->set_icon(get_theme_icon(check->get_text(), SNAME("EditorIcons")));
}
label->add_theme_color_override("font_color", get_theme_color(SNAME("warning_color"), SNAME("Editor")));
}
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
void CanvasItemEditorViewport::_notification(int p_what) {
Improved add texture as node dialog
2017-08-10 16:40:28 +00:00
switch (p_what) {
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
case NOTIFICATION_THEME_CHANGED: {
Revert "Remove NOTIFICATION_ENTER_TREE when paired with NOTIFICATION_THEME_CHANGED" This reverts commit 4b817a565cab8af648c88cfc7ab6481e86ee3625. Fixes #64988. Fixes #64997. This caused several regressions (#64988, #64997, https://github.com/godotengine/godot/issues/64997#issuecomment-1229970605) which point at a flaw in the current logic: - `Control::NOTIFICATION_ENTER_TREE` triggers a *deferred* notification with `NOTIFCATION_THEME_CHANGED` as introduced in #62845. - Some classes use their `THEME_CHANGED` to cache theme items in member variables (e.g. `style_normal`, etc.), and use those member variables in `ENTER_TREE`, `READY`, `DRAW`, etc. Since the `THEME_CHANGE` notification is now deferred, they end up accessing invalid state and this can lead to not applying theme properly (e.g. for EditorHelp) or crashing (e.g. for EditorLog or CodeEdit). So we need to go back to the drawing board and see if `THEME_CHANGED` can be called earlier so that the previous logic still works? Or can we refactor all engine code to make sure that: - `ENTER_TREE` and similar do not depend on theme properties cached in member variables. - Or `THEME_CHANGE` does trigger a general UI update to make sure that any bad theme handling in `ENTER_TREE` and co. gets fixed when `THEME_CHANGE` does arrive for the first time. But that means having a temporary invalid (and possibly still crashing) state, and doing some computations twice which might be heavy (e.g. `EditorHelp::_update_doc()`).
2022-08-29 09:04:31 +00:00
_update_theme();
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
} break;
Improved add texture as node dialog
2017-08-10 16:40:28 +00:00
case NOTIFICATION_ENTER_TREE: {
Revert "Remove NOTIFICATION_ENTER_TREE when paired with NOTIFICATION_THEME_CHANGED" This reverts commit 4b817a565cab8af648c88cfc7ab6481e86ee3625. Fixes #64988. Fixes #64997. This caused several regressions (#64988, #64997, https://github.com/godotengine/godot/issues/64997#issuecomment-1229970605) which point at a flaw in the current logic: - `Control::NOTIFICATION_ENTER_TREE` triggers a *deferred* notification with `NOTIFCATION_THEME_CHANGED` as introduced in #62845. - Some classes use their `THEME_CHANGED` to cache theme items in member variables (e.g. `style_normal`, etc.), and use those member variables in `ENTER_TREE`, `READY`, `DRAW`, etc. Since the `THEME_CHANGE` notification is now deferred, they end up accessing invalid state and this can lead to not applying theme properly (e.g. for EditorHelp) or crashing (e.g. for EditorLog or CodeEdit). So we need to go back to the drawing board and see if `THEME_CHANGED` can be called earlier so that the previous logic still works? Or can we refactor all engine code to make sure that: - `ENTER_TREE` and similar do not depend on theme properties cached in member variables. - Or `THEME_CHANGE` does trigger a general UI update to make sure that any bad theme handling in `ENTER_TREE` and co. gets fixed when `THEME_CHANGE` does arrive for the first time. But that means having a temporary invalid (and possibly still crashing) state, and doing some computations twice which might be heavy (e.g. `EditorHelp::_update_doc()`).
2022-08-29 09:04:31 +00:00
_update_theme();
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
connect("mouse_exited", callable_mp(this, &CanvasItemEditorViewport::_on_mouse_exit));
Improved add texture as node dialog
2017-08-10 16:40:28 +00:00
} break;
Update if == NOTIFICATION_* to switch statements to match coding style
2022-02-16 02:44:22 +00:00
Improved add texture as node dialog
2017-08-10 16:40:28 +00:00
case NOTIFICATION_EXIT_TREE: {
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
disconnect("mouse_exited", callable_mp(this, &CanvasItemEditorViewport::_on_mouse_exit));
Improved add texture as node dialog
2017-08-10 16:40:28 +00:00
} break;
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
}
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
CanvasItemEditorViewport::CanvasItemEditorViewport(CanvasItemEditor *p_canvas_item_editor) {
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
default_texture_node_type = "Sprite2D";
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
// Node2D
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
texture_node_types.push_back("Sprite2D");
texture_node_types.push_back("PointLight2D");
texture_node_types.push_back("CPUParticles2D");
texture_node_types.push_back("GPUParticles2D");
texture_node_types.push_back("Polygon2D");
texture_node_types.push_back("TouchScreenButton");
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
// Control
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
texture_node_types.push_back("TextureRect");
texture_node_types.push_back("TextureButton");
texture_node_types.push_back("NinePatchRect");
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
Replace NULL with nullptr
2020-04-01 23:20:12 +00:00
target_node = nullptr;
Fixes drag and drog of image files on scaled nodes
2018-11-16 15:55:28 +00:00
canvas_item_editor = p_canvas_item_editor;
Fix some unnecessary includes
2021-08-12 23:05:59 +00:00
preview_node = memnew(Control);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
accept = memnew(AcceptDialog);
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
EditorNode::get_singleton()->get_gui_base()->add_child(accept);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
Improved add texture as node dialog
2017-08-10 16:40:28 +00:00
selector = memnew(AcceptDialog);
Remove most EditorNode constructor parameters and fields
2022-01-27 09:36:51 +00:00
EditorNode::get_singleton()->get_gui_base()->add_child(selector);
Improve wording of various messages and make casing more consistent This also adds the number of selected projects to the confirmation dialog that appears before removing projects.
2019-03-25 00:54:29 +00:00
selector->set_title(TTR("Change Default Type"));
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
selector->connect("confirmed", callable_mp(this, &CanvasItemEditorViewport::_on_change_type_confirmed));
Convert en_GB spelling to en_US with codespell
2023-01-21 11:25:29 +00:00
selector->connect("canceled", callable_mp(this, &CanvasItemEditorViewport::_on_change_type_closed));
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
VBoxContainer *vbc = memnew(VBoxContainer);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
selector->add_child(vbc);
Working multiple window support, including editor
2020-03-06 17:00:16 +00:00
vbc->set_h_size_flags(Control::SIZE_EXPAND_FILL);
vbc->set_v_size_flags(Control::SIZE_EXPAND_FILL);
change minimum horizontal size from 200 to 240
2020-07-11 19:21:45 +00:00
vbc->set_custom_minimum_size(Size2(240, 260) * EDSCALE);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
Groundbreaking!! Godot resources can now be flagged to be local to the scene being edited! This means that each time this scene is instanced, the resource will be unique! As such, thanks to this, the following features were implemented: -ButtonGroup is no longer a control, it's now a resource local to the scene -ViewportTexture can be created from the editor and set to any object, making ViewportSprite and other kind of nodes obsolete!
2017-01-10 04:04:31 +00:00
btn_group = memnew(VBoxContainer);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
vbc->add_child(btn_group);
Fix node types in image drag-and-drop and add node icons
2022-02-05 18:28:16 +00:00
btn_group->set_h_size_flags(SIZE_EXPAND_FILL);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
Rename `instance()`->`instantiate()` when it's a verb
2021-06-17 22:03:09 +00:00
button_group.instantiate();
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
for (int i = 0; i < texture_node_types.size(); i++) {
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
CheckBox *check = memnew(CheckBox);
Display draggable anchors only if the parent is not a container
2017-08-19 16:29:37 +00:00
btn_group->add_child(check);
Improve drag and drop by supporting more file types & node types Adds support for dragging in all files of type Texture2D for 2D. Adds support for dragging in all files of type Mesh for 3D. Replaces adding texture as Light2D with PointLight2D. Add more node types that textures can be added as - TextureButton - CPUParticles2D
2021-07-29 06:46:38 +00:00
check->set_text(texture_node_types[i]);
Remove Signal connect binds Remove the optional argument p_binds from `Object::connect` since it was deprecated by Callable.bind(). Changed all uses of it to Callable.bind()
2022-07-28 20:56:41 +00:00
check->connect("button_down", callable_mp(this, &CanvasItemEditorViewport::_on_select_type).bind(check));
Groundbreaking!! Godot resources can now be flagged to be local to the scene being edited! This means that each time this scene is instanced, the resource will be unique! As such, thanks to this, the following features were implemented: -ButtonGroup is no longer a control, it's now a resource local to the scene -ViewportTexture can be created from the editor and set to any object, making ViewportSprite and other kind of nodes obsolete!
2017-01-10 04:04:31 +00:00
check->set_button_group(button_group);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
label = memnew(Label);
Revert "Add missing SNAME macro optimization to all theme methods call" This reverts commit a988fad9a092053434545c32afae91ccbdfbe792. As discussed in #57725 and clarified in #57788, `SNAME` is not meant to be used everywhere but only in critical code paths. For theme methods specifically, it was by design that only getters use `SNAME` and not setters.
2022-02-08 09:14:58 +00:00
label->add_theme_color_override("font_shadow_color", Color(0, 0, 0, 1));
label->add_theme_constant_override("shadow_outline_size", 1 * EDSCALE);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
label->hide();
Fixed "Add Sprite..." label overlapping with zoom controls
2019-11-18 09:49:37 +00:00
canvas_item_editor->get_controls_container()->add_child(label);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
label_desc = memnew(Label);
Revert "Add missing SNAME macro optimization to all theme methods call" This reverts commit a988fad9a092053434545c32afae91ccbdfbe792. As discussed in #57725 and clarified in #57788, `SNAME` is not meant to be used everywhere but only in critical code paths. For theme methods specifically, it was by design that only getters use `SNAME` and not setters.
2022-02-08 09:14:58 +00:00
label_desc->add_theme_color_override("font_color", Color(0.6f, 0.6f, 0.6f, 1));
label_desc->add_theme_color_override("font_shadow_color", Color(0.2f, 0.2f, 0.2f, 1));
label_desc->add_theme_constant_override("shadow_outline_size", 1 * EDSCALE);
label_desc->add_theme_constant_override("line_spacing", 0);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
label_desc->hide();
Fixed "Add Sprite..." label overlapping with zoom controls
2019-11-18 09:49:37 +00:00
canvas_item_editor->get_controls_container()->add_child(label_desc);
Renaming of servers for coherency. VisualServer -> RenderingServer PhysicsServer -> PhysicsServer3D Physics2DServer -> PhysicsServer2D NavigationServer -> NavigationServer3D Navigation2DServer -> NavigationServer2D Also renamed corresponding files.
2020-03-27 18:21:27 +00:00
RS::get_singleton()->canvas_set_disable_scale(true);
Improve drag and drop on 2D viewport
2016-10-25 19:27:24 +00:00
}
Fixed several memory leaks
2017-08-24 16:51:28 +00:00
CanvasItemEditorViewport::~CanvasItemEditorViewport() {
Added support for drag and drop in spatial editor.
2017-09-02 19:47:16 +00:00
memdelete(preview_node);
Fixed several memory leaks
2017-08-24 16:51:28 +00:00
}