asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
virtualx-engine/editor/plugins/canvas_item_editor_plugin.cpp

5089 lines
192 KiB
C++
Raw Normal View History

GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/*************************************************************************/
/* canvas_item_editor_plugin.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
Use HTTPS URL for Godot's website in the headers
2017-08-27 14:16:55 +02:00
/* https://godotengine.org */
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/*************************************************************************/
Update copyright statements to 2018 Happy new year to the wonderful Godot community!
2018-01-01 14:40:08 +01:00
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
Add missing copyright headers and fix formatting Using `misc/scripts/fix_headers.py` on all Godot files. Some missing header guards were added, and the header inclusion order was fixed in the Bullet module.
2018-01-05 00:50:27 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:04:19 +01:00
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 14:21:25 +01:00
#include "editor/editor_node.h"
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 16:44:50 +01:00
#include "editor/editor_settings.h"
#include "editor/plugins/animation_player_editor_plugin.h"
#include "editor/plugins/script_editor_plugin.h"
#include "editor/script_editor_debugger.h"
#include "os/input.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "os/keyboard.h"
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 16:44:50 +01:00
#include "print_string.h"
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
#include "project_settings.h"
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
#include "scene/2d/light_2d.h"
#include "scene/2d/particles_2d.h"
#include "scene/2d/polygon_2d.h"
#include "scene/2d/screen_button.h"
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
#include "scene/2d/skeleton_2d.h"
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 16:44:50 +01:00
#include "scene/2d/sprite.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 09:00:55 +01:00
#include "scene/gui/grid_container.h"
Finished transition of Patch9Rect to NinePatchRect
2017-10-24 07:59:04 +02:00
#include "scene/gui/nine_patch_rect.h"
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 16:44:50 +01:00
#include "scene/main/canvas_layer.h"
#include "scene/main/viewport.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 12:59:50 +02: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 09:00:55 +01:00
Some optimizations and limits for extreme zoom in and out in editor, fixes #5820
2016-07-21 15:06:38 +02:00
#define MIN_ZOOM 0.01
#define MAX_ZOOM 100
Implements rulers
2017-08-29 21:50:18 +02:00
#define RULER_WIDTH 15 * EDSCALE
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 09:00:55 +01:00
class SnapDialog : public ConfirmationDialog {
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 16:44:50 +01:00
GDCLASS(SnapDialog, ConfirmationDialog);
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
friend class CanvasItemEditor;
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02: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 09:00:55 +01:00
SpinBox *grid_offset_x;
SpinBox *grid_offset_y;
SpinBox *grid_step_x;
remove trailing whitespace
2016-03-09 00:00:52 +01:00
SpinBox *grid_step_y;
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 09:00:55 +01:00
SpinBox *rotation_step;
remove trailing whitespace
2016-03-09 00:00:52 +01: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 09:00:55 +01:00
public:
Style: Apply new clang-format 5.0 style to all files
2017-12-06 21:36:34 +01:00
SnapDialog() :
ConfirmationDialog() {
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 09:00:55 +01:00
const int SPIN_BOX_GRID_RANGE = 256;
const int SPIN_BOX_ROTATION_RANGE = 360;
Label *label;
VBoxContainer *container;
GridContainer *child_container;
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
set_title(TTR("Configure Snap"));
get_ok()->set_text(TTR("Close"));
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01: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 09:00:55 +01:00
add_child(container);
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 12:26:56 +01:00
//set_child_rect(container);
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01: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 09:00:55 +01:00
child_container->set_columns(3);
container->add_child(child_container);
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
label = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02: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 09:00:55 +01:00
child_container->add_child(label);
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
label->set_h_size_flags(SIZE_EXPAND_FILL);
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 16:44:50 +01: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 09:00:55 +01:00
grid_offset_x->set_min(-SPIN_BOX_GRID_RANGE);
grid_offset_x->set_max(SPIN_BOX_GRID_RANGE);
grid_offset_x->set_suffix("px");
child_container->add_child(grid_offset_x);
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01: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 09:00:55 +01:00
grid_offset_y->set_min(-SPIN_BOX_GRID_RANGE);
grid_offset_y->set_max(SPIN_BOX_GRID_RANGE);
grid_offset_y->set_suffix("px");
child_container->add_child(grid_offset_y);
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 16:44:50 +01:00
label = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02: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 09:00:55 +01:00
child_container->add_child(label);
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
label->set_h_size_flags(SIZE_EXPAND_FILL);
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 16:44:50 +01:00
grid_step_x = memnew(SpinBox);
Avoid grid step to go below zero
2017-09-03 21:13:59 +02:00
grid_step_x->set_min(0.01);
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 09:00:55 +01:00
grid_step_x->set_max(SPIN_BOX_GRID_RANGE);
grid_step_x->set_suffix("px");
child_container->add_child(grid_step_x);
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
grid_step_y = memnew(SpinBox);
Avoid grid step to go below zero
2017-09-03 21:13:59 +02:00
grid_step_y->set_min(0.01);
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 09:00:55 +01:00
grid_step_y->set_max(SPIN_BOX_GRID_RANGE);
grid_step_y->set_suffix("px");
child_container->add_child(grid_step_y);
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 16:44:50 +01:00
container->add_child(memnew(HSeparator));
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01: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 09:00:55 +01:00
child_container->set_columns(2);
container->add_child(child_container);
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 16:44:50 +01:00
label = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02: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 09:00:55 +01:00
child_container->add_child(label);
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
label->set_h_size_flags(SIZE_EXPAND_FILL);
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 16:44:50 +01: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 09:00:55 +01:00
rotation_offset->set_min(-SPIN_BOX_ROTATION_RANGE);
rotation_offset->set_max(SPIN_BOX_ROTATION_RANGE);
rotation_offset->set_suffix("deg");
child_container->add_child(rotation_offset);
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
label = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02: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 09:00:55 +01:00
child_container->add_child(label);
Small fixes in some editor dialogs
2015-10-18 18:31:44 +02:00
label->set_h_size_flags(SIZE_EXPAND_FILL);
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 16:44:50 +01: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 09:00:55 +01:00
rotation_step->set_min(-SPIN_BOX_ROTATION_RANGE);
rotation_step->set_max(SPIN_BOX_ROTATION_RANGE);
rotation_step->set_suffix("deg");
child_container->add_child(rotation_step);
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Implements rulers
2017-08-29 21:50:18 +02:00
void set_fields(const Point2 p_grid_offset, const Point2 p_grid_step, const float p_rotation_offset, const float p_rotation_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 05:16:14 +01: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);
rotation_offset->set_value(p_rotation_offset * (180 / Math_PI));
rotation_step->set_value(p_rotation_step * (180 / Math_PI));
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 09:00:55 +01:00
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Implements rulers
2017-08-29 21:50:18 +02:00
void get_fields(Point2 &p_grid_offset, Point2 &p_grid_step, float &p_rotation_offset, float &p_rotation_step) {
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());
-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 05:16:14 +01:00
p_rotation_offset = rotation_offset->get_value() / (180 / Math_PI);
p_rotation_step = rotation_step->get_value() / (180 / Math_PI);
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 09:00:55 +01:00
}
};
Implement guides
2017-10-18 23:55:02 +02:00
void CanvasItemEditor::_snap_if_closer_float(float p_value, float p_target_snap, float &r_current_snap, bool &r_snapped, float p_radius) {
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
float radius = p_radius / zoom;
Implement guides
2017-10-18 23:55:02 +02:00
float dist = Math::abs(p_value - p_target_snap);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
if ((p_radius < 0 || dist < radius) && (!r_snapped || dist < Math::abs(r_current_snap - p_value))) {
Implement guides
2017-10-18 23:55:02 +02:00
r_current_snap = p_target_snap;
r_snapped = true;
}
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
Implement guides
2017-10-18 23:55:02 +02:00
void CanvasItemEditor::_snap_if_closer_point(Point2 p_value, Point2 p_target_snap, Point2 &r_current_snap, bool (&r_snapped)[2], real_t rotation, float p_radius) {
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
Transform2D rot_trans = Transform2D(rotation, Point2());
p_value = rot_trans.inverse().xform(p_value);
p_target_snap = rot_trans.inverse().xform(p_target_snap);
r_current_snap = rot_trans.inverse().xform(r_current_snap);
Implement guides
2017-10-18 23:55:02 +02:00
_snap_if_closer_float(p_value.x, p_target_snap.x, r_current_snap.x, r_snapped[0], p_radius);
_snap_if_closer_float(p_value.y, p_target_snap.y, r_current_snap.y, r_snapped[1], p_radius);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
r_current_snap = rot_trans.xform(r_current_snap);
}
void CanvasItemEditor::_snap_other_nodes(Point2 p_value, Point2 &r_current_snap, bool (&r_snapped)[2], const Node *p_current, const CanvasItem *p_to_snap) {
const CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_current);
Implement guides
2017-10-18 23:55:02 +02:00
if (canvas_item && (!p_to_snap || p_current != p_to_snap)) {
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
Transform2D ci_transform = canvas_item->get_global_transform_with_canvas();
Implement guides
2017-10-18 23:55:02 +02:00
Transform2D to_snap_transform = p_to_snap ? p_to_snap->get_global_transform_with_canvas() : Transform2D();
Fix compilation on Visual Studio 2013 again.
2017-11-01 21:47:05 +01:00
if (fmod(ci_transform.get_rotation() - to_snap_transform.get_rotation(), (real_t)360.0) == 0.0) {
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (canvas_item->_edit_use_rect()) {
Point2 begin = ci_transform.xform(canvas_item->_edit_get_rect().get_position());
Point2 end = ci_transform.xform(canvas_item->_edit_get_rect().get_position() + canvas_item->_edit_get_rect().get_size());
_snap_if_closer_point(p_value, begin, r_current_snap, r_snapped, ci_transform.get_rotation());
_snap_if_closer_point(p_value, end, r_current_snap, r_snapped, ci_transform.get_rotation());
} else {
Point2 position = ci_transform.xform(Point2());
_snap_if_closer_point(p_value, position, r_current_snap, r_snapped, ci_transform.get_rotation());
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
}
}
for (int i = 0; i < p_current->get_child_count(); i++) {
_snap_other_nodes(p_value, r_current_snap, r_snapped, p_current->get_child(i), p_to_snap);
}
}
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, const CanvasItem *p_canvas_item, unsigned int p_forced_modes) {
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
bool snapped[2] = { false, false };
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
bool is_snap_active = snap_active ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
// Smart snap using the canvas position
Vector2 output = p_target;
real_t rotation = 0.0;
if (p_canvas_item) {
rotation = p_canvas_item->get_global_transform_with_canvas().get_rotation();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
// Parent sides and center
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
if ((is_snap_active && snap_node_parent && (p_modes & SNAP_NODE_PARENT)) || (p_forced_modes & SNAP_NODE_PARENT)) {
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
if (const Control *c = Object::cast_to<Control>(p_canvas_item)) {
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
Point2 begin = p_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(0, 0)));
Point2 end = p_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(1, 1)));
Implement guides
2017-10-18 23:55:02 +02:00
_snap_if_closer_point(p_target, begin, output, snapped, rotation);
_snap_if_closer_point(p_target, (begin + end) / 2.0, output, snapped, rotation);
_snap_if_closer_point(p_target, end, output, snapped, rotation);
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
} else if (const CanvasItem *parent_ci = Object::cast_to<CanvasItem>(p_canvas_item->get_parent())) {
if (parent_ci->_edit_use_rect()) {
Point2 begin = p_canvas_item->get_transform().affine_inverse().xform(parent_ci->_edit_get_rect().get_position());
Point2 end = p_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, begin, output, snapped, rotation);
_snap_if_closer_point(p_target, (begin + end) / 2.0, output, snapped, rotation);
_snap_if_closer_point(p_target, end, output, snapped, rotation);
} else {
Point2 position = p_canvas_item->get_transform().affine_inverse().xform(Point2());
_snap_if_closer_point(p_target, position, output, snapped, rotation);
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02: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 08:58:35 +01:00
// Self anchors
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
if ((is_snap_active && snap_node_anchors && (p_modes & SNAP_NODE_ANCHORS)) || (p_forced_modes & SNAP_NODE_ANCHORS)) {
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
if (const Control *c = Object::cast_to<Control>(p_canvas_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 08:58:35 +01:00
Point2 begin = p_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(c->get_anchor(MARGIN_LEFT), c->get_anchor(MARGIN_TOP))));
Point2 end = p_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(c->get_anchor(MARGIN_RIGHT), c->get_anchor(MARGIN_BOTTOM))));
Implement guides
2017-10-18 23:55:02 +02:00
_snap_if_closer_point(p_target, begin, output, snapped, rotation);
_snap_if_closer_point(p_target, end, output, snapped, rotation);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02: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 08:58:35 +01:00
// Self sides
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
if ((is_snap_active && snap_node_sides && (p_modes & SNAP_NODE_SIDES)) || (p_forced_modes & SNAP_NODE_SIDES)) {
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (p_canvas_item->_edit_use_rect()) {
Point2 begin = p_canvas_item->get_global_transform_with_canvas().xform(p_canvas_item->_edit_get_rect().get_position());
Point2 end = p_canvas_item->get_global_transform_with_canvas().xform(p_canvas_item->_edit_get_rect().get_position() + p_canvas_item->_edit_get_rect().get_size());
_snap_if_closer_point(p_target, begin, output, snapped, rotation);
_snap_if_closer_point(p_target, end, output, snapped, rotation);
}
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
// Self center
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
if ((is_snap_active && snap_node_center && (p_modes & SNAP_NODE_CENTER)) || (p_forced_modes & SNAP_NODE_CENTER)) {
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (p_canvas_item->_edit_use_rect()) {
Point2 center = p_canvas_item->get_global_transform_with_canvas().xform(p_canvas_item->_edit_get_rect().get_position() + p_canvas_item->_edit_get_rect().get_size() / 2.0);
_snap_if_closer_point(p_target, center, output, snapped, rotation);
} else {
Point2 position = p_canvas_item->get_global_transform_with_canvas().xform(Point2());
_snap_if_closer_point(p_target, position, output, snapped, rotation);
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
}
Implement guides
2017-10-18 23:55:02 +02:00
}
// Other nodes sides
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
if ((is_snap_active && snap_other_nodes && (p_modes & SNAP_OTHER_NODES)) || (p_forced_modes & SNAP_OTHER_NODES)) {
Implement guides
2017-10-18 23:55:02 +02:00
_snap_other_nodes(p_target, output, snapped, get_tree()->get_edited_scene_root(), p_canvas_item);
}
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
if (((is_snap_active && snap_guides && (p_modes & SNAP_GUIDES)) || (p_forced_modes & SNAP_GUIDES)) && fmod(rotation, (real_t)360.0) == 0.0) {
Implement guides
2017-10-18 23:55:02 +02:00
// Guides
if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) {
Array vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_");
for (int i = 0; i < vguides.size(); i++) {
_snap_if_closer_float(p_target.x, vguides[i], output.x, snapped[0]);
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
}
Implement guides
2017-10-18 23:55:02 +02:00
if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_horizontal_guides_")) {
Array hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_");
for (int i = 0; i < hguides.size(); i++) {
_snap_if_closer_float(p_target.y, hguides[i], output.y, snapped[1]);
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
}
}
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
if (((is_snap_active && snap_grid && (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 23:30:54 +02: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 08:58:35 +01: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 23:30:54 +02: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 08:58:35 +01: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 23:30:54 +02:00
}
}
Point2 grid_output;
grid_output.x = Math::stepify(p_target.x - offset.x, grid_step.x * Math::pow(2.0, grid_step_multiplier)) + offset.x;
grid_output.y = Math::stepify(p_target.y - offset.y, grid_step.y * Math::pow(2.0, grid_step_multiplier)) + offset.y;
Implement guides
2017-10-18 23:55:02 +02:00
_snap_if_closer_point(p_target, grid_output, output, snapped, 0.0, -1.0);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02: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 23:30:54 +02:00
// Pixel
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02: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 23:30:54 +02:00
}
return output;
}
float CanvasItemEditor::snap_angle(float p_target, float p_start) const {
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
return (((snap_active || snap_rotation) ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL)) && snap_rotation_step != 0) ? Math::stepify(p_target - snap_rotation_offset, snap_rotation_step) + snap_rotation_offset : p_target;
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
}
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 17:38:03 +02:00
void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) {
Ref<InputEventKey> k = p_ev;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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 14:45:50 +01:00
if (!is_visible_in_tree() || get_viewport()->gui_has_modal_stack())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
Implement missing ShortCuts in CanvasItemEditor
2016-07-15 21:22:01 +02:00
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 17:38:03 +02:00
if (k->get_control())
prevent to change tool mode when control or shift key is pressed
2015-08-11 15:39:59 +02:00
return;
Implement missing ShortCuts in CanvasItemEditor
2016-07-15 21:22:01 +02:00
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
if (k->is_pressed() && !k->is_echo()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
if ((snap_grid || show_grid) && multiply_grid_step_shortcut.is_valid() && multiply_grid_step_shortcut->is_shortcut(p_ev)) {
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
// Multiply the grid size
grid_step_multiplier = MIN(grid_step_multiplier + 1, 12);
viewport->update();
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
} else if ((snap_grid || show_grid) && divide_grid_step_shortcut.is_valid() && divide_grid_step_shortcut->is_shortcut(p_ev)) {
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02: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--;
viewport->update();
made changing pivot simpler in 2D nodes (just press v with mouse over position)
2015-06-12 18:53:18 +02:00
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 22:58:51 +02:00
CanvasItem *ci = Object::cast_to<CanvasItem>(p_what);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!ci)
return NULL;
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 16:44:50 +01:00
return memnew(CanvasItemEditorSelectedItem);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
void CanvasItemEditor::_keying_changed() {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
if (AnimationPlayerEditor::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 08:58:35 +01:00
animation_hb->show();
else
animation_hb->hide();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
Rect2 CanvasItemEditor::_get_encompassing_rect_from_list(List<CanvasItem *> p_list) {
ERR_FAIL_COND_V(p_list.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 09:00:55 +01: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 08:58:35 +01:00
// Handles the first element
CanvasItem *canvas_item = p_list.front()->get();
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
Rect2 rect;
if (canvas_item->_edit_use_rect()) {
rect = Rect2(canvas_item->get_global_transform_with_canvas().xform(canvas_item->_edit_get_rect().position + canvas_item->_edit_get_rect().size / 2), Size2());
} else {
rect = Rect2(canvas_item->get_global_transform_with_canvas().xform(Point2()), 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 09:00:55 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
// Expand with the other ones
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
for (List<CanvasItem *>::Element *E = p_list.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
Transform2D xform = canvas_item->get_global_transform_with_canvas();
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (canvas_item->_edit_use_rect()) {
Rect2 current_rect = canvas_item->_edit_get_rect();
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)));
} else {
rect.expand_to(xform.xform(Point2()));
}
Implements rulers
2017-08-29 21:50:18 +02: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 08:58:35 +01:00
return rect;
}
Implement guides
2017-10-18 23:55:02 +02:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01: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) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
if (!p_node)
return;
if (Object::cast_to<Viewport>(p_node))
return;
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
const CanvasItem *canvas_item = 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 03:43:02 +02:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
/*bool inherited = p_node != get_tree()->get_edited_scene_root() && p_node->get_filename() != "";
bool editable = !inherited || EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(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 08:58:35 +01:00
bool lock_children = p_node->has_meta("_edit_group_") && p_node->get_meta("_edit_group_");
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 03:43:02 +02:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (!lock_children && editable) {}*/
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
if (canvas_item && !canvas_item->is_set_as_toplevel()) {
_expand_encompassing_rect_using_children(r_rect, p_node->get_child(i), r_first, p_parent_xform * canvas_item->get_transform(), p_canvas_xform);
} else {
const CanvasLayer *canvas_layer = Object::cast_to<CanvasLayer>(p_node);
_expand_encompassing_rect_using_children(r_rect, p_node->get_child(i), r_first, Transform2D(), canvas_layer ? canvas_layer->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 08:58:35 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Add show bones checkable menu item
2016-09-07 11:10:00 +02: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 08:58:35 +01:00
if (canvas_item && canvas_item->is_visible_in_tree() && !canvas_item->has_meta("_edit_lock_")) {
Transform2D xform = p_parent_xform * p_canvas_xform * canvas_item->get_transform();
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (canvas_item->_edit_use_rect()) {
Rect2 rect = canvas_item->_edit_get_rect();
if (r_first) {
r_rect = Rect2(xform.xform(rect.position + rect.size / 2), Size2());
r_first = false;
}
if (r_rect.size != Size2()) {
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));
}
} else {
if (r_first) {
r_rect = Rect2(xform.xform(Point2()), Size2());
r_first = false;
} else {
r_rect.expand_to(xform.xform(Point2()));
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
}
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01: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 08:58:35 +01:00
Rect2 rect;
bool first = true;
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01: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 08:58:35 +01: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 12:59:50 +02:00
}
Fixes locks and groups on 2d editor
2018-04-24 21:55:28 +02:00
void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<_SelectResult> &r_items, int p_limit, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
if (!p_node)
return;
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 22:58:51 +02:00
if (Object::cast_to<Viewport>(p_node))
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
return;
More exact picking for canvas editor
2017-12-27 09:28:02 +01:00
const real_t grab_distance = EDITOR_DEF("editors/poly_editor/point_grab_radius", 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 08:58:35 +01:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node);
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
Fixes several selection problems in the 2D editor
2018-05-04 00:27:37 +02:00
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
if (canvas_item && !canvas_item->is_set_as_toplevel()) {
_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, p_limit, p_parent_xform * canvas_item->get_transform(), p_canvas_xform);
} else {
CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, p_limit, Transform2D(), cl ? cl->get_transform() : p_canvas_xform);
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
}
Fixes several selection problems in the 2D editor
2018-05-04 00:27:37 +02:00
if (p_limit != 0 && r_items.size() >= p_limit)
return;
}
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
Fixes several selection problems in the 2D editor
2018-05-04 00:27:37 +02:00
if (canvas_item && canvas_item->is_visible_in_tree()) {
Transform2D xform = (p_parent_xform * p_canvas_xform * canvas_item->get_transform()).affine_inverse();
const real_t local_grab_distance = xform.basis_xform(Vector2(grab_distance, 0)).length();
if (canvas_item->_edit_is_selected_on_click(xform.xform(p_pos), local_grab_distance)) {
Node2D *node = Object::cast_to<Node2D>(canvas_item);
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
Fixes several selection problems in the 2D editor
2018-05-04 00:27:37 +02:00
_SelectResult res;
res.item = canvas_item;
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 22:39:07 +01:00
}
}
return;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fixes locks and groups on 2d editor
2018-04-24 21:55:28 +02:00
void CanvasItemEditor::_get_canvas_items_at_pos(const Point2 &p_pos, Vector<_SelectResult> &r_items, int p_limit) {
Node *scene = editor->get_edited_scene();
_find_canvas_items_at_pos(p_pos, scene, r_items, p_limit);
//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-04 00:27:37 +02:00
// Make sure the selected node is in the current scene, or editable
while (node && node != get_tree()->get_edited_scene_root() && node->get_owner() != scene && !scene->is_editable_instance(node->get_owner())) {
Fixes locks and groups on 2d editor
2018-04-24 21:55:28 +02:00
node = node->get_parent();
};
// Replace the node by the group if grouped
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(node);
Fixes several selection problems in the 2D editor
2018-05-04 00:27:37 +02:00
while (node && node != scene->get_parent()) {
Fixes locks and groups on 2d editor
2018-04-24 21:55:28 +02:00
CanvasItem *canvas_item_tmp = Object::cast_to<CanvasItem>(node);
if (canvas_item_tmp && node->has_meta("_edit_group_")) {
canvas_item = canvas_item_tmp;
}
node = node->get_parent();
}
Fixes hovered Nodes2D display in the editor (remove duplicates)
2018-05-15 09:37:23 +02: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++) {
if (r_items[j].item == canvas_item) {
duplicate = true;
break;
}
}
Fixes locks and groups on 2d editor
2018-04-24 21:55:28 +02:00
//Remove the item if invalid
Fixes hovered Nodes2D display in the editor (remove duplicates)
2018-05-15 09:37:23 +02:00
if (!canvas_item || duplicate || (canvas_item != scene && canvas_item->get_owner() != scene && !scene->is_editable_instance(canvas_item->get_owner())) || (canvas_item->has_meta("_edit_lock_") && canvas_item->get_meta("_edit_lock_"))) {
Fixes locks and groups on 2d editor
2018-04-24 21:55:28 +02:00
r_items.remove(i);
i--;
} else {
r_items[i].item = canvas_item;
}
}
}
Bring back 2D bone selection
2018-05-15 15:18:46 +02:00
void CanvasItemEditor::_get_bones_at_pos(const Point2 &p_pos, Vector<_SelectResult> &r_items) {
Point2 screen_pos = transform.xform(p_pos);
for (Map<BoneKey, BoneList>::Element *E = bone_list.front(); E; E = E->next()) {
Node2D *from_node = Object::cast_to<Node2D>(ObjectDB::get_instance(E->key().from));
Vector<Vector2> bone_shape;
if (!_get_bone_shape(&bone_shape, NULL, E))
continue;
// Check if the point is inside the Polygon2D
if (Geometry::is_point_in_polygon(screen_pos, bone_shape)) {
// Check if the item is already in the list
bool duplicate = false;
for (int i = 0; i < r_items.size(); i++) {
if (r_items[i].item == from_node) {
duplicate = true;
break;
}
}
if (duplicate)
continue;
// Else, add it
_SelectResult res;
res.item = from_node;
res.z_index = from_node ? from_node->get_z_index() : 0;
res.has_z = from_node;
r_items.push_back(res);
}
}
}
bool CanvasItemEditor::_get_bone_shape(Vector<Vector2> *shape, Vector<Vector2> *outline_shape, Map<BoneKey, BoneList>::Element *bone) {
int bone_width = EditorSettings::get_singleton()->get("editors/2d/bone_width");
int bone_outline_width = EditorSettings::get_singleton()->get("editors/2d/bone_outline_size");
Node2D *from_node = Object::cast_to<Node2D>(ObjectDB::get_instance(bone->key().from));
Node2D *to_node = Object::cast_to<Node2D>(ObjectDB::get_instance(bone->key().to));
if (!from_node->is_inside_tree())
return false; //may have been removed
if (!from_node)
return false;
if (!to_node && bone->get().length == 0)
return false;
Vector2 from = transform.xform(from_node->get_global_position());
Vector2 to;
if (to_node)
to = transform.xform(to_node->get_global_position());
else
to = transform.xform(from_node->get_global_transform().xform(Vector2(bone->get().length, 0)));
Vector2 rel = to - from;
Vector2 relt = rel.tangent().normalized() * bone_width;
Vector2 reln = rel.normalized();
Vector2 reltn = relt.normalized();
if (shape) {
shape->clear();
shape->push_back(from);
shape->push_back(from + rel * 0.2 + relt);
shape->push_back(to);
shape->push_back(from + rel * 0.2 - relt);
}
if (outline_shape) {
outline_shape->clear();
outline_shape->push_back(from + (-reln - reltn) * bone_outline_width);
outline_shape->push_back(from + (-reln + reltn) * bone_outline_width);
outline_shape->push_back(from + rel * 0.2 + relt + reltn * bone_outline_width);
outline_shape->push_back(to + (reln + reltn) * bone_outline_width);
outline_shape->push_back(to + (reln - reltn) * bone_outline_width);
outline_shape->push_back(from + rel * 0.2 - relt - reltn * bone_outline_width);
}
return true;
}
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01: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) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!p_node)
return;
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 22:58:51 +02:00
if (Object::cast_to<Viewport>(p_node))
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node);
Fixes several selection problems in the 2D editor
2018-05-04 00:27:37 +02:00
Node *scene = editor->get_edited_scene();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fixes several selection problems in the 2D editor
2018-05-04 00:27:37 +02:00
bool editable = p_node == scene || p_node->get_owner() == scene || scene->is_editable_instance(p_node->get_owner());
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 16:44:50 +01:00
bool lock_children = p_node->has_meta("_edit_group_") && p_node->get_meta("_edit_group_");
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
bool locked = p_node->has_meta("_edit_lock_") && p_node->get_meta("_edit_lock_");
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
Fixes several selection problems in the 2D editor
2018-05-04 00:27:37 +02:00
if (!lock_children || !editable) {
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 16:44:50 +01:00
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
if (canvas_item && !canvas_item->is_set_as_toplevel()) {
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
_find_canvas_items_in_rect(p_rect, p_node->get_child(i), r_items, p_parent_xform * canvas_item->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 08:58:35 +01:00
} else {
CanvasLayer *canvas_layer = Object::cast_to<CanvasLayer>(p_node);
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
_find_canvas_items_in_rect(p_rect, p_node->get_child(i), r_items, Transform2D(), canvas_layer ? canvas_layer->get_transform() : p_canvas_xform);
Prevent to select children if selection lock or instanced scene Fix #7086
2016-11-12 14:43:31 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Fixes several selection problems in the 2D editor
2018-05-04 00:27:37 +02:00
if (canvas_item && canvas_item->is_visible_in_tree() && !locked && editable) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
Transform2D xform = p_parent_xform * p_canvas_xform * canvas_item->get_transform();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (canvas_item->_edit_use_rect()) {
Rect2 rect = canvas_item->_edit_get_rect();
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)))) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
r_items->push_back(canvas_item);
}
} else {
if (p_rect.has_point(xform.xform(Point2()))) {
r_items->push_back(canvas_item);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01: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 20:17:55 +02:00
bool still_selected = true;
if (p_append) {
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01: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 20:17:55 +02:00
// Already in the selection, remove it from the selected nodes
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01: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 20:17:55 +02:00
still_selected = false;
} 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 08:58:35 +01:00
editor_selection->add_node(item);
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01: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 20:17:55 +02:00
// Select a new one and clear previous selection
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01: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 20:17:55 +02:00
// Reselect
Removes editor_hint from SceneTree
2017-08-19 01:02:56 +02:00
if (Engine::get_singleton()->is_editor_hint()) {
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 16:44:50 +01:00
editor->call("edit_node", item);
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01: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 20:17:55 +02:00
}
viewport->update();
return still_selected;
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01: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 08:58:35 +01:00
List<CanvasItem *> CanvasItemEditor::_get_edited_canvas_items(bool retreive_locked, bool remove_canvas_item_if_parent_in_selection) {
List<CanvasItem *> selection;
for (Map<Node *, Object *>::Element *E = editor_selection->get_selection().front(); E; E = E->next()) {
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->key());
if (canvas_item && canvas_item->is_visible_in_tree() && canvas_item->get_viewport() == EditorNode::get_singleton()->get_scene_root() && (!retreive_locked || !canvas_item->has_meta("_edit_lock_"))) {
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
if (se) {
selection.push_back(canvas_item);
}
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
if (remove_canvas_item_if_parent_in_selection) {
List<CanvasItem *> filtered_selection;
for (List<CanvasItem *>::Element *E = selection.front(); E; E = E->next()) {
if (!selection.find(E->get()->get_parent())) {
filtered_selection.push_back(E->get());
}
}
return filtered_selection;
} else {
return selection;
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01: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 02:10:30 +01: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 08:58:35 +01:00
Transform2D parent_transform = p_control->get_transform().affine_inverse();
Fixes the bad calculation of margin & anchors when child of Node2D
2018-05-05 16:59:00 +02:00
Rect2 parent_rect = p_control->get_parent_anchorable_rect();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fixes the bad calculation of margin & anchors when child of Node2D
2018-05-05 16:59:00 +02:00
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 08:58:35 +01:00
}
Add anchor visualization
2017-07-11 00:14:22 +02:00
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
Vector2 CanvasItemEditor::_position_to_anchor(const Control *p_control, Vector2 position) {
Make anchors draggable
2017-07-29 16:57:32 +02:00
ERR_FAIL_COND_V(!p_control, Vector2());
Fixes the bad calculation of margin & anchors when child of Node2D
2018-05-05 16:59:00 +02:00
Rect2 parent_rect = p_control->get_parent_anchorable_rect();
return (p_control->get_transform().xform(position) - parent_rect.position) / parent_rect.size;
Make anchors draggable
2017-07-29 16:57:32 +02: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 08:58:35 +01:00
void CanvasItemEditor::_save_canvas_item_state(List<CanvasItem *> p_canvas_items, bool save_bones) {
for (List<CanvasItem *>::Element *E = p_canvas_items.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
if (se) {
se->undo_state = canvas_item->_edit_get_state();
se->pre_drag_xform = canvas_item->get_global_transform_with_canvas();
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (canvas_item->_edit_use_rect()) {
se->pre_drag_rect = canvas_item->_edit_get_rect();
} else {
se->pre_drag_rect = Rect2();
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
se->pre_drag_bones_length = List<float>();
se->pre_drag_bones_undo_state = List<Dictionary>();
// If we have a bone, save the state of all nodes in the IK chain
Node2D *bone = Object::cast_to<Node2D>(canvas_item);
if (bone && bone->has_meta("_edit_bone_")) {
// Check if we have an IK chain
List<Node2D *> bone_ik_list;
Fix Coverity reports of uninitialized scalar variable Fixes most current reports on Coverity Scan of uninitialized scalar variable (CWE-457): https://cwe.mitre.org/data/definitions/457.html These happen most of the time (in our code) when instanciating structs without a constructor (or with an incomplete one), and later returning the instance. This is sometimes intended though, as some parameters are only used in some situations and should not be double-initialized for performance reasons (e.g. `constant` in ShaderLanguage::Token).
2018-04-19 13:04:41 +02:00
bool ik_found = 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 08:58:35 +01:00
bone = Object::cast_to<Node2D>(bone->get_parent());
while (bone) {
bone_ik_list.push_back(bone);
if (bone->has_meta("_edit_ik_")) {
ik_found = true;
break;
} else if (!bone->has_meta("_edit_bone_")) {
break;
}
bone = Object::cast_to<Node2D>(bone->get_parent());
}
Make anchors draggable
2017-07-29 16:57:32 +02:00
Fix typos with codespell Found via `codespell -q 3 --skip="./thirdparty,./editor/translations" -I ../godot-word-whitelist.txt` Whitelist consists of: ``` ang doubleclick lod nd que te unselect ```
2018-02-21 17:30:55 +01:00
//Save the bone state and length if we have an IK chain
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
if (ik_found) {
bone = Object::cast_to<Node2D>(canvas_item);
Transform2D bone_xform = bone->get_global_transform();
for (List<Node2D *>::Element *bone_E = bone_ik_list.front(); bone_E; bone_E = bone_E->next()) {
bone_xform = bone_xform * bone->get_transform().affine_inverse();
Node2D *parent_bone = bone_E->get();
se->pre_drag_bones_length.push_back(parent_bone->get_global_transform().get_origin().distance_to(bone->get_global_position()));
se->pre_drag_bones_undo_state.push_back(parent_bone->_edit_get_state());
bone = parent_bone;
}
}
Added the possibility to move all anchors at once when they are clustered
2017-08-04 19:27:30 +02:00
}
Make anchors draggable
2017-07-29 16:57:32 +02: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 08:58:35 +01:00
void CanvasItemEditor::_restore_canvas_item_state(List<CanvasItem *> p_canvas_items, bool restore_bones) {
for (List<CanvasItem *>::Element *E = drag_selection.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
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-23 00:47:51 +01:00
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_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 08:58:35 +01:00
canvas_item->_edit_set_state(se->undo_state);
if (restore_bones) {
for (List<Dictionary>::Element *E = se->pre_drag_bones_undo_state.front(); E; E = E->next()) {
canvas_item = Object::cast_to<CanvasItem>(canvas_item->get_parent());
canvas_item->_edit_set_state(E->get());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
void CanvasItemEditor::_commit_canvas_item_state(List<CanvasItem *> p_canvas_items, String action_name, bool commit_bones) {
undo_redo->create_action(action_name);
for (List<CanvasItem *>::Element *E = p_canvas_items.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
undo_redo->add_do_method(canvas_item, "_edit_set_state", canvas_item->_edit_get_state());
undo_redo->add_undo_method(canvas_item, "_edit_set_state", se->undo_state);
if (commit_bones) {
for (List<Dictionary>::Element *E = se->pre_drag_bones_undo_state.front(); E; E = E->next()) {
canvas_item = Object::cast_to<CanvasItem>(canvas_item->get_parent());
undo_redo->add_do_method(canvas_item, "_edit_set_state", canvas_item->_edit_get_state());
undo_redo->add_undo_method(canvas_item, "_edit_set_state", E->get());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
undo_redo->add_do_method(viewport, "update");
undo_redo->add_undo_method(viewport, "update");
undo_redo->commit_action();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 09:00:55 +01:00
void CanvasItemEditor::_snap_changed() {
Implements rulers
2017-08-29 21:50:18 +02:00
((SnapDialog *)snap_dialog)->get_fields(grid_offset, grid_step, snap_rotation_offset, snap_rotation_step);
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
grid_step_multiplier = 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 09:00:55 +01:00
viewport->update();
}
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
void CanvasItemEditor::_selection_result_pressed(int p_result) {
if (selection_results.size() <= p_result)
return;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
CanvasItem *item = selection_results[p_result].item;
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01: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 08:58:35 +01:00
_select_click_on_item(item, Point2(), selection_menu_additive_selection);
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
}
void CanvasItemEditor::_selection_menu_hide() {
selection_results.clear();
selection_menu->clear();
selection_menu->set_size(Vector2(0, 0));
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_event) {
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
Ref<InputEventMouseMotion> m = p_event;
Fix typos with codespell Found via `codespell -q 3 --skip="./thirdparty,./editor/translations" -I ../godot-word-whitelist.txt` Whitelist consists of: ``` ang doubleclick lod nd que te unselect ```
2018-02-21 17:30:55 +01:00
// Start dragging a 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 08:58:35 +01:00
if (drag_type == DRAG_NONE) {
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && b->is_pressed()) {
Implement guides
2017-10-18 23:55:02 +02:00
if (show_guides && show_rulers && EditorNode::get_singleton()->get_edited_scene()) {
Transform2D xform = viewport_scrollable->get_transform() * transform;
Fix typos with codespell Found via `codespell -q 3 --skip="./thirdparty,./editor/translations" -I ../godot-word-whitelist.txt` Whitelist consists of: ``` ang doubleclick lod nd que te unselect ```
2018-02-21 17:30:55 +01:00
// Retrieve the guide lists
Implement guides
2017-10-18 23:55:02 +02:00
Array vguides;
if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) {
vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_");
}
Array hguides;
if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_horizontal_guides_")) {
hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_");
}
// 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 08:58:35 +01:00
drag_type = DRAG_DOUBLE_GUIDE;
dragged_guide_index = -1;
return true;
Implement guides
2017-10-18 23:55:02 +02:00
} else if (b->get_position().x < RULER_WIDTH) {
// Check if we drag an existing horizontal guide
float minimum = 1e20;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
dragged_guide_index = -1;
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
dragged_guide_index = i;
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
if (dragged_guide_index >= 0) {
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
drag_type = DRAG_H_GUIDE;
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
drag_type = DRAG_V_GUIDE;
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
return true;
Implement guides
2017-10-18 23:55:02 +02:00
} else if (b->get_position().y < RULER_WIDTH) {
// Check if we drag an existing vertical guide
float minimum = 1e20;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
dragged_guide_index = -1;
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
dragged_guide_index = i;
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
if (dragged_guide_index >= 0) {
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
drag_type = DRAG_V_GUIDE;
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
drag_type = DRAG_H_GUIDE;
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
drag_from = xform.affine_inverse().xform(b->get_position());
return true;
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01: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 23:55:02 +02: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 08:58:35 +01:00
dragged_guide_pos = xform.xform(snap_point(drag_to, SNAP_GRID | SNAP_PIXEL | SNAP_OTHER_NODES));
viewport->update();
return true;
}
// Release confirms the guide move
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && !b->is_pressed()) {
Implement guides
2017-10-18 23:55:02 +02: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 21:37:17 +01:00
// Retrieve the guide lists
Implement guides
2017-10-18 23:55:02 +02:00
Array vguides;
if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) {
vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_");
}
Array hguides;
if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_horizontal_guides_")) {
hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_");
}
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 08:58:35 +01:00
if (drag_type == DRAG_V_GUIDE) {
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
if (dragged_guide_index >= 0) {
vguides[dragged_guide_index] = edited.x;
Implement guides
2017-10-18 23:55:02 +02:00
undo_redo->create_action(TTR("Move vertical guide"));
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);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
undo_redo->add_undo_method(viewport, "update");
Implement guides
2017-10-18 23:55:02 +02:00
undo_redo->commit_action();
} else {
vguides.push_back(edited.x);
undo_redo->create_action(TTR("Create new vertical guide"));
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);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
undo_redo->add_undo_method(viewport, "update");
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
if (dragged_guide_index >= 0) {
vguides.remove(dragged_guide_index);
Implement guides
2017-10-18 23:55:02 +02:00
undo_redo->create_action(TTR("Remove vertical guide"));
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);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
undo_redo->add_undo_method(viewport, "update");
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
} else if (drag_type == DRAG_H_GUIDE) {
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
if (dragged_guide_index >= 0) {
hguides[dragged_guide_index] = edited.y;
Implement guides
2017-10-18 23:55:02 +02:00
undo_redo->create_action(TTR("Move horizontal guide"));
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);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
undo_redo->add_undo_method(viewport, "update");
Implement guides
2017-10-18 23:55:02 +02:00
undo_redo->commit_action();
} else {
hguides.push_back(edited.y);
undo_redo->create_action(TTR("Create new horizontal guide"));
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);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
undo_redo->add_undo_method(viewport, "update");
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
if (dragged_guide_index >= 0) {
hguides.remove(dragged_guide_index);
Implement guides
2017-10-18 23:55:02 +02:00
undo_redo->create_action(TTR("Remove horizontal guide"));
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);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
undo_redo->add_undo_method(viewport, "update");
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
} else if (drag_type == DRAG_DOUBLE_GUIDE) {
Implement guides
2017-10-18 23:55:02 +02: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);
undo_redo->create_action(TTR("Create new horizontal and vertical guides"));
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);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
undo_redo->add_undo_method(viewport, "update");
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
drag_type = DRAG_NONE;
viewport->update();
return true;
Fixes keybord directionnal keys not moving nodes in the 2D editor
2017-10-29 22:00:03 +01: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 08:58:35 +01:00
return false;
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02: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 08:58:35 +01:00
bool CanvasItemEditor::_gui_input_zoom_or_pan(const Ref<InputEvent> &p_event) {
Removal of InputEvent as built-in Variant type.. this might cause bugs I haven't found yet..
2017-05-20 17:38:03 +02:00
Ref<InputEventMouseButton> b = p_event;
if (b.is_valid()) {
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
if (b->is_pressed() && b->get_button_index() == BUTTON_WHEEL_DOWN) {
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 20:17:55 +02:00
// Scroll or pan down
Add settings to pan canvas editor with scrolling This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive. 2 new settings are added to “editors/2d”: scroll_to_pan: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom pan_speed: use this value to change scroll speed
2017-06-06 01:33:38 +02:00
if (bool(EditorSettings::get_singleton()->get("editors/2d/scroll_to_pan"))) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
view_offset.y += int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor();
_update_scrollbars();
Fix zoom button not zooming on the screen center
2017-10-01 11:30:38 +02:00
viewport->update();
Add settings to pan canvas editor with scrolling This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive. 2 new settings are added to “editors/2d”: scroll_to_pan: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom pan_speed: use this value to change scroll speed
2017-06-06 01:33:38 +02:00
} else {
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
_zoom_on_position(zoom * (1 - (0.05 * b->get_factor())), b->get_position());
Making Godot Easier to Use.. -=-=-=-=-=-=-=-=-=-=-=-=-=-= -Auto indenter in code editor, this makes it much easier to paste external code. -Zoom in 2D viewport now uses the mouse pointer as reference. -Obscure hack to see where code/line of GDScript in C++ backtrace. -Fixed a bug where keys would get stuck on X11 if pressed simultaneously -Added Api on IP singleton to request local IPs. -Premultiplied alpha support when importing texture, editing PNGs and as a blend mode.
2014-05-24 06:35:47 +02: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 08:58:35 +01:00
return true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
if (b->is_pressed() && b->get_button_index() == BUTTON_WHEEL_UP) {
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 20:17:55 +02:00
// Scroll or pan up
Add settings to pan canvas editor with scrolling This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive. 2 new settings are added to “editors/2d”: scroll_to_pan: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom pan_speed: use this value to change scroll speed
2017-06-06 01:33:38 +02:00
if (bool(EditorSettings::get_singleton()->get("editors/2d/scroll_to_pan"))) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
view_offset.y -= int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor();
_update_scrollbars();
Fix zoom button not zooming on the screen center
2017-10-01 11:30:38 +02:00
viewport->update();
Add settings to pan canvas editor with scrolling This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive. 2 new settings are added to “editors/2d”: scroll_to_pan: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom pan_speed: use this value to change scroll speed
2017-06-06 01:33:38 +02:00
} else {
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
_zoom_on_position(zoom * ((0.95 + (0.05 * b->get_factor())) / 0.95), b->get_position());
Making Godot Easier to Use.. -=-=-=-=-=-=-=-=-=-=-=-=-=-= -Auto indenter in code editor, this makes it much easier to paste external code. -Zoom in 2D viewport now uses the mouse pointer as reference. -Obscure hack to see where code/line of GDScript in C++ backtrace. -Fixed a bug where keys would get stuck on X11 if pressed simultaneously -Added Api on IP singleton to request local IPs. -Premultiplied alpha support when importing texture, editing PNGs and as a blend mode.
2014-05-24 06:35:47 +02: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 08:58:35 +01:00
return true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
if (b->is_pressed() && b->get_button_index() == BUTTON_WHEEL_LEFT) {
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 20:17:55 +02:00
// Pan left
Add settings to pan canvas editor with scrolling This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive. 2 new settings are added to “editors/2d”: scroll_to_pan: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom pan_speed: use this value to change scroll speed
2017-06-06 01:33:38 +02:00
if (bool(EditorSettings::get_singleton()->get("editors/2d/scroll_to_pan"))) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
view_offset.x -= int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor();
_update_scrollbars();
viewport->update();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
return true;
Add settings to pan canvas editor with scrolling This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive. 2 new settings are added to “editors/2d”: scroll_to_pan: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom pan_speed: use this value to change scroll speed
2017-06-06 01:33:38 +02:00
}
}
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
if (b->is_pressed() && b->get_button_index() == BUTTON_WHEEL_RIGHT) {
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 20:17:55 +02:00
// Pan right
Add settings to pan canvas editor with scrolling This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive. 2 new settings are added to “editors/2d”: scroll_to_pan: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom pan_speed: use this value to change scroll speed
2017-06-06 01:33:38 +02:00
if (bool(EditorSettings::get_singleton()->get("editors/2d/scroll_to_pan"))) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
view_offset.x += int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor();
_update_scrollbars();
viewport->update();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
return true;
Add settings to pan canvas editor with scrolling This feature is mainly designed for developers who uses touchpad instead of mouse, and want to scroll instead of zoom. Every macOS developers will like it since it feels intuitive. 2 new settings are added to “editors/2d”: scroll_to_pan: turn on to use mouse/touchpad scroll to pan canvas item editor view instead of zoom pan_speed: use this value to change scroll speed
2017-06-06 01:33:38 +02: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 08:58:35 +01:00
if (drag_type == DRAG_NONE) {
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
if (b->is_pressed() &&
(b->get_button_index() == BUTTON_MIDDLE ||
(b->get_button_index() == BUTTON_LEFT && tool == TOOL_PAN) ||
(b->get_button_index() == BUTTON_LEFT && !EditorSettings::get_singleton()->get("editors/2d/simple_spacebar_panning") && Input::get_singleton()->is_key_pressed(KEY_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 08:58:35 +01:00
// Pan the viewport
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
drag_type = DRAG_PAN;
}
}
if (drag_type == DRAG_PAN) {
if (!b->is_pressed()) {
// Stop panning the viewport (for any mouse button press)
drag_type = DRAG_NONE;
}
}
}
Ref<InputEventKey> k = p_event;
if (k.is_valid()) {
if (k->get_scancode() == KEY_SPACE && EditorSettings::get_singleton()->get("editors/2d/simple_spacebar_panning")) {
if (drag_type == DRAG_NONE) {
if (k->is_pressed() && !k->is_echo()) {
//Pan the viewport
drag_type = DRAG_PAN;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
} else if (drag_type == DRAG_PAN) {
if (!k->is_pressed()) {
// Stop panning the viewport (for any mouse button press)
drag_type = DRAG_NONE;
}
}
}
}
Ref<InputEventMouseMotion> m = p_event;
if (m.is_valid()) {
if (drag_type == DRAG_PAN) {
// Pan the viewport
Point2i relative;
if (bool(EditorSettings::get_singleton()->get("editors/2d/warped_mouse_panning"))) {
relative = Input::get_singleton()->warp_mouse_motion(m, viewport->get_global_rect());
} else {
relative = m->get_relative();
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01:00
}
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
view_offset.x -= relative.x / zoom;
view_offset.y -= relative.y / zoom;
_update_scrollbars();
viewport->update();
return true;
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01: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 08:58:35 +01:00
}
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01: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 08:58:35 +01:00
Ref<InputEventMagnifyGesture> magnify_gesture = p_event;
if (magnify_gesture.is_valid()) {
// Zoom gesture
_zoom_on_position(zoom * magnify_gesture->get_factor(), magnify_gesture->get_position());
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 16:49:27 +02: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 08:58:35 +01:00
Ref<InputEventPanGesture> pan_gesture = p_event;
if (pan_gesture.is_valid()) {
// Pan gesture
const Vector2 delta = (int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom) * pan_gesture->get_delta();
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
view_offset.x += delta.x;
view_offset.y += delta.y;
_update_scrollbars();
viewport->update();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01:00
// Drag the pivot (in pivot mode / with V key)
if (drag_type == DRAG_NONE) {
if ((b.is_valid() && b->is_pressed() && b->get_button_index() == BUTTON_LEFT && tool == TOOL_EDIT_PIVOT) ||
(k.is_valid() && k->is_pressed() && !k->is_echo() && k->get_scancode() == KEY_V)) {
List<CanvasItem *> selection = _get_edited_canvas_items();
// Filters the selection with nodes that allow setting the pivot
drag_selection = List<CanvasItem *>();
for (List<CanvasItem *>::Element *E = selection.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
if (canvas_item->_edit_use_pivot()) {
drag_selection.push_back(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
// Start dragging if we still have nodes
if (drag_selection.size() > 0) {
drag_from = transform.affine_inverse().xform((b.is_valid()) ? b->get_position() : viewport->get_local_mouse_position());
Vector2 new_pos;
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, drag_selection[0]);
else
new_pos = snap_point(drag_from, SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL);
for (List<CanvasItem *>::Element *E = drag_selection.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
canvas_item->_edit_set_pivot(canvas_item->get_global_transform_with_canvas().affine_inverse().xform(new_pos));
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
drag_type = DRAG_PIVOT;
_save_canvas_item_state(drag_selection);
}
return true;
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01: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;
if (drag_selection.size() == 1)
new_pos = snap_point(drag_to, SNAP_NODE_SIDES | SNAP_NODE_CENTER | SNAP_NODE_ANCHORS | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, drag_selection[0]);
else
new_pos = snap_point(drag_to, SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL);
for (List<CanvasItem *>::Element *E = drag_selection.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
canvas_item->_edit_set_pivot(canvas_item->get_global_transform_with_canvas().affine_inverse().xform(new_pos));
}
return true;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
// Confirm the pivot move
if ((b.is_valid() && !b->is_pressed() && b->get_button_index() == BUTTON_LEFT && tool == TOOL_EDIT_PIVOT) ||
(k.is_valid() && !k->is_pressed() && k->get_scancode() == KEY_V)) {
_commit_canvas_item_state(drag_selection, TTR("Move pivot"));
drag_type = DRAG_NONE;
return true;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
// Cancel a drag
if (b.is_valid() && b->get_button_index() == BUTTON_RIGHT && b->is_pressed()) {
_restore_canvas_item_state(drag_selection);
drag_type = DRAG_NONE;
viewport->update();
return true;
}
}
return false;
}
void CanvasItemEditor::_solve_IK(Node2D *leaf_node, Point2 target_position) {
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(leaf_node);
if (se && !se->pre_drag_bones_undo_state.empty()) {
// Build the node list
Point2 leaf_pos = target_position;
List<Node2D *> joints_list;
List<Point2> joints_pos;
Node2D *joint = leaf_node;
Transform2D joint_transform = leaf_node->get_global_transform_with_canvas();
for (int i = 0; i < se->pre_drag_bones_undo_state.size() + 1; i++) {
joints_list.push_back(joint);
joints_pos.push_back(joint_transform.get_origin());
joint_transform = joint_transform * joint->get_transform().affine_inverse();
joint = Object::cast_to<Node2D>(joint->get_parent());
}
Point2 root_pos = joints_list.back()->get()->get_global_transform_with_canvas().get_origin();
// Restraints the node to a maximum distance is necessary
float total_len = 0;
for (List<float>::Element *E = se->pre_drag_bones_length.front(); E; E = E->next()) {
total_len += E->get();
}
if ((root_pos.distance_to(leaf_pos)) > total_len) {
Vector2 rel = leaf_pos - root_pos;
rel = rel.normalized() * total_len;
leaf_pos = root_pos + rel;
}
joints_pos[0] = leaf_pos;
// Run the solver
int solver_iterations = 64;
float solver_k = 0.3;
// Build the position list
for (int i = 0; i < solver_iterations; i++) {
// Handle the leaf joint
int node_id = 0;
for (List<float>::Element *E = se->pre_drag_bones_length.front(); E; E = E->next()) {
Vector2 direction = (joints_pos[node_id + 1] - joints_pos[node_id]).normalized();
int len = E->get();
if (E == se->pre_drag_bones_length.front()) {
joints_pos[1] = joints_pos[1].linear_interpolate(joints_pos[0] + len * direction, solver_k);
} else if (E == se->pre_drag_bones_length.back()) {
joints_pos[node_id] = joints_pos[node_id].linear_interpolate(joints_pos[node_id + 1] - len * direction, solver_k);
} else {
Vector2 center = (joints_pos[node_id + 1] + joints_pos[node_id]) / 2.0;
joints_pos[node_id] = joints_pos[node_id].linear_interpolate(center - (direction * len) / 2.0, solver_k);
joints_pos[node_id + 1] = joints_pos[node_id + 1].linear_interpolate(center + (direction * len) / 2.0, solver_k);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
node_id++;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
// Set the position
float total_rot = 0.0f;
for (int node_id = joints_list.size() - 1; node_id > 0; node_id--) {
Point2 current = (joints_list[node_id - 1]->get_global_position() - joints_list[node_id]->get_global_position()).normalized();
Point2 target = (joints_pos[node_id - 1] - joints_list[node_id]->get_global_position()).normalized();
float rot = current.angle_to(target);
if (joints_list[node_id]->get_global_transform().basis_determinant() < 0) {
rot = -rot;
}
joints_list[node_id]->rotate(rot);
total_rot += rot;
}
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 16:49:27 +02: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 08:58:35 +01:00
joints_list[0]->rotate(-total_rot);
}
}
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 16:49:27 +02: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 08:58:35 +01:00
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 16:49:27 +02: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 08:58:35 +01:00
// Start rotation
if (drag_type == DRAG_NONE) {
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && b->is_pressed()) {
drag_selection = _get_edited_canvas_items();
if (drag_selection.size() > 0 && ((b->get_control() && tool == TOOL_SELECT) || tool == TOOL_ROTATE)) {
drag_type = DRAG_ROTATE;
drag_from = transform.affine_inverse().xform(b->get_position());
CanvasItem *canvas_item = drag_selection[0];
if (canvas_item->_edit_use_pivot()) {
drag_rotation_center = canvas_item->get_global_transform_with_canvas().xform(canvas_item->_edit_get_pivot());
} else {
drag_rotation_center = canvas_item->get_global_transform_with_canvas().get_origin();
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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01:00
if (drag_type == DRAG_ROTATE) {
// Rotate the node
if (m.is_valid()) {
_restore_canvas_item_state(drag_selection);
for (List<CanvasItem *>::Element *E = drag_selection.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
drag_to = transform.affine_inverse().xform(m->get_position());
canvas_item->_edit_set_rotation(snap_angle(canvas_item->_edit_get_rotation() + (drag_from - drag_rotation_center).angle_to(drag_to - drag_rotation_center), canvas_item->_edit_get_rotation()));
viewport->update();
}
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 16:49:27 +02: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 08:58:35 +01:00
// Confirms the node rotation
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && !b->is_pressed()) {
_commit_canvas_item_state(drag_selection, TTR("Rotate CanvasItem"));
drag_type = DRAG_NONE;
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 16:49:27 +02: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 08:58:35 +01:00
// Cancel a drag
if (b.is_valid() && b->get_button_index() == BUTTON_RIGHT && b->is_pressed()) {
_restore_canvas_item_state(drag_selection);
drag_type = DRAG_NONE;
viewport->update();
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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01:00
// Open a sub-scene on double-click
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && b->is_pressed() && b->is_doubleclick() && tool == TOOL_SELECT) {
List<CanvasItem *> selection = _get_edited_canvas_items();
if (selection.size() == 1) {
CanvasItem *canvas_item = selection[0];
if (canvas_item->get_filename() != "" && canvas_item != editor->get_edited_scene()) {
editor->open_request(canvas_item->get_filename());
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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01:00
// Starts anchor dragging if needed
if (drag_type == DRAG_NONE) {
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && b->is_pressed() && tool == TOOL_SELECT && show_helpers) {
List<CanvasItem *> selection = _get_edited_canvas_items();
if (selection.size() == 1) {
Control *control = Object::cast_to<Control>(selection[0]);
if (control && !Object::cast_to<Container>(control->get_parent())) {
Vector2 anchor_pos[4];
anchor_pos[0] = Vector2(control->get_anchor(MARGIN_LEFT), control->get_anchor(MARGIN_TOP));
anchor_pos[1] = Vector2(control->get_anchor(MARGIN_RIGHT), control->get_anchor(MARGIN_TOP));
anchor_pos[2] = Vector2(control->get_anchor(MARGIN_RIGHT), control->get_anchor(MARGIN_BOTTOM));
anchor_pos[3] = Vector2(control->get_anchor(MARGIN_LEFT), control->get_anchor(MARGIN_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 16:49:27 +02: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 08:58:35 +01: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());
anchor_rects[i].position -= anchor_handle->get_size() * Vector2(i == 0 || i == 3, i <= 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 16:49:27 +02: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 08:58:35 +01:00
DragType dragger[] = {
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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01: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 16:57:32 +02: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 08:58:35 +01:00
drag_to = transform.affine_inverse().xform(m->get_position());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
Transform2D xform = control->get_global_transform_with_canvas().affine_inverse();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
Point2 previous_anchor;
previous_anchor.x = (drag_type == DRAG_ANCHOR_TOP_LEFT || drag_type == DRAG_ANCHOR_BOTTOM_LEFT) ? control->get_anchor(MARGIN_LEFT) : control->get_anchor(MARGIN_RIGHT);
previous_anchor.y = (drag_type == DRAG_ANCHOR_TOP_LEFT || drag_type == DRAG_ANCHOR_TOP_RIGHT) ? control->get_anchor(MARGIN_TOP) : control->get_anchor(MARGIN_BOTTOM);
previous_anchor = xform.affine_inverse().xform(_anchor_to_position(control, previous_anchor));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
Vector2 new_anchor = xform.xform(snap_point(previous_anchor + (drag_to - drag_from), SNAP_GRID | SNAP_OTHER_NODES, control, SNAP_NODE_PARENT | SNAP_NODE_SIDES | SNAP_NODE_CENTER));
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 20:17:55 +02: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 08:58:35 +01:00
bool use_single_axis = m->get_shift();
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 16:49:27 +02: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 08:58:35 +01:00
switch (drag_type) {
case DRAG_ANCHOR_TOP_LEFT:
Simplify CanvasItemEditor anchor drag logic
2018-03-26 20:30:51 +02:00
if (!use_single_axis || !use_y) control->set_anchor(MARGIN_LEFT, new_anchor.x, false, false);
if (!use_single_axis || use_y) control->set_anchor(MARGIN_TOP, new_anchor.y, false, 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 08:58:35 +01:00
break;
case DRAG_ANCHOR_TOP_RIGHT:
Simplify CanvasItemEditor anchor drag logic
2018-03-26 20:30:51 +02:00
if (!use_single_axis || !use_y) control->set_anchor(MARGIN_RIGHT, new_anchor.x, false, false);
if (!use_single_axis || use_y) control->set_anchor(MARGIN_TOP, new_anchor.y, false, 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 08:58:35 +01:00
break;
case DRAG_ANCHOR_BOTTOM_RIGHT:
Simplify CanvasItemEditor anchor drag logic
2018-03-26 20:30:51 +02:00
if (!use_single_axis || !use_y) control->set_anchor(MARGIN_RIGHT, new_anchor.x, false, false);
if (!use_single_axis || use_y) control->set_anchor(MARGIN_BOTTOM, new_anchor.y, false, 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 08:58:35 +01:00
break;
case DRAG_ANCHOR_BOTTOM_LEFT:
Simplify CanvasItemEditor anchor drag logic
2018-03-26 20:30:51 +02:00
if (!use_single_axis || !use_y) control->set_anchor(MARGIN_LEFT, new_anchor.x, false, false);
if (!use_single_axis || use_y) control->set_anchor(MARGIN_BOTTOM, new_anchor.y, false, 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 08:58:35 +01:00
break;
case DRAG_ANCHOR_ALL:
Simplify CanvasItemEditor anchor drag logic
2018-03-26 20:30:51 +02:00
if (!use_single_axis || !use_y) control->set_anchor(MARGIN_LEFT, new_anchor.x, false, true);
if (!use_single_axis || !use_y) control->set_anchor(MARGIN_RIGHT, new_anchor.x, false, true);
if (!use_single_axis || use_y) control->set_anchor(MARGIN_TOP, new_anchor.y, false, true);
if (!use_single_axis || use_y) control->set_anchor(MARGIN_BOTTOM, new_anchor.y, false, 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 08:58:35 +01:00
break;
default:
break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
return true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
// Confirms new anchor position
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && !b->is_pressed()) {
_commit_canvas_item_state(drag_selection, TTR("Move anchor"));
drag_type = DRAG_NONE;
return true;
Attempt to resolve #4673
2017-08-08 12:13:17 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
// Cancel a drag
if (b.is_valid() && b->get_button_index() == BUTTON_RIGHT && b->is_pressed()) {
_restore_canvas_item_state(drag_selection);
drag_type = DRAG_NONE;
viewport->update();
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 20:17:55 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
return false;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01: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 17:38:03 +02:00
Ref<InputEventMouseMotion> m = p_event;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
// Drag resize handles
if (drag_type == DRAG_NONE) {
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && b->is_pressed() && tool == TOOL_SELECT) {
List<CanvasItem *> selection = _get_edited_canvas_items();
if (selection.size() == 1) {
CanvasItem *canvas_item = selection[0];
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (canvas_item->_edit_use_rect()) {
Rect2 rect = canvas_item->_edit_get_rect();
Transform2D xform = transform * canvas_item->get_global_transform_with_canvas();
Vector2 endpoints[4] = {
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 08:58:35 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
DragType dragger[] = {
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 08:58:35 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
DragType resize_drag = DRAG_NONE;
float 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 08:58:35 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01: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];
if (ofs.distance_to(b->get_position()) < radius)
resize_drag = dragger[i * 2];
ofs = (endpoints[i] + endpoints[next]) / 2;
ofs += (endpoints[next] - endpoints[i]).tangent().normalized() * (select_handle->get_size().width / 2);
if (ofs.distance_to(b->get_position()) < radius)
resize_drag = dragger[i * 2 + 1];
}
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 21:18:47 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (resize_drag != DRAG_NONE) {
drag_type = resize_drag;
drag_from = transform.affine_inverse().xform(b->get_position());
drag_selection = List<CanvasItem *>();
drag_selection.push_back(canvas_item);
_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 08:58:35 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01: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()) {
CanvasItem *canvas_item = drag_selection[0];
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 16:44:50 +01:00
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_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 08:58:35 +01:00
//Reset state
canvas_item->_edit_set_state(se->undo_state);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
bool uniform = m->get_shift();
bool symmetric = m->get_alt();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
Rect2 local_rect = canvas_item->_edit_get_rect();
float aspect = local_rect.get_size().y / local_rect.get_size().x;
Point2 current_begin = local_rect.get_position();
Point2 current_end = local_rect.get_position() + local_rect.get_size();
Point2 max_begin = (symmetric) ? (current_begin + current_end - canvas_item->_edit_get_minimum_size()) / 2.0 : current_end - canvas_item->_edit_get_minimum_size();
Point2 min_end = (symmetric) ? (current_begin + current_end + canvas_item->_edit_get_minimum_size()) / 2.0 : current_begin + canvas_item->_edit_get_minimum_size();
Point2 center = (current_begin + current_end) / 2.0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
drag_to = transform.affine_inverse().xform(m->get_position());
Ability to rotate controls using tool, closes #3800
2016-06-27 15:47:51 +02: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 08:58:35 +01:00
Transform2D xform = canvas_item->get_global_transform_with_canvas().affine_inverse();
Ability to rotate controls using tool, closes #3800
2016-06-27 15:47:51 +02: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 08:58:35 +01:00
Point2 drag_to_snapped_begin = snap_point(xform.affine_inverse().xform(current_begin) + (drag_to - drag_from), SNAP_NODE_ANCHORS | SNAP_NODE_PARENT | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, canvas_item);
Point2 drag_to_snapped_end = snap_point(xform.affine_inverse().xform(current_end) + (drag_to - drag_from), SNAP_NODE_ANCHORS | SNAP_NODE_PARENT | SNAP_OTHER_NODES | SNAP_GRID | SNAP_PIXEL, canvas_item);
Point2 drag_begin = xform.xform(drag_to_snapped_begin);
Point2 drag_end = xform.xform(drag_to_snapped_end);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01: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 02:10:30 +01: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 08:58:35 +01: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 23:27:05 +02: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 08:58:35 +01: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 23:27:05 +02: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 08:58:35 +01: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 23:27:05 +02: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 08:58:35 +01:00
}
Use shift to move anchors on a single axis
2017-08-31 23:27:05 +02: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 08:58:35 +01: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;
}
}
canvas_item->_edit_set_rect(Rect2(current_begin, current_end - current_begin));
return true;
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02: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 08:58:35 +01:00
// Confirm resize
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && !b->is_pressed()) {
_commit_canvas_item_state(drag_selection, TTR("Resize CanvasItem"));
drag_type = DRAG_NONE;
viewport->update();
return true;
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02: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 08:58:35 +01:00
// Cancel a drag
if (b.is_valid() && b->get_button_index() == BUTTON_RIGHT && b->is_pressed()) {
_restore_canvas_item_state(drag_selection);
drag_type = DRAG_NONE;
viewport->update();
return true;
}
}
return false;
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02: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 08:58:35 +01: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 16:57:32 +02: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 08:58:35 +01:00
if (drag_type == DRAG_NONE) {
//Start moving the nodes
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && b->is_pressed()) {
List<CanvasItem *> selection = _get_edited_canvas_items();
if ((b->get_alt() || tool == TOOL_MOVE) && selection.size() > 0) {
drag_type = DRAG_ALL;
drag_from = transform.affine_inverse().xform(b->get_position());
drag_selection = selection;
_save_canvas_item_state(drag_selection);
return true;
Make anchors draggable
2017-07-29 16:57:32 +02: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 08:58:35 +01:00
}
}
Make anchors draggable
2017-07-29 16:57:32 +02: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 08:58:35 +01:00
if (drag_type == DRAG_ALL) {
// Move the nodes
if (m.is_valid()) {
_restore_canvas_item_state(drag_selection, true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
drag_to = transform.affine_inverse().xform(m->get_position());
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());
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02: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 08:58:35 +01:00
previous_pos = _get_encompassing_rect_from_list(drag_selection).position;
}
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);
bool single_axis = m->get_shift();
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-06 00:13:07 +01:00
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
bool force_no_IK = m->get_alt();
for (List<CanvasItem *>::Element *E = drag_selection.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
Transform2D xform = canvas_item->get_global_transform_with_canvas().affine_inverse() * canvas_item->get_transform();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
Node2D *node2d = Object::cast_to<Node2D>(canvas_item);
if (node2d && se->pre_drag_bones_undo_state.size() > 0 && !force_no_IK) {
_solve_IK(node2d, new_pos);
} else {
canvas_item->_edit_set_position(canvas_item->_edit_get_position() + xform.xform(new_pos) - xform.xform(previous_pos));
}
}
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-23 00:47:51 +01: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 08:58:35 +01:00
// Confirm the move (only if it was moved)
if (b.is_valid() && !b->is_pressed() && b->get_button_index() == BUTTON_LEFT && (drag_type == DRAG_ALL)) {
if (transform.affine_inverse().xform(b->get_position()) != drag_from) {
_commit_canvas_item_state(drag_selection, TTR("Move CanvasItem"), true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
drag_type = DRAG_NONE;
viewport->update();
return true;
}
// Cancel a drag
if (b.is_valid() && b->get_button_index() == BUTTON_RIGHT && b->is_pressed()) {
_restore_canvas_item_state(drag_selection, true);
drag_type = DRAG_NONE;
viewport->update();
return true;
}
}
// Move the canvas items with the arrow keys
if (k.is_valid() && k->is_pressed() && tool == TOOL_SELECT &&
(k->get_scancode() == KEY_UP || k->get_scancode() == KEY_DOWN || k->get_scancode() == KEY_LEFT || k->get_scancode() == KEY_RIGHT)) {
if (!k->is_echo()) {
// Start moving the canvas items with the keyboard
drag_selection = _get_edited_canvas_items();
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 21:35:41 +01:00
if (drag_selection.size() > 0) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
_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 08:58:35 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
bool move_local_base = k->get_alt();
bool move_local_base_rotated = k->get_control() || k->get_metakey();
Vector2 dir;
if (k->get_scancode() == KEY_UP)
dir += Vector2(0, -1);
else if (k->get_scancode() == KEY_DOWN)
dir += Vector2(0, 1);
else if (k->get_scancode() == KEY_LEFT)
dir += Vector2(-1, 0);
else if (k->get_scancode() == KEY_RIGHT)
dir += Vector2(1, 0);
if (k->get_shift())
dir *= grid_step * Math::pow(2.0, grid_step_multiplier);
drag_to += dir;
if (k->get_shift())
drag_to = drag_to.snapped(grid_step * Math::pow(2.0, grid_step_multiplier));
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01: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 08:58:35 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01: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) {
Transform2D m;
m.rotate(node_2d->get_rotation());
new_pos += m.xform(drag_to);
} 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 08:58:35 +01: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 16:49:27 +02:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
for (List<CanvasItem *>::Element *E = drag_selection.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
Transform2D xform = canvas_item->get_global_transform_with_canvas().affine_inverse() * canvas_item->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 16:49:27 +02:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
Node2D *node2d = Object::cast_to<Node2D>(canvas_item);
if (node2d && se->pre_drag_bones_undo_state.size() > 0) {
_solve_IK(node2d, new_pos);
} else {
canvas_item->_edit_set_position(canvas_item->_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 08:58:35 +01:00
}
}
return true;
}
if (k.is_valid() && !k->is_pressed() && drag_type == DRAG_KEY_MOVE && tool == TOOL_SELECT &&
(k->get_scancode() == KEY_UP || k->get_scancode() == KEY_DOWN || k->get_scancode() == KEY_LEFT || k->get_scancode() == KEY_RIGHT)) {
// Confirm canvas items move by arrow keys
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))) {
_commit_canvas_item_state(drag_selection, TTR("Move CanvasItem"), true);
drag_type = DRAG_NONE;
}
viewport->update();
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 16:49:27 +02: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 08:58:35 +01:00
if (k.is_valid() && (k->get_scancode() == KEY_UP || k->get_scancode() == KEY_DOWN || k->get_scancode() == KEY_LEFT || k->get_scancode() == KEY_RIGHT)) {
// Accept the key event in any case
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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01:00
if (drag_type == DRAG_NONE) {
if (b.is_valid() &&
FIX to broken item select list (zoom and RMB) FIX to #17346. Compiled and tested.
2018-03-07 21:39:55 +01:00
((b->get_button_index() == BUTTON_RIGHT && b->get_alt() && 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 08:58:35 +01:00
(b->get_button_index() == BUTTON_LEFT && tool == TOOL_LIST_SELECT))) {
// Popup the selection menu list
FIX to broken item select list (zoom and RMB) FIX to #17346. Compiled and tested.
2018-03-07 21:39:55 +01: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 08:58:35 +01:00
Fixes locks and groups on 2d editor
2018-04-24 21:55:28 +02:00
_get_canvas_items_at_pos(click, selection_results);
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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01:00
_select_click_on_item(item, click, b->get_shift());
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 16:49:27 +02: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 08:58:35 +01:00
return true;
} else if (!selection_results.empty()) {
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01:00
Ref<Texture> icon;
if (item->has_meta("_editor_icon"))
icon = item->get_meta("_editor_icon");
else
icon = get_icon(has_icon(item->get_class(), "EditorIcons") ? item->get_class() : String("Object"), "EditorIcons");
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 16:49:27 +02: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 08:58:35 +01:00
selection_menu->add_item(item->get_name());
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 16:49:27 +02: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 08:58:35 +01:00
selection_menu_additive_selection = b->get_shift();
selection_menu->set_global_position(b->get_global_position());
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 16:49:27 +02: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 08:58:35 +01:00
if (b.is_valid() && b->get_button_index() == BUTTON_LEFT && b->is_pressed() && tool == TOOL_SELECT) {
// 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 16:49:27 +02: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 08:58:35 +01:00
Node *scene = editor->get_edited_scene();
if (!scene)
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 16:49:27 +02: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 08:58:35 +01:00
// Find the item to select
CanvasItem *canvas_item = NULL;
Vector<_SelectResult> selection;
Bring back 2D bone selection
2018-05-15 15:18:46 +02:00
// Retrieve the items
Fixes locks and groups on 2d editor
2018-04-24 21:55:28 +02:00
_get_canvas_items_at_pos(click, selection, editor_selection->get_selection().empty() ? 1 : 0);
In CanvasItemEditor, prioritize selected items
2018-03-04 14:05:58 +01:00
Bring back 2D bone selection
2018-05-15 15:18:46 +02:00
// Retrieve the bones
_get_bones_at_pos(click, selection);
In CanvasItemEditor, prioritize selected items
2018-03-04 14:05:58 +01:00
for (int i = 0; i < selection.size(); i++) {
if (editor_selection->is_selected(selection[i].item)) {
// Drag the node(s) if requested
List<CanvasItem *> selection = _get_edited_canvas_items();
drag_type = DRAG_ALL;
drag_selection = selection;
drag_from = click;
_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 08:58:35 +01:00
if (!selection.empty())
canvas_item = selection[0].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 16:49:27 +02: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 08:58:35 +01:00
if (!canvas_item) {
// Start a box selection
if (!b->get_shift()) {
// Clear the selection if not additive
editor_selection->clear();
viewport->update();
};
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 16:49:27 +02: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 08:58:35 +01:00
drag_from = click;
drag_type = DRAG_BOX_SELECTION;
box_selecting_to = drag_from;
return true;
} else {
bool still_selected = _select_click_on_item(canvas_item, click, b->get_shift());
// Start dragging
if (still_selected) {
// Drag the node(s) if requested
List<CanvasItem *> selection = _get_edited_canvas_items();
drag_type = DRAG_ALL;
drag_selection = selection;
drag_from = click;
_save_canvas_item_state(drag_selection);
}
// Select the item
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 16:49:27 +02: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 08:58:35 +01:00
if (drag_type == DRAG_BOX_SELECTION) {
if (b.is_valid() && !b->is_pressed() && b->get_button_index() == BUTTON_LEFT) {
// Confirms box selection
Node *scene = editor->get_edited_scene();
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 16:49:27 +02: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 08:58:35 +01:00
Point2 bsfrom = drag_from;
Point2 bsto = box_selecting_to;
if (bsfrom.x > bsto.x)
SWAP(bsfrom.x, bsto.x);
if (bsfrom.y > bsto.y)
SWAP(bsfrom.y, bsto.y);
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 16:49:27 +02:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
_find_canvas_items_in_rect(Rect2(bsfrom, bsto - bsfrom), scene, &selitems);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
for (List<CanvasItem *>::Element *E = selitems.front(); E; E = E->next()) {
editor_selection->add_node(E->get());
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 16:49:27 +02: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 08:58:35 +01: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 16:49:27 +02: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 08:58:35 +01:00
drag_type = DRAG_NONE;
viewport->update();
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 16:49:27 +02: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 08:58:35 +01:00
if (b.is_valid() && b->is_pressed() && b->get_button_index() == BUTTON_RIGHT) {
// Cancel box selection
drag_type = DRAG_NONE;
viewport->update();
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 16:49:27 +02: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 08:58:35 +01:00
if (m.is_valid()) {
// Update box selection
box_selecting_to = transform.affine_inverse().xform(m->get_position());
viewport->update();
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 16:49:27 +02: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 08:58:35 +01:00
if (k.is_valid() && k->is_pressed() && k->get_scancode() == KEY_ESCAPE && drag_type == DRAG_NONE && tool == TOOL_SELECT) {
// Unselect everything
editor_selection->clear();
viewport->update();
}
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 16:49:27 +02:00
Displays node icon on hover
2018-03-12 23:32:25 +01: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 11:01:24 +02:00
Point2 click = transform.affine_inverse().xform(m->get_position());
Displays node icon on hover
2018-03-12 23:32:25 +01:00
Fixes a crash on draw_hover
2018-06-12 11:01:24 +02:00
// Checks if the hovered items changed, update the viewport if so
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++) {
CanvasItem *canvas_item = hovering_results_items[i].item;
if (canvas_item->_edit_use_rect())
continue;
_HoverResult hover_result;
hover_result.position = canvas_item->get_global_transform_with_canvas().get_origin();
if (has_icon(canvas_item->get_class(), "EditorIcons"))
hover_result.icon = get_icon(canvas_item->get_class(), "EditorIcons");
else
hover_result.icon = get_icon("Object", "EditorIcons");
hover_result.name = canvas_item->get_name();
hovering_results_tmp.push_back(hover_result);
}
// Check if changed, if so, update.
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 23:32:25 +01:00
}
Fixes a crash on draw_hover
2018-06-12 11:01:24 +02:00
} else {
changed = true;
}
Displays node icon on hover
2018-03-12 23:32:25 +01:00
Fixes a crash on draw_hover
2018-06-12 11:01:24 +02:00
if (changed) {
hovering_results = hovering_results_tmp;
viewport->update();
Displays node icon on hover
2018-03-12 23:32:25 +01:00
}
Fixes a crash on draw_hover
2018-06-12 11:01:24 +02:00
return true;
Displays node icon on hover
2018-03-12 23:32:25 +01: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 08:58:35 +01:00
void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
bool accepted = false;
if ((accepted = _gui_input_rulers_and_guides(p_event))) {
//printf("Rulers and guides\n");
} else if ((accepted = editor->get_editor_plugins_over()->forward_gui_input(p_event))) {
//printf("Plugin\n");
} else if ((accepted = _gui_input_open_scene_on_double_click(p_event))) {
//printf("Open scene on double click\n");
} else if ((accepted = _gui_input_anchors(p_event))) {
//printf("Anchors\n");
} else if ((accepted = _gui_input_pivot(p_event))) {
//printf("Set pivot\n");
} else if ((accepted = _gui_input_resize(p_event))) {
//printf("Resize\n");
} else if ((accepted = _gui_input_rotate(p_event))) {
//printf("Rotate\n");
} else if ((accepted = _gui_input_move(p_event))) {
//printf("Move\n");
} else if ((accepted = _gui_input_zoom_or_pan(p_event))) {
//printf("Zoom or pan\n");
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
} else if ((accepted = _gui_input_select(p_event))) {
//printf("Selection\n");
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
}
if (accepted)
accept_event();
Displays node icon on hover
2018-03-12 23:32:25 +01:00
// Handles the mouse hovering
_gui_input_hover(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 08:58:35 +01:00
// Change the cursor
CursorShape c = CURSOR_ARROW;
switch (drag_type) {
case DRAG_NONE:
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
switch (tool) {
case TOOL_MOVE:
c = CURSOR_MOVE;
break;
case TOOL_EDIT_PIVOT:
c = CURSOR_CROSS;
break;
case TOOL_PAN:
c = CURSOR_DRAG;
break;
default:
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 16:49:27 +02: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 08:58:35 +01:00
break;
case DRAG_LEFT:
case DRAG_RIGHT:
c = CURSOR_HSIZE;
break;
case DRAG_TOP:
case DRAG_BOTTOM:
c = CURSOR_VSIZE;
break;
case DRAG_TOP_LEFT:
case DRAG_BOTTOM_RIGHT:
c = CURSOR_FDIAGSIZE;
break;
case DRAG_TOP_RIGHT:
case DRAG_BOTTOM_LEFT:
c = CURSOR_BDIAGSIZE;
break;
case DRAG_ALL:
c = CURSOR_MOVE;
break;
Fixes 2d editor panning not working
2018-04-22 23:27:46 +02:00
case DRAG_PAN:
c = CURSOR_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 08:58:35 +01:00
default:
break;
}
viewport->set_default_cursor_shape(c);
// Grab focus
if (!viewport->has_focus() && (!get_focus_owner() || !get_focus_owner()->is_text_field())) {
viewport->call_deferred("grab_focus");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
void CanvasItemEditor::_draw_text_at_position(Point2 p_position, String p_string, Margin p_side) {
Visual tweaks. Updated icons Updated some color
2017-09-21 02:29:52 +02:00
Color color = get_color("font_color", "Editor");
color.a = 0.8;
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
Ref<Font> font = get_font("font", "Label");
Size2 text_size = font->get_string_size(p_string);
switch (p_side) {
case MARGIN_LEFT:
p_position += Vector2(-text_size.x - 5, text_size.y / 2);
break;
case MARGIN_TOP:
p_position += Vector2(-text_size.x / 2, -5);
break;
case MARGIN_RIGHT:
p_position += Vector2(5, text_size.y / 2);
break;
case MARGIN_BOTTOM:
p_position += Vector2(-text_size.x / 2, text_size.y + 5);
break;
}
viewport->draw_string(font, p_position, p_string, color);
}
void CanvasItemEditor::_draw_margin_at_position(int p_value, Point2 p_position, Margin p_side) {
String str = vformat("%d px", p_value);
if (p_value != 0) {
_draw_text_at_position(p_position, str, p_side);
}
}
Displays percentages when dragging anchors
2017-08-02 18:33:06 +02:00
void CanvasItemEditor::_draw_percentage_at_position(float p_value, Point2 p_position, Margin p_side) {
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
String str = vformat("%.1f %%", p_value * 100.0);
Displays percentages when dragging anchors
2017-08-02 18:33:06 +02:00
if (p_value != 0) {
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
_draw_text_at_position(p_position, str, p_side);
Displays percentages when dragging anchors
2017-08-02 18:33:06 +02:00
}
}
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
if (viewport->has_focus()) {
get_stylebox("Focus", "EditorStyles")->draw(viewport->get_canvas_item(), Rect2(Point2(), viewport->get_size()));
Implement guides
2017-10-18 23:55:02 +02:00
}
}
void CanvasItemEditor::_draw_guides() {
Moves the guides colors to editor settings
2017-12-05 21:42:33 +01:00
Color guide_color = EditorSettings::get_singleton()->get("editors/2d/guides_color");
Implement guides
2017-10-18 23:55:02 +02:00
Transform2D xform = viewport_scrollable->get_transform() * transform;
// Guides already there
if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) {
Array vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_");
for (int i = 0; i < vguides.size(); i++) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
if (drag_type == DRAG_V_GUIDE && i == dragged_guide_index)
Implement guides
2017-10-18 23:55:02 +02:00
continue;
float x = xform.xform(Point2(vguides[i], 0)).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 08:58:35 +01:00
viewport->draw_line(Point2(x, 0), Point2(x, viewport->get_size().y), guide_color);
Implement guides
2017-10-18 23:55:02 +02:00
}
}
if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_horizontal_guides_")) {
Array hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_");
for (int i = 0; i < hguides.size(); i++) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
if (drag_type == DRAG_H_GUIDE && i == dragged_guide_index)
Implement guides
2017-10-18 23:55:02 +02:00
continue;
float y = xform.xform(Point2(0, hguides[i])).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 08:58:35 +01:00
viewport->draw_line(Point2(0, y), Point2(viewport->get_size().x, y), guide_color);
Implement guides
2017-10-18 23:55:02 +02:00
}
}
// Dragged guide
Color text_color = get_color("font_color", "Editor");
text_color.a = 0.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 08:58:35 +01:00
if (drag_type == DRAG_DOUBLE_GUIDE || drag_type == DRAG_V_GUIDE) {
String str = vformat("%d px", xform.affine_inverse().xform(dragged_guide_pos).x);
Implement guides
2017-10-18 23:55:02 +02:00
Ref<Font> font = get_font("font", "Label");
Size2 text_size = font->get_string_size(str);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
viewport->draw_string(font, Point2(dragged_guide_pos.x + 10, RULER_WIDTH + text_size.y / 2 + 10), str, text_color);
viewport->draw_line(Point2(dragged_guide_pos.x, 0), Point2(dragged_guide_pos.x, viewport->get_size().y), guide_color);
Implement guides
2017-10-18 23:55:02 +02: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 08:58:35 +01:00
if (drag_type == DRAG_DOUBLE_GUIDE || drag_type == DRAG_H_GUIDE) {
String str = vformat("%d px", xform.affine_inverse().xform(dragged_guide_pos).y);
Implement guides
2017-10-18 23:55:02 +02:00
Ref<Font> font = get_font("font", "Label");
Size2 text_size = font->get_string_size(str);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
viewport->draw_string(font, Point2(RULER_WIDTH + 10, dragged_guide_pos.y + text_size.y / 2 + 10), str, text_color);
viewport->draw_line(Point2(0, dragged_guide_pos.y), Point2(viewport->get_size().x, dragged_guide_pos.y), guide_color);
Implement guides
2017-10-18 23:55:02 +02:00
}
}
Implements rulers
2017-08-29 21:50:18 +02:00
void CanvasItemEditor::_draw_rulers() {
Color bg_color = get_color("dark_color_2", "Editor");
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
Color graduation_color = get_color("font_color", "Editor").linear_interpolate(bg_color, 0.5);
Visual tweaks. Updated icons Updated some color
2017-09-21 02:29:52 +02:00
Color font_color = get_color("font_color", "Editor");
font_color.a = 0.8;
Implements rulers
2017-08-29 21:50:18 +02:00
Ref<Font> font = get_font("rulers", "EditorFonts");
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
bool is_snap_active = snap_active ^ Input::get_singleton()->is_key_pressed(KEY_CONTROL);
Implements rulers
2017-08-29 21:50:18 +02:00
// The rule transform
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
Transform2D ruler_transform = Transform2D();
Enable snapping in 2D when control key pressed
2018-03-27 17:30:39 +02:00
if (show_grid || (is_snap_active && snap_grid)) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
List<CanvasItem *> selection = _get_edited_canvas_items();
if (snap_relative && selection.size() > 0) {
ruler_transform.translate(_get_encompassing_rect_from_list(selection).position);
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
ruler_transform.scale_basis(grid_step * Math::pow(2.0, grid_step_multiplier));
Implements rulers
2017-08-29 21:50:18 +02:00
} else {
ruler_transform.translate(grid_offset);
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
ruler_transform.scale_basis(grid_step * Math::pow(2.0, grid_step_multiplier));
Implements rulers
2017-08-29 21:50:18 +02:00
}
while ((transform * ruler_transform).get_scale().x < 50 || (transform * ruler_transform).get_scale().y < 50) {
ruler_transform.scale_basis(Point2(2, 2));
}
} else {
float basic_rule = 100;
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;
Transform2D major_subdivide = Transform2D();
major_subdivide.scale(Size2(1.0 / major_subdivision, 1.0 / major_subdivision));
int minor_subdivision = 5;
Transform2D minor_subdivide = Transform2D();
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 08:58:35 +01:00
Point2 first = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(Point2(RULER_WIDTH, RULER_WIDTH));
Implements rulers
2017-08-29 21:50:18 +02: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 08:58:35 +01:00
viewport->draw_rect(Rect2(Point2(RULER_WIDTH, 0), Size2(viewport->get_size().x, RULER_WIDTH)), bg_color);
Implements rulers
2017-08-29 21:50:18 +02:00
for (int i = Math::ceil(first.x); i < last.x; i++) {
Point2 position = (transform * ruler_transform * major_subdivide * minor_subdivide).xform(Point2(i, 0));
if (i % (major_subdivision * minor_subdivision) == 0) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
viewport->draw_line(Point2(position.x, 0), Point2(position.x, RULER_WIDTH), graduation_color);
Implements rulers
2017-08-29 21:50:18 +02:00
float val = (ruler_transform * major_subdivide * minor_subdivide).xform(Point2(i, 0)).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 08:58:35 +01:00
viewport->draw_string(font, Point2(position.x + 2, font->get_height()), vformat(((int)val == val) ? "%d" : "%.1f", val), font_color);
Implements rulers
2017-08-29 21:50:18 +02:00
} else {
if (i % minor_subdivision == 0) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
viewport->draw_line(Point2(position.x, RULER_WIDTH * 0.33), Point2(position.x, RULER_WIDTH), graduation_color);
Implements rulers
2017-08-29 21:50:18 +02: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 08:58:35 +01:00
viewport->draw_line(Point2(position.x, RULER_WIDTH * 0.66), Point2(position.x, RULER_WIDTH), graduation_color);
Implements rulers
2017-08-29 21:50:18 +02: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 08:58:35 +01:00
viewport->draw_rect(Rect2(Point2(0, RULER_WIDTH), Size2(RULER_WIDTH, viewport->get_size().y)), bg_color);
Implements rulers
2017-08-29 21:50:18 +02:00
for (int i = Math::ceil(first.y); i < last.y; i++) {
Point2 position = (transform * ruler_transform * major_subdivide * minor_subdivide).xform(Point2(0, i));
if (i % (major_subdivision * minor_subdivision) == 0) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
viewport->draw_line(Point2(0, position.y), Point2(RULER_WIDTH, position.y), graduation_color);
Implements rulers
2017-08-29 21:50:18 +02:00
float val = (ruler_transform * major_subdivide * minor_subdivide).xform(Point2(0, i)).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 08:58:35 +01:00
viewport->draw_string(font, Point2(2, position.y + 2 + font->get_height()), vformat(((int)val == val) ? "%d" : "%.1f", val), font_color);
Implements rulers
2017-08-29 21:50:18 +02:00
} else {
if (i % minor_subdivision == 0) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
viewport->draw_line(Point2(RULER_WIDTH * 0.33, position.y), Point2(RULER_WIDTH, position.y), graduation_color);
Implements rulers
2017-08-29 21:50:18 +02: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 08:58:35 +01:00
viewport->draw_line(Point2(RULER_WIDTH * 0.66, position.y), Point2(RULER_WIDTH, position.y), graduation_color);
Implements rulers
2017-08-29 21:50:18 +02: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 08:58:35 +01:00
viewport->draw_rect(Rect2(Point2(), Size2(RULER_WIDTH, RULER_WIDTH)), graduation_color);
Implements rulers
2017-08-29 21:50:18 +02:00
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
void CanvasItemEditor::_draw_grid() {
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
if (show_grid) {
Change the grid offset when the snap is set as relative
2017-07-25 21:09:32 +02:00
//Draw the grid
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Size2 s = viewport->get_size();
Fix use of unitialized variables The second in my quest to make Godot 3.x compile with -Werror on GCC7
2017-09-01 22:33:39 +02:00
int last_cell = 0;
Type renames: Matrix32 -> Transform2D Matrix3 -> Basis AABB -> Rect3 RawArray -> PoolByteArray IntArray -> PoolIntArray FloatArray -> PoolFloatArray Vector2Array -> PoolVector2Array Vector3Array -> PoolVector3Array ColorArray -> PoolColorArray
2017-01-11 04:52:51 +01:00
Transform2D xform = transform.affine_inverse();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Implements rulers
2017-08-29 21:50:18 +02:00
Vector2 real_grid_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 08:58:35 +01:00
List<CanvasItem *> selection = _get_edited_canvas_items();
if (snap_relative && selection.size() > 0) {
Vector2 topleft = _get_encompassing_rect_from_list(selection).position;
Fix compilation on Visual Studio 2013 (#10219).
2017-10-19 18:41:36 +02: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 21:09:32 +02:00
} else {
Implements rulers
2017-08-29 21:50:18 +02:00
real_grid_offset = grid_offset;
Change the grid offset when the snap is set as relative
2017-07-25 21:09:32 +02:00
}
Visual tweaks. Updated icons Updated some color
2017-09-21 02:29:52 +02:00
const Color grid_minor_color = get_color("grid_minor_color", "Editor");
Implements rulers
2017-08-29 21:50:18 +02:00
if (grid_step.x != 0) {
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 16:44:50 +01:00
for (int i = 0; i < s.width; i++) {
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
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))));
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 16:44:50 +01:00
if (i == 0)
last_cell = cell;
if (last_cell != cell)
Visual tweaks. Updated icons Updated some color
2017-09-21 02:29:52 +02:00
viewport->draw_line(Point2(i, 0), Point2(i, s.height), grid_minor_color);
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 16:44:50 +01: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 09:00:55 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Implements rulers
2017-08-29 21:50:18 +02:00
if (grid_step.y != 0) {
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 16:44:50 +01:00
for (int i = 0; i < s.height; i++) {
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
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))));
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 16:44:50 +01:00
if (i == 0)
last_cell = cell;
if (last_cell != cell)
Visual tweaks. Updated icons Updated some color
2017-09-21 02:29:52 +02:00
viewport->draw_line(Point2(0, i), Point2(s.width, i), grid_minor_color);
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 16:44:50 +01: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 09:00:55 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
void CanvasItemEditor::_draw_selection() {
Ref<Texture> pivot_icon = get_icon("EditorPivot", "EditorIcons");
Display nodes without rect's position
2018-03-10 11:56:27 +01:00
Ref<Texture> position_icon = get_icon("EditorPosition", "EditorIcons");
Ref<Texture> previous_position_icon = get_icon("EditorPositionPrevious", "EditorIcons");
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
RID ci = viewport->get_canvas_item();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
List<CanvasItem *> selection = _get_edited_canvas_items(false, false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
bool single = selection.size() == 1;
for (List<CanvasItem *>::Element *E = selection.front(); E; E = E->next()) {
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
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 16:44:50 +01:00
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
// Draw the previous position if we are dragging the node
if (show_helpers &&
(drag_type == DRAG_ALL || drag_type == DRAG_ROTATE ||
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 19:11:53 +02:00
const Transform2D pre_drag_xform = transform * se->pre_drag_xform;
const Color pre_drag_color = Color(0.4, 0.6, 1, 0.7);
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (canvas_item->_edit_use_rect()) {
Vector2 pre_drag_endpoints[4] = {
adds display of old bounding box as suggested by Zephilinox in issue #10936
2017-09-12 19:11:53 +02:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
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 19:11:53 +02:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
for (int i = 0; i < 4; i++) {
viewport->draw_line(pre_drag_endpoints[i], pre_drag_endpoints[(i + 1) % 4], pre_drag_color, 2);
}
} else {
Display nodes without rect's position
2018-03-10 11:56:27 +01: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 19:11:53 +02:00
}
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
Transform2D xform = transform * canvas_item->get_global_transform_with_canvas();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
// Draw the selected items position / surrounding boxes
if (canvas_item->_edit_use_rect()) {
Rect2 rect = canvas_item->_edit_get_rect();
Vector2 endpoints[4] = {
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 02:10:30 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
Color c = Color(1, 0.6, 0.4, 0.7);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
for (int i = 0; i < 4; i++) {
viewport->draw_line(endpoints[i], endpoints[(i + 1) % 4], c, 2);
}
} else {
Transform2D transform = Transform2D(xform.get_rotation(), xform.get_origin());
viewport->draw_set_transform_matrix(transform);
viewport->draw_texture(position_icon, -(position_icon->get_size() / 2));
viewport->draw_set_transform_matrix(Transform2D());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
if (single && (tool == TOOL_SELECT || tool == TOOL_MOVE || 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 08:58:35 +01:00
// Draw the pivot
if (canvas_item->_edit_get_pivot() != Vector2() || drag_type == DRAG_PIVOT || tool == TOOL_EDIT_PIVOT) { // This is not really clean :/
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
viewport->draw_texture(pivot_icon, (xform.xform(canvas_item->_edit_get_pivot()) - (pivot_icon->get_size() / 2)).floor());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Add anchor visualization
2017-07-11 00:14:22 +02: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 22:58:51 +02:00
Control *control = Object::cast_to<Control>(canvas_item);
Add anchor visualization
2017-07-11 00:14:22 +02:00
if (control) {
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
if (tool == TOOL_SELECT && show_helpers && !Object::cast_to<Container>(control->get_parent())) {
// Draw the helpers
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
Color color_base = Color(0.8, 0.8, 0.8, 0.5);
Simplifies the canvas editor code
2017-07-31 18:49:46 +02:00
float anchors_values[4];
anchors_values[0] = control->get_anchor(MARGIN_LEFT);
anchors_values[1] = control->get_anchor(MARGIN_TOP);
anchors_values[2] = control->get_anchor(MARGIN_RIGHT);
anchors_values[3] = control->get_anchor(MARGIN_BOTTOM);
Add anchor visualization
2017-07-11 00:14:22 +02:00
// Draw the anchors
Add lines to make understandable when anchors are snapped
2017-07-30 17:59:57 +02:00
Vector2 anchors[4];
Vector2 anchors_pos[4];
for (int i = 0; i < 4; i++) {
Simplifies the canvas editor code
2017-07-31 18:49:46 +02:00
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]);
Add lines to make understandable when anchors are snapped
2017-07-30 17:59:57 +02:00
anchors_pos[i] = xform.xform(_anchor_to_position(control, anchors[i]));
}
// Get which anchor is dragged
int dragged_anchor = -1;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
switch (drag_type) {
Added the possibility to move all anchors at once when they are clustered
2017-08-04 19:27:30 +02:00
case DRAG_ANCHOR_ALL:
Add lines to make understandable when anchors are snapped
2017-07-30 17:59:57 +02:00
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;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
default:
break;
Add lines to make understandable when anchors are snapped
2017-07-30 17:59:57 +02:00
}
if (dragged_anchor >= 0) {
// Draw the 4 lines when dragged
Simplifies the canvas editor code
2017-07-31 18:49:46 +02:00
bool snapped;
Add lines to make understandable when anchors are snapped
2017-07-30 17:59:57 +02:00
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)));
}
Displays percentages when dragging anchors
2017-08-02 18:33:06 +02:00
Vector2 line_starts[4];
Vector2 line_ends[4];
Add lines to make understandable when anchors are snapped
2017-07-30 17:59:57 +02:00
for (int i = 0; i < 4; i++) {
Simplifies the canvas editor code
2017-07-31 18:49:46 +02:00
float anchor_val = (i >= 2) ? ANCHOR_END - anchors_values[i] : anchors_values[i];
Displays percentages when dragging anchors
2017-08-02 18:33:06 +02:00
line_starts[i] = Vector2::linear_interpolate(corners_pos[i], corners_pos[(i + 1) % 4], anchor_val);
line_ends[i] = Vector2::linear_interpolate(corners_pos[(i + 3) % 4], corners_pos[(i + 2) % 4], anchor_val);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
snapped = anchors_values[i] == 0.0 || anchors_values[i] == 0.5 || anchors_values[i] == 1.0;
Displays percentages when dragging anchors
2017-08-02 18:33:06 +02:00
viewport->draw_line(line_starts[i], line_ends[i], snapped ? color_snapped : color_base, (i == dragged_anchor || (i + 3) % 4 == dragged_anchor) ? 2 : 1);
Add lines to make understandable when anchors are snapped
2017-07-30 17:59:57 +02:00
}
Displays percentages when dragging anchors
2017-08-02 18:33:06 +02:00
// Display the percentages next to the lines
float percent_val;
percent_val = anchors_values[(dragged_anchor + 2) % 4] - anchors_values[dragged_anchor];
percent_val = (dragged_anchor >= 2) ? -percent_val : percent_val;
_draw_percentage_at_position(percent_val, (anchors_pos[dragged_anchor] + anchors_pos[(dragged_anchor + 1) % 4]) / 2, (Margin)((dragged_anchor + 1) % 4));
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;
_draw_percentage_at_position(percent_val, (anchors_pos[dragged_anchor] + anchors_pos[(dragged_anchor + 3) % 4]) / 2, (Margin)(dragged_anchor));
percent_val = anchors_values[(dragged_anchor + 1) % 4];
percent_val = ((dragged_anchor + 1) % 4 >= 2) ? ANCHOR_END - percent_val : percent_val;
_draw_percentage_at_position(percent_val, (line_starts[dragged_anchor] + anchors_pos[dragged_anchor]) / 2, (Margin)(dragged_anchor));
percent_val = anchors_values[dragged_anchor];
percent_val = (dragged_anchor >= 2) ? ANCHOR_END - percent_val : percent_val;
_draw_percentage_at_position(percent_val, (line_ends[(dragged_anchor + 1) % 4] + anchors_pos[dragged_anchor]) / 2, (Margin)((dragged_anchor + 1) % 4));
Add lines to make understandable when anchors are snapped
2017-07-30 17:59:57 +02:00
}
Add anchor visualization
2017-07-11 00:14:22 +02:00
Rect2 anchor_rects[4];
Add lines to make understandable when anchors are snapped
2017-07-30 17:59:57 +02:00
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));
Add anchor visualization
2017-07-11 00:14:22 +02:00
for (int i = 0; i < 4; i++) {
anchor_handle->draw_rect(ci, anchor_rects[i]);
}
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
Display width and height when dragging a node side
2017-08-18 23:32:23 +02:00
// Draw the margin values and the node width/height when dragging control side
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
float ratio = 0.33;
Transform2D parent_transform = xform * control->get_transform().affine_inverse();
float node_pos_in_parent[4];
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
Fixes the bad calculation of margin & anchors when child of Node2D
2018-05-05 16:59:00 +02:00
Rect2 parent_rect = control->get_parent_anchorable_rect();
node_pos_in_parent[0] = control->get_anchor(MARGIN_LEFT) * parent_rect.size.width + control->get_margin(MARGIN_LEFT) + parent_rect.position.x;
node_pos_in_parent[1] = control->get_anchor(MARGIN_TOP) * parent_rect.size.height + control->get_margin(MARGIN_TOP) + parent_rect.position.y;
node_pos_in_parent[2] = control->get_anchor(MARGIN_RIGHT) * parent_rect.size.width + control->get_margin(MARGIN_RIGHT) + parent_rect.position.x;
node_pos_in_parent[3] = control->get_anchor(MARGIN_BOTTOM) * parent_rect.size.height + control->get_margin(MARGIN_BOTTOM) + parent_rect.position.y;
Displays margins values when moving the node
2017-08-18 00:42:49 +02: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 08:58:35 +01:00
Point2 start, end;
switch (drag_type) {
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
case DRAG_LEFT:
case DRAG_TOP_LEFT:
case DRAG_BOTTOM_LEFT:
Display width and height when dragging a node side
2017-08-18 23:32:23 +02: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), MARGIN_BOTTOM);
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
case DRAG_ALL:
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
start = Vector2(node_pos_in_parent[0], Math::lerp(node_pos_in_parent[1], node_pos_in_parent[3], ratio));
end = start - Vector2(control->get_margin(MARGIN_LEFT), 0);
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
_draw_margin_at_position(control->get_margin(MARGIN_LEFT), parent_transform.xform((start + end) / 2), MARGIN_TOP);
viewport->draw_line(parent_transform.xform(start), parent_transform.xform(end), color_base, 1);
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 08:58:35 +01:00
default:
break;
Displays margins values when moving the node
2017-08-18 00:42:49 +02: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 08:58:35 +01:00
switch (drag_type) {
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
case DRAG_RIGHT:
case DRAG_TOP_RIGHT:
case DRAG_BOTTOM_RIGHT:
Display width and height when dragging a node side
2017-08-18 23:32:23 +02: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), MARGIN_BOTTOM);
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
case DRAG_ALL:
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
start = Vector2(node_pos_in_parent[2], Math::lerp(node_pos_in_parent[3], node_pos_in_parent[1], ratio));
end = start - Vector2(control->get_margin(MARGIN_RIGHT), 0);
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
_draw_margin_at_position(control->get_margin(MARGIN_RIGHT), parent_transform.xform((start + end) / 2), MARGIN_BOTTOM);
viewport->draw_line(parent_transform.xform(start), parent_transform.xform(end), color_base, 1);
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 08:58:35 +01:00
default:
break;
Displays margins values when moving the node
2017-08-18 00:42:49 +02: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 08:58:35 +01:00
switch (drag_type) {
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
case DRAG_TOP:
case DRAG_TOP_LEFT:
case DRAG_TOP_RIGHT:
Display width and height when dragging a node side
2017-08-18 23:32:23 +02: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), MARGIN_RIGHT);
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
case DRAG_ALL:
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
start = Vector2(Math::lerp(node_pos_in_parent[0], node_pos_in_parent[2], ratio), node_pos_in_parent[1]);
end = start - Vector2(0, control->get_margin(MARGIN_TOP));
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
_draw_margin_at_position(control->get_margin(MARGIN_TOP), parent_transform.xform((start + end) / 2), MARGIN_LEFT);
viewport->draw_line(parent_transform.xform(start), parent_transform.xform(end), color_base, 1);
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 08:58:35 +01:00
default:
break;
Displays margins values when moving the node
2017-08-18 00:42:49 +02: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 08:58:35 +01:00
switch (drag_type) {
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
case DRAG_BOTTOM:
case DRAG_BOTTOM_LEFT:
case DRAG_BOTTOM_RIGHT:
Display width and height when dragging a node side
2017-08-18 23:32:23 +02: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)), MARGIN_RIGHT);
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
case DRAG_ALL:
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
start = Vector2(Math::lerp(node_pos_in_parent[2], node_pos_in_parent[0], ratio), node_pos_in_parent[3]);
end = start - Vector2(0, control->get_margin(MARGIN_BOTTOM));
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
_draw_margin_at_position(control->get_margin(MARGIN_BOTTOM), parent_transform.xform((start + end) / 2), MARGIN_RIGHT);
viewport->draw_line(parent_transform.xform(start), parent_transform.xform(end), color_base, 1);
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 08:58:35 +01:00
default:
break;
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
}
Draw a ghost rect when dragging nodes if it's rotated/scaled
2017-08-18 22:56:00 +02: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 08:58:35 +01:00
switch (drag_type) {
Draw a ghost rect when dragging nodes if it's rotated/scaled
2017-08-18 22:56:00 +02:00
//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_ALL:
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());
viewport->draw_rect(parent_transform.xform(rect), color_base, false);
}
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 08:58:35 +01:00
default:
break;
Draw a ghost rect when dragging nodes if it's rotated/scaled
2017-08-18 22:56:00 +02:00
}
Add anchor visualization
2017-07-11 00:14:22 +02:00
}
Ability to set rotation and scaling pivot for controls.
2017-07-06 22:42:44 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (tool == TOOL_SELECT && canvas_item->_edit_use_rect()) {
Rect2 rect = canvas_item->_edit_get_rect();
Vector2 endpoints[4] = {
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))
};
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 16:44:50 +01:00
for (int i = 0; i < 4; i++) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
// Draw the resize handles
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 16:44:50 +01:00
int prev = (i + 3) % 4;
int next = (i + 1) % 4;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Vector2 ofs = ((endpoints[i] - endpoints[prev]).normalized() + ((endpoints[i] - endpoints[next]).normalized())).normalized();
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 16:44:50 +01:00
ofs *= 1.4144 * (select_handle->get_size().width / 2);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
select_handle->draw(ci, (endpoints[i] + ofs - (select_handle->get_size() / 2)).floor());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
ofs = (endpoints[i] + endpoints[next]) / 2;
ofs += (endpoints[next] - endpoints[i]).tangent().normalized() * (select_handle->get_size().width / 2);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
select_handle->draw(ci, (ofs - (select_handle->get_size() / 2)).floor());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
if (drag_type == DRAG_BOX_SELECTION) {
// Draw the dragging box
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Point2 bsfrom = transform.xform(drag_from);
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 16:44:50 +01:00
Point2 bsto = transform.xform(box_selecting_to);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(bsfrom, bsto - bsfrom), Color(0.7, 0.7, 1.0, 0.3));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
Color rotate_color(0.4, 0.7, 1.0, 0.8);
if (drag_type == DRAG_ROTATE) {
// Draw the line when rotating a node
viewport->draw_line(transform.xform(drag_rotation_center), transform.xform(drag_to), rotate_color);
}
}
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 {
float y_for_zero_x = (to.y * from.x - from.y * to.x) / (from.x - to.x);
float x_for_zero_y = (to.x * from.y - from.x * to.y) / (from.y - to.y);
float y_for_viewport_x = ((to.y - from.y) * (viewport_size.x - from.x)) / (to.x - from.x) + from.y;
float x_for_viewport_y = ((to.x - from.x) * (viewport_size.y - from.y)) / (to.y - from.y) + from.x; // faux
//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) {
VisualServer::get_singleton()->canvas_item_add_line(ci, points[0], points[1], p_color);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
}
void CanvasItemEditor::_draw_axis() {
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 09:52:13 +01:00
if (show_origin) {
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 09:52:13 +01:00
Color x_axis_color(1.0, 0.4, 0.4, 0.6);
Color y_axis_color(0.4, 1.0, 0.4, 0.6);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 09:52:13 +01:00
_draw_straight_line(Point2(), Point2(1, 0), x_axis_color);
_draw_straight_line(Point2(), Point2(0, 1), y_axis_color);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 09:52:13 +01:00
if (show_viewport) {
RID ci = viewport->get_canvas_item();
Color area_axis_color(0.4, 0.4, 1.0, 0.4);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 09:52:13 +01:00
Size2 screen_size = Size2(ProjectSettings::get_singleton()->get("display/window/size/width"), ProjectSettings::get_singleton()->get("display/window/size/height"));
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++) {
VisualServer::get_singleton()->canvas_item_add_line(ci, screen_endpoints[i], screen_endpoints[(i + 1) % 4], area_axis_color);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
void CanvasItemEditor::_draw_bones() {
RID ci = viewport->get_canvas_item();
Made it possible to properly draw over the 2D canvas for 2D objects. Arranged some functions to achieve this.
2016-09-10 21:44:03 +02:00
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
if (skeleton_show_bones) {
2D and 3D viewport are working again :D
2017-01-15 02:20:05 +01:00
Color bone_color1 = EditorSettings::get_singleton()->get("editors/2d/bone_color1");
Color bone_color2 = EditorSettings::get_singleton()->get("editors/2d/bone_color2");
Color bone_ik_color = EditorSettings::get_singleton()->get("editors/2d/bone_ik_color");
Make bones have more contrast with outline
2018-05-04 16:54:04 +02:00
Color bone_outline_color = EditorSettings::get_singleton()->get("editors/2d/bone_outline_color");
2D and 3D viewport are working again :D
2017-01-15 02:20:05 +01:00
Color bone_selected_color = EditorSettings::get_singleton()->get("editors/2d/bone_selected_color");
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 16:49:27 +02:00
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
for (Map<BoneKey, BoneList>::Element *E = bone_list.front(); E; E = E->next()) {
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 16:49:27 +02:00
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
Vector<Vector2> bone_shape;
Make bones have more contrast with outline
2018-05-04 16:54:04 +02:00
Vector<Vector2> bone_shape_outline;
Bring back 2D bone selection
2018-05-15 15:18:46 +02:00
if (!_get_bone_shape(&bone_shape, &bone_shape_outline, E))
continue;
Make bones have more contrast with outline
2018-05-04 16:54:04 +02:00
Bring back 2D bone selection
2018-05-15 15:18:46 +02:00
Node2D *from_node = Object::cast_to<Node2D>(ObjectDB::get_instance(E->key().from));
Don't draw bones if it's not visible
2018-05-25 06:01:15 +02:00
if (!from_node->is_visible_in_tree())
continue;
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
Vector<Color> colors;
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
if (from_node->has_meta("_edit_ik_")) {
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
colors.push_back(bone_ik_color);
colors.push_back(bone_ik_color);
colors.push_back(bone_ik_color);
colors.push_back(bone_ik_color);
} else {
colors.push_back(bone_color1);
colors.push_back(bone_color2);
colors.push_back(bone_color1);
colors.push_back(bone_color2);
}
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 16:49:27 +02:00
Make bones have more contrast with outline
2018-05-04 16:54:04 +02:00
Vector<Color> outline_colors;
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
if (editor_selection->is_selected(from_node)) {
Make bones have more contrast with outline
2018-05-04 16:54:04 +02:00
outline_colors.push_back(bone_selected_color);
outline_colors.push_back(bone_selected_color);
outline_colors.push_back(bone_selected_color);
outline_colors.push_back(bone_selected_color);
outline_colors.push_back(bone_selected_color);
outline_colors.push_back(bone_selected_color);
} else {
outline_colors.push_back(bone_outline_color);
outline_colors.push_back(bone_outline_color);
outline_colors.push_back(bone_outline_color);
outline_colors.push_back(bone_outline_color);
outline_colors.push_back(bone_outline_color);
outline_colors.push_back(bone_outline_color);
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 16:49:27 +02:00
}
Make bones have more contrast with outline
2018-05-04 16:54:04 +02:00
VisualServer::get_singleton()->canvas_item_add_polygon(ci, bone_shape_outline, outline_colors);
VisualServer::get_singleton()->canvas_item_add_primitive(ci, bone_shape, colors, Vector<Vector2>(), RID());
Add show bones checkable menu item
2016-09-07 11:10:00 +02: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 16:49:27 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Display nodes without rect's position
2018-03-10 11:56:27 +01: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 21:28:16 +02:00
ERR_FAIL_COND(!p_node);
Display nodes without rect's position
2018-03-10 11:56:27 +01:00
Node *scene = editor->get_edited_scene();
Fixes several selection problems in the 2D editor
2018-05-04 00:27:37 +02: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 11:56:27 +01:00
return;
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node);
if (canvas_item && !canvas_item->is_visible())
return;
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
Display nodes without rect's position
2018-03-10 11:56:27 +01:00
Transform2D parent_xform = p_parent_xform;
Transform2D canvas_xform = p_canvas_xform;
if (canvas_item && !canvas_item->is_set_as_toplevel()) {
parent_xform = parent_xform * canvas_item->get_transform();
} 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 21:51:56 +02:00
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
Display nodes without rect's position
2018-03-10 11:56:27 +01:00
_draw_invisible_nodes_positions(p_node->get_child(i), parent_xform, canvas_xform);
}
if (canvas_item && !canvas_item->_edit_use_rect() && !editor_selection->is_selected(canvas_item)) {
Transform2D xform = transform * canvas_xform * parent_xform;
Displays node icon on hover
2018-03-12 23:32:25 +01:00
// Draw the node's position
Ref<Texture> position_icon = get_icon("EditorPositionUnselected", "EditorIcons");
Display nodes without rect's position
2018-03-10 11:56:27 +01:00
Transform2D transform = Transform2D(xform.get_rotation(), xform.get_origin());
viewport->draw_set_transform_matrix(transform);
viewport->draw_texture(position_icon, -position_icon->get_size() / 2, Color(1.0, 1.0, 1.0, 0.5));
viewport->draw_set_transform_matrix(Transform2D());
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
}
Displays node icon on hover
2018-03-12 23:32:25 +01:00
}
void CanvasItemEditor::_draw_hover() {
List<Rect2> previous_rects;
for (int i = 0; i < hovering_results.size(); i++) {
Fixes a crash on draw_hover
2018-06-12 11:01:24 +02:00
Ref<Texture> node_icon = hovering_results[i].icon;
String node_name = hovering_results[i].name;
Displays node icon on hover
2018-03-12 23:32:25 +01:00
Display nodes without rect's position
2018-03-10 11:56:27 +01:00
Ref<Font> font = get_font("font", "Label");
Displays node icon on hover
2018-03-12 23:32:25 +01:00
Size2 node_name_size = font->get_string_size(node_name);
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 11:01:24 +02: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);
Displays node icon on hover
2018-03-12 23:32:25 +01:00
// Rectify the position to avoid overlaping items
for (List<Rect2>::Element *E = previous_rects.front(); E; E = E->next()) {
if (E->get().intersects(Rect2(pos, item_size))) {
pos.y = E->get().get_position().y - item_size.y;
}
}
previous_rects.push_back(Rect2(pos, item_size));
Fixes a crash on draw_hover
2018-06-12 11:01:24 +02:00
// Draw icon
Displays node icon on hover
2018-03-12 23:32:25 +01: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 11:01:24 +02:00
// Draw name
Displays node icon on hover
2018-03-12 23:32:25 +01:00
viewport->draw_string(font, pos + Point2(node_icon->get_size().x + 4, item_size.y - 3), node_name, Color(1.0, 1.0, 1.0, 0.5));
Display nodes without rect's position
2018-03-10 11:56:27 +01:00
}
}
Fixes issues with selectable children and locks
2018-03-08 21:12:49 +01: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 21:28:16 +02:00
ERR_FAIL_COND(!p_node);
Fixes issues with selectable children and locks
2018-03-08 21:12:49 +01:00
Node *scene = editor->get_edited_scene();
if (p_node != scene && p_node->get_owner() != scene && !scene->is_editable_instance(p_node->get_owner()))
return;
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node);
if (canvas_item && !canvas_item->is_visible())
return;
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
Fixes issues with selectable children and locks
2018-03-08 21:12:49 +01:00
Transform2D parent_xform = p_parent_xform;
Transform2D canvas_xform = p_canvas_xform;
if (canvas_item && !canvas_item->is_set_as_toplevel()) {
parent_xform = parent_xform * canvas_item->get_transform();
} 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 21:51:56 +02:00
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
Fixes issues with selectable children and locks
2018-03-08 21:12:49 +01: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 21:51:56 +02:00
}
Fixes issues with selectable children and locks
2018-03-08 21:12:49 +01:00
RID viewport_canvas_item = viewport->get_canvas_item();
if (canvas_item) {
float offset = 0;
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
Improved a lot of icons, and some style fixes
2017-09-21 22:55:07 +02:00
Ref<Texture> lock = get_icon("LockViewport", "EditorIcons");
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
if (p_node->has_meta("_edit_lock_")) {
Fixes issues with selectable children and locks
2018-03-08 21:12:49 +01:00
lock->draw(viewport_canvas_item, (transform * canvas_xform * parent_xform).xform(Point2(0, 0)) + Point2(offset, 0));
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 21:51:56 +02:00
}
Improved a lot of icons, and some style fixes
2017-09-21 22:55:07 +02:00
Ref<Texture> group = get_icon("GroupViewport", "EditorIcons");
Fixes issues with selectable children and locks
2018-03-08 21:12:49 +01:00
if (canvas_item->has_meta("_edit_group_")) {
group->draw(viewport_canvas_item, (transform * canvas_xform * parent_xform).xform(Point2(0, 0)) + Point2(offset, 0));
//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 21:51:56 +02:00
}
}
}
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
bool CanvasItemEditor::_build_bones_list(Node *p_node) {
ERR_FAIL_COND_V(!p_node, false);
bool has_child_bones = false;
Add missing NULL checks on CanvasItemEditor
2017-09-20 21:28:16 +02:00
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
for (int i = 0; i < p_node->get_child_count(); i++) {
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
if (_build_bones_list(p_node->get_child(i))) {
has_child_bones = true;
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
}
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node);
Node *scene = editor->get_edited_scene();
if (!canvas_item || !canvas_item->is_visible() || (canvas_item != scene && canvas_item->get_owner() != scene && !scene->is_editable_instance(canvas_item->get_owner()))) {
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
return false;
Fix bone refresh logic, closes #18564
2018-05-04 23:11:28 +02:00
}
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
Node *parent = canvas_item->get_parent();
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
if (Object::cast_to<Bone2D>(canvas_item)) {
if (Object::cast_to<Bone2D>(parent)) {
// Add as bone->parent relationship
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
BoneKey bk;
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
bk.from = parent->get_instance_id();
bk.to = canvas_item->get_instance_id();
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
if (!bone_list.has(bk)) {
BoneList b;
b.length = 0;
bone_list[bk] = b;
}
bone_list[bk].last_pass = bone_last_frame;
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
if (!has_child_bones) {
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
// Add a last bone if the Bone2D has no Bone2D child
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
BoneKey bk;
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
bk.from = canvas_item->get_instance_id();
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
bk.to = 0;
if (!bone_list.has(bk)) {
BoneList b;
b.length = 0;
bone_list[bk] = b;
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
}
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
bone_list[bk].last_pass = bone_last_frame;
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
return true;
}
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
if (canvas_item->has_meta("_edit_bone_")) {
// Add a "custom bone"
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
BoneKey bk;
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
bk.from = parent->get_instance_id();
bk.to = canvas_item->get_instance_id();
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
if (!bone_list.has(bk)) {
BoneList b;
b.length = 0;
bone_list[bk] = b;
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
}
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
bone_list[bk].last_pass = bone_last_frame;
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
}
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
return false;
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
}
void CanvasItemEditor::_draw_viewport() {
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
// Update the transform
transform = Transform2D();
transform.scale_basis(Size2(zoom, zoom));
transform.elements[2] = -view_offset * zoom;
editor->get_scene_root()->set_global_canvas_transform(transform);
Fusion the lock/unlock and the group/ungroup buttons
2017-08-31 00:03:03 +02: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 09:55:26 +01:00
List<Node *> selection = editor_selection->get_selected_node_list();
Fusion the lock/unlock and the group/ungroup buttons
2017-08-31 00:03:03 +02:00
if (selection.empty()) {
all_locked = false;
all_group = false;
} else {
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
Fixes node2D not lockable/groupable
2017-09-30 15:30:51 +02:00
if (Object::cast_to<CanvasItem>(E->get()) && !Object::cast_to<CanvasItem>(E->get())->has_meta("_edit_lock_")) {
Fusion the lock/unlock and the group/ungroup buttons
2017-08-31 00:03:03 +02:00
all_locked = false;
break;
}
}
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
Fixes node2D not lockable/groupable
2017-09-30 15:30:51 +02:00
if (Object::cast_to<CanvasItem>(E->get()) && !Object::cast_to<CanvasItem>(E->get())->has_meta("_edit_group_")) {
Fusion the lock/unlock and the group/ungroup buttons
2017-08-31 00:03:03 +02:00
all_group = false;
break;
}
}
}
lock_button->set_visible(!all_locked);
lock_button->set_disabled(selection.empty());
unlock_button->set_visible(all_locked);
group_button->set_visible(!all_group);
group_button->set_disabled(selection.empty());
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 21:51:56 +02:00
_draw_grid();
_draw_selection();
_draw_axis();
Display nodes without rect's position
2018-03-10 11:56:27 +01:00
if (editor->get_edited_scene()) {
Fixes issues with selectable children and locks
2018-03-08 21:12:49 +01:00
_draw_locks_and_groups(editor->get_edited_scene());
Display nodes without rect's position
2018-03-10 11:56:27 +01:00
_draw_invisible_nodes_positions(editor->get_edited_scene());
}
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
RID ci = viewport->get_canvas_item();
VisualServer::get_singleton()->canvas_item_add_set_transform(ci, Transform2D());
EditorPluginList *over_plugin_list = editor->get_editor_plugins_over();
if (!over_plugin_list->empty()) {
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 20:32:09 +01:00
over_plugin_list->forward_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 21:51:56 +02:00
}
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 20:32:09 +01:00
EditorPluginList *force_over_plugin_list = editor->get_editor_plugins_force_over();
if (!force_over_plugin_list->empty()) {
force_over_plugin_list->forward_force_draw_over_viewport(viewport);
}
Fix bones draw on viewport
2017-10-01 21:00:44 +02:00
_draw_bones();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
if (show_rulers)
_draw_rulers();
if (show_guides)
_draw_guides();
_draw_focus();
Displays node icon on hover
2018-03-12 23:32:25 +01:00
_draw_hover();
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void CanvasItemEditor::_notification(int p_what) {
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
if (p_what == NOTIFICATION_PHYSICS_PROCESS) {
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 16:22:07 +02:00
EditorNode::get_singleton()->get_scene_root()->set_snap_controls_to_pixels(GLOBAL_GET("gui/common/snap_controls_to_pixels"));
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
int nb_control = 0;
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 06:00:39 +02:00
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
// Update the viewport if the canvas_item changes
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
List<CanvasItem *> selection = _get_edited_canvas_items();
for (List<CanvasItem *>::Element *E = selection.front(); E; E = E->next()) {
CanvasItem *canvas_item = E->get();
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 16:44:50 +01:00
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
Rect2 rect;
if (canvas_item->_edit_use_rect()) {
rect = canvas_item->_edit_get_rect();
} else {
rect = Rect2();
}
Type renames: Matrix32 -> Transform2D Matrix3 -> Basis AABB -> Rect3 RawArray -> PoolByteArray IntArray -> PoolIntArray FloatArray -> PoolFloatArray Vector2Array -> PoolVector2Array Vector3Array -> PoolVector3Array ColorArray -> PoolColorArray
2017-01-11 04:52:51 +01:00
Transform2D xform = canvas_item->get_transform();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
if (rect != se->prev_rect || xform != se->prev_xform) {
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 18:44:32 +02:00
viewport->update();
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
se->prev_rect = rect;
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 18:44:32 +02:00
se->prev_xform = 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 08:58:35 +01:00
Control *control = Object::cast_to<Control>(canvas_item);
if (control) {
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 18:44:32 +02:00
float anchors[4];
Vector2 pivot;
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
pivot = control->get_pivot_offset();
anchors[MARGIN_LEFT] = control->get_anchor(MARGIN_LEFT);
anchors[MARGIN_RIGHT] = control->get_anchor(MARGIN_RIGHT);
anchors[MARGIN_TOP] = control->get_anchor(MARGIN_TOP);
anchors[MARGIN_BOTTOM] = control->get_anchor(MARGIN_BOTTOM);
Ability to set rotation and scaling pivot for controls.
2017-07-06 22:42:44 +02:00
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 18:44:32 +02:00
if (pivot != se->prev_pivot || anchors[MARGIN_LEFT] != se->prev_anchors[MARGIN_LEFT] || anchors[MARGIN_RIGHT] != se->prev_anchors[MARGIN_RIGHT] || anchors[MARGIN_TOP] != se->prev_anchors[MARGIN_TOP] || anchors[MARGIN_BOTTOM] != se->prev_anchors[MARGIN_BOTTOM]) {
Fix use of unitialized variables The second in my quest to make Godot 3.x compile with -Werror on GCC7
2017-09-01 22:33:39 +02:00
se->prev_pivot = pivot;
se->prev_anchors[MARGIN_LEFT] = anchors[MARGIN_LEFT];
se->prev_anchors[MARGIN_RIGHT] = anchors[MARGIN_RIGHT];
se->prev_anchors[MARGIN_TOP] = anchors[MARGIN_TOP];
se->prev_anchors[MARGIN_BOTTOM] = anchors[MARGIN_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 08:58:35 +01:00
viewport->update();
Fix use of unitialized variables The second in my quest to make Godot 3.x compile with -Werror on GCC7
2017-09-01 22:33:39 +02: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 08:58:35 +01:00
nb_control++;
}
if (canvas_item->_edit_use_pivot()) {
nb_having_pivot++;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02: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 08:58:35 +01:00
// Activate / Deactivate the pivot tool
pivot_button->set_disabled(nb_having_pivot == 0);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
// Show / Hide the layout button
presets_menu->set_visible(nb_control > 0 && nb_control == selection.size());
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
// Update the viewport if bones changes
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
for (Map<BoneKey, BoneList>::Element *E = bone_list.front(); E; E = E->next()) {
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 22:44:21 +02:00
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
Object *b = ObjectDB::get_instance(E->key().from);
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 22:44:21 +02:00
if (!b) {
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02: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 22:44:21 +02:00
viewport->update();
break;
}
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 22:58:51 +02:00
Node2D *b2 = Object::cast_to<Node2D>(b);
Fixes some 2d bones display problems
2018-05-05 15:45:26 +02:00
if (!b2 || !b2->is_inside_tree()) {
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 22:44:21 +02:00
continue;
}
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
Transform2D global_xform = b2->get_global_transform();
if (global_xform != E->get().xform) {
E->get().xform = global_xform;
viewport->update();
}
Bone2D *bone = Object::cast_to<Bone2D>(b);
if (bone && bone->get_default_length() != E->get().length) {
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 22:44:21 +02:00
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
E->get().length = bone->get_default_length();
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 22:44:21 +02:00
viewport->update();
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
if (p_what == NOTIFICATION_ENTER_TREE) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
select_sb->set_texture(get_icon("EditorRect2D", "EditorIcons"));
for (int i = 0; i < 4; i++) {
select_sb->set_margin_size(Margin(i), 4);
select_sb->set_default_margin(Margin(i), 4);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->connect("visibility_changed", this, "_keying_changed");
Insert new key helper is back to 2D editor, missed it?
2016-02-09 20:09:29 +01:00
_keying_changed();
Fix bone refresh logic, closes #18564
2018-05-04 23:11:28 +02:00
get_tree()->connect("node_added", this, "_tree_changed", varray());
get_tree()->connect("node_removed", this, "_tree_changed", varray());
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
added icon updating to most ui elements
2017-08-30 01:03:13 +02:00
} else if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
select_sb->set_texture(get_icon("EditorRect2D", "EditorIcons"));
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
}
added icon updating to most ui elements
2017-08-30 01:03:13 +02:00
Fix bone refresh logic, closes #18564
2018-05-04 23:11:28 +02:00
if (p_what == NOTIFICATION_EXIT_TREE) {
get_tree()->disconnect("node_added", this, "_tree_changed");
get_tree()->disconnect("node_removed", this, "_tree_changed");
}
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
if (p_what == NOTIFICATION_ENTER_TREE || p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
added icon updating to most ui elements
2017-08-30 01:03:13 +02:00
select_button->set_icon(get_icon("ToolSelect", "EditorIcons"));
list_select_button->set_icon(get_icon("ListSelect", "EditorIcons"));
move_button->set_icon(get_icon("ToolMove", "EditorIcons"));
rotate_button->set_icon(get_icon("ToolRotate", "EditorIcons"));
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
snap_button->set_icon(get_icon("Snap", "EditorIcons"));
snap_config_menu->set_icon(get_icon("GuiMiniTabMenu", "EditorIcons"));
skeleton_menu->set_icon(get_icon("Bone", "EditorIcons"));
added icon updating to most ui elements
2017-08-30 01:03:13 +02:00
pan_button->set_icon(get_icon("ToolPan", "EditorIcons"));
pivot_button->set_icon(get_icon("EditPivot", "EditorIcons"));
select_handle = get_icon("EditorHandle", "EditorIcons");
anchor_handle = get_icon("EditorControlAnchor", "EditorIcons");
lock_button->set_icon(get_icon("Lock", "EditorIcons"));
unlock_button->set_icon(get_icon("Unlock", "EditorIcons"));
group_button->set_icon(get_icon("Group", "EditorIcons"));
ungroup_button->set_icon(get_icon("Ungroup", "EditorIcons"));
Added and improved some icons, plus some other minor visual fixes.
2017-10-12 20:59:25 +02:00
key_loc_button->set_icon(get_icon("KeyPosition", "EditorIcons"));
key_rot_button->set_icon(get_icon("KeyRotation", "EditorIcons"));
key_scale_button->set_icon(get_icon("KeyScale", "EditorIcons"));
added icon updating to most ui elements
2017-08-30 01:03:13 +02:00
key_insert_button->set_icon(get_icon("Key", "EditorIcons"));
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
zoom_minus->set_icon(get_icon("ZoomLess", "EditorIcons"));
zoom_reset->set_icon(get_icon("ZoomReset", "EditorIcons"));
zoom_plus->set_icon(get_icon("ZoomMore", "EditorIcons"));
added icon updating to most ui elements
2017-08-30 01:03:13 +02:00
Added and improved some missing icons, plus some other visual fixes.
2017-10-13 23:39:17 +02:00
presets_menu->set_icon(get_icon("ControlLayout", "EditorIcons"));
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
PopupMenu *p = presets_menu->get_popup();
p->clear();
p->add_icon_item(get_icon("ControlAlignTopLeft", "EditorIcons"), "Top Left", ANCHORS_AND_MARGINS_PRESET_TOP_LEFT);
p->add_icon_item(get_icon("ControlAlignTopRight", "EditorIcons"), "Top Right", ANCHORS_AND_MARGINS_PRESET_TOP_RIGHT);
p->add_icon_item(get_icon("ControlAlignBottomRight", "EditorIcons"), "Bottom Right", ANCHORS_AND_MARGINS_PRESET_BOTTOM_RIGHT);
p->add_icon_item(get_icon("ControlAlignBottomLeft", "EditorIcons"), "Bottom Left", ANCHORS_AND_MARGINS_PRESET_BOTTOM_LEFT);
added icon updating to most ui elements
2017-08-30 01:03:13 +02:00
p->add_separator();
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
p->add_icon_item(get_icon("ControlAlignLeftCenter", "EditorIcons"), "Center Left", ANCHORS_AND_MARGINS_PRESET_CENTER_LEFT);
p->add_icon_item(get_icon("ControlAlignTopCenter", "EditorIcons"), "Center Top", ANCHORS_AND_MARGINS_PRESET_CENTER_TOP);
p->add_icon_item(get_icon("ControlAlignRightCenter", "EditorIcons"), "Center Right", ANCHORS_AND_MARGINS_PRESET_CENTER_RIGHT);
p->add_icon_item(get_icon("ControlAlignBottomCenter", "EditorIcons"), "Center Bottom", ANCHORS_AND_MARGINS_PRESET_CENTER_BOTTOM);
p->add_icon_item(get_icon("ControlAlignCenter", "EditorIcons"), "Center", ANCHORS_AND_MARGINS_PRESET_CENTER);
added icon updating to most ui elements
2017-08-30 01:03:13 +02:00
p->add_separator();
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
p->add_icon_item(get_icon("ControlAlignLeftWide", "EditorIcons"), "Left Wide", ANCHORS_AND_MARGINS_PRESET_LEFT_WIDE);
p->add_icon_item(get_icon("ControlAlignTopWide", "EditorIcons"), "Top Wide", ANCHORS_AND_MARGINS_PRESET_TOP_WIDE);
p->add_icon_item(get_icon("ControlAlignRightWide", "EditorIcons"), "Right Wide", ANCHORS_AND_MARGINS_PRESET_RIGHT_WIDE);
p->add_icon_item(get_icon("ControlAlignBottomWide", "EditorIcons"), "Bottom Wide", ANCHORS_AND_MARGINS_PRESET_BOTTOM_WIDE);
p->add_icon_item(get_icon("ControlVcenterWide", "EditorIcons"), "VCenter Wide ", ANCHORS_AND_MARGINS_PRESET_VCENTER_WIDE);
p->add_icon_item(get_icon("ControlHcenterWide", "EditorIcons"), "HCenter Wide ", ANCHORS_AND_MARGINS_PRESET_HCENTER_WIDE);
added icon updating to most ui elements
2017-08-30 01:03:13 +02:00
p->add_separator();
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
p->add_icon_item(get_icon("ControlAlignWide", "EditorIcons"), "Full Rect", ANCHORS_AND_MARGINS_PRESET_WIDE);
p->add_separator();
p->add_submenu_item(TTR("Anchors only"), "Anchors");
p->set_item_icon(20, get_icon("Anchor", "EditorIcons"));
anchors_popup->clear();
anchors_popup->add_icon_item(get_icon("ControlAlignTopLeft", "EditorIcons"), "Top Left", ANCHORS_PRESET_TOP_LEFT);
anchors_popup->add_icon_item(get_icon("ControlAlignTopRight", "EditorIcons"), "Top Right", ANCHORS_PRESET_TOP_RIGHT);
anchors_popup->add_icon_item(get_icon("ControlAlignBottomRight", "EditorIcons"), "Bottom Right", ANCHORS_PRESET_BOTTOM_RIGHT);
anchors_popup->add_icon_item(get_icon("ControlAlignBottomLeft", "EditorIcons"), "Bottom Left", ANCHORS_PRESET_BOTTOM_LEFT);
anchors_popup->add_separator();
anchors_popup->add_icon_item(get_icon("ControlAlignLeftCenter", "EditorIcons"), "Center Left", ANCHORS_PRESET_CENTER_LEFT);
anchors_popup->add_icon_item(get_icon("ControlAlignTopCenter", "EditorIcons"), "Center Top", ANCHORS_PRESET_CENTER_TOP);
anchors_popup->add_icon_item(get_icon("ControlAlignRightCenter", "EditorIcons"), "Center Right", ANCHORS_PRESET_CENTER_RIGHT);
anchors_popup->add_icon_item(get_icon("ControlAlignBottomCenter", "EditorIcons"), "Center Bottom", ANCHORS_PRESET_CENTER_BOTTOM);
anchors_popup->add_icon_item(get_icon("ControlAlignCenter", "EditorIcons"), "Center", ANCHORS_PRESET_CENTER);
anchors_popup->add_separator();
anchors_popup->add_icon_item(get_icon("ControlAlignLeftWide", "EditorIcons"), "Left Wide", ANCHORS_PRESET_LEFT_WIDE);
anchors_popup->add_icon_item(get_icon("ControlAlignTopWide", "EditorIcons"), "Top Wide", ANCHORS_PRESET_TOP_WIDE);
anchors_popup->add_icon_item(get_icon("ControlAlignRightWide", "EditorIcons"), "Right Wide", ANCHORS_PRESET_RIGHT_WIDE);
anchors_popup->add_icon_item(get_icon("ControlAlignBottomWide", "EditorIcons"), "Bottom Wide", ANCHORS_PRESET_BOTTOM_WIDE);
anchors_popup->add_icon_item(get_icon("ControlVcenterWide", "EditorIcons"), "VCenter Wide ", ANCHORS_PRESET_VCENTER_WIDE);
anchors_popup->add_icon_item(get_icon("ControlHcenterWide", "EditorIcons"), "HCenter Wide ", ANCHORS_PRESET_HCENTER_WIDE);
anchors_popup->add_separator();
anchors_popup->add_icon_item(get_icon("ControlAlignWide", "EditorIcons"), "Full Rect", ANCHORS_PRESET_WIDE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
void CanvasItemEditor::edit(CanvasItem *p_canvas_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 08:58:35 +01:00
drag_type = DRAG_NONE;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fusion the lock/unlock and the group/ungroup buttons
2017-08-31 00:03:03 +02:00
// Clear the selection
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 16:44:50 +01:00
editor_selection->clear(); //_clear_canvas_items();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_selection->add_node(p_canvas_item);
}
Fix bone refresh logic, closes #18564
2018-05-04 23:11:28 +02:00
void CanvasItemEditor::_queue_update_bone_list() {
if (bone_list_dirty)
return;
call_deferred("_update_bone_list");
bone_list_dirty = true;
}
void CanvasItemEditor::_update_bone_list() {
bone_last_frame++;
if (editor->get_edited_scene()) {
_build_bones_list(editor->get_edited_scene());
}
List<Map<BoneKey, BoneList>::Element *> bone_to_erase;
for (Map<BoneKey, BoneList>::Element *E = bone_list.front(); E; E = E->next()) {
if (E->get().last_pass != bone_last_frame) {
bone_to_erase.push_back(E);
continue;
}
Node *node = Object::cast_to<Node>(ObjectDB::get_instance(E->key().from));
if (!node || !node->is_inside_tree() || (node != get_tree()->get_edited_scene_root() && !get_tree()->get_edited_scene_root()->is_a_parent_of(node))) {
bone_to_erase.push_back(E);
continue;
}
}
while (bone_to_erase.size()) {
bone_list.erase(bone_to_erase.front()->get());
bone_to_erase.pop_front();
}
bone_list_dirty = false;
}
void CanvasItemEditor::_tree_changed(Node *) {
_queue_update_bone_list();
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void CanvasItemEditor::_update_scrollbars() {
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 16:44:50 +01:00
updating_scroll = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
// Move the zoom buttons
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
Point2 zoom_hb_begin = Point2(5, 5);
zoom_hb_begin += (show_rulers) ? Point2(RULER_WIDTH, RULER_WIDTH) : Point2();
zoom_hb->set_begin(zoom_hb_begin);
Implements rulers
2017-08-29 21:50:18 +02:00
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
// Move and resize the scrollbars
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Size2 size = viewport->get_size();
Size2 hmin = h_scroll->get_minimum_size();
Size2 vmin = v_scroll->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 08:58:35 +01:00
v_scroll->set_begin(Point2(size.width - vmin.width, (show_rulers) ? RULER_WIDTH : 0));
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 16:44:50 +01:00
v_scroll->set_end(Point2(size.width, size.height));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
h_scroll->set_begin(Point2((show_rulers) ? RULER_WIDTH : 0, size.height - hmin.height));
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 16:44:50 +01:00
h_scroll->set_end(Point2(size.width - vmin.width, size.height));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
// Get the visible frame
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
Size2 screen_rect = Size2(ProjectSettings::get_singleton()->get("display/window/size/width"), ProjectSettings::get_singleton()->get("display/window/size/height"));
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 16:44:50 +01:00
Rect2 local_rect = Rect2(Point2(), viewport->get_size() - Size2(vmin.width, hmin.height));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fix bone refresh logic, closes #18564
2018-05-04 23:11:28 +02:00
_queue_update_bone_list();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
// Calculate scrollable area
Rect2 canvas_item_rect = Rect2(Point2(), screen_rect);
if (editor->get_edited_scene()) {
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
Rect2 content_rect = _get_encompassing_rect(editor->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 08:58:35 +01:00
canvas_item_rect.expand_to(content_rect.position);
canvas_item_rect.expand_to(content_rect.position + content_rect.size);
}
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 16:44:50 +01:00
canvas_item_rect.size += screen_rect * 2;
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
canvas_item_rect.position -= screen_rect;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
// Constraints the view offset and updates the scrollbars
Point2 begin = canvas_item_rect.position;
Point2 end = canvas_item_rect.position + canvas_item_rect.size - local_rect.size / zoom;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
if (canvas_item_rect.size.height <= (local_rect.size.y / zoom)) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
if (ABS(begin.y - previous_update_view_offset.y) < ABS(begin.y - view_offset.y)) {
view_offset.y = previous_update_view_offset.y;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
v_scroll->hide();
} else {
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
if (view_offset.y > end.y && view_offset.y > previous_update_view_offset.y) {
view_offset.y = MAX(end.y, previous_update_view_offset.y);
}
if (view_offset.y < begin.y && view_offset.y < previous_update_view_offset.y) {
view_offset.y = MIN(begin.y, previous_update_view_offset.y);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01: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 02:10:30 +01:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
if (canvas_item_rect.size.width <= (local_rect.size.x / zoom)) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
if (ABS(begin.x - previous_update_view_offset.x) < ABS(begin.x - view_offset.x)) {
view_offset.x = previous_update_view_offset.x;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
h_scroll->hide();
} else {
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
if (view_offset.x > end.x && view_offset.x > previous_update_view_offset.x) {
view_offset.x = MAX(end.x, previous_update_view_offset.x);
}
if (view_offset.x < begin.x && view_offset.x < previous_update_view_offset.x) {
view_offset.x = MIN(begin.x, previous_update_view_offset.x);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
h_scroll->show();
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01: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 02:10:30 +01:00
}
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
// Calculate scrollable area
v_scroll->set_value(view_offset.y);
h_scroll->set_value(view_offset.x);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
previous_update_view_offset = view_offset;
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 16:44:50 +01:00
updating_scroll = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void CanvasItemEditor::_update_scroll(float) {
if (updating_scroll)
return;
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
view_offset.x = h_scroll->get_value();
view_offset.y = v_scroll->get_value();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
viewport->update();
}
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
void CanvasItemEditor::_set_anchors_and_margins_preset(Control::LayoutPreset p_preset) {
Fix crash due to stale refs to node selection lists
2018-01-07 09:55:26 +01:00
List<Node *> selection = editor_selection->get_selected_node_list();
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 06:00:39 +02:00
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
undo_redo->create_action(TTR("Change Anchors and Margins"));
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
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 06:00:39 +02: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 08:58:35 +01:00
Control *control = Object::cast_to<Control>(E->get());
if (control) {
undo_redo->add_do_method(control, "set_anchors_preset", p_preset);
switch (p_preset) {
case PRESET_TOP_LEFT:
case PRESET_TOP_RIGHT:
case PRESET_BOTTOM_LEFT:
case PRESET_BOTTOM_RIGHT:
case PRESET_CENTER_LEFT:
case PRESET_CENTER_TOP:
case PRESET_CENTER_RIGHT:
case PRESET_CENTER_BOTTOM:
case PRESET_CENTER:
undo_redo->add_do_method(control, "set_margins_preset", p_preset, Control::PRESET_MODE_KEEP_SIZE);
break;
case PRESET_LEFT_WIDE:
case PRESET_TOP_WIDE:
case PRESET_RIGHT_WIDE:
case PRESET_BOTTOM_WIDE:
case PRESET_VCENTER_WIDE:
case PRESET_HCENTER_WIDE:
case PRESET_WIDE:
undo_redo->add_do_method(control, "set_margins_preset", p_preset, Control::PRESET_MODE_MINSIZE);
break;
}
undo_redo->add_undo_method(control, "_edit_set_state", control->_edit_get_state());
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
}
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 06:00:39 +02:00
}
undo_redo->commit_action();
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
void CanvasItemEditor::_set_anchors_preset(Control::LayoutPreset p_preset) {
Fix crash due to stale refs to node selection lists
2018-01-07 09:55:26 +01:00
List<Node *> selection = editor_selection->get_selected_node_list();
Add anchor shortcut to fit parent Also remove old Edit -> Expand to Parent menu option
2017-07-09 15:54:49 +02:00
undo_redo->create_action(TTR("Change Anchors"));
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
Control *control = Object::cast_to<Control>(E->get());
if (control) {
undo_redo->add_do_method(control, "set_anchors_preset", p_preset);
undo_redo->add_undo_method(control, "_edit_set_state", control->_edit_get_state());
}
Add anchor shortcut to fit parent Also remove old Edit -> Expand to Parent menu option
2017-07-09 15:54:49 +02:00
}
undo_redo->commit_action();
}
Fix zoom button not zooming on the screen center
2017-10-01 11:30:38 +02:00
void CanvasItemEditor::_zoom_on_position(float p_zoom, Point2 p_position) {
if (p_zoom < MIN_ZOOM || p_zoom > MAX_ZOOM)
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
return;
Fix zoom button not zooming on the screen center
2017-10-01 11:30:38 +02:00
float prev_zoom = zoom;
zoom = p_zoom;
Point2 ofs = p_position;
ofs = ofs / prev_zoom - ofs / zoom;
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
view_offset.x = Math::round(view_offset.x + ofs.x);
view_offset.y = Math::round(view_offset.y + ofs.y);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
_update_scrollbars();
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
viewport->update();
}
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
void CanvasItemEditor::_button_zoom_minus() {
Adds shortcuts for zooming in the 2D editor
2018-04-25 10:48:21 +02:00
_zoom_on_position(zoom / 1.5, viewport_scrollable->get_size() / 2.0);
Fix zoom button not zooming on the screen center
2017-10-01 11:30:38 +02: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 08:58:35 +01:00
void CanvasItemEditor::_button_zoom_reset() {
Fix zoom button not zooming on the screen center
2017-10-01 11:30:38 +02:00
_zoom_on_position(1.0, viewport_scrollable->get_size() / 2.0);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02: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 08:58:35 +01:00
void CanvasItemEditor::_button_zoom_plus() {
Adds shortcuts for zooming in the 2D editor
2018-04-25 10:48:21 +02:00
_zoom_on_position(zoom * 1.5, viewport_scrollable->get_size() / 2.0);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02: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 08:58:35 +01:00
void CanvasItemEditor::_button_toggle_snap(bool p_status) {
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
snap_active = p_status;
viewport->update();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
}
void CanvasItemEditor::_button_tool_select(int p_index) {
ToolButton *tb[TOOL_MAX] = { select_button, list_select_button, move_button, rotate_button, pivot_button, pan_button };
for (int i = 0; i < TOOL_MAX; i++) {
tb[i]->set_pressed(i == p_index);
}
viewport->update();
tool = (Tool)p_index;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void CanvasItemEditor::_popup_callback(int p_op) {
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 16:44:50 +01:00
last_option = MenuOption(p_op);
switch (p_op) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
case SHOW_GRID: {
show_grid = !show_grid;
int idx = view_menu->get_popup()->get_item_index(SHOW_GRID);
view_menu->get_popup()->set_item_checked(idx, show_grid);
Change the grid offset when the snap is set as relative
2017-07-25 21:09:32 +02:00
viewport->update();
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 09:00:55 +01:00
} break;
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 09:52:13 +01: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);
viewport->update();
} 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);
viewport->update();
} break;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02: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 08:58:35 +01: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 22:52:41 +02: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 23:55:02 +02: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;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
case SNAP_USE_GRID: {
snap_grid = !snap_grid;
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_GRID);
snap_config_menu->get_popup()->set_item_checked(idx, snap_grid);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} 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 09:00:55 +01: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 22:52:41 +02: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 09:00:55 +01:00
} break;
Renamed "snap to offset" to "snap relative". Better conveys meaning.
2015-02-20 13:21:59 +01:00
case SNAP_RELATIVE: {
snap_relative = !snap_relative;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_RELATIVE);
snap_config_menu->get_popup()->set_item_checked(idx, snap_relative);
Change the grid offset when the snap is set as relative
2017-07-25 21:09:32 +02:00
viewport->update();
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 09:00:55 +01:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 09:00:55 +01:00
snap_pixel = !snap_pixel;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02: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 02:10:30 +01:00
} break;
case SNAP_CONFIGURE: {
Implements rulers
2017-08-29 21:50:18 +02:00
((SnapDialog *)snap_dialog)->set_fields(grid_offset, grid_step, snap_rotation_offset, snap_rotation_step);
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 16:44:50 +01:00
snap_dialog->popup_centered(Size2(220, 160));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} break;
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
case SKELETON_SHOW_BONES: {
skeleton_show_bones = !skeleton_show_bones;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
int idx = skeleton_menu->get_popup()->get_item_index(SKELETON_SHOW_BONES);
skeleton_menu->get_popup()->set_item_checked(idx, skeleton_show_bones);
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
viewport->update();
} break;
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02: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);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
viewport->update();
} break;
Implements rulers
2017-08-29 21:50:18 +02: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);
viewport->update();
} break;
Implement guides
2017-10-18 23:55:02 +02: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);
viewport->update();
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case LOCK_SELECTED: {
Fix crash due to stale refs to node selection lists
2018-01-07 09:55:26 +01:00
List<Node *> selection = editor_selection->get_selected_node_list();
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 16:44:50 +01:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
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 22:58:51 +02:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
Fix lock or group with invisible node Fix #15205
2017-12-31 18:18:39 +01:00
if (!canvas_item || !canvas_item->is_inside_tree())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
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 16:44:50 +01:00
if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 20:41:50 +01:00
continue;
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 16:44:50 +01:00
canvas_item->set_meta("_edit_lock_", true);
Add lock and group icon to scene tree editor
2014-05-08 07:43:19 +02:00
emit_signal("item_lock_status_changed");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
viewport->update();
} break;
case UNLOCK_SELECTED: {
Fix crash due to stale refs to node selection lists
2018-01-07 09:55:26 +01:00
List<Node *> selection = editor_selection->get_selected_node_list();
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 16:44:50 +01:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
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 22:58:51 +02:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
Fix lock or group with invisible node Fix #15205
2017-12-31 18:18:39 +01:00
if (!canvas_item || !canvas_item->is_inside_tree())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
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 16:44:50 +01:00
if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 20:41:50 +01:00
continue;
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 16:44:50 +01:00
canvas_item->set_meta("_edit_lock_", Variant());
Add lock and group icon to scene tree editor
2014-05-08 07:43:19 +02:00
emit_signal("item_lock_status_changed");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
viewport->update();
} break;
case GROUP_SELECTED: {
Fix crash due to stale refs to node selection lists
2018-01-07 09:55:26 +01:00
List<Node *> selection = editor_selection->get_selected_node_list();
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 16:44:50 +01:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
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 22:58:51 +02:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
Fix lock or group with invisible node Fix #15205
2017-12-31 18:18:39 +01:00
if (!canvas_item || !canvas_item->is_inside_tree())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
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 16:44:50 +01:00
if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 20:41:50 +01:00
continue;
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 16:44:50 +01:00
canvas_item->set_meta("_edit_group_", true);
Add lock and group icon to scene tree editor
2014-05-08 07:43:19 +02:00
emit_signal("item_group_status_changed");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
viewport->update();
} break;
case UNGROUP_SELECTED: {
Fix crash due to stale refs to node selection lists
2018-01-07 09:55:26 +01:00
List<Node *> selection = editor_selection->get_selected_node_list();
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 16:44:50 +01:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
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 22:58:51 +02:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
Fix lock or group with invisible node Fix #15205
2017-12-31 18:18:39 +01:00
if (!canvas_item || !canvas_item->is_inside_tree())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
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 16:44:50 +01:00
if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 20:41:50 +01:00
continue;
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 16:44:50 +01:00
canvas_item->set_meta("_edit_group_", Variant());
Add lock and group icon to scene tree editor
2014-05-08 07:43:19 +02:00
emit_signal("item_group_status_changed");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
viewport->update();
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_AND_MARGINS_PRESET_TOP_LEFT: {
_set_anchors_and_margins_preset(PRESET_TOP_LEFT);
} break;
case ANCHORS_AND_MARGINS_PRESET_TOP_RIGHT: {
_set_anchors_and_margins_preset(PRESET_TOP_RIGHT);
} break;
case ANCHORS_AND_MARGINS_PRESET_BOTTOM_LEFT: {
_set_anchors_and_margins_preset(PRESET_BOTTOM_LEFT);
} break;
case ANCHORS_AND_MARGINS_PRESET_BOTTOM_RIGHT: {
_set_anchors_and_margins_preset(PRESET_BOTTOM_RIGHT);
} break;
case ANCHORS_AND_MARGINS_PRESET_CENTER_LEFT: {
_set_anchors_and_margins_preset(PRESET_CENTER_LEFT);
} break;
case ANCHORS_AND_MARGINS_PRESET_CENTER_RIGHT: {
_set_anchors_and_margins_preset(PRESET_CENTER_RIGHT);
} break;
case ANCHORS_AND_MARGINS_PRESET_CENTER_TOP: {
_set_anchors_and_margins_preset(PRESET_CENTER_TOP);
} break;
case ANCHORS_AND_MARGINS_PRESET_CENTER_BOTTOM: {
_set_anchors_and_margins_preset(PRESET_CENTER_BOTTOM);
} break;
case ANCHORS_AND_MARGINS_PRESET_CENTER: {
_set_anchors_and_margins_preset(PRESET_CENTER);
} break;
case ANCHORS_AND_MARGINS_PRESET_TOP_WIDE: {
_set_anchors_and_margins_preset(PRESET_TOP_WIDE);
} break;
case ANCHORS_AND_MARGINS_PRESET_LEFT_WIDE: {
_set_anchors_and_margins_preset(PRESET_LEFT_WIDE);
} break;
case ANCHORS_AND_MARGINS_PRESET_RIGHT_WIDE: {
_set_anchors_and_margins_preset(PRESET_RIGHT_WIDE);
} break;
case ANCHORS_AND_MARGINS_PRESET_BOTTOM_WIDE: {
_set_anchors_and_margins_preset(PRESET_BOTTOM_WIDE);
} break;
case ANCHORS_AND_MARGINS_PRESET_VCENTER_WIDE: {
_set_anchors_and_margins_preset(PRESET_VCENTER_WIDE);
} break;
case ANCHORS_AND_MARGINS_PRESET_HCENTER_WIDE: {
_set_anchors_and_margins_preset(PRESET_HCENTER_WIDE);
} break;
case ANCHORS_AND_MARGINS_PRESET_WIDE: {
_set_anchors_and_margins_preset(Control::PRESET_WIDE);
} break;
case ANCHORS_PRESET_TOP_LEFT: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_TOP_LEFT);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_TOP_RIGHT: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_TOP_RIGHT);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_BOTTOM_LEFT: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_BOTTOM_LEFT);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_BOTTOM_RIGHT: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_BOTTOM_RIGHT);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_CENTER_LEFT: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_CENTER_LEFT);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_CENTER_RIGHT: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_CENTER_RIGHT);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_CENTER_TOP: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_CENTER_TOP);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_CENTER_BOTTOM: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_CENTER_BOTTOM);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_CENTER: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_CENTER);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_TOP_WIDE: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_TOP_WIDE);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_LEFT_WIDE: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_LEFT_WIDE);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_RIGHT_WIDE: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_RIGHT_WIDE);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_BOTTOM_WIDE: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_BOTTOM_WIDE);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_VCENTER_WIDE: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_VCENTER_WIDE);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_HCENTER_WIDE: {
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
_set_anchors_preset(PRESET_HCENTER_WIDE);
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 06:00:39 +02:00
} break;
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
case ANCHORS_PRESET_WIDE: {
Remove set_area_as_parent_rect and replace it by set_anchors_and_margins_preset(PRESET_WIDE)
2017-09-22 00:12:33 +02:00
_set_anchors_preset(Control::PRESET_WIDE);
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 06:00:39 +02:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case ANIM_INSERT_KEY:
case ANIM_INSERT_KEY_EXISTING: {
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 16:44:50 +01:00
bool existing = p_op == ANIM_INSERT_KEY_EXISTING;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
Map<Node *, Object *> &selection = editor_selection->get_selection();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
for (Map<Node *, Object *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 22:58:51 +02:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->key());
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 14:45:50 +01:00
if (!canvas_item || !canvas_item->is_visible_in_tree())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
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 16:44:50 +01:00
if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 20:41:50 +01:00
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 22:58:51 +02:00
if (Object::cast_to<Node2D>(canvas_item)) {
Node2D *n2d = Object::cast_to<Node2D>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (key_pos)
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->insert_node_value_key(n2d, "position", n2d->get_position(), existing);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (key_rot)
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->insert_node_value_key(n2d, "rotation_degrees", Math::rad2deg(n2d->get_rotation()), existing);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (key_scale)
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->insert_node_value_key(n2d, "scale", n2d->get_scale(), existing);
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 16:49:27 +02:00
if (n2d->has_meta("_edit_bone_") && n2d->get_parent_item()) {
//look for an IK chain
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 16:44:50 +01:00
List<Node2D *> ik_chain;
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 16:49:27 +02: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 22:58:51 +02:00
Node2D *n = Object::cast_to<Node2D>(n2d->get_parent_item());
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 16:44:50 +01:00
bool has_chain = 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 16:49:27 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
while (n) {
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 16:49:27 +02:00
ik_chain.push_back(n);
if (n->has_meta("_edit_ik_")) {
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 16:44:50 +01:00
has_chain = 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 16:49:27 +02:00
break;
}
if (!n->get_parent_item())
break;
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 22:58:51 +02:00
n = Object::cast_to<Node2D>(n->get_parent_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 16:49:27 +02:00
}
if (has_chain && ik_chain.size()) {
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 16:44:50 +01:00
for (List<Node2D *>::Element *F = ik_chain.front(); F; F = F->next()) {
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 16:49:27 +02:00
if (key_pos)
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->insert_node_value_key(F->get(), "position", F->get()->get_position(), existing);
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 16:49:27 +02:00
if (key_rot)
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->insert_node_value_key(F->get(), "rotation_degrees", Math::rad2deg(F->get()->get_rotation()), existing);
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 16:49:27 +02:00
if (key_scale)
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->insert_node_value_key(F->get(), "scale", F->get()->get_scale(), existing);
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 16:49:27 +02: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 22:58:51 +02:00
} else if (Object::cast_to<Control>(canvas_item)) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 22:58:51 +02:00
Control *ctrl = Object::cast_to<Control>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (key_pos)
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->insert_node_value_key(ctrl, "rect_position", ctrl->get_position(), existing);
Update some property names for animation keys. Added rect_rotation too. Fixes #9337
2017-06-24 11:39:57 +02:00
if (key_rot)
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->insert_node_value_key(ctrl, "rect_rotation", ctrl->get_rotation_degrees(), existing);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (key_scale)
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->insert_node_value_key(ctrl, "rect_size", ctrl->get_size(), existing);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 16:49:27 +02: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 21:31:43 +01: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 16:49:27 +02:00
} break;
case ANIM_INSERT_SCALE: {
key_scale = key_scale_button->is_pressed();
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case ANIM_COPY_POSE: {
Style: Fix statements ending with ';;'
2017-01-14 18:03:38 +01:00
pose_clipboard.clear();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
Map<Node *, Object *> &selection = editor_selection->get_selection();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
for (Map<Node *, Object *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 22:58:51 +02:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->key());
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 14:45:50 +01:00
if (!canvas_item || !canvas_item->is_visible_in_tree())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
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 16:44:50 +01:00
if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 20:41:50 +01:00
continue;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 22:58:51 +02:00
if (Object::cast_to<Node2D>(canvas_item)) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 22:58:51 +02:00
Node2D *n2d = Object::cast_to<Node2D>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
PoseClipboard pc;
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 16:44:50 +01:00
pc.pos = n2d->get_position();
pc.rot = n2d->get_rotation();
pc.scale = n2d->get_scale();
Makes all Godot API's methods Lower Case
2017-08-07 12:17:31 +02:00
pc.id = n2d->get_instance_id();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
pose_clipboard.push_back(pc);
}
}
} break;
case ANIM_PASTE_POSE: {
if (!pose_clipboard.size())
break;
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
undo_redo->create_action(TTR("Paste Pose"));
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 16:44:50 +01:00
for (List<PoseClipboard>::Element *E = pose_clipboard.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 22:58:51 +02:00
Node2D *n2d = Object::cast_to<Node2D>(ObjectDB::get_instance(E->get().id));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!n2d)
continue;
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 17:29:38 +02:00
undo_redo->add_do_method(n2d, "set_position", E->get().pos);
Update some property names for animation keys. Added rect_rotation too. Fixes #9337
2017-06-24 11:39:57 +02:00
undo_redo->add_do_method(n2d, "set_rotation", E->get().rot);
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 16:44:50 +01:00
undo_redo->add_do_method(n2d, "set_scale", E->get().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 17:29:38 +02: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 11:39:57 +02:00
undo_redo->add_undo_method(n2d, "set_rotation", n2d->get_rotation());
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 16:44:50 +01:00
undo_redo->add_undo_method(n2d, "set_scale", n2d->get_scale());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
undo_redo->commit_action();
} break;
case ANIM_CLEAR_POSE: {
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 16:44:50 +01:00
Map<Node *, Object *> &selection = editor_selection->get_selection();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
for (Map<Node *, Object *>::Element *E = selection.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 22:58:51 +02:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->key());
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 14:45:50 +01:00
if (!canvas_item || !canvas_item->is_visible_in_tree())
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
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 16:44:50 +01:00
if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 20:41:50 +01:00
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 22:58:51 +02:00
if (Object::cast_to<Node2D>(canvas_item)) {
Node2D *n2d = Object::cast_to<Node2D>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 05:16:14 +01:00
n2d->set_position(Vector2());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 05:16:14 +01:00
n2d->set_rotation(0);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (key_scale)
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 16:44:50 +01:00
n2d->set_scale(Vector2(1, 1));
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 22:58:51 +02:00
} else if (Object::cast_to<Control>(canvas_item)) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 22:58:51 +02:00
Control *ctrl = Object::cast_to<Control>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 17:29:38 +02:00
ctrl->set_position(Point2());
Style: Fix whole-line commented code They do not play well with clang-format which aligns the `//` part with the rest of the code block, thus producing badly indented commented code.
2017-01-14 12:26:56 +01: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 08:58:35 +01:00
if (key_scale)
Entirely new (and much improved) animation editor.
2018-06-07 17:46:14 +02:00
AnimationPlayerEditor::singleton->get_track_editor()->insert_node_value_key(ctrl,"rect/size",ctrl->get_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 08:58:35 +01:00
*/
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 19:36:59 +02:00
case VIEW_CENTER_TO_SELECTION:
case VIEW_FRAME_TO_SELECTION: {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 21:37:52 +02: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 19:36:59 +02: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 16:49:27 +02:00
case SKELETON_MAKE_BONES: {
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 16:44:50 +01:00
Map<Node *, Object *> &selection = editor_selection->get_selection();
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 16:49:27 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
for (Map<Node *, Object *>::Element *E = selection.front(); E; E = E->next()) {
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 16:49:27 +02: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 22:58:51 +02:00
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 16:49:27 +02:00
if (!n2d)
continue;
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 14:45:50 +01:00
if (!n2d->is_visible_in_tree())
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 16:49:27 +02:00
continue;
if (!n2d->get_parent_item())
continue;
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 16:44:50 +01:00
n2d->set_meta("_edit_bone_", true);
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
if (!skeleton_show_bones)
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
skeleton_menu->get_popup()->activate_item(skeleton_menu->get_popup()->get_item_index(SKELETON_SHOW_BONES));
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 16:49:27 +02:00
}
viewport->update();
} break;
case SKELETON_CLEAR_BONES: {
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 16:44:50 +01:00
Map<Node *, Object *> &selection = editor_selection->get_selection();
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 16:49:27 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
for (Map<Node *, Object *>::Element *E = selection.front(); E; E = E->next()) {
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 16:49:27 +02: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 22:58:51 +02:00
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 16:49:27 +02:00
if (!n2d)
continue;
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 14:45:50 +01:00
if (!n2d->is_visible_in_tree())
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 16:49:27 +02:00
continue;
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 16:44:50 +01:00
n2d->set_meta("_edit_bone_", Variant());
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
if (!skeleton_show_bones)
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
skeleton_menu->get_popup()->activate_item(skeleton_menu->get_popup()->get_item_index(SKELETON_SHOW_BONES));
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 16:49:27 +02:00
}
viewport->update();
} break;
case SKELETON_SET_IK_CHAIN: {
Fix crash due to stale refs to node selection lists
2018-01-07 09:55:26 +01:00
List<Node *> selection = editor_selection->get_selected_node_list();
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 16:49:27 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
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 16:49:27 +02: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 22:58:51 +02:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get());
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 14:45:50 +01:00
if (!canvas_item || !canvas_item->is_visible_in_tree())
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 16:49:27 +02:00
continue;
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 16:44:50 +01:00
if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
-avoid allowing selection of canvasitems inside a viewport, fixes #1383
2016-01-24 20:41:50 +01:00
continue;
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 16:49:27 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
canvas_item->set_meta("_edit_ik_", true);
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
if (!skeleton_show_bones)
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
skeleton_menu->get_popup()->activate_item(skeleton_menu->get_popup()->get_item_index(SKELETON_SHOW_BONES));
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 16:49:27 +02:00
}
viewport->update();
} break;
case SKELETON_CLEAR_IK_CHAIN: {
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 16:44:50 +01:00
Map<Node *, Object *> &selection = editor_selection->get_selection();
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 16:49:27 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
for (Map<Node *, Object *>::Element *E = selection.front(); E; E = E->next()) {
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 16:49:27 +02: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 22:58:51 +02:00
CanvasItem *n2d = Object::cast_to<CanvasItem>(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 16:49:27 +02:00
if (!n2d)
continue;
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 14:45:50 +01:00
if (!n2d->is_visible_in_tree())
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 16:49:27 +02:00
continue;
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 16:44:50 +01:00
n2d->set_meta("_edit_ik_", Variant());
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
if (!skeleton_show_bones)
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
skeleton_menu->get_popup()->activate_item(skeleton_menu->get_popup()->get_item_index(SKELETON_SHOW_BONES));
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 16:49:27 +02:00
}
viewport->update();
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 21:37:52 +02:00
void CanvasItemEditor::_focus_selection(int p_op) {
Vector2 center(0.f, 0.f);
Rect2 rect;
int count = 0;
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 16:44:50 +01:00
Map<Node *, Object *> &selection = editor_selection->get_selection();
for (Map<Node *, Object *>::Element *E = selection.front(); E; E = E->next()) {
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 22:58:51 +02:00
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->key());
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 21:37:52 +02:00
if (!canvas_item) continue;
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 16:44:50 +01:00
if (canvas_item->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 21:37:52 +02:00
continue;
// counting invisible items, for now
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 14:45:50 +01:00
//if (!canvas_item->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 21:37:52 +02:00
++count;
Remove the selection rect for nodes that do not require it
2018-03-08 21:35:41 +01:00
Rect2 item_rect;
if (canvas_item->_edit_use_rect()) {
item_rect = canvas_item->_edit_get_rect();
} 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 21:37:52 +02:00
Vector2 pos = canvas_item->get_global_transform().get_origin();
Vector2 scale = canvas_item->get_global_transform().get_scale();
real_t angle = canvas_item->get_global_transform().get_rotation();
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 16:44:50 +01: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 21:37:52 +02:00
item_rect = t.xform(item_rect);
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02: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 21:37:52 +02:00
if (count == 1) {
rect = canvas_item_rect;
} else {
rect = rect.merge(canvas_item_rect);
}
};
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 16:44:50 +01:00
if (count == 0) return;
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 21:37:52 +02:00
if (p_op == VIEW_CENTER_TO_SELECTION) {
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
center = rect.position + rect.size / 2;
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 16:44:50 +01:00
Vector2 offset = viewport->get_size() / 2 - editor->get_scene_root()->get_global_canvas_transform().xform(center);
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
view_offset.x -= offset.x / zoom;
view_offset.y -= offset.y / zoom;
_update_scrollbars();
viewport->update();
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 21:37:52 +02:00
} else { // VIEW_FRAME_TO_SELECTION
if (rect.size.x > CMP_EPSILON && rect.size.y > CMP_EPSILON) {
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 16:44:50 +01:00
float scale_x = viewport->get_size().x / rect.size.x;
float scale_y = viewport->get_size().y / rect.size.y;
zoom = scale_x < scale_y ? scale_x : scale_y;
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 21:37:52 +02:00
zoom *= 0.90;
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
viewport->update();
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 21:37:52 +02:00
call_deferred("_popup_callback", VIEW_CENTER_TO_SELECTION);
}
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void CanvasItemEditor::_bind_methods() {
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
ClassDB::bind_method("_button_zoom_minus", &CanvasItemEditor::_button_zoom_minus);
ClassDB::bind_method("_button_zoom_reset", &CanvasItemEditor::_button_zoom_reset);
ClassDB::bind_method("_button_zoom_plus", &CanvasItemEditor::_button_zoom_plus);
ClassDB::bind_method("_button_toggle_snap", &CanvasItemEditor::_button_toggle_snap);
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 16:44:50 +01:00
ClassDB::bind_method("_update_scroll", &CanvasItemEditor::_update_scroll);
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
ClassDB::bind_method("_update_scrollbars", &CanvasItemEditor::_update_scrollbars);
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 16:44:50 +01:00
ClassDB::bind_method("_popup_callback", &CanvasItemEditor::_popup_callback);
ClassDB::bind_method("_get_editor_data", &CanvasItemEditor::_get_editor_data);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
ClassDB::bind_method("_button_tool_select", &CanvasItemEditor::_button_tool_select);
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 16:44:50 +01:00
ClassDB::bind_method("_keying_changed", &CanvasItemEditor::_keying_changed);
ClassDB::bind_method("_unhandled_key_input", &CanvasItemEditor::_unhandled_key_input);
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
ClassDB::bind_method("_draw_viewport", &CanvasItemEditor::_draw_viewport);
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
ClassDB::bind_method("_gui_input_viewport", &CanvasItemEditor::_gui_input_viewport);
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 16:44:50 +01:00
ClassDB::bind_method("_snap_changed", &CanvasItemEditor::_snap_changed);
Fix bone refresh logic, closes #18564
2018-05-04 23:11:28 +02:00
ClassDB::bind_method("_update_bone_list", &CanvasItemEditor::_update_bone_list);
ClassDB::bind_method("_tree_changed", &CanvasItemEditor::_tree_changed);
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 16:44:50 +01:00
ClassDB::bind_method(D_METHOD("_selection_result_pressed"), &CanvasItemEditor::_selection_result_pressed);
ClassDB::bind_method(D_METHOD("_selection_menu_hide"), &CanvasItemEditor::_selection_menu_hide);
Fix get_edited_scene_root error at starting editor Fix #15300
2018-01-04 19:55:43 +01:00
ClassDB::bind_method(D_METHOD("set_state"), &CanvasItemEditor::set_state);
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 16:44:50 +01:00
ADD_SIGNAL(MethodInfo("item_lock_status_changed"));
ADD_SIGNAL(MethodInfo("item_group_status_changed"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 08:58:35 +01:00
Dictionary CanvasItemEditor::get_state() const {
Dictionary state;
state["zoom"] = zoom;
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01: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 08:58:35 +01:00
state["grid_offset"] = grid_offset;
state["grid_step"] = grid_step;
state["snap_rotation_offset"] = snap_rotation_offset;
state["snap_rotation_step"] = snap_rotation_step;
state["snap_active"] = snap_active;
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_grid"] = snap_grid;
state["snap_guides"] = snap_guides;
state["show_grid"] = show_grid;
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 09:52:13 +01: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 08:58:35 +01:00
state["show_rulers"] = show_rulers;
state["show_guides"] = show_guides;
state["show_helpers"] = show_helpers;
state["snap_rotation"] = snap_rotation;
state["snap_relative"] = snap_relative;
state["snap_pixel"] = snap_pixel;
state["skeleton_show_bones"] = skeleton_show_bones;
return state;
}
void CanvasItemEditor::set_state(const Dictionary &p_state) {
Dictionary state = p_state;
if (state.has("zoom")) {
zoom = p_state["zoom"];
}
if (state.has("ofs")) {
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
view_offset = p_state["ofs"];
previous_update_view_offset = view_offset;
_update_scrollbars();
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
}
if (state.has("grid_offset")) {
grid_offset = state["grid_offset"];
}
if (state.has("grid_step")) {
grid_step = state["grid_step"];
}
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"];
}
if (state.has("snap_active")) {
snap_active = state["snap_active"];
snap_button->set_pressed(snap_active);
}
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);
}
if (state.has("snap_grid")) {
snap_grid = state["snap_grid"];
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_GRID);
snap_config_menu->get_popup()->set_item_checked(idx, snap_grid);
}
if (state.has("show_grid")) {
show_grid = state["show_grid"];
int idx = view_menu->get_popup()->get_item_index(SHOW_GRID);
view_menu->get_popup()->set_item_checked(idx, show_grid);
}
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 09:52:13 +01: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 08:58:35 +01: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);
}
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);
}
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);
}
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);
}
if (state.has("skeleton_show_bones")) {
skeleton_show_bones = state["skeleton_show_bones"];
int idx = skeleton_menu->get_popup()->get_item_index(SKELETON_SHOW_BONES);
skeleton_menu->get_popup()->set_item_checked(idx, skeleton_show_bones);
}
viewport->update();
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void CanvasItemEditor::add_control_to_menu_panel(Control *p_control) {
hb->add_child(p_control);
}
Add a function to remove controls from containers Closes #5968
2018-02-13 22:21:19 +01:00
void CanvasItemEditor::remove_control_from_menu_panel(Control *p_control) {
hb->remove_child(p_control);
}
Replace TileMapEditor floating tile palette with HSplitContainer.
2014-12-28 23:37:25 +01:00
HSplitContainer *CanvasItemEditor::get_palette_split() {
return palette_split;
}
2D shader progress
2015-01-12 00:52:42 +01: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 21:37:52 +02:00
void CanvasItemEditor::focus_selection() {
_focus_selection(VIEW_CENTER_TO_SELECTION);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
Fix bone refresh logic, closes #18564
2018-05-04 23:11:28 +02:00
bone_list_dirty = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
tool = TOOL_SELECT;
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 16:44:50 +01:00
undo_redo = p_editor->get_undo_redo();
editor = p_editor;
editor_selection = p_editor->get_editor_selection();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor_selection->add_editor_plugin(this);
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 16:44:50 +01:00
editor_selection->connect("selection_changed", this, "update");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
hb = memnew(HBoxContainer);
add_child(hb);
Remove set_area_as_parent_rect and replace it by set_anchors_and_margins_preset(PRESET_WIDE)
2017-09-22 00:12:33 +02:00
hb->set_anchors_and_margins_preset(Control::PRESET_WIDE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
bottom_split = memnew(VSplitContainer);
2D shader progress
2015-01-12 00:52:42 +01:00
add_child(bottom_split);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
bottom_split->set_v_size_flags(SIZE_EXPAND_FILL);
2D shader progress
2015-01-12 00:52:42 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
palette_split = memnew(HSplitContainer);
2D shader progress
2015-01-12 00:52:42 +01:00
bottom_split->add_child(palette_split);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
palette_split->set_v_size_flags(SIZE_EXPAND_FILL);
Replace TileMapEditor floating tile palette with HSplitContainer.
2014-12-28 23:37:25 +01:00
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_scrollable = memnew(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 08:58:35 +01:00
palette_split->add_child(viewport_scrollable);
Implements rulers
2017-08-29 21:50:18 +02: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 08:58:35 +01:00
viewport_scrollable->set_clip_contents(true);
viewport_scrollable->set_v_size_flags(SIZE_EXPAND_FILL);
viewport_scrollable->set_h_size_flags(SIZE_EXPAND_FILL);
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
viewport_scrollable->connect("draw", this, "_update_scrollbars");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
ViewportContainer *scene_tree = memnew(ViewportContainer);
Implements rulers
2017-08-29 21:50:18 +02: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 21:51:56 +02:00
scene_tree->set_stretch(true);
Remove set_area_as_parent_rect and replace it by set_anchors_and_margins_preset(PRESET_WIDE)
2017-09-22 00:12:33 +02:00
scene_tree->set_anchors_and_margins_preset(Control::PRESET_WIDE);
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
scene_tree->add_child(p_editor->get_scene_root());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
viewport = memnew(CanvasItemEditorViewport(p_editor, this));
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_scrollable->add_child(viewport);
viewport->set_mouse_filter(MOUSE_FILTER_PASS);
Remove set_area_as_parent_rect and replace it by set_anchors_and_margins_preset(PRESET_WIDE)
2017-09-22 00:12:33 +02:00
viewport->set_anchors_and_margins_preset(Control::PRESET_WIDE);
-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 19:50:08 +01: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 08:58:35 +01:00
viewport->set_focus_mode(FOCUS_ALL);
Split some functions to make the code more readable (maybe at the price of a neglibile performance loss)
2017-08-28 21:51:56 +02:00
viewport->connect("draw", this, "_draw_viewport");
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
viewport->connect("gui_input", this, "_gui_input_viewport");
Implements rulers
2017-08-29 21:50:18 +02:00
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
h_scroll = memnew(HScrollBar);
viewport->add_child(h_scroll);
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
h_scroll->connect("value_changed", this, "_update_scroll");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
h_scroll->hide();
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
v_scroll = memnew(VScrollBar);
viewport->add_child(v_scroll);
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01:00
v_scroll->connect("value_changed", this, "_update_scroll");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
v_scroll->hide();
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02: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 08:58:35 +01:00
zoom_hb = memnew(HBoxContainer);
Implements rulers
2017-08-29 21:50:18 +02:00
viewport->add_child(zoom_hb);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
zoom_hb->set_begin(Point2(5, 5));
zoom_minus = memnew(ToolButton);
zoom_hb->add_child(zoom_minus);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
zoom_minus->connect("pressed", this, "_button_zoom_minus");
Adds shortcuts for zooming in the 2D editor
2018-04-25 10:48:21 +02:00
zoom_minus->set_shortcut(ED_SHORTCUT("canvas_item_editor/zoom_minus", TTR("Zoom out"), KEY_MASK_CMD | KEY_MINUS));
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
zoom_minus->set_focus_mode(FOCUS_NONE);
zoom_reset = memnew(ToolButton);
zoom_hb->add_child(zoom_reset);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
zoom_reset->connect("pressed", this, "_button_zoom_reset");
Adds shortcuts for zooming in the 2D editor
2018-04-25 10:48:21 +02:00
zoom_reset->set_shortcut(ED_SHORTCUT("canvas_item_editor/zoom_reset", TTR("Zoom reset"), KEY_MASK_CMD | KEY_0));
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
zoom_reset->set_focus_mode(FOCUS_NONE);
zoom_plus = memnew(ToolButton);
zoom_hb->add_child(zoom_plus);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
zoom_plus->connect("pressed", this, "_button_zoom_plus");
Adds shortcuts for zooming in the 2D editor
2018-04-25 10:48:21 +02:00
zoom_plus->set_shortcut(ED_SHORTCUT("canvas_item_editor/zoom_plus", TTR("Zoom in"), KEY_MASK_CMD | KEY_PLUS));
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
zoom_plus->set_focus_mode(FOCUS_NONE);
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 16:44:50 +01:00
updating_scroll = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
select_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
hb->add_child(select_button);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
select_button->set_toggle_mode(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 08:58:35 +01:00
select_button->connect("pressed", this, "_button_tool_select", make_binds(TOOL_SELECT));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
select_button->set_pressed(true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
select_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/select_mode", TTR("Select Mode"), KEY_Q));
Consistent display of shortcut names in tooltips
2017-12-21 20:17:30 +01:00
select_button->set_tooltip(keycode_get_string(KEY_MASK_CMD) + TTR("Drag: Rotate") + "\n" + TTR("Alt+Drag: Move") + "\n" + TTR("Press 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving).") + "\n" + TTR("Alt+RMB: Depth list selection"));
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
move_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
hb->add_child(move_button);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
move_button->set_toggle_mode(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 08:58:35 +01:00
move_button->connect("pressed", this, "_button_tool_select", make_binds(TOOL_MOVE));
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 16:44:50 +01:00
move_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/move_mode", TTR("Move Mode"), KEY_W));
Implement missing ShortCuts in CanvasItemEditor
2016-07-15 21:22:01 +02:00
move_button->set_tooltip(TTR("Move Mode"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
rotate_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
hb->add_child(rotate_button);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
rotate_button->set_toggle_mode(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 08:58:35 +01:00
rotate_button->connect("pressed", this, "_button_tool_select", make_binds(TOOL_ROTATE));
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 16:44:50 +01:00
rotate_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/rotate_mode", TTR("Rotate Mode"), KEY_E));
Implement missing ShortCuts in CanvasItemEditor
2016-07-15 21:22:01 +02:00
rotate_button->set_tooltip(TTR("Rotate Mode"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
hb->add_child(memnew(VSeparator));
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 16:44:50 +01:00
list_select_button = memnew(ToolButton);
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
hb->add_child(list_select_button);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
list_select_button->set_toggle_mode(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 08:58:35 +01:00
list_select_button->connect("pressed", this, "_button_tool_select", make_binds(TOOL_LIST_SELECT));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
list_select_button->set_tooltip(TTR("Show a list of all objects at the position clicked\n(same as Alt+RMB in select mode)."));
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
pivot_button = memnew(ToolButton);
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01:00
hb->add_child(pivot_button);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
pivot_button->set_toggle_mode(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 08:58:35 +01:00
pivot_button->connect("pressed", this, "_button_tool_select", make_binds(TOOL_EDIT_PIVOT));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
pivot_button->set_tooltip(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 13:38:15 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
pan_button = memnew(ToolButton);
Add pan mode in 2d editor
2014-05-02 13:39:12 +02:00
hb->add_child(pan_button);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
pan_button->set_toggle_mode(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 08:58:35 +01:00
pan_button->connect("pressed", this, "_button_tool_select", make_binds(TOOL_PAN));
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
pan_button->set_tooltip(TTR("Pan Mode"));
Add pan mode in 2d editor
2014-05-02 13:39:12 +02:00
hb->add_child(memnew(VSeparator));
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
snap_button = memnew(ToolButton);
hb->add_child(snap_button);
snap_button->set_toggle_mode(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 08:58:35 +01:00
snap_button->connect("toggled", this, "_button_toggle_snap");
Minor changes to the Scene and Canvas editors' tooltips.
2018-05-28 17:54:07 +02:00
snap_button->set_tooltip(TTR("Toggle snapping."));
Remove shortcut conflict
2018-06-18 21:24:01 +02:00
snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_snap", TTR("Use Snap"), KEY_MASK_SHIFT | KEY_S));
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
snap_config_menu = memnew(MenuButton);
hb->add_child(snap_config_menu);
snap_config_menu->set_h_size_flags(SIZE_SHRINK_END);
Minor changes to the Scene and Canvas editors' tooltips.
2018-05-28 17:54:07 +02:00
snap_config_menu->set_tooltip(TTR("Snapping Options"));
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
PopupMenu *p = snap_config_menu->get_popup();
p->connect("id_pressed", this, "_popup_callback");
p->set_hide_on_checkable_item_selection(false);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_grid", TTR("Snap to grid")), SNAP_USE_GRID);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_rotation_snap", TTR("Use Rotation Snap")), SNAP_USE_ROTATION);
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/configure_snap", TTR("Configure Snap...")), SNAP_CONFIGURE);
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);
p->add_submenu_item(TTR("Smart snapping"), "SmartSnapping");
smartsnap_config_popup = memnew(PopupMenu);
p->add_child(smartsnap_config_popup);
smartsnap_config_popup->set_name("SmartSnapping");
smartsnap_config_popup->connect("id_pressed", this, "_popup_callback");
smartsnap_config_popup->set_hide_on_checkable_item_selection(false);
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);
2D editor GUI input rework. Changes are: - The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
2017-11-07 08:58:35 +01:00
smartsnap_config_popup->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_node_center", TTR("Snap to node center")), SNAP_USE_NODE_CENTER);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
smartsnap_config_popup->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_other_nodes", TTR("Snap to other nodes")), SNAP_USE_OTHER_NODES);
Implement guides
2017-10-18 23:55:02 +02:00
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 22:52:41 +02:00
hb->add_child(memnew(VSeparator));
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 16:44:50 +01:00
lock_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
hb->add_child(lock_button);
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 16:44:50 +01:00
lock_button->connect("pressed", this, "_popup_callback", varray(LOCK_SELECTED));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
lock_button->set_tooltip(TTR("Lock the selected object in place (can't be moved)."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
unlock_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
hb->add_child(unlock_button);
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 16:44:50 +01:00
unlock_button->connect("pressed", this, "_popup_callback", varray(UNLOCK_SELECTED));
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
unlock_button->set_tooltip(TTR("Unlock the selected object (can be moved)."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
group_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
hb->add_child(group_button);
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 16:44:50 +01:00
group_button->connect("pressed", this, "_popup_callback", varray(GROUP_SELECTED));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
group_button->set_tooltip(TTR("Makes sure the object's children are not selectable."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
ungroup_button = memnew(ToolButton);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
hb->add_child(ungroup_button);
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 16:44:50 +01:00
ungroup_button->connect("pressed", this, "_popup_callback", varray(UNGROUP_SELECTED));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-19 00:08:12 +02:00
ungroup_button->set_tooltip(TTR("Restores the object's children's ability to be selected."));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
hb->add_child(memnew(VSeparator));
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
skeleton_menu = memnew(MenuButton);
hb->add_child(skeleton_menu);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02: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 13:49:50 +02:00
p->set_hide_on_checkable_item_selection(false);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_show_bones", TTR("Show Bones")), SKELETON_SHOW_BONES);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_set_ik_chain", TTR("Make IK Chain")), SKELETON_SET_IK_CHAIN);
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_clear_ik_chain", TTR("Clear IK Chain")), SKELETON_CLEAR_IK_CHAIN);
Made bone handling for actual Bone2D a special case. Make custom bones appear like a custom (less important) option now.
2018-05-04 21:46:32 +02:00
p->add_separator();
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_make_bones", TTR("Make Custom Bone(s) from Node(s)"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_B), SKELETON_MAKE_BONES);
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_clear_bones", TTR("Clear Custom Bones")), SKELETON_CLEAR_BONES);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
p->connect("id_pressed", this, "_popup_callback");
hb->add_child(memnew(VSeparator));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
view_menu = memnew(MenuButton);
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
view_menu->set_text(TTR("View"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
hb->add_child(view_menu);
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 16:44:50 +01:00
view_menu->get_popup()->connect("id_pressed", this, "_popup_callback");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p = view_menu->get_popup();
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_grid", TTR("Show Grid"), KEY_G), SHOW_GRID);
Capitalized "View" menu options.
2018-02-02 20:27:57 +01:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_helpers", TTR("Show Helpers"), KEY_H), SHOW_HELPERS);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_rulers", TTR("Show Rulers"), KEY_R), SHOW_RULERS);
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 09:52:13 +01: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);
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 16:49:27 +02:00
p->add_separator();
Canvas item editor shortcuts
2016-06-29 22:02:26 +02:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/center_selection", TTR("Center Selection"), KEY_F), VIEW_CENTER_TO_SELECTION);
CanvasItemEditor: Changed Frame Selection shortcut
2016-07-15 21:38:43 +02:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/frame_selection", TTR("Frame Selection"), KEY_MASK_SHIFT | KEY_F), VIEW_FRAME_TO_SELECTION);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
presets_menu = memnew(MenuButton);
presets_menu->set_text(TTR("Layout"));
hb->add_child(presets_menu);
presets_menu->hide();
p = presets_menu->get_popup();
p->connect("id_pressed", this, "_popup_callback");
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 06:00:39 +02:00
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
anchors_popup = memnew(PopupMenu);
p->add_child(anchors_popup);
anchors_popup->set_name("Anchors");
anchors_popup->connect("id_pressed", this, "_popup_callback");
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 06:00:39 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
animation_hb = memnew(HBoxContainer);
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 16:49:27 +02:00
hb->add_child(animation_hb);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
animation_hb->add_child(memnew(VSeparator));
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 16:49:27 +02:00
animation_hb->hide();
Added and improved some icons, plus some other minor visual fixes.
2017-10-12 20:59:25 +02:00
key_loc_button = memnew(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 16:49:27 +02:00
key_loc_button->set_toggle_mode(true);
Fixed button flat behavior when not in normal state. Also changed some buttons to flat mode
2017-07-18 18:03:06 +02: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 16:49:27 +02:00
key_loc_button->set_pressed(true);
key_loc_button->set_focus_mode(FOCUS_NONE);
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 16:44:50 +01:00
key_loc_button->connect("pressed", this, "_popup_callback", varray(ANIM_INSERT_POS));
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 16:49:27 +02:00
animation_hb->add_child(key_loc_button);
Added and improved some icons, plus some other minor visual fixes.
2017-10-12 20:59:25 +02:00
key_rot_button = memnew(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 16:49:27 +02:00
key_rot_button->set_toggle_mode(true);
Fixed button flat behavior when not in normal state. Also changed some buttons to flat mode
2017-07-18 18:03:06 +02: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 16:49:27 +02:00
key_rot_button->set_pressed(true);
key_rot_button->set_focus_mode(FOCUS_NONE);
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 16:44:50 +01:00
key_rot_button->connect("pressed", this, "_popup_callback", varray(ANIM_INSERT_ROT));
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 16:49:27 +02:00
animation_hb->add_child(key_rot_button);
Added and improved some icons, plus some other minor visual fixes.
2017-10-12 20:59:25 +02:00
key_scale_button = memnew(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 16:49:27 +02:00
key_scale_button->set_toggle_mode(true);
Fixed button flat behavior when not in normal state. Also changed some buttons to flat mode
2017-07-18 18:03:06 +02: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 16:49:27 +02:00
key_scale_button->set_focus_mode(FOCUS_NONE);
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 16:44:50 +01:00
key_scale_button->connect("pressed", this, "_popup_callback", varray(ANIM_INSERT_SCALE));
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 16:49:27 +02:00
animation_hb->add_child(key_scale_button);
Revert "Add new editor and default theme (WIP)" This reverts commit f045efe007cffb87238ee519b7f33d710814ded7.
2017-05-02 23:02:06 +02:00
key_insert_button = memnew(Button);
Fixed button flat behavior when not in normal state. Also changed some buttons to flat mode
2017-07-18 18:03:06 +02: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 16:49:27 +02:00
key_insert_button->set_focus_mode(FOCUS_NONE);
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 16:44:50 +01:00
key_insert_button->connect("pressed", this, "_popup_callback", varray(ANIM_INSERT_KEY));
Minor changes to the AnimationPlayer editor.
2018-06-09 20:49:16 +02:00
key_insert_button->set_tooltip(TTR("Insert keys."));
Canvas item editor shortcuts
2016-06-29 22:02:26 +02:00
key_insert_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/anim_insert_key", TTR("Insert Key"), KEY_INSERT));
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 16:49:27 +02:00
animation_hb->add_child(key_insert_button);
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 16:44:50 +01:00
animation_menu = memnew(MenuButton);
Added 3 more translatable strings and fixed russian localization based on user feedback. Added strings already contained in the current version of the localization.
2016-06-01 13:32:20 +02:00
animation_menu->set_text(TTR("Animation"));
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 16:49:27 +02:00
animation_hb->add_child(animation_menu);
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 16:44:50 +01:00
animation_menu->get_popup()->connect("id_pressed", this, "_popup_callback");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p = animation_menu->get_popup();
Canvas item editor shortcuts
2016-06-29 22:02:26 +02:00
p->add_shortcut(ED_GET_SHORTCUT("canvas_item_editor/anim_insert_key"), ANIM_INSERT_KEY);
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 16:44:50 +01:00
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_insert_key_existing_tracks", TTR("Insert Key (Existing Tracks)"), KEY_MASK_CMD + KEY_INSERT), ANIM_INSERT_KEY_EXISTING);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
p->add_separator();
Canvas item editor shortcuts
2016-06-29 22:02:26 +02: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);
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_clear_pose", TTR("Clear Pose"), KEY_MASK_SHIFT | KEY_K), ANIM_CLEAR_POSE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
snap_dialog = memnew(SnapDialog);
snap_dialog->connect("confirmed", this, "_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 09:00:55 +01:00
add_child(snap_dialog);
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 16:44:50 +01:00
select_sb = Ref<StyleBoxTexture>(memnew(StyleBoxTexture));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
selection_menu = memnew(PopupMenu);
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
add_child(selection_menu);
selection_menu->set_custom_minimum_size(Vector2(100, 0));
PopupMenu now emits both index_pressed and id_pressed instead of item_pressed, closes #3188
2017-01-08 22:18:54 +01:00
selection_menu->connect("id_pressed", this, "_selection_result_pressed");
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
selection_menu->connect("popup_hide", this, "_selection_menu_hide");
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02: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);
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 16:44:50 +01:00
key_pos = true;
key_rot = true;
key_scale = false;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
show_grid = false;
Add "Show Origin" and "Show Viewport" options to 2D Editor Viewport
2018-03-02 09:52:13 +01:00
show_origin = true;
show_viewport = true;
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
show_helpers = false;
Make rulers on by default
2017-12-04 15:39:12 +01:00
show_rulers = true;
Implement guides
2017-10-18 23:55:02 +02:00
show_guides = true;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
zoom = 1;
Fixes scrollbars in Canvas Item Editor
2018-03-15 15:12:16 +01: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
Implements rulers
2017-08-29 21:50:18 +02:00
grid_offset = Point2();
grid_step = Point2(10, 10);
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
grid_step_multiplier = 0;
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 16:44:50 +01:00
snap_rotation_offset = 0;
snap_rotation_step = 15 / (180 / Math_PI);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
snap_active = false;
snap_node_parent = true;
snap_node_anchors = true;
snap_node_sides = 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 08:58:35 +01:00
snap_node_center = true;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
snap_other_nodes = true;
snap_grid = true;
Implement guides
2017-10-18 23:55:02 +02:00
snap_guides = true;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
snap_rotation = false;
snap_pixel = false;
skeleton_show_bones = true;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
skeleton_menu->get_popup()->set_item_checked(skeleton_menu->get_popup()->get_item_index(SKELETON_SHOW_BONES), true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
singleton = this;
Insert new key helper is back to 2D editor, missed it?
2016-02-09 20:09:29 +01:00
-Fixed a few bugs in Viewport -Made a few demos using Viewport to show it's true power! -Fixed some start-up error messages.
2014-04-10 05:18:27 +02:00
set_process_unhandled_key_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 08:58:35 +01:00
drag_type = DRAG_NONE;
drag_from = Vector2();
drag_to = Vector2();
dragged_guide_pos = Point2();
dragged_guide_index = -1;
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 16:44:50 +01:00
bone_last_frame = 0;
Fixes the checkboxes update
2017-12-09 15:25:20 +01: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 08:58:35 +01:00
// Update the menus' checkboxes
Fix get_edited_scene_root error at starting editor Fix #15300
2018-01-04 19:55:43 +01:00
call_deferred("set_state", get_state());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
CanvasItemEditor *CanvasItemEditor::singleton = NULL;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void CanvasItemEditorPlugin::edit(Object *p_object) {
canvas_item_editor->set_undo_redo(&get_undo_redo());
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 22:58:51 +02:00
canvas_item_editor->edit(Object::cast_to<CanvasItem>(p_object));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 03:03:46 +01:00
return p_object->is_class("CanvasItem");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void CanvasItemEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
canvas_item_editor->show();
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
canvas_item_editor->set_physics_process(true);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
VisualServer::get_singleton()->viewport_set_hide_canvas(editor->get_scene_root()->get_viewport_rid(), 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 08:58:35 +01:00
canvas_item_editor->viewport->grab_focus();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
canvas_item_editor->hide();
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
canvas_item_editor->set_physics_process(false);
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
VisualServer::get_singleton()->viewport_set_hide_canvas(editor->get_scene_root()->get_viewport_rid(), true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Dictionary CanvasItemEditorPlugin::get_state() const {
return canvas_item_editor->get_state();
}
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 16:44:50 +01:00
void CanvasItemEditorPlugin::set_state(const Dictionary &p_state) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
canvas_item_editor->set_state(p_state);
}
CanvasItemEditorPlugin::CanvasItemEditorPlugin(EditorNode *p_node) {
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
editor = p_node;
canvas_item_editor = memnew(CanvasItemEditor(editor));
-Property apply limits to V/H Splits in main editor window. Fixes #3567
2016-02-08 17:01:54 +01:00
canvas_item_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor->get_viewport()->add_child(canvas_item_editor);
Remove set_area_as_parent_rect and replace it by set_anchors_and_margins_preset(PRESET_WIDE)
2017-09-22 00:12:33 +02:00
canvas_item_editor->set_anchors_and_margins_preset(Control::PRESET_WIDE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
canvas_item_editor->hide();
}
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 16:44:50 +01:00
CanvasItemEditorPlugin::~CanvasItemEditorPlugin() {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
void CanvasItemEditorViewport::_on_mouse_exit() {
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 16:44:50 +01:00
if (!selector->is_visible()) {
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
_remove_preview();
}
}
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 16:44:50 +01:00
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 22:58:51 +02:00
CheckBox *check = Object::cast_to<CheckBox>(selected);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
String type = check->get_text();
Fixed theme update and some widgets.
2017-11-11 18:57:54 +01:00
selector->set_title(vformat(TTR("Add %s"), type));
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 16:44:50 +01:00
label->set_text(vformat(TTR("Adding %s..."), type));
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
Remove preview when closing "change default type" dialog.
2017-11-12 10:50:06 +01:00
void CanvasItemEditorViewport::_on_change_type_confirmed() {
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 05:04:31 +01:00
if (!button_group->get_pressed_button())
return;
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 22:58:51 +02:00
CheckBox *check = Object::cast_to<CheckBox>(button_group->get_pressed_button());
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 16:44:50 +01:00
default_type = check->get_text();
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
_perform_drop_data();
selector->hide();
}
Remove preview when closing "change default type" dialog.
2017-11-12 10:50:06 +01:00
void CanvasItemEditorViewport::_on_change_type_closed() {
_remove_preview();
}
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 16:44:50 +01:00
void CanvasItemEditorViewport::_create_preview(const Vector<String> &files) const {
Improved add texture as node dialog
2017-08-10 18:40:28 +02:00
label->set_position(get_global_position() + Point2(14, 14) * EDSCALE);
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 17:29:38 +02:00
label_desc->set_position(label->get_position() + Point2(0, label->get_size().height));
- 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 07:05:15 +01:00
bool add_preview = false;
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
for (int i = 0; i < files.size(); i++) {
String path = files[i];
RES res = ResourceLoader::load(path);
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 22:58:51 +02:00
Ref<Texture> texture = Ref<Texture>(Object::cast_to<Texture>(*res));
Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
Fix drag and drop on 2d viewport
2017-03-13 11:35:27 +01:00
if (texture != NULL || scene != NULL) {
if (texture != NULL) {
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 16:44:50 +01:00
Sprite *sprite = memnew(Sprite);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
sprite->set_texture(texture);
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 16:44:50 +01:00
sprite->set_modulate(Color(1, 1, 1, 0.7f));
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
preview_node->add_child(sprite);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
label->show();
label_desc->show();
Fix drag and drop on 2d viewport
2017-03-13 11:35:27 +01:00
} else {
if (scene.is_valid()) {
Node *instance = scene->instance();
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 16:44:50 +01:00
if (instance) {
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
preview_node->add_child(instance);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02: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 07:05:15 +01:00
add_preview = true;
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02: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 07:05:15 +01:00
if (add_preview)
editor->get_scene_root()->add_child(preview_node);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
void CanvasItemEditorViewport::_remove_preview() {
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02: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);
node->queue_delete();
preview_node->remove_child(node);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
editor->get_scene_root()->remove_child(preview_node);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
label->hide();
label_desc->hide();
}
}
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 16:44:50 +01:00
bool CanvasItemEditorViewport::_cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node) {
if (p_desired_node->get_filename() == p_target_scene_path) {
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
return true;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
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)) {
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
return true;
}
}
return false;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
void CanvasItemEditorViewport::_create_nodes(Node *parent, Node *child, String &path, const Point2 &p_point) {
rename String.extension() -> String.get_extension() / String.basename() -> String.get_basename()
2017-01-14 04:51:09 +01:00
child->set_name(path.get_file().get_basename());
Added/Fixed null pointer checks
2017-08-25 17:14:33 +02:00
Ref<Texture> texture = Ref<Texture>(Object::cast_to<Texture>(ResourceCache::get(path)));
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
Size2 texture_size = texture->get_size();
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 03:28:02 +01:00
if (parent) {
editor_data->get_undo_redo().add_do_method(parent, "add_child", child);
editor_data->get_undo_redo().add_do_method(child, "set_owner", editor->get_edited_scene());
editor_data->get_undo_redo().add_do_reference(child);
editor_data->get_undo_redo().add_undo_method(parent, "remove_child", child);
} else { // if we haven't parent, lets try to make a child as a parent.
editor_data->get_undo_redo().add_do_method(editor, "set_edited_scene", child);
editor_data->get_undo_redo().add_do_method(child, "set_owner", editor->get_edited_scene());
editor_data->get_undo_redo().add_do_reference(child);
editor_data->get_undo_redo().add_undo_method(editor, "set_edited_scene", (Object *)NULL);
}
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02: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 03:28:02 +01:00
if (parent) {
String new_name = parent->validate_child_name(child);
ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
editor_data->get_undo_redo().add_do_method(sed, "live_debug_create_node", editor->get_edited_scene()->get_path_to(parent), child->get_class(), new_name);
editor_data->get_undo_redo().add_undo_method(sed, "live_debug_remove_node", NodePath(String(editor->get_edited_scene()->get_path_to(parent)) + "/" + new_name));
}
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
// handle with different property for texture
String property = "texture";
List<PropertyInfo> props;
child->get_property_list(&props);
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 16:44:50 +01:00
for (const List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
if (E->get().name == "config/texture") { // Particles2D
property = "config/texture";
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
break;
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 16:44:50 +01:00
} else if (E->get().name == "texture/texture") { // Polygon2D
property = "texture/texture";
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
break;
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 16:44:50 +01:00
} else if (E->get().name == "normal") { // TouchScreenButton
property = "normal";
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
break;
}
}
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 16:44:50 +01:00
editor_data->get_undo_redo().add_do_property(child, property, texture);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
// make visible for certain node type
Renamed Patch9Rect (which was expected to be renamed to NinePacthRect) into NinePatchRect on "drag & drop asset to 2D viewport" feature.
2017-09-30 14:44:01 +02:00
if (default_type == "NinePatchRect") {
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 16:44:50 +01:00
editor_data->get_undo_redo().add_do_property(child, "rect/size", texture_size);
} else if (default_type == "Polygon2D") {
Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector
2017-01-07 22:25:37 +01:00
PoolVector<Vector2> list;
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 16:44:50 +01:00
list.push_back(Vector2(0, 0));
list.push_back(Vector2(texture_size.width, 0));
list.push_back(Vector2(texture_size.width, texture_size.height));
list.push_back(Vector2(0, texture_size.height));
editor_data->get_undo_redo().add_do_property(child, "polygon", list);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
// locate at preview position
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 03:28:02 +01:00
Point2 pos = Point2(0, 0);
if (parent && parent->has_method("get_global_position")) {
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 17:29:38 +02:00
pos = parent->call("get_global_position");
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
Transform2D trans = canvas->get_canvas_transform();
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 15:37:49 +02:00
Point2 target_position = (p_point - trans.get_origin()) / trans.get_scale().x - pos;
Renamed Patch9Rect (which was expected to be renamed to NinePacthRect) into NinePatchRect on "drag & drop asset to 2D viewport" feature.
2017-09-30 14:44:01 +02:00
if (default_type == "Polygon2D" || default_type == "TouchScreenButton" || default_type == "TextureRect" || default_type == "NinePatchRect") {
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 15:37:49 +02:00
target_position -= texture_size / 2;
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
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-23 00:47:51 +01:00
// there's nothing to be used as source position so snapping will work as absolute if enabled
Rename pos to position in user facing methods and variables Rename user facing methods and variables as well as the corresponding C++ methods according to the folloming changes: * pos -> position * rot -> rotation * loc -> location C++ variables are left as is.
2017-09-10 15:37:49 +02:00
target_position = canvas->snap_point(target_position);
editor_data->get_undo_redo().add_do_method(child, "set_position", target_position);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
bool CanvasItemEditorViewport::_create_instance(Node *parent, String &path, const Point2 &p_point) {
Ref<PackedScene> sdata = ResourceLoader::load(path);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
if (!sdata.is_valid()) { // invalid scene
return false;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
Node *instanced_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
if (!instanced_scene) { // error on instancing
return false;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
if (editor->get_edited_scene()->get_filename() != "") { // cyclical instancing
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
if (_cyclical_dependency_exists(editor->get_edited_scene()->get_filename(), instanced_scene)) {
Fix memory leak with drag & drop on 2D viewport
2016-10-31 03:50:34 +01:00
memdelete(instanced_scene);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
return false;
}
}
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
instanced_scene->set_filename(ProjectSettings::get_singleton()->localize_path(path));
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
editor_data->get_undo_redo().add_do_method(parent, "add_child", instanced_scene);
editor_data->get_undo_redo().add_do_method(instanced_scene, "set_owner", editor->get_edited_scene());
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
editor_data->get_undo_redo().add_do_reference(instanced_scene);
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 16:44:50 +01:00
editor_data->get_undo_redo().add_undo_method(parent, "remove_child", instanced_scene);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
String new_name = parent->validate_child_name(instanced_scene);
ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
editor_data->get_undo_redo().add_do_method(sed, "live_debug_instance_node", editor->get_edited_scene()->get_path_to(parent), path, new_name);
editor_data->get_undo_redo().add_undo_method(sed, "live_debug_remove_node", NodePath(String(editor->get_edited_scene()->get_path_to(parent)) + "/" + new_name));
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
CanvasItem *parent_ci = Object::cast_to<CanvasItem>(parent);
if (parent_ci) {
Vector2 target_pos = canvas->get_canvas_transform().affine_inverse().xform(p_point);
target_pos = canvas->snap_point(target_pos);
target_pos = parent_ci->get_global_transform_with_canvas().affine_inverse().xform(target_pos);
editor_data->get_undo_redo().add_do_method(instanced_scene, "set_position", target_pos);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
return true;
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
void CanvasItemEditorViewport::_perform_drop_data() {
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
_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 07:05:15 +01:00
// Without root dropping multiple files is not allowed
if (!target_node && selected_files.size() > 1) {
accept->get_ok()->set_text(TTR("Ok"));
accept->set_text(TTR("Cannot instantiate multiple nodes without root."));
accept->popup_centered_minsize();
return;
}
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
Vector<String> error_files;
editor_data->get_undo_redo().create_action(TTR("Create Node"));
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
for (int i = 0; i < selected_files.size(); i++) {
String path = selected_files[i];
RES res = ResourceLoader::load(path);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02: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 22:58:51 +02:00
Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
- 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 07:05:15 +01:00
if (scene != NULL && scene.is_valid()) {
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 {
Ref<Texture> texture = Ref<Texture>(Object::cast_to<Texture>(*res));
if (texture != NULL && texture.is_valid()) {
Node *child;
if (default_type == "Light2D")
child = memnew(Light2D);
else if (default_type == "Particles2D")
child = memnew(Particles2D);
else if (default_type == "Polygon2D")
child = memnew(Polygon2D);
else if (default_type == "TouchScreenButton")
child = memnew(TouchScreenButton);
else if (default_type == "TextureRect")
child = memnew(TextureRect);
else if (default_type == "NinePatchRect")
child = memnew(NinePatchRect);
else
child = memnew(Sprite); // default
_create_nodes(target_node, child, path, drop_pos);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
}
}
editor_data->get_undo_redo().commit_action();
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 16:44:50 +01:00
if (error_files.size() > 0) {
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
String files_str;
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 16:44:50 +01:00
for (int i = 0; i < error_files.size(); i++) {
rename String.extension() -> String.get_extension() / String.basename() -> String.get_basename()
2017-01-14 04:51:09 +01:00
files_str += error_files[i].get_file().get_basename() + ",";
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
files_str = files_str.substr(0, files_str.length() - 1);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
accept->get_ok()->set_text(TTR("Ugh"));
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 16:44:50 +01:00
accept->set_text(vformat(TTR("Error instancing scene from %s"), files_str.c_str()));
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
accept->popup_centered_minsize();
}
}
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 16:44:50 +01:00
bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Variant &p_data) const {
Dictionary d = p_data;
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
if (d.has("type")) {
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 16:44:50 +01:00
if (String(d["type"]) == "files") {
Vector<String> files = d["files"];
bool can_instance = false;
- 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 07:05:15 +01:00
for (int i = 0; i < files.size(); i++) { // check if dragged files contain resource or scene can be created at least once
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 16:44:50 +01:00
RES res = ResourceLoader::load(files[i]);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
if (res.is_null()) {
continue;
}
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 16:44:50 +01:00
String type = res->get_class();
if (type == "PackedScene") {
- 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 07:05:15 +01:00
Ref<PackedScene> sdata = Ref<PackedScene>(Object::cast_to<PackedScene>(*res));
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 16:44:50 +01:00
Node *instanced_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
if (!instanced_scene) {
continue;
}
memdelete(instanced_scene);
Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.
2017-09-16 15:57:17 +02:00
} else if (type == "Texture" ||
type == "ImageTexture" ||
type == "ViewportTexture" ||
type == "CurveTexture" ||
type == "GradientTexture" ||
type == "StreamTexture" ||
type == "AtlasTexture" ||
type == "LargeTexture") {
- 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 07:05:15 +01:00
Ref<Texture> texture = Ref<Texture>(Object::cast_to<Texture>(*res));
Drag and drop for meshes directly and fix drop restriction for non-Texture objects in canvas editor.
2017-09-16 15:57:17 +02:00
if (texture.is_valid() == false) {
continue;
}
} else {
continue;
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
can_instance = true;
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
break;
}
if (can_instance) {
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
if (!preview_node->get_parent()) { // create preview only once
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
_create_preview(files);
}
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 16:44:50 +01:00
Transform2D trans = canvas->get_canvas_transform();
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
preview_node->set_position((p_point - trans.get_origin()) / trans.get_scale().x);
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 16:44:50 +01:00
label->set_text(vformat(TTR("Adding %s..."), default_type));
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
return can_instance;
}
}
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 03:28:02 +01: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 07:05:15 +01: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 03:28:02 +01: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]);
check->set_pressed(check->get_text() == default_type);
}
selector->set_title(vformat(TTR("Add %s"), default_type));
selector->popup_centered_minsize();
}
- 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 07:05:15 +01: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;
}
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 16:44:50 +01:00
void CanvasItemEditorViewport::drop_data(const Point2 &p_point, const Variant &p_data) {
bool is_shift = Input::get_singleton()->is_key_pressed(KEY_SHIFT);
bool is_alt = Input::get_singleton()->is_key_pressed(KEY_ALT);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
selected_files.clear();
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 16:44:50 +01:00
Dictionary d = p_data;
if (d.has("type") && String(d["type"]) == "files") {
selected_files = d["files"];
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02: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 07:05:15 +01:00
if (selected_files.size() == 0)
return;
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
List<Node *> list = editor->get_editor_selection()->get_selected_node_list();
if (list.size() == 0) {
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
Node *root_node = editor->get_edited_scene();
if (root_node) {
list.push_back(root_node);
} else {
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 03:28:02 +01:00
drop_pos = p_point;
Fixed #14503
2017-12-11 00:43:27 +01:00
target_node = NULL;
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
}
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02: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 07:05:15 +01:00
if (list.size() > 0) {
target_node = list[0];
if (is_shift && target_node != editor->get_edited_scene()) {
target_node = target_node->get_parent();
}
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02: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 07:05:15 +01:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
drop_pos = p_point;
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02: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 07:05:15 +01: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 03:28:02 +01:00
_show_resource_type_selector();
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
} else {
_perform_drop_data();
}
}
void CanvasItemEditorViewport::_notification(int p_what) {
Improved add texture as node dialog
2017-08-10 18:40:28 +02:00
switch (p_what) {
case NOTIFICATION_ENTER_TREE: {
connect("mouse_exited", this, "_on_mouse_exit");
label->add_color_override("font_color", get_color("warning_color", "Editor"));
} break;
case NOTIFICATION_EXIT_TREE: {
disconnect("mouse_exited", this, "_on_mouse_exit");
} break;
default: break;
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
}
void CanvasItemEditorViewport::_bind_methods() {
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 16:44:50 +01:00
ClassDB::bind_method(D_METHOD("_on_select_type"), &CanvasItemEditorViewport::_on_select_type);
Remove preview when closing "change default type" dialog.
2017-11-12 10:50:06 +01:00
ClassDB::bind_method(D_METHOD("_on_change_type_confirmed"), &CanvasItemEditorViewport::_on_change_type_confirmed);
ClassDB::bind_method(D_METHOD("_on_change_type_closed"), &CanvasItemEditorViewport::_on_change_type_closed);
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 16:44:50 +01:00
ClassDB::bind_method(D_METHOD("_on_mouse_exit"), &CanvasItemEditorViewport::_on_mouse_exit);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasItemEditor *p_canvas) {
default_type = "Sprite";
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
// Node2D
types.push_back("Sprite");
types.push_back("Light2D");
types.push_back("Particles2D");
types.push_back("Polygon2D");
types.push_back("TouchScreenButton");
// Control
some class renames TextureFrame -> TextureRect Patch9Frame -> NinePatchRect ColorFrame -> ColorRect
2017-01-12 22:27:27 +01:00
types.push_back("TextureRect");
Renamed Patch9Rect (which was expected to be renamed to NinePacthRect) into NinePatchRect on "drag & drop asset to 2D viewport" feature.
2017-09-30 14:44:01 +02:00
types.push_back("NinePatchRect");
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
target_node = NULL;
editor = p_node;
editor_data = editor->get_scene_tree_dock()->get_editor_data();
canvas = p_canvas;
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
preview_node = memnew(Node2D);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
accept = memnew(AcceptDialog);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
editor->get_gui_base()->add_child(accept);
Improved add texture as node dialog
2017-08-10 18:40:28 +02:00
selector = memnew(AcceptDialog);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
editor->get_gui_base()->add_child(selector);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
selector->set_title(TTR("Change default type"));
Remove preview when closing "change default type" dialog.
2017-11-12 10:50:06 +01:00
selector->connect("confirmed", this, "_on_change_type_confirmed");
selector->connect("popup_hide", this, "_on_change_type_closed");
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
VBoxContainer *vbc = memnew(VBoxContainer);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
selector->add_child(vbc);
Improved add texture as node dialog
2017-08-10 18:40:28 +02:00
vbc->set_h_size_flags(SIZE_EXPAND_FILL);
vbc->set_v_size_flags(SIZE_EXPAND_FILL);
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 16:44:50 +01:00
vbc->set_custom_minimum_size(Size2(200, 260) * EDSCALE);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
btn_group = memnew(VBoxContainer);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
vbc->add_child(btn_group);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
btn_group->set_h_size_flags(0);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
button_group.instance();
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 16:44:50 +01:00
for (int i = 0; i < types.size(); i++) {
CheckBox *check = memnew(CheckBox);
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
btn_group->add_child(check);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
check->set_text(types[i]);
Fix signal error when starting editor need to merge #8198 to work properly
2017-04-10 06:00:08 +02:00
check->connect("button_down", this, "_on_select_type", varray(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 05:04:31 +01:00
check->set_button_group(button_group);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
}
A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
2017-03-05 16:44:50 +01:00
label = memnew(Label);
label->add_color_override("font_color_shadow", Color(0, 0, 0, 1));
label->add_constant_override("shadow_as_outline", 1 * EDSCALE);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
label->hide();
editor->get_gui_base()->add_child(label);
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 16:44:50 +01:00
label_desc = memnew(Label);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
label_desc->set_text(TTR("Drag & drop + Shift : Add node as sibling\nDrag & drop + Alt : Change node type"));
Fix drag and drop on 2d viewport
2017-03-13 11:35:27 +01:00
label_desc->add_color_override("font_color", Color(0.6f, 0.6f, 0.6f, 1));
label_desc->add_color_override("font_color_shadow", Color(0.2f, 0.2f, 0.2f, 1));
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 16:44:50 +01:00
label_desc->add_constant_override("shadow_as_outline", 1 * EDSCALE);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
label_desc->add_constant_override("line_spacing", 0);
label_desc->hide();
editor->get_gui_base()->add_child(label_desc);
}
Fixed several memory leaks
2017-08-24 18:51:28 +02:00
CanvasItemEditorViewport::~CanvasItemEditorViewport() {
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
memdelete(preview_node);
Fixed several memory leaks
2017-08-24 18:51:28 +02:00
}
Reference in a new issue Copy permalink