godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89219 from devloglogan/xr-profile-changed

Browse Source 
Expose `profile_changed` signal to XRController3D
This commit is contained in:
Rémi Verschelde 2024-03-07 00:24:03 +01:00
commit 6c9a166308
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/classes/XRController3D.xml
View File

@ -75,5 +75,11 @@
Emitted when a thumbstick or thumbpad on this controller is moved. Emitted when a thumbstick or thumbpad on this controller is moved.
</description> </description>
</signal> </signal>
<signal name="profile_changed">
<param index="0" name="role" type="String" />
<description>
Emitted when the interaction profile on this controller is changed.
</description>
</signal>
</signals> </signals>
</class> </class>

11
scene/3d/xr_nodes.cpp
View File

@ -461,6 +461,7 @@ void XRController3D::_bind_methods() {
ADD_SIGNAL(MethodInfo("button_released", PropertyInfo(Variant::STRING, "name"))); ADD_SIGNAL(MethodInfo("button_released", PropertyInfo(Variant::STRING, "name")));
ADD_SIGNAL(MethodInfo("input_float_changed", PropertyInfo(Variant::STRING, "name"), PropertyInfo(Variant::FLOAT, "value"))); ADD_SIGNAL(MethodInfo("input_float_changed", PropertyInfo(Variant::STRING, "name"), PropertyInfo(Variant::FLOAT, "value")));
ADD_SIGNAL(MethodInfo("input_vector2_changed", PropertyInfo(Variant::STRING, "name"), PropertyInfo(Variant::VECTOR2, "value"))); ADD_SIGNAL(MethodInfo("input_vector2_changed", PropertyInfo(Variant::STRING, "name"), PropertyInfo(Variant::VECTOR2, "value")));
ADD_SIGNAL(MethodInfo("profile_changed", PropertyInfo(Variant::STRING, "role")));
}; };
void XRController3D::_bind_tracker() { void XRController3D::_bind_tracker() {
@ -471,6 +472,7 @@ void XRController3D::_bind_tracker() {
tracker->connect("button_released", callable_mp(this, &XRController3D::_button_released)); tracker->connect("button_released", callable_mp(this, &XRController3D::_button_released));
tracker->connect("input_float_changed", callable_mp(this, &XRController3D::_input_float_changed)); tracker->connect("input_float_changed", callable_mp(this, &XRController3D::_input_float_changed));
tracker->connect("input_vector2_changed", callable_mp(this, &XRController3D::_input_vector2_changed)); tracker->connect("input_vector2_changed", callable_mp(this, &XRController3D::_input_vector2_changed));
tracker->connect("profile_changed", callable_mp(this, &XRController3D::_profile_changed));
} }
} }
@ -481,31 +483,32 @@ void XRController3D::_unbind_tracker() {
tracker->disconnect("button_released", callable_mp(this, &XRController3D::_button_released)); tracker->disconnect("button_released", callable_mp(this, &XRController3D::_button_released));
tracker->disconnect("input_float_changed", callable_mp(this, &XRController3D::_input_float_changed)); tracker->disconnect("input_float_changed", callable_mp(this, &XRController3D::_input_float_changed));
tracker->disconnect("input_vector2_changed", callable_mp(this, &XRController3D::_input_vector2_changed)); tracker->disconnect("input_vector2_changed", callable_mp(this, &XRController3D::_input_vector2_changed));
tracker->disconnect("profile_changed", callable_mp(this, &XRController3D::_profile_changed));
} }
XRNode3D::_unbind_tracker(); XRNode3D::_unbind_tracker();
} }
void XRController3D::_button_pressed(const String &p_name) { void XRController3D::_button_pressed(const String &p_name) {
// just pass it on...
emit_signal(SNAME("button_pressed"), p_name); emit_signal(SNAME("button_pressed"), p_name);
} }
void XRController3D::_button_released(const String &p_name) { void XRController3D::_button_released(const String &p_name) {
// just pass it on...
emit_signal(SNAME("button_released"), p_name); emit_signal(SNAME("button_released"), p_name);
} }
void XRController3D::_input_float_changed(const String &p_name, float p_value) { void XRController3D::_input_float_changed(const String &p_name, float p_value) {
// just pass it on...
emit_signal(SNAME("input_float_changed"), p_name, p_value); emit_signal(SNAME("input_float_changed"), p_name, p_value);
} }
void XRController3D::_input_vector2_changed(const String &p_name, Vector2 p_value) { void XRController3D::_input_vector2_changed(const String &p_name, Vector2 p_value) {
// just pass it on...
emit_signal(SNAME("input_vector2_changed"), p_name, p_value); emit_signal(SNAME("input_vector2_changed"), p_name, p_value);
} }
void XRController3D::_profile_changed(const String &p_role) {
emit_signal(SNAME("profile_changed"), p_role);
}
bool XRController3D::is_button_pressed(const StringName &p_name) const { bool XRController3D::is_button_pressed(const StringName &p_name) const {
if (tracker.is_valid()) { if (tracker.is_valid()) {
// Inputs should already be of the correct type, our XR runtime handles conversions between raw input and the desired type // Inputs should already be of the correct type, our XR runtime handles conversions between raw input and the desired type

1
scene/3d/xr_nodes.h
View File

@ -135,6 +135,7 @@ protected:
void _button_released(const String &p_name); void _button_released(const String &p_name);
void _input_float_changed(const String &p_name, float p_value); void _input_float_changed(const String &p_name, float p_value);
void _input_vector2_changed(const String &p_name, Vector2 p_value); void _input_vector2_changed(const String &p_name, Vector2 p_value);
void _profile_changed(const String &p_role);
public: public:
bool is_button_pressed(const StringName &p_name) const; bool is_button_pressed(const StringName &p_name) const;