|
@@ -280,7 +280,8 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
|
|
|
|
|
|
} else if (p_msg.begins_with("runtime_node_select_")) { /// Runtime Node Selection
|
|
|
if (p_msg == "runtime_node_select_setup") {
|
|
|
- runtime_node_select->_setup();
|
|
|
+ ERR_FAIL_COND_V(p_args.is_empty() || p_args[0].get_type() != Variant::DICTIONARY, ERR_INVALID_DATA);
|
|
|
+ runtime_node_select->_setup(p_args[0]);
|
|
|
|
|
|
} else if (p_msg == "runtime_node_select_set_type") {
|
|
|
ERR_FAIL_COND_V(p_args.is_empty(), ERR_INVALID_DATA);
|
|
@@ -1221,7 +1222,7 @@ RuntimeNodeSelect::~RuntimeNodeSelect() {
|
|
|
#endif // _3D_DISABLED
|
|
|
}
|
|
|
|
|
|
-void RuntimeNodeSelect::_setup() {
|
|
|
+void RuntimeNodeSelect::_setup(const Dictionary &p_settings) {
|
|
|
Window *root = SceneTree::get_singleton()->get_root();
|
|
|
ERR_FAIL_COND(root->is_connected(SceneStringName(window_input), callable_mp(this, &RuntimeNodeSelect::_root_window_input)));
|
|
|
|
|
@@ -1238,6 +1239,14 @@ void RuntimeNodeSelect::_setup() {
|
|
|
panner.instantiate();
|
|
|
panner->set_callbacks(callable_mp(this, &RuntimeNodeSelect::_pan_callback), callable_mp(this, &RuntimeNodeSelect::_zoom_callback));
|
|
|
|
|
|
+ ViewPanner::ControlScheme panning_scheme = (ViewPanner::ControlScheme)p_settings.get("editors/panning/2d_editor_panning_scheme", 0).operator int();
|
|
|
+ bool simple_panning = p_settings.get("editors/panning/simple_panning", false);
|
|
|
+ int pan_speed = p_settings.get("editors/panning/2d_editor_pan_speed", 20);
|
|
|
+ Array keys = p_settings.get("canvas_item_editor/pan_view", Array()).operator Array();
|
|
|
+ panner->setup(panning_scheme, DebuggerMarshalls::deserialize_key_shortcut(keys), simple_panning);
|
|
|
+ panner->set_scroll_speed(pan_speed);
|
|
|
+ warped_panning = p_settings.get("editors/panning/warped_mouse_panning", false);
|
|
|
+
|
|
|
/// 2D Selection Box Generation
|
|
|
|
|
|
sbox_2d_canvas = RS::get_singleton()->canvas_create();
|
|
@@ -1347,7 +1356,7 @@ void RuntimeNodeSelect::_root_window_input(const Ref<InputEvent> &p_event) {
|
|
|
|
|
|
if (camera_override) {
|
|
|
if (node_select_type == NODE_TYPE_2D) {
|
|
|
- if (panner->gui_input(p_event, Rect2(Vector2(), root->get_size()))) {
|
|
|
+ if (panner->gui_input(p_event, warped_panning ? Rect2(Vector2(), root->get_size()) : Rect2())) {
|
|
|
return;
|
|
|
}
|
|
|
} else if (node_select_type == NODE_TYPE_3D) {
|