godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Fix touch events when using smartphone AR with WebXR

Browse Source
This commit is contained in:
David Snopek
2022-01-13 12:07:18 -06:00
parent afadd3d12e
commit e39f62876d
7 changed files with 225 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/webxr/webxr_interface_js.h
View File

@@ -54,11 +54,16 @@ private:
String reference_space_type;
bool controllers_state[2];
bool touching[5];
Size2 render_targetsize;
Transform _js_matrix_to_transform(float *p_js_matrix);
void _update_tracker(int p_controller_id);
Vector2 _get_joy_vector_from_axes(int *p_axes);
int _get_touch_index(int p_input_source);
Vector2 _get_screen_position_from_joy_vector(const Vector2 &p_joy_vector);
public:
virtual void is_session_supported(const String &p_session_mode);
virtual void set_session_mode(String p_session_mode);
@@ -72,6 +77,7 @@ public:
void _set_reference_space_type(String p_reference_space_type);
virtual String get_reference_space_type() const;
virtual Ref<ARVRPositionalTracker> get_controller(int p_controller_id) const;
virtual TargetRayMode get_controller_target_ray_mode(int p_controller_id) const;
virtual String get_visibility_state() const;
virtual PoolVector3Array get_bounds_geometry() const;
@@ -92,6 +98,7 @@ public:
virtual void notification(int p_what);
void _on_controller_changed();
void _on_input_event(int p_event_type, int p_input_source);
WebXRInterfaceJS();
~WebXRInterfaceJS();