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

Merge pull request #51336 from naithar/fix/ios-plugin-initialization 

[3.x] [iOS] Use platform generated api to initialize iOS plugins
This commit is contained in:
Rémi Verschelde 2021-08-06 23:59:06 +02:00 committed by GitHub
parent 8db0bd4424 d48d7cc94f
commit afe7b3fc58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 90 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
platform/iphone/api/api.cpp Normal file
View File

@ -0,0 +1,48 @@
/*************************************************************************/
/* api.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "api.h"
#if defined(IPHONE_ENABLED)
void register_iphone_api() {
godot_ios_plugins_initialize();
}
void unregister_iphone_api() {
godot_ios_plugins_deinitialize();
}
#else
void register_iphone_api() {}
void unregister_iphone_api() {}
#endif

42
platform/iphone/api/api.h Normal file
View File

@ -0,0 +1,42 @@
/*************************************************************************/
/* api.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef IPHONE_API_H
#define IPHONE_API_H
#if defined(IPHONE_ENABLED)
extern void godot_ios_plugins_initialize();
extern void godot_ios_plugins_deinitialize();
#endif
void register_iphone_api();
void unregister_iphone_api();
#endif // IPHONE_API_H

3
platform/iphone/os_iphone.h
View File

@ -44,9 +44,6 @@
#include "servers/visual/rasterizer.h" #include "servers/visual/rasterizer.h"
#include "servers/visual_server.h" #include "servers/visual_server.h"
extern void godot_ios_plugins_initialize();
extern void godot_ios_plugins_deinitialize();
class OSIPhone : public OS_Unix { class OSIPhone : public OS_Unix {
private: private:
static HashMap<String, void *> dynamic_symbol_lookup_table; static HashMap<String, void *> dynamic_symbol_lookup_table;

4
platform/iphone/os_iphone.mm
View File

@ -110,8 +110,6 @@ int OSIPhone::get_current_video_driver() const {
} }
void OSIPhone::start() { void OSIPhone::start() {
godot_ios_plugins_initialize();
Main::start(); Main::start();
if (joypad_iphone) { if (joypad_iphone) {
@ -337,8 +335,6 @@ void OSIPhone::finalize() {
memdelete(ios); memdelete(ios);
} }
godot_ios_plugins_deinitialize();
visual_server->finish(); visual_server->finish();
memdelete(visual_server); memdelete(visual_server);
// memdelete(rasterizer); // memdelete(rasterizer);