Merge pull request #57449 from dsnopek/webxr-ar-touch-render-target

[3.x] Make WebXR touch events proportional to render target size, not viewport
This commit is contained in:
Rémi Verschelde 2022-01-31 09:57:31 +01:00 committed by GitHub
commit a0438ff8f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -554,16 +554,9 @@ Vector2 WebXRInterfaceJS::_get_joy_vector_from_axes(int *p_axes) {
}
Vector2 WebXRInterfaceJS::_get_screen_position_from_joy_vector(const Vector2 &p_joy_vector) {
SceneTree *scene_tree = Object::cast_to<SceneTree>(OS::get_singleton()->get_main_loop());
if (!scene_tree) {
return Vector2();
}
Viewport *viewport = scene_tree->get_root();
// Invert the y-axis.
Vector2 position_percentage((p_joy_vector.x + 1.0f) / 2.0f, ((-p_joy_vector.y) + 1.0f) / 2.0f);
Vector2 position = viewport->get_size() * position_percentage;
Vector2 position = get_render_targetsize() * position_percentage;
return position;
}