Merge pull request #20509 from BastiaanOlij/fixup_mobile_vr_interface

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

View File

@ -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

View File

@ -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);
};

View File

@ -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

View File

@ -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<MobileVRInterface>();