Fix GridMap cursor position when using half-resolution rendering

This closes godotengine#33937.
Calinou · May 5, 2021 · e082c59 · e082c59
1 parent 758bccf
commit e082c59
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
@@ -410,6 +410,10 @@ float Node3DEditorViewport::get_fov() const {
 	return CLAMP(spatial_editor->get_fov(), MIN_FOV, MAX_FOV);
 }
 
+SubViewportContainer *Node3DEditorViewport::get_subviewport_container() const {
+	return subviewport_container;
+}
+
 Transform Node3DEditorViewport::_get_camera_transform() const {
 	return camera->get_global_transform();
 }

diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h
@@ -251,6 +251,8 @@ class Node3DEditorViewport : public Control {
 		FREELOOK_FULLY_AXIS_LOCKED,
 	};
 
+	SubViewportContainer *get_subviewport_container() const;
+
 private:
 	float cpu_time_history[FRAME_TIME_HISTORY];
 	int cpu_time_history_index;

diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp
@@ -34,6 +34,7 @@
 #include "editor/editor_settings.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/camera_3d.h"
+#include "scene/gui/subviewport_container.h"
 
 #include "core/os/keyboard.h"
 #include "scene/main/window.h"
@@ -664,7 +665,11 @@ bool GridMapEditor::forward_spatial_input_event(Camera3D *p_camera, const Ref<In
 				return false;
 			}
 
-			return do_input_action(p_camera, Point2(mb->get_position().x, mb->get_position().y), true);
+			// Compensate for the 3D viewport's Half Resolution setting.
+			return do_input_action(
+					p_camera,
+					Point2(mb->get_position().x, mb->get_position().y) / Node3DEditor::get_singleton()->get_editor_viewport(0)->get_subviewport_container()->get_stretch_shrink(),
+					true);
 		} else {
 			if ((mb->get_button_index() == MOUSE_BUTTON_RIGHT && input_action == INPUT_ERASE) || (mb->get_button_index() == MOUSE_BUTTON_LEFT && input_action == INPUT_PAINT)) {
 				if (set_items.size()) {
@@ -707,7 +712,11 @@ bool GridMapEditor::forward_spatial_input_event(Camera3D *p_camera, const Ref<In
 	Ref<InputEventMouseMotion> mm = p_event;
 
 	if (mm.is_valid()) {
-		return do_input_action(p_camera, mm->get_position(), false);
+		// Compensate for the 3D viewport's Half Resolution setting.
+		return do_input_action(
+				p_camera,
+				mm->get_position() / Node3DEditor::get_singleton()->get_editor_viewport(0)->get_subviewport_container()->get_stretch_shrink(),
+				false);
 	}
 
 	Ref<InputEventKey> k = p_event;