Merge pull request #40582 from PoqXert/game-center-4.0

[4.0] iOS Game Center improvements
This commit is contained in:
Rémi Verschelde 2020-10-01 13:54:03 +02:00 committed by GitHub
commit 23ab8ea6f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 23 deletions

View File

@ -48,7 +48,7 @@ class GameCenter : public Object {
void return_connect_error(const char *p_error_description);
public:
void connect();
Error authenticate();
bool is_authenticated();
Error post_score(Dictionary p_score);

View File

@ -52,6 +52,7 @@ extern "C" {
GameCenter *GameCenter::instance = NULL;
void GameCenter::_bind_methods() {
ClassDB::bind_method(D_METHOD("authenticate"), &GameCenter::authenticate);
ClassDB::bind_method(D_METHOD("is_authenticated"), &GameCenter::is_authenticated);
ClassDB::bind_method(D_METHOD("post_score"), &GameCenter::post_score);
@ -66,34 +67,17 @@ void GameCenter::_bind_methods() {
ClassDB::bind_method(D_METHOD("pop_pending_event"), &GameCenter::pop_pending_event);
};
void GameCenter::return_connect_error(const char *p_error_description) {
authenticated = false;
Dictionary ret;
ret["type"] = "authentication";
ret["result"] = "error";
ret["error_code"] = 0;
ret["error_description"] = p_error_description;
pending_events.push_back(ret);
}
void GameCenter::connect() {
Error GameCenter::authenticate() {
//if this class isn't available, game center isn't implemented
if ((NSClassFromString(@"GKLocalPlayer")) == nil) {
return_connect_error("GameCenter not available");
return;
return ERR_UNAVAILABLE;
}
GKLocalPlayer *player = [GKLocalPlayer localPlayer];
if (![player respondsToSelector:@selector(authenticateHandler)]) {
return_connect_error("GameCenter doesn't respond to 'authenticateHandler'");
return;
}
ERR_FAIL_COND_V(![player respondsToSelector:@selector(authenticateHandler)], ERR_UNAVAILABLE);
ViewController *root_controller = (ViewController *)((AppDelegate *)[[UIApplication sharedApplication] delegate]).window.rootViewController;
if (!root_controller) {
return_connect_error("Window doesn't have root ViewController");
return;
}
ERR_FAIL_COND_V(!root_controller, FAILED);
// This handler is called several times. First when the view needs to be shown, then again
// after the view is cancelled or the user logs in. Or if the user's already logged in, it's
@ -126,6 +110,8 @@ void GameCenter::connect() {
pending_events.push_back(ret);
};
});
return OK;
};
bool GameCenter::is_authenticated() {

View File

@ -128,7 +128,6 @@ void OSIPhone::initialize_modules() {
#ifdef GAME_CENTER_ENABLED
game_center = memnew(GameCenter);
Engine::get_singleton()->add_singleton(Engine::Singleton("GameCenter", game_center));
game_center->connect();
#endif
#ifdef STOREKIT_ENABLED