Skip to content

Commit 3fa6ec7

Browse files
akien-mgaakien-mga
committed
Merge pull request godotengine#89901 from jsjtxietian/path3d
Fix Path3D picking working incorrectly when viewport is in half resolution
2 parents bad1f4a + 20f4a5d commit 3fa6ec7

File tree

3 files changed

+46
-33
lines changed

3 files changed

+46
-33
lines changed

‎editor/plugins/node_3d_editor_plugin.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -691,19 +691,19 @@ Vector3 Node3DEditorViewport::_get_camera_position() const {
691691
return _get_camera_transform().origin;
692692
}
693693

694-
Point2 Node3DEditorViewport::_point_to_screen(const Vector3 &p_point) {
694+
Point2 Node3DEditorViewport::point_to_screen(const Vector3 &p_point) {
695695
return camera->unproject_position(p_point) * subviewport_container->get_stretch_shrink();
696696
}
697697

698-
Vector3 Node3DEditorViewport::_get_ray_pos(const Vector2 &p_pos) const {
698+
Vector3 Node3DEditorViewport::get_ray_pos(const Vector2 &p_pos) const {
699699
return camera->project_ray_origin(p_pos / subviewport_container->get_stretch_shrink());
700700
}
701701

702702
Vector3 Node3DEditorViewport::_get_camera_normal() const {
703703
return -_get_camera_transform().basis.get_column(2);
704704
}
705705

706-
Vector3 Node3DEditorViewport::_get_ray(const Vector2 &p_pos) const {
706+
Vector3 Node3DEditorViewport::get_ray(const Vector2 &p_pos) const {
707707
return camera->project_ray_normal(p_pos / subviewport_container->get_stretch_shrink());
708708
}
709709

@@ -769,8 +769,8 @@ void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {
769769
}
770770

771771
ObjectID Node3DEditorViewport::_select_ray(const Point2 &p_pos) const {
772-
Vector3 ray = _get_ray(p_pos);
773-
Vector3 pos = _get_ray_pos(p_pos);
772+
Vector3 ray = get_ray(p_pos);
773+
Vector3 pos = get_ray_pos(p_pos);
774774
Vector2 shrinked_pos = p_pos / subviewport_container->get_stretch_shrink();
775775

776776
if (viewport->get_debug_draw() == Viewport::DEBUG_DRAW_SDFGI_PROBES) {
@@ -837,8 +837,8 @@ ObjectID Node3DEditorViewport::_select_ray(const Point2 &p_pos) const {
837837
}
838838

839839
void Node3DEditorViewport::_find_items_at_pos(const Point2 &p_pos, Vector<_RayResult> &r_results, bool p_include_locked_nodes) {
840-
Vector3 ray = _get_ray(p_pos);
841-
Vector3 pos = _get_ray_pos(p_pos);
840+
Vector3 ray = get_ray(p_pos);
841+
Vector3 pos = get_ray_pos(p_pos);
842842

843843
Vector<ObjectID> instances = RenderingServer::get_singleton()->instances_cull_ray(pos, pos + ray * camera->get_far(), get_tree()->get_root()->get_world_3d()->get_scenario());
844844
HashSet<Node3D *> found_nodes;
@@ -1153,8 +1153,8 @@ void Node3DEditorViewport::_update_name() {
11531153

11541154
void Node3DEditorViewport::_compute_edit(const Point2 &p_point) {
11551155
_edit.original_local = spatial_editor->are_local_coords_enabled();
1156-
_edit.click_ray = _get_ray(p_point);
1157-
_edit.click_ray_pos = _get_ray_pos(p_point);
1156+
_edit.click_ray = get_ray(p_point);
1157+
_edit.click_ray_pos = get_ray_pos(p_point);
11581158
_edit.plane = TRANSFORM_VIEW;
11591159
spatial_editor->update_transform_gizmo();
11601160
_edit.center = spatial_editor->get_gizmo_transform().origin;
@@ -1233,8 +1233,8 @@ bool Node3DEditorViewport::_transform_gizmo_select(const Vector2 &p_screenpos, b
12331233
return false;
12341234
}
12351235

1236-
Vector3 ray_pos = _get_ray_pos(p_screenpos);
1237-
Vector3 ray = _get_ray(p_screenpos);
1236+
Vector3 ray_pos = get_ray_pos(p_screenpos);
1237+
Vector3 ray = get_ray(p_screenpos);
12381238

12391239
Transform3D gt = spatial_editor->get_gizmo_transform();
12401240

@@ -3115,7 +3115,7 @@ void Node3DEditorViewport::_draw() {
31153115
}
31163116

31173117
if (_edit.mode == TRANSFORM_ROTATE && _edit.show_rotation_line) {
3118-
Point2 center = _point_to_screen(_edit.center);
3118+
Point2 center = point_to_screen(_edit.center);
31193119

31203120
Color handle_color;
31213121
switch (_edit.plane) {
@@ -4087,8 +4087,8 @@ Vector3 Node3DEditorViewport::_get_instance_position(const Point2 &p_pos) const
40874087
const float MAX_DISTANCE = 50.0;
40884088
const float FALLBACK_DISTANCE = 5.0;
40894089

4090-
Vector3 world_ray = _get_ray(p_pos);
4091-
Vector3 world_pos = _get_ray_pos(p_pos);
4090+
Vector3 world_ray = get_ray(p_pos);
4091+
Vector3 world_pos = get_ray_pos(p_pos);
40924092

40934093
PhysicsDirectSpaceState3D *ss = get_tree()->get_root()->get_world_3d()->get_direct_space_state();
40944094

@@ -4250,8 +4250,8 @@ bool Node3DEditorViewport::_apply_preview_material(ObjectID p_target, const Poin
42504250
Ref<Mesh> mesh = mesh_instance->get_mesh();
42514251
int surface_count = mesh->get_surface_count();
42524252

4253-
Vector3 world_ray = _get_ray(p_point);
4254-
Vector3 world_pos = _get_ray_pos(p_point);
4253+
Vector3 world_ray = get_ray(p_point);
4254+
Vector3 world_pos = get_ray_pos(p_point);
42554255

42564256
int closest_surface = -1;
42574257
float closest_dist = 1e20;
@@ -4698,8 +4698,8 @@ void Node3DEditorViewport::apply_transform(Vector3 p_motion, double p_snap) {
46984698

46994699
// Update the current transform operation in response to an input.
47004700
void Node3DEditorViewport::update_transform(bool p_shift) {
4701-
Vector3 ray_pos = _get_ray_pos(_edit.mouse_pos);
4702-
Vector3 ray = _get_ray(_edit.mouse_pos);
4701+
Vector3 ray_pos = get_ray_pos(_edit.mouse_pos);
4702+
Vector3 ray = get_ray(_edit.mouse_pos);
47034703
double snap = EDITOR_GET("interface/inspector/default_float_step");
47044704
int snap_step_decimals = Math::range_step_decimals(snap);
47054705

‎editor/plugins/node_3d_editor_plugin.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,7 @@ class Node3DEditorViewport : public Control {
271271
void _select_clicked(bool p_allow_locked);
272272
ObjectID _select_ray(const Point2 &p_pos) const;
273273
void _find_items_at_pos(const Point2 &p_pos, Vector<_RayResult> &r_results, bool p_include_locked);
274-
Vector3 _get_ray_pos(const Vector2 &p_pos) const;
275-
Vector3 _get_ray(const Vector2 &p_pos) const;
276-
Point2 _point_to_screen(const Vector3 &p_point);
274+
277275
Transform3D _get_camera_transform() const;
278276
int get_selected_count() const;
279277
void cancel_transform();
@@ -481,6 +479,10 @@ class Node3DEditorViewport : public Control {
481479
void reset();
482480
bool is_freelook_active() const { return freelook_active; }
483481

482+
Vector3 get_ray_pos(const Vector2 &p_pos) const;
483+
Vector3 get_ray(const Vector2 &p_pos) const;
484+
Point2 point_to_screen(const Vector3 &p_point);
485+
484486
void focus_selection();
485487

486488
void assign_pending_data_pointers(

‎editor/plugins/path_3d_editor_plugin.cpp‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,17 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p
473473
if (mb.is_valid()) {
474474
Point2 mbpos(mb->get_position().x, mb->get_position().y);
475475

476+
Node3DEditorViewport *viewport = nullptr;
477+
for (uint32_t i = 0; i < Node3DEditor::VIEWPORTS_COUNT; i++) {
478+
Node3DEditorViewport *vp = Node3DEditor::get_singleton()->get_editor_viewport(i);
479+
if (vp->get_camera_3d() == p_camera) {
480+
viewport = vp;
481+
break;
482+
}
483+
}
484+
485+
ERR_FAIL_NULL_V(viewport, EditorPlugin::AFTER_GUI_INPUT_PASS);
486+
476487
if (!mb->is_pressed()) {
477488
set_handle_clicked(false);
478489
}
@@ -489,14 +500,14 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p
489500
const Vector3 *r = v3a.ptr();
490501
float closest_d = 1e20;
491502

492-
if (p_camera->unproject_position(gt.xform(c->get_point_position(0))).distance_to(mbpos) < click_dist) {
503+
if (viewport->point_to_screen(gt.xform(c->get_point_position(0))).distance_to(mbpos) < click_dist) {
493504
return EditorPlugin::AFTER_GUI_INPUT_PASS; //nope, existing
494505
}
495506

496507
for (int i = 0; i < c->get_point_count() - 1; i++) {
497508
//find the offset and point index of the place to break up
498509
int j = idx;
499-
if (p_camera->unproject_position(gt.xform(c->get_point_position(i + 1))).distance_to(mbpos) < click_dist) {
510+
if (viewport->point_to_screen(gt.xform(c->get_point_position(i + 1))).distance_to(mbpos) < click_dist) {
500511
return EditorPlugin::AFTER_GUI_INPUT_PASS; //nope, existing
501512
}
502513

@@ -508,16 +519,16 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p
508519
to = gt.xform(to);
509520
if (cdist > 0) {
510521
Vector2 s[2];
511-
s[0] = p_camera->unproject_position(from);
512-
s[1] = p_camera->unproject_position(to);
522+
s[0] = viewport->point_to_screen(from);
523+
s[1] = viewport->point_to_screen(to);
513524
Vector2 inters = Geometry2D::get_closest_point_to_segment(mbpos, s);
514525
float d = inters.distance_to(mbpos);
515526

516527
if (d < 10 && d < closest_d) {
517528
closest_d = d;
518529
closest_seg = i;
519-
Vector3 ray_from = p_camera->project_ray_origin(mbpos);
520-
Vector3 ray_dir = p_camera->project_ray_normal(mbpos);
530+
Vector3 ray_from = viewport->get_ray_pos(mbpos);
531+
Vector3 ray_dir = viewport->get_ray(mbpos);
521532

522533
Vector3 ra, rb;
523534
Geometry3D::get_closest_points_between_segments(ray_from, ray_from + ray_dir * 4096, from, to, ra, rb);
@@ -557,8 +568,8 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p
557568
origin = gt.xform(c->get_point_position(c->get_point_count() - 1));
558569
}
559570
Plane p(p_camera->get_transform().basis.get_column(2), origin);
560-
Vector3 ray_from = p_camera->project_ray_origin(mbpos);
561-
Vector3 ray_dir = p_camera->project_ray_normal(mbpos);
571+
Vector3 ray_from = viewport->get_ray_pos(mbpos);
572+
Vector3 ray_dir = viewport->get_ray(mbpos);
562573

563574
Vector3 inters;
564575
if (p.intersects_ray(ray_from, ray_dir, &inters)) {
@@ -574,10 +585,10 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p
574585

575586
} else if (mb->is_pressed() && ((mb->get_button_index() == MouseButton::LEFT && curve_del->is_pressed()) || (mb->get_button_index() == MouseButton::RIGHT && curve_edit->is_pressed()))) {
576587
for (int i = 0; i < c->get_point_count(); i++) {
577-
real_t dist_to_p = p_camera->unproject_position(gt.xform(c->get_point_position(i))).distance_to(mbpos);
578-
real_t dist_to_p_out = p_camera->unproject_position(gt.xform(c->get_point_position(i) + c->get_point_out(i))).distance_to(mbpos);
579-
real_t dist_to_p_in = p_camera->unproject_position(gt.xform(c->get_point_position(i) + c->get_point_in(i))).distance_to(mbpos);
580-
real_t dist_to_p_up = p_camera->unproject_position(gt.xform(c->get_point_position(i) + c->get_point_baked_posture(i, true).get_column(1) * disk_size)).distance_to(mbpos);
588+
real_t dist_to_p = viewport->point_to_screen(gt.xform(c->get_point_position(i))).distance_to(mbpos);
589+
real_t dist_to_p_out = viewport->point_to_screen(gt.xform(c->get_point_position(i) + c->get_point_out(i))).distance_to(mbpos);
590+
real_t dist_to_p_in = viewport->point_to_screen(gt.xform(c->get_point_position(i) + c->get_point_in(i))).distance_to(mbpos);
591+
real_t dist_to_p_up = viewport->point_to_screen(gt.xform(c->get_point_position(i) + c->get_point_baked_posture(i, true).get_column(1) * disk_size)).distance_to(mbpos);
581592

582593
// Find the offset and point index of the place to break up.
583594
// Also check for the control points.

0 commit comments

Comments
 (0)