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

Merge pull request #20509 from BastiaanOlij/fixup_mobile_vr_interface

Browse source 
Reenabled module and fixed missing const
This commit is contained in:
Rémi Verschelde 2018-07-27 11:09:19 +02:00 committed by GitHub
commit bfb21be871
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/mobile_vr/config.py
View file

@ -1,6 +1,5 @@
def can_build(env, platform): def can_build(env, platform):
# should probably change this to only be true on iOS and Android return True
return False
def configure(env): def configure(env):
pass pass

4
modules/mobile_vr/mobile_interface.cpp → modules/mobile_vr/mobile_vr_interface.cpp
View file

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "mobile_interface.h" #include "mobile_vr_interface.h"
#include "core/os/input.h" #include "core/os/input.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "servers/visual/visual_server_global.h" #include "servers/visual/visual_server_global.h"
@ -279,7 +279,7 @@ bool MobileVRInterface::is_stereo() {
return true; return true;
}; };
bool MobileVRInterface::is_initialized() { bool MobileVRInterface::is_initialized() const {
return (initialized); return (initialized);
}; };

4
modules/mobile_vr/mobile_interface.h → modules/mobile_vr/mobile_vr_interface.h
View file

@ -134,7 +134,7 @@ public:
virtual StringName get_name() const; virtual StringName get_name() const;
virtual int get_capabilities() const; virtual int get_capabilities() const;
virtual bool is_initialized(); virtual bool is_initialized() const;
virtual bool initialize(); virtual bool initialize();
virtual void uninitialize(); virtual void uninitialize();
@ -150,4 +150,4 @@ public:
~MobileVRInterface(); ~MobileVRInterface();
}; };
#endif // MOBILE_VR_INTERFACE_H #endif // !MOBILE_VR_INTERFACE_H

2
modules/mobile_vr/register_types.cpp
View file

@ -30,7 +30,7 @@
#include "register_types.h" #include "register_types.h"
#include "mobile_interface.h" #include "mobile_vr_interface.h"
void register_mobile_vr_types() { void register_mobile_vr_types() {
ClassDB::register_class<MobileVRInterface>(); ClassDB::register_class<MobileVRInterface>();