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

4845 lines
172 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
/*************************************************************************/
Welcome in 2017, dear changelog reader! That year should bring the long-awaited OpenGL ES 3.0 compatible renderer with state-of-the-art rendering techniques tuned to work as low as middle end handheld devices - without compromising with the possibilities given for higher end desktop games of course. Great times ahead for the Godot community and the gamers that will play our games!
2017-01-01 22:01:57 +01:00
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
Add "Godot Engine contributors" copyright line
2017-04-08 00:11:42 +02:00
/* Copyright (c) 2014-2017 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. */
/*************************************************************************/
#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
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/animation_editor.h"
Refactoring: rename tools/editor/ to editor/ The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful.
2017-03-05 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"
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
}
};
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 CanvasItemEditor::_edit_set_pivot(const Vector2 &mouse_pos) {
List<Node *> &selection = editor_selection->get_selected_node_list();
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01:00
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
undo_redo->create_action(TTR("Move 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
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +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>(E->get());
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
if (n2d && n2d->_edit_use_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
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Vector2 offset = n2d->_edit_get_pivot();
-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
Vector2 gpos = n2d->get_global_position();
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01:00
-property change object's rotation pivot on children of scaled CanvasLayer, fixes #2599
2015-12-29 11:31:50 +01:00
Vector2 local_mouse_pos = n2d->get_canvas_transform().affine_inverse().xform(mouse_pos);
-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
Vector2 motion_ofs = gpos - local_mouse_pos;
-property change object's rotation pivot on children of scaled CanvasLayer, fixes #2599
2015-12-29 11:31:50 +01:00
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_global_position", local_mouse_pos);
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
undo_redo->add_do_method(n2d, "_edit_set_pivot", offset + n2d->get_global_transform().affine_inverse().basis_xform(motion_ofs));
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_global_position", gpos);
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
undo_redo->add_undo_method(n2d, "_edit_set_pivot", 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
for (int i = 0; i < n2d->get_child_count(); i++) {
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 *n2dc = Object::cast_to<Node2D>(n2d->get_child(i));
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01:00
if (!n2dc)
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(n2dc, "set_global_position", n2dc->get_global_position());
undo_redo->add_undo_method(n2dc, "set_global_position", n2dc->get_global_position());
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01:00
}
}
Ability to set rotation and scaling pivot for controls.
2017-07-06 22:42:44 +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 *cnt = Object::cast_to<Control>(E->get());
Ability to set rotation and scaling pivot for controls.
2017-07-06 22:42:44 +02:00
if (cnt) {
Vector2 old_pivot = cnt->get_pivot_offset();
Vector2 new_pivot = cnt->get_global_transform_with_canvas().affine_inverse().xform(mouse_pos);
Vector2 old_pos = cnt->get_position();
Vector2 top_pos = cnt->get_transform().get_origin(); //remember where top pos was
cnt->set_pivot_offset(new_pivot);
Vector2 new_top_pos = cnt->get_transform().get_origin(); //check where it is now
Vector2 new_pos = old_pos - (new_top_pos - top_pos); //offset it back
undo_redo->add_do_method(cnt, "set_pivot_offset", new_pivot);
undo_redo->add_do_method(cnt, "set_position", new_pos);
undo_redo->add_undo_method(cnt, "set_pivot_offset", old_pivot);
undo_redo->add_undo_method(cnt, "set_position", old_pos);
}
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01:00
}
undo_redo->commit_action();
}
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);
if (p_radius < 0 || dist < radius && (!r_snapped || dist < Math::abs(r_current_snap - p_value))) {
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) {
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
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());
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
_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());
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
Point2 dist[2];
bool snapped[2] = { false, false };
// Smart snap using the canvas position
Vector2 output = p_target;
real_t rotation = 0.0;
if (p_canvas_item) {
Point2 begin;
Point2 end;
rotation = p_canvas_item->get_global_transform_with_canvas().get_rotation();
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
if ((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
// Parent sides and center
bool can_snap = false;
if (const Control *c = Object::cast_to<Control>(p_canvas_item)) {
begin = p_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(0, 0)));
end = p_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(1, 1)));
can_snap = true;
} else if (const CanvasItem *parent_ci = Object::cast_to<CanvasItem>(p_canvas_item->get_parent())) {
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
begin = p_canvas_item->get_transform().affine_inverse().xform(parent_ci->_edit_get_rect().get_position());
end = p_canvas_item->get_transform().affine_inverse().xform(parent_ci->_edit_get_rect().get_position() + parent_ci->_edit_get_rect().get_size());
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
can_snap = true;
}
if (can_snap) {
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);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
}
}
// Self anchors (for sides)
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
if ((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)) {
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))));
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
}
}
// Self sides (for anchors)
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
if ((snap_active && snap_node_sides && (p_modes & SNAP_NODE_SIDES)) || (p_forced_modes & SNAP_NODE_SIDES)) {
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
begin = p_canvas_item->get_global_transform_with_canvas().xform(p_canvas_item->_edit_get_rect().get_position());
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());
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);
}
}
// Other nodes sides
if ((snap_active && snap_other_nodes && (p_modes & SNAP_OTHER_NODES)) || (p_forced_modes & SNAP_OTHER_NODES)) {
_snap_other_nodes(p_target, output, snapped, get_tree()->get_edited_scene_root(), p_canvas_item);
}
Fix compilation on Visual Studio 2013 again.
2017-11-01 21:47:05 +01:00
if (((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
}
}
Fix compilation on Visual Studio 2013 again.
2017-11-01 21:47:05 +01:00
if (((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) {
List<Node *> &selection = editor_selection->get_selected_node_list();
if (selection.size() == 1 && Object::cast_to<Node2D>(selection[0])) {
offset = Object::cast_to<Node2D>(selection[0])->get_global_position();
} else {
offset = _find_topleftmost_point();
}
}
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 {
float offset = snap_relative ? p_start : p_target;
return (snap_rotation && snap_rotation_step != 0) ? Math::stepify(p_target - snap_rotation_offset, snap_rotation_step) + snap_rotation_offset : p_target;
}
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()) {
if (drag_pivot_shortcut.is_valid() && drag_pivot_shortcut->is_shortcut(p_ev) && drag == DRAG_NONE && can_move_pivot) {
//move drag pivot
drag = DRAG_PIVOT;
} else if (set_pivot_shortcut.is_valid() && set_pivot_shortcut->is_shortcut(p_ev) && drag == DRAG_NONE && can_move_pivot) {
if (!Input::get_singleton()->is_mouse_button_pressed(0)) {
List<Node *> &selection = editor_selection->get_selected_node_list();
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
Vector2 mouse_pos = viewport->get_local_mouse_position();
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
if (selection.size() && viewport->get_rect().has_point(mouse_pos)) {
//just in case, make it work if over viewport
mouse_pos = transform.affine_inverse().xform(mouse_pos);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
mouse_pos = snap_point(mouse_pos, SNAP_DEFAULT, _get_single_item());
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
_edit_set_pivot(mouse_pos);
}
made changing pivot simpler in 2D nodes (just press v with mouse over position)
2015-06-12 18:53:18 +02:00
}
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) && 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_base->update();
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_base->update();
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
}
void CanvasItemEditor::_tool_select(int p_index) {
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
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);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
viewport->update();
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
tool = (Tool)p_index;
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
}
Dictionary CanvasItemEditor::get_state() const {
Dictionary 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
state["zoom"] = zoom;
state["ofs"] = Point2(h_scroll->get_value(), v_scroll->get_value());
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
//state["ofs"]=-transform.get_origin();
Implements rulers
2017-08-29 21:50:18 +02:00
state["grid_offset"] = grid_offset;
state["grid_step"] = grid_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
state["snap_rotation_offset"] = snap_rotation_offset;
state["snap_rotation_step"] = snap_rotation_step;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
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_other_nodes"] = snap_other_nodes;
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
state["snap_grid"] = snap_grid;
Implement guides
2017-10-18 23:55:02 +02:00
state["snap_guides"] = snap_guides;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
state["show_grid"] = show_grid;
Implements rulers
2017-08-29 21:50:18 +02:00
state["show_rulers"] = show_rulers;
Implement guides
2017-10-18 23:55:02 +02:00
state["show_guides"] = show_guides;
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
state["show_helpers"] = show_helpers;
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
state["snap_rotation"] = snap_rotation;
state["snap_relative"] = snap_relative;
state["snap_pixel"] = snap_pixel;
state["skeleton_show_bones"] = skeleton_show_bones;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return 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 CanvasItemEditor::set_state(const Dictionary &p_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
Dictionary state = p_state;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (state.has("zoom")) {
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 = p_state["zoom"];
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
if (state.has("ofs")) {
_update_scrollbars(); // i wonder how safe is calling this here..
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 ofs = p_state["ofs"];
-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
h_scroll->set_value(ofs.x);
v_scroll->set_value(ofs.y);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Implements rulers
2017-08-29 21:50:18 +02:00
if (state.has("grid_offset")) {
grid_offset = state["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
}
Implements rulers
2017-08-29 21:50:18 +02:00
if (state.has("grid_step")) {
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
grid_step = state["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
}
if (state.has("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_rotation_step = state["snap_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
}
if (state.has("snap_rotation_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
snap_rotation_offset = state["snap_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
}
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
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_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);
}
Implement guides
2017-10-18 23:55:02 +02:00
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);
}
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
if (state.has("snap_grid")) {
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_grid = state["snap_grid"];
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_GRID);
snap_config_menu->get_popup()->set_item_checked(idx, snap_grid);
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 some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
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);
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
}
Implements rulers
2017-08-29 21:50:18 +02: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);
}
Implement guides
2017-10-18 23:55:02 +02:00
if (state.has("show_guides")) {
show_guides = state["show_guides"];
int idx = view_menu->get_popup()->get_item_index(SHOW_GUIDES);
view_menu->get_popup()->set_item_checked(idx, show_guides);
}
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
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);
}
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
if (state.has("snap_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
snap_rotation = state["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);
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
}
Renamed "snap to offset" to "snap relative". Better conveys meaning.
2015-02-20 13:21:59 +01:00
if (state.has("snap_relative")) {
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_relative = state["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);
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
}
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
if (state.has("snap_pixel")) {
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_pixel = state["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
}
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
if (state.has("skeleton_show_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
skeleton_show_bones = state["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
}
Clean up canvas item when changing state, closes #5977
2017-08-09 02:12:32 +02:00
viewport->update();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void CanvasItemEditor::_add_canvas_item(CanvasItem *p_canvas_item) {
editor_selection->add_node(p_canvas_item);
}
void CanvasItemEditor::_remove_canvas_item(CanvasItem *p_canvas_item) {
editor_selection->remove_node(p_canvas_item);
}
void CanvasItemEditor::_clear_canvas_items() {
Style: Fix statements ending with ';;'
2017-01-14 18:03:38 +01:00
editor_selection->clear();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Fix some error messages
2016-01-09 12:35:57 +01:00
void CanvasItemEditor::_keying_changed() {
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 (AnimationPlayerEditor::singleton->get_key_editor()->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
animation_hb->show();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
else
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();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
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
bool CanvasItemEditor::_is_part_of_subscene(CanvasItem *p_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
Node *scene_node = get_tree()->get_edited_scene_root();
Node *item_owner = p_item->get_owner();
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
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 item_owner && item_owner != scene_node && p_item != scene_node && item_owner->get_filename() != "";
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
}
Fix signed and unsigned comparisons The first in my quest to make Godot 3.x compile with -Werror on GCC7
2017-08-31 23:30:35 +02:00
void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, Vector<_SelectResult> &r_items, int limit) {
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;
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 *c = Object::cast_to<CanvasItem>(p_node);
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +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 (int i = p_node->get_child_count() - 1; i >= 0; i--) {
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
if (c && !c->is_set_as_toplevel())
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
_find_canvas_items_at_pos(p_pos, p_node->get_child(i), p_parent_xform * c->get_transform(), p_canvas_xform, r_items);
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
else {
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
CanvasLayer *cl = Object::cast_to<CanvasLayer>(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
_find_canvas_items_at_pos(p_pos, p_node->get_child(i), transform, cl ? cl->get_transform() : p_canvas_xform, r_items); //use base transform
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
}
Generalized _find_canvas_items_at_pos to remove _select_canvas_items_at_pos Removed some useless parameters Removed old comments
2017-07-17 23:28:19 +02:00
if (limit != 0 && r_items.size() >= limit)
return;
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +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 (c && c->is_visible_in_tree() && !c->has_meta("_edit_lock_") && !Object::cast_to<CanvasLayer>(c)) {
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Rect2 rect = c->_edit_get_rect();
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
Point2 local_pos = (p_parent_xform * p_canvas_xform * c->get_transform()).affine_inverse().xform(p_pos);
if (rect.has_point(local_pos)) {
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 *node = Object::cast_to<Node2D>(c);
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
_SelectResult 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
res.item = c;
res.z = node ? node->get_z() : 0;
res.has_z = node;
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
r_items.push_back(res);
}
}
return;
}
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
void CanvasItemEditor::_find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, List<CanvasItem *> *r_items) {
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;
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 *c = Object::cast_to<CanvasItem>(p_node);
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
bool inherited = p_node != get_tree()->get_edited_scene_root() && p_node->get_filename() != "";
bool editable = false;
if (inherited) {
editable = EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(p_node);
Prevent to select children if selection lock or instanced scene Fix #7086
2016-11-12 14:43:31 +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
bool lock_children = p_node->has_meta("_edit_group_") && p_node->get_meta("_edit_group_");
Prevent to select children if selection lock or instanced scene Fix #7086
2016-11-12 14:43:31 +01:00
if (!lock_children && (!inherited || 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--) {
Prevent to select children if selection lock or instanced scene Fix #7086
2016-11-12 14:43:31 +01:00
if (c && !c->is_set_as_toplevel())
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
_find_canvas_items_at_rect(p_rect, p_node->get_child(i), p_parent_xform * c->get_transform(), p_canvas_xform, r_items);
Prevent to select children if selection lock or instanced scene Fix #7086
2016-11-12 14:43:31 +01:00
else {
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
CanvasLayer *cl = Object::cast_to<CanvasLayer>(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
_find_canvas_items_at_rect(p_rect, p_node->get_child(i), transform, cl ? cl->get_transform() : p_canvas_xform, r_items);
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
}
}
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 (c && c->is_visible_in_tree() && !c->has_meta("_edit_lock_") && !Object::cast_to<CanvasLayer>(c)) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Rect2 rect = c->_edit_get_rect();
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 = p_parent_xform * p_canvas_xform * c->get_transform();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
if (p_rect.has_point(xform.xform(rect.position)) &&
p_rect.has_point(xform.xform(rect.position + Vector2(rect.size.x, 0))) &&
p_rect.has_point(xform.xform(rect.position + Vector2(rect.size.x, rect.size.y))) &&
p_rect.has_point(xform.xform(rect.position + Vector2(0, rect.size.y)))) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
r_items->push_back(c);
}
}
}
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
void CanvasItemEditor::_select_click_on_empty_area(Point2 p_click_pos, bool p_append, bool p_box_selection) {
if (!p_append) {
editor_selection->clear();
viewport->update();
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_base->update();
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
};
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
if (p_box_selection) {
// Start a box selection
drag_from = transform.affine_inverse().xform(p_click_pos);
box_selecting = true;
box_selecting_to = drag_from;
}
}
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
bool CanvasItemEditor::_select_click_on_item(CanvasItem *item, Point2 p_click_pos, bool p_append, bool p_drag) {
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
_append_canvas_item(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
}
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
if (still_selected && p_drag) {
// Drag the node(s) if requested
_prepare_drag(p_click_pos);
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();
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_base->update();
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
return still_selected;
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +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
void CanvasItemEditor::_key_move(const Vector2 &p_dir, bool p_snap, KeyMoveMODE p_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
if (drag != DRAG_NONE)
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
if (editor_selection->get_selected_node_list().empty())
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
undo_redo->create_action(TTR("Move Action"), UndoRedo::MERGE_ENDS);
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
List<Node *> &selection = editor_selection->get_selected_node_list();
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 (List<Node *>::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->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())
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
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!se)
continue;
if (canvas_item->has_meta("_edit_lock_"))
continue;
Change key move behavior of canvas item editor to ignore zoom level; Add alt + arrow key as local base move mode; Control + arrow key as local + rotation move mode
2014-05-09 09:11:24 +02:00
Vector2 drag = p_dir;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (p_snap)
Implement shortcuts to multiply/divide the grid step
2017-08-31 21:54:42 +02:00
drag *= grid_step * Math::pow(2.0, grid_step_multiplier);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
undo_redo->add_undo_method(canvas_item, "_edit_set_state", canvas_item->_edit_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
if (p_move_mode == MOVE_VIEW_BASE) {
Change key move behavior of canvas item editor to ignore zoom level; Add alt + arrow key as local base move mode; Control + arrow key as local + rotation move mode
2014-05-09 09:11:24 +02:00
// drag = transform.affine_inverse().basis_xform(p_dir); // zoom sensitive
drag = canvas_item->get_global_transform_with_canvas().affine_inverse().basis_xform(drag);
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Rect2 local_rect = canvas_item->_edit_get_rect();
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
local_rect.position += drag;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
undo_redo->add_do_method(canvas_item, "_edit_set_rect", local_rect);
Change key move behavior of canvas item editor to ignore zoom level; Add alt + arrow key as local base move mode; Control + arrow key as local + rotation move mode
2014-05-09 09:11:24 +02:00
} else { // p_move_mode==MOVE_LOCAL_BASE || p_move_mode==MOVE_LOCAL_WITH_ROT
Remove assignment and declarations in if statements After discussing with @reduz and @akien-mga it was decided that we do not allow assignments or declarations in if statements. This PR removes the instances of this I could find by automated means.
2017-09-06 23:50:18 +02:00
Node2D *node_2d = Object::cast_to<Node2D>(canvas_item);
if (node_2d) {
Change key move behavior of canvas item editor to ignore zoom level; Add alt + arrow key as local base move mode; Control + arrow key as local + rotation move mode
2014-05-09 09:11:24 +02:00
if (p_move_mode == MOVE_LOCAL_WITH_ROT) {
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 m;
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
m.rotate(node_2d->get_rotation());
Change key move behavior of canvas item editor to ignore zoom level; Add alt + arrow key as local base move mode; Control + arrow key as local + rotation move mode
2014-05-09 09:11:24 +02:00
drag = m.xform(drag);
}
-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
node_2d->set_position(node_2d->get_position() + drag);
Change key move behavior of canvas item editor to ignore zoom level; Add alt + arrow key as local base move mode; Control + arrow key as local + rotation move mode
2014-05-09 09:11:24 +02:00
Remove assignment and declarations in if statements After discussing with @reduz and @akien-mga it was decided that we do not allow assignments or declarations in if statements. This PR removes the instances of this I could find by automated means.
2017-09-06 23:50:18 +02:00
} else {
Control *control = Object::cast_to<Control>(canvas_item);
if (control)
control->set_position(control->get_position() + drag);
Change key move behavior of canvas item editor to ignore zoom level; Add alt + arrow key as local base move mode; Control + arrow key as local + rotation move mode
2014-05-09 09:11:24 +02:00
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
undo_redo->commit_action();
}
Point2 CanvasItemEditor::_find_topleftmost_point() {
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 tl = Point2(1e10, 1e10);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Rect2 r2;
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
r2.position = tl;
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
List<Node *> &selection = editor_selection->get_selected_node_list();
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 (List<Node *>::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->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())
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;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Rect2 rect = canvas_item->_edit_get_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
Transform2D xform = canvas_item->get_global_transform_with_canvas();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
r2.expand_to(xform.xform(rect.position));
r2.expand_to(xform.xform(rect.position + Vector2(rect.size.x, 0)));
r2.expand_to(xform.xform(rect.position + rect.size));
r2.expand_to(xform.xform(rect.position + Vector2(0, rect.size.y)));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
return r2.position;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
int CanvasItemEditor::get_item_count() {
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 *> &selection = editor_selection->get_selected_node_list();
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
int ic = 0;
for (List<Node *>::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->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())
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
ic++;
};
return ic;
}
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
CanvasItem *CanvasItemEditor::_get_single_item() {
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
CanvasItem *single_item = NULL;
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
if (single_item)
return NULL; //morethan one
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
single_item = canvas_item;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
};
return single_item;
}
Make anchors draggable
2017-07-29 16:57:32 +02:00
CanvasItemEditor::DragType CanvasItemEditor::_get_resize_handle_drag_type(const Point2 &p_click, Vector2 &r_point) {
// Returns a drag type if a resize handle is clicked
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
CanvasItem *canvas_item = _get_single_item();
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
ERR_FAIL_COND_V(!canvas_item, DRAG_NONE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Rect2 rect = canvas_item->_edit_get_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
Transform2D xforml = canvas_item->get_global_transform_with_canvas();
Transform2D xform = transform * xforml;
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
Vector2 endpoints[4] = {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
xform.xform(rect.position),
xform.xform(rect.position + Vector2(rect.size.x, 0)),
xform.xform(rect.position + rect.size),
xform.xform(rect.position + Vector2(0, rect.size.y))
GODOT IS OPEN SOURCE
2014-02-10 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
Vector2 endpointsl[4] = {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
xforml.xform(rect.position),
xforml.xform(rect.position + Vector2(rect.size.x, 0)),
xforml.xform(rect.position + rect.size),
xforml.xform(rect.position + Vector2(0, rect.size.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
DragType dragger[] = {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
DRAG_TOP_LEFT,
DRAG_TOP,
DRAG_TOP_RIGHT,
DRAG_RIGHT,
DRAG_BOTTOM_RIGHT,
DRAG_BOTTOM,
DRAG_BOTTOM_LEFT,
DRAG_LEFT
};
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 radius = (select_handle->get_size().width / 2) * 1.5;
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 (int i = 0; i < 4; i++) {
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
int prev = (i + 3) % 4;
int next = (i + 1) % 4;
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
r_point = endpointsl[i];
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
ofs += endpoints[i];
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 (ofs.distance_to(p_click) < radius)
return dragger[i * 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
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
r_point = (endpointsl[i] + endpointsl[next]) / 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
if (ofs.distance_to(p_click) < radius)
return dragger[i * 2 + 1];
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
return DRAG_NONE;
}
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::_anchor_to_position(const Control *p_control, Vector2 anchor) {
Add anchor visualization
2017-07-11 00:14:22 +02:00
ERR_FAIL_COND_V(!p_control, Vector2());
Transform2D parent_transform = p_control->get_transform().affine_inverse();
Size2 parent_size = p_control->get_parent_area_size();
return parent_transform.xform(Vector2(parent_size.x * anchor.x, parent_size.y * anchor.y));
}
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());
Size2 parent_size = p_control->get_parent_area_size();
return p_control->get_transform().xform(position) / parent_size;
}
CanvasItemEditor::DragType CanvasItemEditor::_get_anchor_handle_drag_type(const Point2 &p_click, Vector2 &r_point) {
// Returns a drag type if an anchor handle is clicked
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
CanvasItem *canvas_item = _get_single_item();
Make anchors draggable
2017-07-29 16:57:32 +02:00
ERR_FAIL_COND_V(!canvas_item, DRAG_NONE);
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);
Make anchors draggable
2017-07-29 16:57:32 +02:00
ERR_FAIL_COND_V(!control, DRAG_NONE);
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));
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);
}
DragType dragger[] = {
DRAG_ANCHOR_TOP_LEFT,
DRAG_ANCHOR_TOP_RIGHT,
DRAG_ANCHOR_BOTTOM_RIGHT,
DRAG_ANCHOR_BOTTOM_LEFT,
};
for (int i = 0; i < 4; i++) {
if (anchor_rects[i].has_point(p_click)) {
r_point = transform.affine_inverse().xform(anchor_pos[i]);
Added the possibility to move all anchors at once when they are clustered
2017-08-04 19:27:30 +02:00
if ((anchor_pos[0] == anchor_pos[2]) && (anchor_pos[0].distance_to(p_click) < anchor_handle->get_size().length() / 3.0)) {
return DRAG_ANCHOR_ALL;
} else {
return dragger[i];
}
Make anchors draggable
2017-07-29 16:57:32 +02:00
}
}
return DRAG_NONE;
}
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
void CanvasItemEditor::_prepare_drag(const Point2 &p_click_pos) {
List<Node *> &selection = editor_selection->get_selected_node_list();
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());
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
if (!canvas_item || !canvas_item->is_visible_in_tree())
continue;
if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root())
continue;
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
if (!se)
continue;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->undo_state = canvas_item->_edit_get_state();
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))
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->undo_pivot = Object::cast_to<Node2D>(canvas_item)->_edit_get_pivot();
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<Control>(canvas_item))
se->undo_pivot = Object::cast_to<Control>(canvas_item)->get_pivot_offset();
adds display of old bounding box as suggested by Zephilinox in issue #10936
2017-09-12 19:11:53 +02:00
se->pre_drag_xform = canvas_item->get_global_transform_with_canvas();
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->pre_drag_rect = canvas_item->_edit_get_rect();
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
}
Fix IK Bone Drag on Viewport
2017-10-05 02:58:13 +02:00
if (selection.size() == 1 && Object::cast_to<Node2D>(selection[0]) && bone_ik_list.size() == 0) {
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
drag = DRAG_NODE_2D;
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
drag_point_from = Object::cast_to<Node2D>(selection[0])->get_global_position();
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
} else {
drag = DRAG_ALL;
drag_point_from = _find_topleftmost_point();
}
drag_from = transform.affine_inverse().xform(p_click_pos);
}
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 CanvasItemEditor::incbeg(float &beg, float &end, float inc, float minsize, bool p_symmetric) {
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 (minsize < 0) {
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
beg += inc;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (p_symmetric)
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
end -= inc;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
if (p_symmetric) {
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
beg += inc;
end -= inc;
if (end - beg < minsize) {
float center = (beg + end) / 2.0;
beg = center - minsize / 2.0;
end = center + minsize / 2.0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
} else {
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 (end - (beg + inc) < minsize)
beg = end - minsize;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
else
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
beg += inc;
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
void CanvasItemEditor::incend(float &beg, float &end, float inc, float minsize, bool p_symmetric) {
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 (minsize < 0) {
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
end += inc;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (p_symmetric)
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
beg -= inc;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
if (p_symmetric) {
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
end += inc;
beg -= inc;
if (end - beg < minsize) {
float center = (beg + end) / 2.0;
beg = center - minsize / 2.0;
end = center + minsize / 2.0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
} else {
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 ((end + inc) - beg < minsize)
end = beg + minsize;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
else
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
end += inc;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
}
Updated function argument names
2017-08-12 18:52:50 +02:00
void CanvasItemEditor::_append_canvas_item(CanvasItem *p_item) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Updated function argument names
2017-08-12 18:52:50 +02:00
editor_selection->add_node(p_item);
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;
viewport_base->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
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)
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_click_on_item(item, Point2(), additive_selection, false);
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));
}
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::_list_select(const Ref<InputEventMouseButton> &b) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Implements rulers
2017-08-29 21:50:18 +02:00
Point2 click = viewport_scrollable->get_transform().affine_inverse().xform(b->get_position());
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
Node *scene = editor->get_edited_scene();
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
if (!scene)
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
_find_canvas_items_at_pos(click, scene, transform, Transform2D(), selection_results);
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
for (int i = 0; i < selection_results.size(); i++) {
CanvasItem *item = selection_results[i].item;
if (item != scene && item->get_owner() != scene && !scene->is_editable_instance(item->get_owner())) {
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
//invalid result
selection_results.remove(i);
i--;
}
}
if (selection_results.size() == 1) {
CanvasItem *item = selection_results[0].item;
selection_results.clear();
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
additive_selection = b->get_shift();
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
if (!_select_click_on_item(item, click, additive_selection, false))
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
return;
} else if (!selection_results.empty()) {
selection_results.sort();
NodePath root_path = get_tree()->get_edited_scene_root()->get_path();
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
StringName root_name = root_path.get_name(root_path.get_name_count() - 1);
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
for (int i = 0; i < selection_results.size(); i++) {
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[i].item;
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
Ref<Texture> icon;
if (item->has_meta("_editor_icon"))
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
icon = item->get_meta("_editor_icon");
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
else
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
icon = get_icon(has_icon(item->get_class(), "EditorIcons") ? item->get_class() : String("Object"), "EditorIcons");
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
String node_path = "/" + root_name + "/" + root_path.rel_path_to(item->get_path());
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
selection_menu->add_item(item->get_name());
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->set_item_icon(i, icon);
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
selection_menu->set_item_metadata(i, node_path);
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
selection_menu->set_item_tooltip(i, String(item->get_name()) + "\nType: " + item->get_class() + "\nPath: " + node_path);
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01: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
additive_selection = b->get_shift();
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
InputEvent: Renamed "pos" property to "position" Make the naming consistent with other classes.
2017-06-03 10:54:24 +02:00
selection_menu->set_global_position(b->get_global_position());
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
selection_menu->popup();
selection_menu->call_deferred("grab_click_focus");
selection_menu->set_invalidate_click_until_motion();
return;
}
}
2DEditor: enhance viewport cursor shape
2017-09-03 17:04:11 +02:00
void CanvasItemEditor::_update_cursor() {
CursorShape c = CURSOR_ARROW;
switch (drag) {
case DRAG_NONE:
if (Input::get_singleton()->is_mouse_button_pressed(BUTTON_MIDDLE) || Input::get_singleton()->is_key_pressed(KEY_SPACE)) {
c = CURSOR_DRAG;
} else {
switch (tool) {
case TOOL_MOVE:
c = CURSOR_MOVE;
break;
case TOOL_EDIT_PIVOT:
c = CURSOR_CROSS;
break;
case TOOL_PAN:
c = CURSOR_DRAG;
break;
}
}
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:
case DRAG_NODE_2D:
c = CURSOR_MOVE;
break;
}
viewport->set_default_cursor_shape(c);
}
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
void CanvasItemEditor::_gui_input_viewport_base(const Ref<InputEvent> &p_event) {
Implement guides
2017-10-18 23:55:02 +02:00
Ref<InputEventMouseButton> b = p_event;
if (b.is_valid()) {
if (b->get_button_index() == BUTTON_LEFT && b->is_pressed()) {
if (show_guides && show_rulers && EditorNode::get_singleton()->get_edited_scene()) {
Transform2D xform = viewport_scrollable->get_transform() * transform;
// Retreive the guide lists
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
drag = DRAG_DOUBLE_GUIDE;
edited_guide_index = -1;
} else if (b->get_position().x < RULER_WIDTH) {
// Check if we drag an existing horizontal guide
float minimum = 1e20;
edited_guide_index = -1;
for (int i = 0; i < hguides.size(); i++) {
if (ABS(xform.xform(Point2(0, hguides[i])).y - b->get_position().y) < MIN(minimum, 8)) {
edited_guide_index = i;
}
}
if (edited_guide_index >= 0) {
// Drag an existing horizontal guide
drag = DRAG_H_GUIDE;
} else {
// Drag a new vertical guide
drag = DRAG_V_GUIDE;
}
} else if (b->get_position().y < RULER_WIDTH) {
// Check if we drag an existing vertical guide
float minimum = 1e20;
edited_guide_index = -1;
for (int i = 0; i < vguides.size(); i++) {
if (ABS(xform.xform(Point2(vguides[i], 0)).x - b->get_position().x) < MIN(minimum, 8)) {
edited_guide_index = i;
}
}
if (edited_guide_index >= 0) {
// Drag an existing vertical guide
drag = DRAG_V_GUIDE;
} else {
// Drag a new vertical guide
drag = DRAG_H_GUIDE;
}
}
}
}
if (b->get_button_index() == BUTTON_LEFT && !b->is_pressed()) {
// Release button
if (show_guides && EditorNode::get_singleton()->get_edited_scene()) {
Transform2D xform = viewport_scrollable->get_transform() * transform;
// Retreive the guide lists
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);
if (drag == DRAG_V_GUIDE) {
Array prev_vguides = vguides.duplicate();
if (b->get_position().x > RULER_WIDTH) {
// Adds a new vertical guide
if (edited_guide_index >= 0) {
vguides[edited_guide_index] = edited.x;
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);
undo_redo->add_undo_method(viewport_base, "update");
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);
undo_redo->add_undo_method(viewport_base, "update");
undo_redo->commit_action();
}
} else {
if (edited_guide_index >= 0) {
vguides.remove(edited_guide_index);
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);
undo_redo->add_undo_method(viewport_base, "update");
undo_redo->commit_action();
}
}
} else if (drag == DRAG_H_GUIDE) {
Array prev_hguides = hguides.duplicate();
if (b->get_position().y > RULER_WIDTH) {
// Adds a new horizontal guide
if (edited_guide_index >= 0) {
hguides[edited_guide_index] = edited.y;
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);
undo_redo->add_undo_method(viewport_base, "update");
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);
undo_redo->add_undo_method(viewport_base, "update");
undo_redo->commit_action();
}
} else {
if (edited_guide_index >= 0) {
hguides.remove(edited_guide_index);
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);
undo_redo->add_undo_method(viewport_base, "update");
undo_redo->commit_action();
}
}
} else if (drag == DRAG_DOUBLE_GUIDE) {
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);
undo_redo->add_undo_method(viewport_base, "update");
undo_redo->commit_action();
}
}
}
if (drag == DRAG_DOUBLE_GUIDE || drag == DRAG_V_GUIDE || drag == DRAG_H_GUIDE) {
drag = DRAG_NONE;
viewport_base->update();
}
}
}
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
Ref<InputEventMouseMotion> m = p_event;
if (m.is_valid()) {
Implement guides
2017-10-18 23:55:02 +02:00
if (!viewport_base->has_focus() && (!get_focus_owner() || !get_focus_owner()->is_text_field())) {
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
viewport_base->call_deferred("grab_focus");
Implement guides
2017-10-18 23:55:02 +02:00
}
if (drag == DRAG_DOUBLE_GUIDE || drag == DRAG_H_GUIDE || drag == DRAG_V_GUIDE) {
Transform2D xform = viewport_scrollable->get_transform() * transform;
Point2 mouse_pos = m->get_position();
mouse_pos = xform.affine_inverse().xform(mouse_pos);
mouse_pos = xform.xform(snap_point(mouse_pos, SNAP_GRID | SNAP_PIXEL | SNAP_OTHER_NODES));
edited_guide_pos = mouse_pos;
viewport_base->update();
}
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
}
Fixes keybord directionnal keys not moving nodes in the 2D editor
2017-10-29 22:00:03 +01:00
Ref<InputEventKey> k = p_event;
if (k.is_valid()) {
if (k->is_pressed() && drag == DRAG_NONE) {
// Move the object with the arrow keys
KeyMoveMODE move_mode = MOVE_VIEW_BASE;
if (k->get_alt()) move_mode = MOVE_LOCAL_BASE;
if (k->get_control() || k->get_metakey()) move_mode = MOVE_LOCAL_WITH_ROT;
if (k->get_scancode() == KEY_UP)
_key_move(Vector2(0, -1), k->get_shift(), move_mode);
else if (k->get_scancode() == KEY_DOWN)
_key_move(Vector2(0, 1), k->get_shift(), move_mode);
else if (k->get_scancode() == KEY_LEFT)
_key_move(Vector2(-1, 0), k->get_shift(), move_mode);
else if (k->get_scancode() == KEY_RIGHT)
_key_move(Vector2(1, 0), k->get_shift(), move_mode);
else if (k->get_scancode() == KEY_ESCAPE) {
editor_selection->clear();
viewport->update();
} else
return;
accept_event();
}
}
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
}
void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
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
{
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
EditorNode *en = editor;
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
EditorPluginList *over_plugin_list = en->get_editor_plugins_over();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Enables the possibility of editing on multiple plugins at same time on same object type.
2016-03-30 01:02:53 +02:00
if (!over_plugin_list->empty()) {
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
bool discard = over_plugin_list->forward_gui_input(p_event);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (discard) {
accept_event();
return;
}
}
}
Native pan and zoom for macOS
2017-11-01 21:49:39 +01:00
Ref<InputEventMagnifyGesture> magnify_gesture = p_event;
if (magnify_gesture.is_valid()) {
_zoom_on_position(zoom * magnify_gesture->get_factor(), magnify_gesture->get_position());
return;
}
Ref<InputEventPanGesture> pan_gesture = p_event;
if (pan_gesture.is_valid()) {
const Vector2 delta = (int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom) * pan_gesture->get_delta();
h_scroll->set_value(h_scroll->get_value() + delta.x);
v_scroll->set_value(v_scroll->get_value() + delta.y);
return;
}
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()) {
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
// Button event
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 (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"))) {
v_scroll->set_value(v_scroll->get_value() + int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor());
Fix zoom button not zooming on the screen center
2017-10-01 11:30:38 +02:00
_update_scroll(0);
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
}
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
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
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 (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"))) {
v_scroll->set_value(v_scroll->get_value() - int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor());
Fix zoom button not zooming on the screen center
2017-10-01 11:30:38 +02:00
_update_scroll(0);
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
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
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 (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"))) {
h_scroll->set_value(h_scroll->get_value() - int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor());
}
}
if (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"))) {
h_scroll->set_value(h_scroll->get_value() + int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom * b->get_factor());
}
}
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 (b->get_button_index() == BUTTON_RIGHT) {
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01: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 (b->is_pressed() && (tool == TOOL_SELECT && b->get_alt())) {
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
// Open the selection list
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
_list_select(b);
return;
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +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
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 (get_item_count() > 0 && drag != DRAG_NONE) {
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
// Cancel a drag
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 (bone_ik_list.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<BoneIK>::Element *E = bone_ik_list.back(); E; E = E->prev()) {
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
E->get().node->_edit_set_state(E->get().orig_state);
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
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
bone_ik_list.clear();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +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
} else {
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 *> &selection = editor_selection->get_selected_node_list();
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 (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());
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;
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 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 (!se)
continue;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
canvas_item->_edit_set_state(se->undo_state);
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))
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Object::cast_to<Node2D>(canvas_item)->_edit_set_pivot(se->undo_pivot);
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<Control>(canvas_item))
Object::cast_to<Control>(canvas_item)->set_pivot_offset(se->undo_pivot);
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
}
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
drag = DRAG_NONE;
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();
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_move_pivot = 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
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else if (box_selecting) {
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
// Cancel box 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
box_selecting = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
viewport->update();
}
return;
}
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 (b->get_button_index() == BUTTON_LEFT && tool == TOOL_LIST_SELECT) {
if (b->is_pressed())
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
// Open the selection list
fixed and improved selection and list selection, closes #2852
2015-12-13 21:16:13 +01:00
_list_select(b);
return;
}
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 (b->get_button_index() == BUTTON_LEFT && tool == TOOL_EDIT_PIVOT) {
if (b->is_pressed()) {
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
// Set the pivot point
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
Point2 mouse_pos = b->get_position();
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
mouse_pos = transform.affine_inverse().xform(mouse_pos);
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
mouse_pos = snap_point(mouse_pos, SNAP_DEFAULT, _get_single_item());
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01:00
_edit_set_pivot(mouse_pos);
}
return;
}
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 (tool == TOOL_PAN || b->get_button_index() != BUTTON_LEFT || Input::get_singleton()->is_key_pressed(KEY_SPACE))
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 the view
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
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
// -- From now we consider that the button is BUTTON_LEFT --
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 (!b->is_pressed()) {
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 (drag != DRAG_NONE) {
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
// Stop dragging
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (undo_redo) {
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 (bone_ik_list.size()) {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
undo_redo->create_action(TTR("Edit 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
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<BoneIK>::Element *E = bone_ik_list.back(); E; E = E->prev()) {
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
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
undo_redo->add_do_method(E->get().node, "_edit_set_state", E->get().node->_edit_get_state());
undo_redo->add_undo_method(E->get().node, "_edit_set_state", E->get().orig_state);
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
undo_redo->add_do_method(viewport, "update");
undo_redo->add_undo_method(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
bone_ik_list.clear();
undo_redo->commit_action();
} else {
Modified editor strings to be translatable in the future
2016-05-04 03:25:37 +02:00
undo_redo->create_action(TTR("Edit CanvasItem"));
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
List<Node *> &selection = editor_selection->get_selected_node_list();
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 (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;
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 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 (!se)
continue;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Variant state = canvas_item->_edit_get_state();
undo_redo->add_do_method(canvas_item, "_edit_set_state", state);
undo_redo->add_undo_method(canvas_item, "_edit_set_state", se->undo_state);
Ability to set rotation and scaling pivot for controls.
2017-07-06 22:42:44 +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 *pvt = Object::cast_to<Node2D>(canvas_item);
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
if (pvt && pvt->_edit_use_pivot()) {
undo_redo->add_do_method(canvas_item, "_edit_set_pivot", pvt->_edit_get_pivot());
undo_redo->add_undo_method(canvas_item, "_edit_set_pivot", se->undo_pivot);
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
}
Ability to set rotation and scaling pivot for controls.
2017-07-06 22:42:44 +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 *cnt = Object::cast_to<Control>(canvas_item);
Ability to set rotation and scaling pivot for controls.
2017-07-06 22:42:44 +02:00
if (cnt) {
undo_redo->add_do_method(canvas_item, "set_pivot_offset", cnt->get_pivot_offset());
undo_redo->add_undo_method(canvas_item, "set_pivot_offset", se->undo_pivot);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +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
undo_redo->commit_action();
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
drag = DRAG_NONE;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
viewport->update();
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_move_pivot = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
if (box_selecting) {
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
// Stop box 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
Node *scene = editor->get_edited_scene();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (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
List<CanvasItem *> selitems;
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);
if (bsfrom.x > bsto.x)
SWAP(bsfrom.x, bsto.x);
if (bsfrom.y > bsto.y)
SWAP(bsfrom.y, bsto.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
_find_canvas_items_at_rect(Rect2(bsfrom, bsto - bsfrom), scene, transform, Transform2D(), &selitems);
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 (List<CanvasItem *>::Element *E = selitems.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
_append_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
box_selecting = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
viewport->update();
}
return;
}
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
// -- From now we consider that the button is BUTTON_LEFT and that it is pressed --
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<ObjectID, BoneList>::Element *Cbone = NULL; //closest
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
{
bone_ik_list.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
float closest_dist = 1e20;
2D and 3D viewport are working again :D
2017-01-15 02:20:05 +01:00
int bone_width = EditorSettings::get_singleton()->get("editors/2d/bone_width");
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<ObjectID, 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
if (E->get().from == E->get().to)
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
Vector2 s[2] = {
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
E->get().from,
E->get().to
};
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
Vector2 p = Geometry::get_closest_point_to_segment_2d(b->get_position(), s);
float d = p.distance_to(b->get_position());
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 (d < bone_width && d < closest_dist) {
Cbone = E;
closest_dist = d;
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 (Cbone) {
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 *b = Object::cast_to<Node2D>(ObjectDB::get_instance(Cbone->get().bone));
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 (b) {
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 ik_found = false;
Snap anchors when dragged, depending on the zoom level
2017-07-30 15:32:22 +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 first = 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
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 (b) {
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
CanvasItem *pi = b->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 (!pi)
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
float len = pi->get_global_transform().get_origin().distance_to(b->get_global_position());
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
b = Object::cast_to<Node2D>(pi);
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 (!b)
break;
if (first) {
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_orig_xform = b->get_global_transform();
first = 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
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
BoneIK bik;
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
bik.node = b;
bik.len = len;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
bik.orig_state = b->_edit_get_state();
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
bone_ik_list.push_back(bik);
if (b->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
ik_found = bone_ik_list.size() > 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
break;
}
if (!pi->has_meta("_edit_bone_"))
break;
}
if (!ik_found)
bone_ik_list.clear();
}
}
}
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
// Single selected item
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
CanvasItem *canvas_item = _get_single_item();
Generalized _find_canvas_items_at_pos to remove _select_canvas_items_at_pos Removed some useless parameters Removed old comments
2017-07-17 23:28:19 +02:00
if (canvas_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
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ERR_FAIL_COND(!se);
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
Point2 click = b->get_position();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Generalized _find_canvas_items_at_pos to remove _select_canvas_items_at_pos Removed some useless parameters Removed old comments
2017-07-17 23:28:19 +02:00
// Rotation
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 ((b->get_control() && tool == TOOL_SELECT) || tool == 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
drag = DRAG_ROTATE;
drag_from = transform.affine_inverse().xform(click);
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->undo_state = canvas_item->_edit_get_state();
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))
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->undo_pivot = Object::cast_to<Node2D>(canvas_item)->_edit_get_pivot();
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<Control>(canvas_item))
se->undo_pivot = Object::cast_to<Control>(canvas_item)->get_pivot_offset();
adds display of old bounding box as suggested by Zephilinox in issue #10936
2017-09-12 19:11:53 +02:00
se->pre_drag_xform = canvas_item->get_global_transform_with_canvas();
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->pre_drag_rect = canvas_item->_edit_get_rect();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
if (tool == TOOL_SELECT) {
Generalized _find_canvas_items_at_pos to remove _select_canvas_items_at_pos Removed some useless parameters Removed old comments
2017-07-17 23:28:19 +02:00
// Open a sub-scene on double-click
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 (b->is_doubleclick()) {
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_filename() != "" && canvas_item != editor->get_edited_scene()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor->open_request(canvas_item->get_filename());
return;
}
}
Make anchors draggable
2017-07-29 16:57:32 +02:00
// Drag resize handles
drag = _get_resize_handle_drag_type(click, drag_point_from);
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
if (drag != DRAG_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
drag_from = transform.affine_inverse().xform(click);
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->undo_state = canvas_item->_edit_get_state();
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))
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->undo_pivot = Object::cast_to<Node2D>(canvas_item)->_edit_get_pivot();
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<Control>(canvas_item))
se->undo_pivot = Object::cast_to<Control>(canvas_item)->get_pivot_offset();
adds display of old bounding box as suggested by Zephilinox in issue #10936
2017-09-12 19:11:53 +02:00
se->pre_drag_xform = canvas_item->get_global_transform_with_canvas();
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->pre_drag_rect = canvas_item->_edit_get_rect();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return;
}
Make anchors draggable
2017-07-29 16:57:32 +02:00
// Drag anchor handles
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
Control *control = Object::cast_to<Control>(canvas_item);
if (control && show_helpers && !Object::cast_to<Container>(control->get_parent())) {
Make anchors draggable
2017-07-29 16:57:32 +02:00
drag = _get_anchor_handle_drag_type(click, drag_point_from);
if (drag != DRAG_NONE) {
drag_from = transform.affine_inverse().xform(click);
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->undo_state = canvas_item->_edit_get_state();
adds display of old bounding box as suggested by Zephilinox in issue #10936
2017-09-12 19:11:53 +02:00
se->pre_drag_xform = canvas_item->get_global_transform_with_canvas();
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
se->pre_drag_rect = canvas_item->_edit_get_rect();
Make anchors draggable
2017-07-29 16:57:32 +02:00
return;
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +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
// Multiple selected items
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
Point2 click = b->get_position();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01: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 ((b->get_alt() || tool == TOOL_MOVE) && get_item_count()) {
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
// Drag the nodes
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
_prepare_drag(click);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
viewport->update();
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 *c = NULL;
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 (Cbone) {
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
c = Object::cast_to<CanvasItem>(ObjectDB::get_instance(Cbone->get().bone));
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 (c)
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
c = c->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
}
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
Node *scene = editor->get_edited_scene();
if (!scene)
return;
// Find the item to select
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 16:49:27 +02:00
if (!c) {
Generalized _find_canvas_items_at_pos to remove _select_canvas_items_at_pos Removed some useless parameters Removed old comments
2017-07-17 23:28:19 +02:00
Vector<_SelectResult> selection;
_find_canvas_items_at_pos(click, scene, transform, Transform2D(), selection, 1);
if (!selection.empty())
c = 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
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 *cn = c;
while (cn) {
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 (cn->has_meta("_edit_group_")) {
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
c = cn;
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
cn = cn->get_parent_item();
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
Node *n = c;
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
while ((n && n != scene && n->get_owner() != scene) || (n && !n->is_class("CanvasItem"))) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
n = n->get_parent();
};
Attempt to resolve #4673
2017-08-08 12:13:17 +02:00
if (n) {
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
c = Object::cast_to<CanvasItem>(n);
Attempt to resolve #4673
2017-08-08 12:13:17 +02:00
} else {
c = NULL;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +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
// Select the item
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
additive_selection = b->get_shift();
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
if (!c) {
_select_click_on_empty_area(click, additive_selection, true);
} else if (!_select_click_on_item(c, click, additive_selection, true)) {
Added selection menu to spatial and canvas editors
2015-11-04 22:39:07 +01:00
return;
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
}
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;
if (m.is_valid()) {
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
// Mouse motion event
2DEditor: enhance viewport cursor shape
2017-09-03 17:04:11 +02:00
_update_cursor();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (box_selecting) {
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
// Update box selection
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
box_selecting_to = transform.affine_inverse().xform(m->get_position());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
viewport->update();
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
if (drag == DRAG_NONE) {
Add simple spacebar panning setting for 2D editor
2017-10-10 02:30:13 +02:00
bool space_pressed = Input::get_singleton()->is_key_pressed(KEY_SPACE);
bool simple_panning = EditorSettings::get_singleton()->get("editors/2d/simple_spacebar_panning");
int button = m->get_button_mask();
// Check if any of the panning triggers are activated
bool panning_tool = (button & BUTTON_MASK_LEFT) && tool == TOOL_PAN;
bool panning_middle_button = button & BUTTON_MASK_MIDDLE;
bool panning_spacebar = (button & BUTTON_MASK_LEFT) && space_pressed;
bool panning_spacebar_simple = space_pressed && simple_panning;
if (panning_tool || panning_middle_button || panning_spacebar || panning_spacebar_simple) {
Make anchors draggable
2017-07-29 16:57:32 +02:00
// Pan the viewport
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
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 {
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
relative = m->get_relative();
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
}
h_scroll->set_value(h_scroll->get_value() - relative.x / zoom);
v_scroll->set_value(v_scroll->get_value() - relative.y / zoom);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
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
List<Node *> &selection = editor_selection->get_selected_node_list();
for (List<Node *>::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->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())
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
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!se)
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
bool dragging_bone = drag == DRAG_ALL && selection.size() == 1 && bone_ik_list.size();
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 (!dragging_bone) {
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
canvas_item->_edit_set_state(se->undo_state); //reset state and reapply
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))
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Object::cast_to<Node2D>(canvas_item)->_edit_set_pivot(se->undo_pivot);
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<Control>(canvas_item))
Object::cast_to<Control>(canvas_item)->set_pivot_offset(se->undo_pivot);
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
Vector2 dfrom = drag_from;
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
Vector2 dto = transform.affine_inverse().xform(m->get_position());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (canvas_item->has_meta("_edit_lock_"))
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 (drag == DRAG_ROTATE) {
Make anchors draggable
2017-07-29 16:57:32 +02:00
// Rotate the node
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Vector2 center = canvas_item->get_global_transform_with_canvas().get_origin();
Ability to rotate controls using tool, closes #3800
2016-06-27 15:47:51 +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 *node = Object::cast_to<Node2D>(canvas_item);
Ability to rotate controls using tool, closes #3800
2016-06-27 15:47:51 +02:00
if (node) {
Various corrections in 2D math. This is the follow up for the 2D changes mentioned in PR #6865. It fixes various mistakes regarding the order of matrix indices, order of transformation operations, usage of atan2 function and ensures that the sense of rotation is compatible with a left-handed coordinate system with Y-axis pointing down (which flips the sense of rotations along the z-axis). Also replaced float with real_t, and tried to make use of Matrix32 methods rather than accessing its elements directly. Affected code in the Godot code base is also fixed in this commit. The user code using functions involving angles such as atan2, angle_to, get_rotation, set_rotation will need to be updated to conform with the new behavior. Furthermore, the sign of the rotation angles in existing 2D scene files need to be flipped as well.
2017-01-06 06:27:48 +01:00
real_t angle = node->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
node->set_rotation(snap_angle(angle + (dfrom - center).angle_to(dto - center), angle));
Ability to rotate controls using tool, closes #3800
2016-06-27 15:47:51 +02:00
display_rotate_to = dto;
display_rotate_from = center;
viewport->update();
}
}
{
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 *node = Object::cast_to<Control>(canvas_item);
Ability to rotate controls using tool, closes #3800
2016-06-27 15:47:51 +02:00
if (node) {
Various corrections in 2D math. This is the follow up for the 2D changes mentioned in PR #6865. It fixes various mistakes regarding the order of matrix indices, order of transformation operations, usage of atan2 function and ensures that the sense of rotation is compatible with a left-handed coordinate system with Y-axis pointing down (which flips the sense of rotations along the z-axis). Also replaced float with real_t, and tried to make use of Matrix32 methods rather than accessing its elements directly. Affected code in the Godot code base is also fixed in this commit. The user code using functions involving angles such as atan2, angle_to, get_rotation, set_rotation will need to be updated to conform with the new behavior. Furthermore, the sign of the rotation angles in existing 2D scene files need to be flipped as well.
2017-01-06 06:27:48 +01:00
real_t angle = node->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
node->set_rotation(snap_angle(angle + (dfrom - center).angle_to(dto - center), angle));
Ability to rotate controls using tool, closes #3800
2016-06-27 15:47:51 +02:00
display_rotate_to = dto;
display_rotate_from = center;
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
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
continue;
}
Use shift to move anchors on a single axis
2017-08-31 23:27:05 +02:00
bool uniform = m->get_shift();
bool symmetric = m->get_alt();
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
Vector2 drag_vector =
canvas_item->get_global_transform_with_canvas().affine_inverse().xform(dto) -
canvas_item->get_global_transform_with_canvas().affine_inverse().xform(dfrom);
Use shift to move anchors on a single axis
2017-08-31 23:27:05 +02:00
switch (drag) {
case DRAG_ALL:
case DRAG_NODE_2D:
dto -= drag_from - drag_point_from;
if (uniform) {
if (ABS(dto.x - drag_point_from.x) > ABS(dto.y - drag_point_from.y)) {
dto.y = drag_point_from.y;
} else {
dto.x = drag_point_from.x;
}
}
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
Control *control = Object::cast_to<Control>(canvas_item);
Make anchors draggable
2017-07-29 16:57:32 +02:00
if (control) {
Snap anchors when dragged, depending on the zoom level
2017-07-30 15:32:22 +02:00
// Drag and snap the anchor
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
Transform2D c_trans_rev = canvas_item->get_global_transform_with_canvas().affine_inverse();
Vector2 anchor = c_trans_rev.xform(dto - drag_from + drag_point_from);
anchor = _position_to_anchor(control, anchor);
Implement guides
2017-10-18 23:55:02 +02:00
Vector2 anchor_snapped = c_trans_rev.xform(snap_point(dto - drag_from + drag_point_from, SNAP_GRID | SNAP_GUIDES | SNAP_OTHER_NODES, _get_single_item(), SNAP_NODE_PARENT | SNAP_NODE_SIDES));
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
anchor_snapped = _position_to_anchor(control, anchor_snapped).snapped(Vector2(0.00001, 0.00001));
bool use_y = Math::abs(drag_vector.y) > Math::abs(drag_vector.x);
Make anchors draggable
2017-07-29 16:57:32 +02:00
switch (drag) {
case DRAG_ANCHOR_TOP_LEFT:
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
if (!uniform || (uniform && !use_y)) control->set_anchor(MARGIN_LEFT, anchor_snapped.x);
if (!uniform || (uniform && use_y)) control->set_anchor(MARGIN_TOP, anchor_snapped.y);
Make anchors draggable
2017-07-29 16:57:32 +02:00
continue;
break;
case DRAG_ANCHOR_TOP_RIGHT:
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
if (!uniform || (uniform && !use_y)) control->set_anchor(MARGIN_RIGHT, anchor_snapped.x);
if (!uniform || (uniform && use_y)) control->set_anchor(MARGIN_TOP, anchor_snapped.y);
Make anchors draggable
2017-07-29 16:57:32 +02:00
continue;
break;
case DRAG_ANCHOR_BOTTOM_RIGHT:
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
if (!uniform || (uniform && !use_y)) control->set_anchor(MARGIN_RIGHT, anchor_snapped.x);
if (!uniform || (uniform && use_y)) control->set_anchor(MARGIN_BOTTOM, anchor_snapped.y);
Make anchors draggable
2017-07-29 16:57:32 +02:00
break;
case DRAG_ANCHOR_BOTTOM_LEFT:
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
if (!uniform || (uniform && !use_y)) control->set_anchor(MARGIN_LEFT, anchor_snapped.x);
if (!uniform || (uniform && use_y)) control->set_anchor(MARGIN_BOTTOM, anchor_snapped.y);
Make anchors draggable
2017-07-29 16:57:32 +02:00
continue;
break;
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:
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
if (!uniform || (uniform && !use_y)) control->set_anchor(MARGIN_LEFT, anchor_snapped.x);
if (!uniform || (uniform && !use_y)) control->set_anchor(MARGIN_RIGHT, anchor_snapped.x);
if (!uniform || (uniform && use_y)) control->set_anchor(MARGIN_TOP, anchor_snapped.y);
if (!uniform || (uniform && use_y)) control->set_anchor(MARGIN_BOTTOM, anchor_snapped.y);
Added the possibility to move all anchors at once when they are clustered
2017-08-04 19:27:30 +02:00
continue;
break;
Make anchors draggable
2017-07-29 16:57:32 +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
dfrom = drag_point_from;
Implement guides
2017-10-18 23:55:02 +02:00
dto = snap_point(dto, SNAP_NODE_ANCHORS | SNAP_NODE_PARENT | SNAP_OTHER_NODES | SNAP_GRID | SNAP_GUIDES | SNAP_PIXEL, _get_single_item());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
drag_vector =
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
canvas_item->get_global_transform_with_canvas().affine_inverse().xform(dto) -
canvas_item->get_global_transform_with_canvas().affine_inverse().xform(dfrom);
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Rect2 local_rect = canvas_item->_edit_get_rect();
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
Vector2 begin = local_rect.position;
Vector2 end = local_rect.position + local_rect.size;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Vector2 minsize = canvas_item->_edit_get_minimum_size();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
if (uniform) {
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
// Keep the height/width ratio of the item
Vector2.get_aspect() renamed to Vector2.aspect() to keep consistent method naming
2017-01-14 00:00:43 +01:00
float aspect = local_rect.size.aspect();
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
switch (drag) {
Add anchor visualization
2017-07-11 00:14:22 +02:00
case DRAG_LEFT:
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
drag_vector.y = -drag_vector.x / aspect;
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
case DRAG_RIGHT:
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
drag_vector.y = drag_vector.x / aspect;
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
case DRAG_TOP:
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
drag_vector.x = -drag_vector.y * aspect;
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
case DRAG_BOTTOM:
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
drag_vector.x = drag_vector.y * aspect;
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
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
case DRAG_BOTTOM_LEFT:
Add anchor visualization
2017-07-11 00:14:22 +02:00
case DRAG_TOP_RIGHT:
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
if (aspect > 1.0) { // width > height, take x as reference
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
drag_vector.y = -drag_vector.x / aspect;
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
} else { // height > width, take y as reference
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
drag_vector.x = -drag_vector.y * aspect;
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
}
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
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
case DRAG_BOTTOM_RIGHT:
Add anchor visualization
2017-07-11 00:14:22 +02:00
case DRAG_TOP_LEFT:
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
if (aspect > 1.0) { // width > height, take x as reference
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
drag_vector.y = drag_vector.x / aspect;
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
} else { // height > width, take y as reference
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
drag_vector.x = drag_vector.y * aspect;
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
}
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
}
} else {
switch (drag) {
case DRAG_RIGHT:
Add anchor visualization
2017-07-11 00:14:22 +02:00
case DRAG_LEFT:
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
drag_vector.y = 0;
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
case DRAG_TOP:
Add anchor visualization
2017-07-11 00:14:22 +02:00
case DRAG_BOTTOM:
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
drag_vector.x = 0;
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
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
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
switch (drag) {
Add anchor visualization
2017-07-11 00:14:22 +02:00
case DRAG_ALL:
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
begin += drag_vector;
end += drag_vector;
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
case DRAG_RIGHT:
case DRAG_BOTTOM:
Add anchor visualization
2017-07-11 00:14:22 +02:00
case DRAG_BOTTOM_RIGHT:
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
incend(begin.x, end.x, drag_vector.x, minsize.x, symmetric);
incend(begin.y, end.y, drag_vector.y, minsize.y, symmetric);
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
case DRAG_TOP_LEFT:
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
incbeg(begin.x, end.x, drag_vector.x, minsize.x, symmetric);
incbeg(begin.y, end.y, drag_vector.y, minsize.y, symmetric);
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
case DRAG_TOP:
Add anchor visualization
2017-07-11 00:14:22 +02:00
case DRAG_TOP_RIGHT:
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
incbeg(begin.y, end.y, drag_vector.y, minsize.y, symmetric);
incend(begin.x, end.x, drag_vector.x, minsize.x, symmetric);
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
Make uniform resize possible with side (top, left, right, bottom) handles.
2017-07-20 22:03:34 +02:00
case DRAG_LEFT:
Add anchor visualization
2017-07-11 00:14:22 +02:00
case DRAG_BOTTOM_LEFT:
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
incbeg(begin.x, end.x, drag_vector.x, minsize.x, symmetric);
incend(begin.y, end.y, drag_vector.y, minsize.y, symmetric);
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
case DRAG_PIVOT:
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)) {
Node2D *n2d = Object::cast_to<Node2D>(canvas_item);
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
n2d->_edit_set_pivot(se->undo_pivot + drag_vector);
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<Control>(canvas_item)) {
Object::cast_to<Control>(canvas_item)->set_pivot_offset(se->undo_pivot + drag_vector);
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
continue;
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
case DRAG_NODE_2D:
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
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
ERR_FAIL_COND(!Object::cast_to<Node2D>(canvas_item));
Object::cast_to<Node2D>(canvas_item)->set_global_position(dto);
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
continue;
Add anchor visualization
2017-07-11 00:14:22 +02:00
break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +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
if (!dragging_bone) {
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
local_rect.position = begin;
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
local_rect.size = end - begin;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
canvas_item->_edit_set_rect(local_rect);
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
} else {
//ok, all that had to be done was done, now solve IK
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);
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 final_xform = bone_orig_xform;
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) {
float total_len = 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 (List<BoneIK>::Element *E = bone_ik_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
if (E->prev())
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
total_len += E->get().len;
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
E->get().pos = E->get().node->get_global_transform().get_origin();
}
{
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
final_xform.elements[2] += dto - dfrom; //final_xform.affine_inverse().basis_xform_inv(drag_vector);
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
//n2d->set_global_transform(final_xform);
}
CanvasItem *last = bone_ik_list.back()->get().node;
if (!last)
break;
Vector2 root_pos = last->get_global_transform().get_origin();
Vector2 leaf_pos = final_xform.get_origin();
if ((leaf_pos.distance_to(root_pos)) > total_len) {
//oops dude you went too far
i18n: Don't make print_line calls translatable
2016-05-04 15:28:37 +02:00
//print_line("TOO FAR!");
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
Vector2 rel = leaf_pos - root_pos;
rel = rel.normalized() * total_len;
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
leaf_pos = root_pos + rel;
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
bone_ik_list.front()->get().pos = leaf_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
i18n: Don't make print_line calls translatable
2016-05-04 15:28:37 +02:00
//print_line("BONE IK LIST "+itos(bone_ik_list.size()));
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
if (bone_ik_list.size() > 2) {
int solver_iterations = 64;
float solver_k = 0.3;
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 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 (int i = 0; i < solver_iterations; i++) {
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<BoneIK>::Element *E = bone_ik_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
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 (E == bone_ik_list.back()) {
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;
}
float len = E->next()->get().len;
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 (E->next() == bone_ik_list.back()) {
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
//print_line("back");
Vector2 rel = E->get().pos - E->next()->get().pos;
i18n: Don't make print_line calls translatable
2016-05-04 15:28:37 +02:00
//print_line("PREV "+E->get().pos);
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 desired = E->next()->get().pos + rel.normalized() * len;
i18n: Don't make print_line calls translatable
2016-05-04 15:28:37 +02:00
//print_line("DESIRED "+desired);
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
E->get().pos = E->get().pos.linear_interpolate(desired, solver_k);
i18n: Don't make print_line calls translatable
2016-05-04 15:28:37 +02:00
//print_line("POST "+E->get().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
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 == bone_ik_list.front()) {
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
//only adjust parent
//print_line("front");
Vector2 rel = E->next()->get().pos - E->get().pos;
i18n: Don't make print_line calls translatable
2016-05-04 15:28:37 +02:00
//print_line("PREV "+E->next()->get().pos);
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 desired = E->get().pos + rel.normalized() * len;
i18n: Don't make print_line calls translatable
2016-05-04 15:28:37 +02:00
//print_line("DESIRED "+desired);
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
E->next()->get().pos = E->next()->get().pos.linear_interpolate(desired, solver_k);
i18n: Don't make print_line calls translatable
2016-05-04 15:28:37 +02:00
//print_line("POST "+E->next()->get().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
} else {
Vector2 rel = E->next()->get().pos - E->get().pos;
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 cen = (E->next()->get().pos + E->get().pos) * 0.5;
rel = rel.linear_interpolate(rel.normalized() * len, solver_k);
rel *= 0.5;
E->next()->get().pos = cen + rel;
E->get().pos = cen - rel;
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
//print_line("mid");
}
}
}
}
}
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<BoneIK>::Element *E = bone_ik_list.back(); E; E = E->prev()) {
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
Node2D *n = E->get().node;
if (!E->prev()) {
//last goes to what it was
-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
final_xform.set_origin(n->get_global_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
n->set_global_transform(final_xform);
} else {
-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
Vector2 rel = (E->prev()->get().node->get_global_position() - n->get_global_position()).normalized();
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
Vector2 rel2 = (E->prev()->get().pos - E->get().pos).normalized();
float rot = rel.angle_to(rel2);
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 (n->get_global_transform().basis_determinant() < 0) {
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
//mirrored, rotate the other way
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
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
}
n->rotate(rot);
}
}
break;
}
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
if (viewport_base->has_focus()) {
get_stylebox("Focus", "EditorStyles")->draw(viewport_base->get_canvas_item(), Rect2(Point2(), viewport_base->get_size()));
}
}
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++) {
if (drag == DRAG_V_GUIDE && i == edited_guide_index)
continue;
float x = xform.xform(Point2(vguides[i], 0)).x;
viewport_base->draw_line(Point2(x, 0), Point2(x, viewport_base->get_size().y), guide_color);
}
}
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++) {
if (drag == DRAG_H_GUIDE && i == edited_guide_index)
continue;
float y = xform.xform(Point2(0, hguides[i])).y;
viewport_base->draw_line(Point2(0, y), Point2(viewport_base->get_size().x, y), guide_color);
}
}
// Dragged guide
Color text_color = get_color("font_color", "Editor");
text_color.a = 0.5;
if (drag == DRAG_DOUBLE_GUIDE || drag == DRAG_V_GUIDE) {
String str = vformat("%d px", xform.affine_inverse().xform(edited_guide_pos).x);
Ref<Font> font = get_font("font", "Label");
Size2 text_size = font->get_string_size(str);
viewport_base->draw_string(font, Point2(edited_guide_pos.x + 10, RULER_WIDTH + text_size.y / 2 + 10), str, text_color);
viewport_base->draw_line(Point2(edited_guide_pos.x, 0), Point2(edited_guide_pos.x, viewport_base->get_size().y), guide_color);
}
if (drag == DRAG_DOUBLE_GUIDE || drag == DRAG_H_GUIDE) {
String str = vformat("%d px", xform.affine_inverse().xform(edited_guide_pos).y);
Ref<Font> font = get_font("font", "Label");
Size2 text_size = font->get_string_size(str);
viewport_base->draw_string(font, Point2(RULER_WIDTH + 10, edited_guide_pos.y + text_size.y / 2 + 10), str, text_color);
viewport_base->draw_line(Point2(0, edited_guide_pos.y), Point2(viewport_base->get_size().x, edited_guide_pos.y), guide_color);
}
}
Implements rulers
2017-08-29 21:50:18 +02:00
void CanvasItemEditor::_draw_rulers() {
Visual tweaks. Updated icons Updated some color
2017-09-21 02:29:52 +02:00
Color graduation_color = get_color("font_color", "Editor");
graduation_color.a = 0.5;
Implements rulers
2017-08-29 21:50:18 +02:00
Color bg_color = get_color("dark_color_2", "Editor");
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");
// The rule transform
Transform2D ruler_transform;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
if (show_grid || snap_grid) {
Implements rulers
2017-08-29 21:50:18 +02:00
ruler_transform = Transform2D();
if (snap_relative && get_item_count() > 0) {
ruler_transform.translate(_find_topleftmost_point());
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 = Transform2D();
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)
Point2 first = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(Point2());
Point2 last = (transform * ruler_transform * major_subdivide * minor_subdivide).affine_inverse().xform(viewport->get_size());
// Draw top ruler
viewport_base->draw_rect(Rect2(Point2(RULER_WIDTH, 0), Size2(viewport->get_size().x, RULER_WIDTH)), bg_color);
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) {
viewport_base->draw_line(Point2(position.x + RULER_WIDTH, 0), Point2(position.x + RULER_WIDTH, RULER_WIDTH), graduation_color);
float val = (ruler_transform * major_subdivide * minor_subdivide).xform(Point2(i, 0)).x;
viewport_base->draw_string(font, Point2(position.x + RULER_WIDTH + 2, font->get_height()), vformat(((int)val == val) ? "%d" : "%.1f", val), font_color);
} else {
if (i % minor_subdivision == 0) {
viewport_base->draw_line(Point2(position.x + RULER_WIDTH, RULER_WIDTH * 0.33), Point2(position.x + RULER_WIDTH, RULER_WIDTH), graduation_color);
} else {
viewport_base->draw_line(Point2(position.x + RULER_WIDTH, RULER_WIDTH * 0.66), Point2(position.x + RULER_WIDTH, RULER_WIDTH), graduation_color);
}
}
}
// Draw left ruler
viewport_base->draw_rect(Rect2(Point2(0, RULER_WIDTH), Size2(RULER_WIDTH, viewport->get_size().y)), bg_color);
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) {
viewport_base->draw_line(Point2(0, position.y + RULER_WIDTH), Point2(RULER_WIDTH, position.y + RULER_WIDTH), graduation_color);
float val = (ruler_transform * major_subdivide * minor_subdivide).xform(Point2(0, i)).y;
viewport_base->draw_string(font, Point2(2, position.y + RULER_WIDTH + 2 + font->get_height()), vformat(((int)val == val) ? "%d" : "%.1f", val), font_color);
} else {
if (i % minor_subdivision == 0) {
viewport_base->draw_line(Point2(RULER_WIDTH * 0.33, position.y + RULER_WIDTH), Point2(RULER_WIDTH, position.y + RULER_WIDTH), graduation_color);
} else {
viewport_base->draw_line(Point2(RULER_WIDTH * 0.66, position.y + RULER_WIDTH), Point2(RULER_WIDTH, position.y + RULER_WIDTH), graduation_color);
}
}
}
viewport_base->draw_rect(Rect2(Point2(), Size2(RULER_WIDTH, RULER_WIDTH)), graduation_color);
}
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;
if (snap_relative && get_item_count() > 0) {
Change the grid offset when the snap is set as relative
2017-07-25 21:09:32 +02:00
Vector2 topleft = _find_topleftmost_point();
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() {
bool pivot_found = false;
Ref<Texture> pivot_icon = get_icon("EditorPivot", "EditorIcons");
Implement smart snapping. Fixes a bug with anchors single-axis move (when they were rotated).
2017-09-07 23:30:54 +02:00
bool single = _get_single_item() != NULL;
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
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()) {
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;
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
if (!se)
continue;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Rect2 rect = canvas_item->_edit_get_rect();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fixes the pre drag rect not drawn correctly
2017-10-03 22:44:34 +02:00
if (show_helpers && drag != DRAG_NONE && drag != DRAG_PIVOT) {
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);
Vector2 pre_drag_endpoints[4] = {
Fixes the pre drag rect not drawn correctly
2017-10-03 22:44:34 +02: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
};
for (int i = 0; i < 4; i++) {
viewport->draw_line(pre_drag_endpoints[i], pre_drag_endpoints[(i + 1) % 4], pre_drag_color, 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
Transform2D xform = transform * canvas_item->get_global_transform_with_canvas();
VisualServer::get_singleton()->canvas_item_add_set_transform(ci, xform);
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
Vector2 endpoints[4] = {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
xform.xform(rect.position),
xform.xform(rect.position + Vector2(rect.size.x, 0)),
xform.xform(rect.position + rect.size),
xform.xform(rect.position + Vector2(0, rect.size.y))
GODOT IS OPEN SOURCE
2014-02-10 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
Color c = Color(1, 0.6, 0.4, 0.7);
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_set_transform(ci, 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
for (int i = 0; i < 4; i++) {
viewport->draw_line(endpoints[i], endpoints[(i + 1) % 4], c, 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
if (single && (tool == TOOL_SELECT || tool == TOOL_MOVE || tool == TOOL_ROTATE || tool == TOOL_EDIT_PIVOT)) { //kind of sucks
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
Node2D *node2d = Object::cast_to<Node2D>(canvas_item);
if (node2d) {
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
if (node2d->_edit_use_pivot()) {
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->draw_texture(pivot_icon, xform.get_origin() + (-pivot_icon->get_size() / 2).floor());
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_move_pivot = true;
pivot_found = true;
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) {
Vector2 pivot_ofs = control->get_pivot_offset();
Ability to set rotation and scaling pivot for controls.
2017-07-06 22:42:44 +02:00
if (pivot_ofs != Vector2()) {
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->draw_texture(pivot_icon, xform.xform(pivot_ofs) + (-pivot_icon->get_size() / 2).floor());
Ability to set rotation and scaling pivot for controls.
2017-07-06 22:42:44 +02:00
}
can_move_pivot = true;
pivot_found = true;
Add anchor visualization
2017-07-11 00:14:22 +02:00
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]));
}
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
Map<Node *, Object *> &selection = editor_selection->get_selection();
Add lines to make understandable when anchors are snapped
2017-07-30 17:59:57 +02:00
// Get which anchor is dragged
int dragged_anchor = -1;
switch (drag) {
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;
}
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
Displays margins values when moving the node
2017-08-18 00:42:49 +02:00
node_pos_in_parent[0] = control->get_anchor(MARGIN_LEFT) * control->get_parent_area_size().width + control->get_margin(MARGIN_LEFT);
node_pos_in_parent[1] = control->get_anchor(MARGIN_TOP) * control->get_parent_area_size().height + control->get_margin(MARGIN_TOP);
node_pos_in_parent[2] = control->get_anchor(MARGIN_RIGHT) * control->get_parent_area_size().width + control->get_margin(MARGIN_RIGHT);
node_pos_in_parent[3] = control->get_anchor(MARGIN_BOTTOM) * control->get_parent_area_size().height + control->get_margin(MARGIN_BOTTOM);
switch (drag) {
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:
Point2 start = Vector2(node_pos_in_parent[0], Math::lerp(node_pos_in_parent[1], node_pos_in_parent[3], ratio));
Point2 end = start - Vector2(control->get_margin(MARGIN_LEFT), 0);
_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;
}
switch (drag) {
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:
Point2 start = Vector2(node_pos_in_parent[2], Math::lerp(node_pos_in_parent[3], node_pos_in_parent[1], ratio));
Point2 end = start - Vector2(control->get_margin(MARGIN_RIGHT), 0);
_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;
}
switch (drag) {
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:
Point2 start = Vector2(Math::lerp(node_pos_in_parent[0], node_pos_in_parent[2], ratio), node_pos_in_parent[1]);
Point2 end = start - Vector2(0, control->get_margin(MARGIN_TOP));
_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;
}
switch (drag) {
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:
Point2 start = Vector2(Math::lerp(node_pos_in_parent[2], node_pos_in_parent[0], ratio), node_pos_in_parent[3]);
Point2 end = start - Vector2(0, control->get_margin(MARGIN_BOTTOM));
_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;
}
Draw a ghost rect when dragging nodes if it's rotated/scaled
2017-08-18 22:56:00 +02:00
switch (drag) {
//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;
}
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
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 (tool == TOOL_SELECT) {
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 (int i = 0; i < 4; i++) {
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
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
}
}
}
}
-added a visual tool to change the pivot of a sprite/asprite/polygon/etc. Closes #2670
2015-12-28 13:38:15 +01:00
pivot_button->set_disabled(!pivot_found);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (box_selecting) {
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
}
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
Color rotate_color(0.4, 0.7, 1.0, 0.8);
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 (drag == DRAG_ROTATE) {
VisualServer::get_singleton()->canvas_item_add_line(ci, transform.xform(display_rotate_from), transform.xform(display_rotate_to), rotate_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() {
RID ci = viewport->get_canvas_item();
Color x_axis_color(1.0, 0.4, 0.4, 0.6);
Color y_axis_color(0.4, 1.0, 0.4, 0.6);
Color area_axis_color(0.4, 0.4, 1.0, 0.4);
Fixes axis badly displayed with high zooming values
2017-08-29 00:19:14 +02:00
Point2 origin = transform.get_origin();
VisualServer::get_singleton()->canvas_item_add_line(ci, Point2(0, origin.y), Point2(viewport->get_size().x, origin.y), x_axis_color);
VisualServer::get_singleton()->canvas_item_add_line(ci, Point2(origin.x, 0), Point2(origin.x, viewport->get_size().y), y_axis_color);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-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_size = Size2(ProjectSettings::get_singleton()->get("display/window/size/width"), ProjectSettings::get_singleton()->get("display/window/size/height"));
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
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))
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 (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
int bone_width = EditorSettings::get_singleton()->get("editors/2d/bone_width");
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");
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
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<ObjectID, 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
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
E->get().from = Vector2();
E->get().to = Vector2();
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>(ObjectDB::get_instance(E->get().bone));
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
if (!n2d)
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
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
if (!n2d->get_parent())
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
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
CanvasItem *pi = n2d->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
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 *pn2d = Object::cast_to<Node2D>(n2d->get_parent());
2D Animation Improvements -=-=-=-=-=-=-=-=-=--=-=-= -Ability to set 2D nodes as bones -Abity to set 2D nodes as IK chains -2D IK Solver -Improvements in the UI for adding keyframes (separate loc,rot,scale buttons)
2014-07-06 16:49:27 +02:00
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
if (!pn2d)
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
-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
Vector2 from = transform.xform(pn2d->get_global_position());
Vector2 to = transform.xform(n2d->get_global_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
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
E->get().from = from;
E->get().to = to;
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
Vector2 rel = to - from;
Vector2 relt = rel.tangent().normalized() * bone_width;
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;
bone_shape.push_back(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
bone_shape.push_back(from + rel * 0.2 + relt);
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
bone_shape.push_back(to);
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_shape.push_back(from + rel * 0.2 - relt);
Add show bones checkable menu item
2016-09-07 11:10:00 +02:00
Vector<Color> colors;
if (pi->has_meta("_edit_ik_")) {
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
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
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_primitive(ci, bone_shape, colors, Vector<Vector2>(), RID());
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
if (editor_selection->is_selected(pi)) {
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 < bone_shape.size(); i++) {
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
VisualServer::get_singleton()->canvas_item_add_line(ci, bone_shape[i], bone_shape[(i + 1) % bone_shape.size()], bone_selected_color, 2);
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
}
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
}
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_locks_and_groups(Node *p_node, const Transform2D &p_xform) {
Add missing NULL checks on CanvasItemEditor
2017-09-20 21:28:16 +02:00
ERR_FAIL_COND(!p_node);
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 viewport_ci = viewport->get_canvas_item();
Transform2D transform_ci = p_xform;
CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
if (ci)
transform_ci = transform_ci * ci->get_transform();
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
_draw_locks_and_groups(p_node->get_child(i), transform_ci);
}
if (ci) {
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_")) {
lock->draw(viewport_ci, transform_ci.xform(Point2(0, 0)));
}
Improved a lot of icons, and some style fixes
2017-09-21 22:55:07 +02:00
Ref<Texture> group = get_icon("GroupViewport", "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 (ci->has_meta("_edit_group_")) {
Vector2 ofs = transform_ci.xform(Point2(0, 0));
if (ci->has_meta("_edit_lock_"))
ofs = Point2(ofs.x + lock->get_size().x, ofs.y);
group->draw(viewport_ci, ofs);
}
}
}
void CanvasItemEditor::_build_bones_list(Node *p_node) {
Add missing NULL checks on CanvasItemEditor
2017-09-20 21:28:16 +02:00
ERR_FAIL_COND(!p_node);
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++) {
_build_bones_list(p_node->get_child(i));
}
CanvasItem *c = Object::cast_to<CanvasItem>(p_node);
if (c && c->is_visible_in_tree()) {
if (c->has_meta("_edit_bone_")) {
ObjectID id = c->get_instance_id();
if (!bone_list.has(id)) {
BoneList bone;
bone.bone = id;
bone_list[id] = bone;
}
bone_list[id].last_pass = bone_last_frame;
}
}
}
void CanvasItemEditor::_get_encompassing_rect(Node *p_node, Rect2 &r_rect, const Transform2D &p_xform) {
Add missing NULL checks on CanvasItemEditor
2017-09-20 21:28:16 +02:00
ERR_FAIL_COND(!p_node);
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++) {
_get_encompassing_rect(p_node->get_child(i), r_rect, p_xform);
}
CanvasItem *c = Object::cast_to<CanvasItem>(p_node);
if (c && c->is_visible_in_tree()) {
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Rect2 rect = c->_edit_get_rect();
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
Transform2D xform = p_xform * c->get_transform();
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));
}
}
Implements rulers
2017-08-29 21:50:18 +02:00
void CanvasItemEditor::_draw_viewport_base() {
if (show_rulers)
_draw_rulers();
Implement guides
2017-10-18 23:55:02 +02:00
if (show_guides)
_draw_guides();
Implements rulers
2017-08-29 21:50:18 +02:00
_draw_focus();
}
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() {
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;
List<Node *> &selection = editor_selection->get_selected_node_list();
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
_update_scrollbars();
_draw_grid();
_draw_selection();
_draw_axis();
Fix godot spraying errors about a null check
2017-09-21 21:59:38 +02:00
if (editor->get_edited_scene())
_draw_locks_and_groups(editor->get_edited_scene(), transform);
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();
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) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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"));
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 *> &selection = editor_selection->get_selected_node_list();
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
bool all_control = true;
bool has_control = false;
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
for (List<Node *>::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->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())
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<Control>(canvas_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
has_control = true;
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
else
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
all_control = false;
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
CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!se)
continue;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Rect2 r = canvas_item->_edit_get_rect();
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
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 (r != se->prev_rect || xform != se->prev_xform) {
viewport->update();
se->prev_rect = r;
se->prev_xform = xform;
}
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<Control>(canvas_item)) {
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;
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
pivot = Object::cast_to<Control>(canvas_item)->get_pivot_offset();
anchors[MARGIN_LEFT] = Object::cast_to<Control>(canvas_item)->get_anchor(MARGIN_LEFT);
anchors[MARGIN_RIGHT] = Object::cast_to<Control>(canvas_item)->get_anchor(MARGIN_RIGHT);
anchors[MARGIN_TOP] = Object::cast_to<Control>(canvas_item)->get_anchor(MARGIN_TOP);
anchors[MARGIN_BOTTOM] = Object::cast_to<Control>(canvas_item)->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
viewport->update();
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_base->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
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];
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
Showing anchor icon in editor if control-node is hidden (fixes #9542)
2017-08-12 13:23:08 +02:00
if (all_control && has_control)
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
presets_menu->show();
Showing anchor icon in editor if control-node is hidden (fixes #9542)
2017-08-12 13:23:08 +02:00
else
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
presets_menu->hide();
-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
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<ObjectID, 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
Object *b = ObjectDB::get_instance(E->get().bone);
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);
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 (!b2) {
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 (b2->get_global_transform() != E->get().xform) {
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
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
E->get().xform = b2->get_global_transform();
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
}
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
AnimationPlayerEditor::singleton->get_key_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();
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
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) {
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
drag = 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);
//_add_canvas_item(p_canvas_item);
viewport->update();
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_base->update();
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
Implements rulers
2017-08-29 21:50:18 +02:00
if (show_rulers)
viewport_scrollable->set_begin(Point2(RULER_WIDTH, RULER_WIDTH));
else
viewport_scrollable->set_begin(Point2());
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();
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_begin(Point2(size.width - vmin.width, 0));
v_scroll->set_end(Point2(size.width, size.height));
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
h_scroll->set_begin(Point2(0, size.height - hmin.height));
h_scroll->set_end(Point2(size.width - vmin.width, size.height));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-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"));
no more errors related to missing GlobalConfig::Get (or so I hope)
2017-01-15 01:56:22 +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
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
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 canvas_item_rect = Rect2(Point2(), screen_rect);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-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
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
if (editor->get_edited_scene()) {
_build_bones_list(editor->get_edited_scene());
_get_encompassing_rect(editor->get_edited_scene(), canvas_item_rect, 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
List<Map<ObjectID, BoneList>::Element *> bone_to_erase;
-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
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<ObjectID, BoneList>::Element *E = bone_list.front(); E; E = E->next()) {
-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
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 (E->get().last_pass != bone_last_frame) {
-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
bone_to_erase.push_back(E);
}
}
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 (bone_to_erase.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
bone_list.erase(bone_to_erase.front()->get());
bone_to_erase.pop_front();
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//expand area so it's easier to do animations and stuff at 0,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
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
Point2 ofs;
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)) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
v_scroll->hide();
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
ofs.y = canvas_item_rect.position.y;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
v_scroll->show();
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
v_scroll->set_min(canvas_item_rect.position.y);
v_scroll->set_max(canvas_item_rect.position.y + canvas_item_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
v_scroll->set_page(local_rect.size.y / zoom);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (first_update) {
//so 0,0 is visible
-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
v_scroll->set_value(-10);
h_scroll->set_value(-10);
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
first_update = 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
ofs.y = v_scroll->get_value();
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)) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
h_scroll->hide();
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
ofs.x = canvas_item_rect.position.x;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
h_scroll->show();
renamed all Rect2.pos to Rect2.position
2017-06-04 00:25:13 +02:00
h_scroll->set_min(canvas_item_rect.position.x);
h_scroll->set_max(canvas_item_rect.position.x + canvas_item_rect.size.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
h_scroll->set_page(local_rect.size.x / zoom);
ofs.x = h_scroll->get_value();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
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
//transform=Matrix32();
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
transform.elements[2] = -ofs * zoom;
no more errors related to missing GlobalConfig::Get (or so I hope)
2017-01-15 01:56:22 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor->get_scene_root()->set_global_canvas_transform(transform);
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
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
//transform.scale_basis(Vector2(zoom,zoom));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void CanvasItemEditor::_update_scroll(float) {
if (updating_scroll)
return;
Point2 ofs;
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.x = h_scroll->get_value();
ofs.y = v_scroll->get_value();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
//current_window->set_scroll(-ofs);
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
transform = 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
transform.scale_basis(Size2(zoom, zoom));
transform.elements[2] = -ofs;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
editor->get_scene_root()->set_global_canvas_transform(transform);
viewport->update();
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_base->update();
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_and_margins_preset(Control::LayoutPreset p_preset) {
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 *> &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"));
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
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 *c = Object::cast_to<Control>(E->get());
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
Adds a function to set Anchors with a layout preset
2017-08-11 18:16:28 +02:00
undo_redo->add_do_method(c, "set_anchors_preset", p_preset);
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
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(c, "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(c, "set_margins_preset", p_preset, Control::PRESET_MODE_MINSIZE);
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
undo_redo->add_undo_method(c, "set_anchor", MARGIN_LEFT, c->get_anchor(MARGIN_LEFT));
undo_redo->add_undo_method(c, "set_anchor", MARGIN_TOP, c->get_anchor(MARGIN_TOP));
undo_redo->add_undo_method(c, "set_anchor", MARGIN_RIGHT, c->get_anchor(MARGIN_RIGHT));
undo_redo->add_undo_method(c, "set_anchor", MARGIN_BOTTOM, c->get_anchor(MARGIN_BOTTOM));
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
undo_redo->add_undo_method(c, "set_margin", MARGIN_LEFT, c->get_margin(MARGIN_LEFT));
undo_redo->add_undo_method(c, "set_margin", MARGIN_TOP, c->get_margin(MARGIN_TOP));
undo_redo->add_undo_method(c, "set_margin", MARGIN_RIGHT, c->get_margin(MARGIN_RIGHT));
undo_redo->add_undo_method(c, "set_margin", MARGIN_BOTTOM, c->get_margin(MARGIN_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
}
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) {
Add anchor shortcut to fit parent Also remove old Edit -> Expand to Parent menu option
2017-07-09 15:54:49 +02:00
List<Node *> &selection = editor_selection->get_selected_node_list();
undo_redo->create_action(TTR("Change Anchors"));
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
Control *c = Object::cast_to<Control>(E->get());
Add anchor shortcut to fit parent Also remove old Edit -> Expand to Parent menu option
2017-07-09 15:54:49 +02:00
Extends the anchors menu to a presets
2017-10-04 00:47:40 +02:00
undo_redo->add_do_method(c, "set_anchors_preset", p_preset);
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->add_undo_method(c, "set_anchor", MARGIN_LEFT, c->get_anchor(MARGIN_LEFT));
undo_redo->add_undo_method(c, "set_anchor", MARGIN_TOP, c->get_anchor(MARGIN_TOP));
undo_redo->add_undo_method(c, "set_anchor", MARGIN_RIGHT, c->get_anchor(MARGIN_RIGHT));
undo_redo->add_undo_method(c, "set_anchor", MARGIN_BOTTOM, c->get_anchor(MARGIN_BOTTOM));
}
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;
Fix blurry after zooming
2017-12-20 16:39:02 +01:00
h_scroll->set_value(Math::round(h_scroll->get_value() + ofs.x));
v_scroll->set_value(Math::round(v_scroll->get_value() + ofs.y));
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
_update_scroll(0);
viewport->update();
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_base->update();
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
}
Fix zoom button not zooming on the screen center
2017-10-01 11:30:38 +02:00
void CanvasItemEditor::_zoom_minus() {
_zoom_on_position(zoom / 2.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
void CanvasItemEditor::_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
}
void CanvasItemEditor::_zoom_plus() {
Fix zoom button not zooming on the screen center
2017-10-01 11:30:38 +02:00
_zoom_on_position(zoom * 2.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
}
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
void CanvasItemEditor::_toggle_snap(bool p_status) {
snap_active = p_status;
viewport->update();
viewport_base->update();
}
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();
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_base->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 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;
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();
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_base->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();
viewport_base->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();
viewport_base->update();
} break;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case LOCK_SELECTED: {
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 *> &selection = editor_selection->get_selected_node_list();
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 (List<Node *>::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->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())
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: {
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 *> &selection = editor_selection->get_selected_node_list();
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 (List<Node *>::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->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())
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: {
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 *> &selection = editor_selection->get_selected_node_list();
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 (List<Node *>::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->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())
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: {
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 *> &selection = editor_selection->get_selected_node_list();
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 (List<Node *>::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->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())
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)
Update some property names for animation keys. Added rect_rotation too. Fixes #9337
2017-06-24 11:39:57 +02:00
AnimationPlayerEditor::singleton->get_key_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)
Unify degree members and properties
2017-11-10 11:07:52 +01:00
AnimationPlayerEditor::singleton->get_key_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)
Update some property names for animation keys. Added rect_rotation too. Fixes #9337
2017-06-24 11:39:57 +02:00
AnimationPlayerEditor::singleton->get_key_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)
Update some property names for animation keys. Added rect_rotation too. Fixes #9337
2017-06-24 11:39:57 +02:00
AnimationPlayerEditor::singleton->get_key_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)
Unify degree members and properties
2017-11-10 11:07:52 +01:00
AnimationPlayerEditor::singleton->get_key_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)
Update some property names for animation keys. Added rect_rotation too. Fixes #9337
2017-06-24 11:39:57 +02:00
AnimationPlayerEditor::singleton->get_key_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)
Update some property names for animation keys. Added rect_rotation too. Fixes #9337
2017-06-24 11:39:57 +02:00
AnimationPlayerEditor::singleton->get_key_editor()->insert_node_value_key(ctrl, "rect_position", ctrl->get_position(), existing);
if (key_rot)
Unify degree members and properties
2017-11-10 11:07:52 +01:00
AnimationPlayerEditor::singleton->get_key_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)
Update some property names for animation keys. Added rect_rotation too. Fixes #9337
2017-06-24 11:39:57 +02:00
AnimationPlayerEditor::singleton->get_key_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;
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
/*
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_ROT
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
case ANIM_INSERT_POS_SCALE:
case ANIM_INSERT_ROT_SCALE:
case ANIM_INSERT_POS_ROT_SCALE: {
static const bool key_toggles[7][3]={
{true,false,false},
{false,true,false},
{false,false,true},
{true,true,false},
{true,false,true},
{false,true,true},
{true,true,true}
};
key_pos=key_toggles[p_op-ANIM_INSERT_POS][0];
key_rot=key_toggles[p_op-ANIM_INSERT_POS][1];
key_scale=key_toggles[p_op-ANIM_INSERT_POS][2];
for(int i=ANIM_INSERT_POS;i<=ANIM_INSERT_POS_ROT_SCALE;i++) {
int idx = animation_menu->get_popup()->get_item_index(i);
animation_menu->get_popup()->set_item_checked(idx,i==p_op);
}
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;*/
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
/*
if (key_scale)
AnimationPlayerEditor::singleton->get_key_editor()->insert_node_value_key(ctrl,"rect/size",ctrl->get_size());
*/
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: {
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 *> &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;
Rework the canvas_item API for further improves to the canvas item editor
2017-11-15 23:03:25 +01:00
Rect2 item_rect = canvas_item->_edit_get_rect();
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);
h_scroll->set_value(h_scroll->get_value() - offset.x / zoom);
v_scroll->set_value(v_scroll->get_value() - offset.y / zoom);
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;
_update_scroll(0);
call_deferred("_popup_callback", VIEW_CENTER_TO_SELECTION);
}
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
void CanvasItemEditor::_bind_methods() {
Display draggable anchors only if the parent is not a container
2017-08-19 18:29:37 +02:00
ClassDB::bind_method("_zoom_minus", &CanvasItemEditor::_zoom_minus);
ClassDB::bind_method("_zoom_reset", &CanvasItemEditor::_zoom_reset);
ClassDB::bind_method("_zoom_plus", &CanvasItemEditor::_zoom_plus);
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
ClassDB::bind_method("_toggle_snap", &CanvasItemEditor::_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);
ClassDB::bind_method("_popup_callback", &CanvasItemEditor::_popup_callback);
ClassDB::bind_method("_get_editor_data", &CanvasItemEditor::_get_editor_data);
ClassDB::bind_method("_tool_select", &CanvasItemEditor::_tool_select);
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);
Implements rulers
2017-08-29 21:50:18 +02:00
ClassDB::bind_method("_draw_viewport_base", &CanvasItemEditor::_draw_viewport_base);
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);
ClassDB::bind_method("_gui_input_viewport_base", &CanvasItemEditor::_gui_input_viewport_base);
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);
ClassDB::bind_method(D_METHOD("_selection_result_pressed"), &CanvasItemEditor::_selection_result_pressed);
ClassDB::bind_method(D_METHOD("_selection_menu_hide"), &CanvasItemEditor::_selection_menu_hide);
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
}
void CanvasItemEditor::add_control_to_menu_panel(Control *p_control) {
hb->add_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) {
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_base = memnew(Control);
palette_split->add_child(viewport_base);
Fixes the rulers text drawn outside the viewport_base
2017-09-22 00:21:41 +02:00
viewport_base->set_clip_contents(true);
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_base->connect("draw", this, "_draw_viewport_base");
Fixes snapping and replaces the _draw_canvas by forward_canvas_draw
2017-10-15 22:33:25 +02:00
viewport_base->connect("gui_input", this, "_gui_input_viewport_base");
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_base->set_focus_mode(FOCUS_ALL);
viewport_base->set_v_size_flags(SIZE_EXPAND_FILL);
viewport_base->set_h_size_flags(SIZE_EXPAND_FILL);
viewport_scrollable = memnew(Control);
viewport_base->add_child(viewport_scrollable);
viewport_scrollable->set_mouse_filter(MOUSE_FILTER_PASS);
viewport_scrollable->set_draw_behind_parent(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
viewport_scrollable->set_anchors_and_margins_preset(Control::PRESET_WIDE);
Implements rulers
2017-08-29 21:50:18 +02:00
viewport_scrollable->set_begin(Point2(RULER_WIDTH, RULER_WIDTH));
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);
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);
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->connect("value_changed", this, "_update_scroll", Vector<Variant>(), Object::CONNECT_DEFERRED);
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);
v_scroll->connect("value_changed", this, "_update_scroll", Vector<Variant>(), Object::CONNECT_DEFERRED);
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
HBoxContainer *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);
zoom_minus->connect("pressed", this, "_zoom_minus");
zoom_minus->set_focus_mode(FOCUS_NONE);
zoom_reset = memnew(ToolButton);
zoom_hb->add_child(zoom_reset);
zoom_reset->connect("pressed", this, "_zoom_reset");
zoom_reset->set_focus_mode(FOCUS_NONE);
zoom_plus = memnew(ToolButton);
zoom_hb->add_child(zoom_plus);
zoom_plus->connect("pressed", this, "_zoom_plus");
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;
handle_len = 10;
first_update = true;
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);
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->connect("pressed", this, "_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);
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->connect("pressed", this, "_tool_select", make_binds(TOOL_MOVE));
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);
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->connect("pressed", this, "_tool_select", make_binds(TOOL_ROTATE));
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);
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->connect("pressed", this, "_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);
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->connect("pressed", this, "_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);
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->connect("pressed", this, "_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);
snap_button->connect("toggled", this, "_toggle_snap");
snap_button->set_tooltip(TTR("Toggles snapping"));
snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_snap", TTR("Use Snap"), KEY_S));
snap_config_menu = memnew(MenuButton);
hb->add_child(snap_config_menu);
snap_config_menu->set_h_size_flags(SIZE_SHRINK_END);
snap_config_menu->set_tooltip(TTR("Snapping options"));
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);
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_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_make_bones", TTR("Make Bones"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_B), SKELETON_MAKE_BONES);
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_clear_bones", TTR("Clear Bones")), SKELETON_CLEAR_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_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);
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);
Adds keyboards shortcuts
2017-08-30 22:12:38 +02: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);
Implement guides
2017-10-18 23:55:02 +02:00
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_guides", TTR("Show guides"), KEY_Y), SHOW_GUIDES);
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));
Canvas item editor shortcuts
2016-06-29 22:02:26 +02:00
key_insert_button->set_tooltip(TTR("Insert Keys"));
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");
Make the shortcuts for setting the pivot editable
2017-08-20 00:01:12 +02:00
drag_pivot_shortcut = ED_SHORTCUT("canvas_item_editor/drag_pivot", TTR("Drag pivot from mouse position"), KEY_MASK_SHIFT | KEY_V);
set_pivot_shortcut = ED_SHORTCUT("canvas_item_editor/set_pivot", TTR("Set pivot at mouse position"), KEY_V);
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;
Implement guides
2017-10-18 23:55:02 +02:00
edited_guide_pos = Point2();
edited_guide_index = -1;
Add some options and reorganize the 2D editor menus. Makes available forced snapping.
2017-09-17 22:52:41 +02:00
show_grid = false;
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;
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;
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
box_selecting = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//zoom=0.5;
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);
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_move_pivot = false;
drag = DRAG_NONE;
bone_last_frame = 0;
additive_selection = false;
Fixes the checkboxes update
2017-12-09 15:25:20 +01:00
// Update the menus checkboxes
Fix 2D editor checkboxes with a new project
2017-12-26 16:39:03 +01:00
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);
Implements rulers
2017-08-29 21:50:18 +02:00
canvas_item_editor->viewport_base->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));
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
}
}
}
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
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();
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<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) {
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 *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);
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
else 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
child = memnew(NinePatchRect);
else
child = memnew(Sprite); // default
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
_create_nodes(target_node, child, path, drop_pos);
Fix drag and drop on 2d viewport
2017-03-13 11:35:27 +01:00
} else if (scene != 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
bool success = _create_instance(target_node, path, drop_pos);
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
if (!success) {
error_files.push_back(path);
}
}
}
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;
for (int i = 0; i < files.size(); i++) { // check if dragged files contain resource or scene can be created at least one
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") {
Ref<PackedScene> sdata = ResourceLoader::load(files[i]);
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") {
Ref<Texture> texture = ResourceLoader::load(files[i]);
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() {
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();
}
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
}
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;
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();
Added support for drag and drop in spatial editor.
2017-09-02 21:47:16 +02:00
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
if (list.size() != 1) {
Improve drag and drop on 2D viewport
2016-10-25 21:27:24 +02:00
accept->get_ok()->set_text(TTR("I see.."));
accept->set_text(TTR("This operation requires a single selected node."));
accept->popup_centered_minsize();
_remove_preview();
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
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
}
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
if (is_alt) {
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