asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #53160 from BastiaanOlij/improve_xr_server_cleanup

Browse source
This commit is contained in:
Rémi Verschelde 2021-09-28 08:44:54 +02:00 committed by GitHub
commit a56e8f8afc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
main/main.cpp
View file

@ -2689,8 +2689,9 @@ void Main::cleanup(bool p_force) {
rendering_server->global_variables_clear();
if (xr_server) {
// cleanup now before we pull the rug from underneath...
memdelete(xr_server);
// Now that we're unregistering properly in plugins we need to keep access to xr_server for a little longer
// We do however unset our primary interface
xr_server->set_primary_interface(Ref<XRInterface>());
}
unregister_driver_types();
@ -2706,6 +2707,10 @@ void Main::cleanup(bool p_force) {
unregister_scene_types();
unregister_server_types();
if (xr_server) {
memdelete(xr_server);
}
if (audio_server) {
audio_server->finish();
memdelete(audio_server);

17
modules/mobile_vr/register_types.cpp
View file

@ -32,15 +32,30 @@
#include "mobile_vr_interface.h"
Ref<MobileVRInterface> mobile_vr;
void register_mobile_vr_types() {
GDREGISTER_CLASS(MobileVRInterface);
if (XRServer::get_singleton()) {
Ref<MobileVRInterface> mobile_vr;
mobile_vr.instantiate();
XRServer::get_singleton()->add_interface(mobile_vr);
}
}
void unregister_mobile_vr_types() {
if (mobile_vr.is_valid()) {
// uninitialise our interface if it is initialised
if (mobile_vr->is_initialized()) {
mobile_vr->uninitialize();
}
// unregister our interface from the XR server
if (XRServer::get_singleton()) {
XRServer::get_singleton()->remove_interface(mobile_vr);
}
// and release
mobile_vr.unref();
}
}

21
modules/webxr/register_types.cpp
View file

@ -33,15 +33,34 @@
#include "webxr_interface.h"
#include "webxr_interface_js.h"
#ifdef JAVASCRIPT_ENABLED
Ref<WebXRInterfaceJS> webxr;
#endif
void register_webxr_types() {
GDREGISTER_VIRTUAL_CLASS(WebXRInterface);
#ifdef JAVASCRIPT_ENABLED
Ref<WebXRInterfaceJS> webxr;
webxr.instantiate();
XRServer::get_singleton()->add_interface(webxr);
#endif
}
void unregister_webxr_types() {
#ifdef JAVASCRIPT_ENABLED
if (webxr.is_valid()) {
// uninitialise our interface if it is initialised
if (webxr->is_initialized()) {
webxr->uninitialize();
}
// unregister our interface from the XR server
if (XRServer::get_singleton()) {
XRServer::get_singleton()->remove_interface(webxr);
}
// and release
webxr.unref();
}
#endif
}