From 03d02e88fc38c5f96e9b4a6e29df777dec398f9d Mon Sep 17 00:00:00 2001 From: Bastiaan Olij Date: Fri, 27 Jul 2018 18:43:50 +1000 Subject: [PATCH] Reenabled module and fixed missing const --- modules/mobile_vr/config.py | 3 +-- .../{mobile_interface.cpp => mobile_vr_interface.cpp} | 4 ++-- .../mobile_vr/{mobile_interface.h => mobile_vr_interface.h} | 4 ++-- modules/mobile_vr/register_types.cpp | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) rename modules/mobile_vr/{mobile_interface.cpp => mobile_vr_interface.cpp} (99%) rename modules/mobile_vr/{mobile_interface.h => mobile_vr_interface.h} (98%) diff --git a/modules/mobile_vr/config.py b/modules/mobile_vr/config.py index 4912457e2b9..e85fa631dd3 100644 --- a/modules/mobile_vr/config.py +++ b/modules/mobile_vr/config.py @@ -1,6 +1,5 @@ def can_build(env, platform): - # should probably change this to only be true on iOS and Android - return False + return True def configure(env): pass diff --git a/modules/mobile_vr/mobile_interface.cpp b/modules/mobile_vr/mobile_vr_interface.cpp similarity index 99% rename from modules/mobile_vr/mobile_interface.cpp rename to modules/mobile_vr/mobile_vr_interface.cpp index 6b1c7eb279e..2ec00aa72d8 100644 --- a/modules/mobile_vr/mobile_interface.cpp +++ b/modules/mobile_vr/mobile_vr_interface.cpp @@ -28,7 +28,7 @@ /* 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/os.h" #include "servers/visual/visual_server_global.h" @@ -279,7 +279,7 @@ bool MobileVRInterface::is_stereo() { return true; }; -bool MobileVRInterface::is_initialized() { +bool MobileVRInterface::is_initialized() const { return (initialized); }; diff --git a/modules/mobile_vr/mobile_interface.h b/modules/mobile_vr/mobile_vr_interface.h similarity index 98% rename from modules/mobile_vr/mobile_interface.h rename to modules/mobile_vr/mobile_vr_interface.h index bb84281b46a..7b2344f1fe8 100644 --- a/modules/mobile_vr/mobile_interface.h +++ b/modules/mobile_vr/mobile_vr_interface.h @@ -134,7 +134,7 @@ public: virtual StringName get_name() const; virtual int get_capabilities() const; - virtual bool is_initialized(); + virtual bool is_initialized() const; virtual bool initialize(); virtual void uninitialize(); @@ -150,4 +150,4 @@ public: ~MobileVRInterface(); }; -#endif // MOBILE_VR_INTERFACE_H +#endif // !MOBILE_VR_INTERFACE_H diff --git a/modules/mobile_vr/register_types.cpp b/modules/mobile_vr/register_types.cpp index 0655727a4ab..edddaa87e1f 100644 --- a/modules/mobile_vr/register_types.cpp +++ b/modules/mobile_vr/register_types.cpp @@ -30,7 +30,7 @@ #include "register_types.h" -#include "mobile_interface.h" +#include "mobile_vr_interface.h" void register_mobile_vr_types() { ClassDB::register_class();