maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge baa105ab60 into fee83d02cc

Browse source
This commit is contained in:
Roberto F. Arroyo 2021-11-10 18:20:20 -06:00 committed by GitHub
parent fee83d02cc baa105ab60
commit 29f8108d4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scene/main/viewport.cpp
View file

@ -1448,7 +1448,7 @@ void Viewport::_vp_unhandled_input(const Ref<InputEvent> &p_ev) {
}
Vector2 Viewport::get_mouse_position() const {
return (get_final_transform().affine_inverse() * _get_input_pre_xform()).xform(Input::get_singleton()->get_mouse_position() - _get_window_offset());
return last_mousepos;
}
void Viewport::warp_mouse(const Vector2 &p_pos) {
@ -2799,6 +2799,11 @@ void Viewport::_post_gui_grab_click_focus() {
void Viewport::input(const Ref<InputEvent> &p_event) {
ERR_FAIL_COND(!is_inside_tree());
Ref<InputEventMouse> ev_mm = p_event;
if (ev_mm.is_valid()) {
last_mousepos = ev_mm->get_position();
}
local_input_handled = false;
if (!is_input_handled()) {
@ -3429,6 +3434,8 @@ Viewport::Viewport() {
local_input_handled = false;
handle_input_locally = true;
physics_last_id = 0; //ensures first time there will be a check
last_mousepos = Vector2(Math_INF, Math_INF);
}
Viewport::~Viewport() {

1
scene/main/viewport.h
View file

@ -214,6 +214,7 @@ private:
Size2 size_override_margin;
Rect2 last_vp_rect;
Vector2 last_mousepos;
bool transparent_bg;
bool vflip;