feat: finish PoingGodotAdMobMetaFBAdSettings #59

poingstudios · Aug 5, 2023 · 02c4243 · 02c4243
1 parent df43186
commit 02c4243
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 13 deletions.
diff --git a/PoingGodotAdMob/Podfile b/PoingGodotAdMob/Podfile
@@ -16,11 +16,12 @@ end
 
 target 'meta' do
   common_pods
+  pod 'GoogleMobileAdsMediationFacebook', '6.12.0.1'
 end
 
-target 'vungle' do
+target 'vungle' do  
   common_pods
-  pod 'GoogleMobileAdsMediationVungle', '6.12.3'
+  pod 'GoogleMobileAdsMediationVungle', '6.12.3.0'
 end
 
 

diff --git a/PoingGodotAdMob/Podfile.lock b/PoingGodotAdMob/Podfile.lock
@@ -1,5 +1,6 @@
 PODS:
   - AdColony (4.9.0)
+  - FBAudienceNetwork (6.12.0)
   - Google-Mobile-Ads-SDK (10.9.0):
     - GoogleAppMeasurement (< 11.0, >= 7.0)
     - GoogleUserMessagingPlatform (>= 1.1)
@@ -26,6 +27,9 @@ PODS:
   - GoogleMobileAdsMediationAdColony (4.9.0.2):
     - AdColony (= 4.9.0)
     - Google-Mobile-Ads-SDK (~> 10.0)
+  - GoogleMobileAdsMediationFacebook (6.12.0.1):
+    - FBAudienceNetwork (= 6.12.0)
+    - Google-Mobile-Ads-SDK (~> 10.0)
   - GoogleMobileAdsMediationVungle (6.12.3.0):
     - Google-Mobile-Ads-SDK (~> 10.0)
     - VungleSDK-iOS (= 6.12.3)
@@ -58,14 +62,17 @@ PODS:
 DEPENDENCIES:
   - Google-Mobile-Ads-SDK (= 10.9.0)
   - GoogleMobileAdsMediationAdColony (= 4.9.0.2)
-  - GoogleMobileAdsMediationVungle (= 6.12.3)
+  - GoogleMobileAdsMediationFacebook (= 6.12.0.1)
+  - GoogleMobileAdsMediationVungle (= 6.12.3.0)
 
 SPEC REPOS:
   trunk:
     - AdColony
+    - FBAudienceNetwork
     - Google-Mobile-Ads-SDK
     - GoogleAppMeasurement
     - GoogleMobileAdsMediationAdColony
+    - GoogleMobileAdsMediationFacebook
     - GoogleMobileAdsMediationVungle
     - GoogleUserMessagingPlatform
     - GoogleUtilities
@@ -75,16 +82,18 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   AdColony: 4f3738dc633d7aaa8ec60729df973076cc8e97ed
+  FBAudienceNetwork: e0fcc9091fced34910ed0b6da06f129db46ac9e6
   Google-Mobile-Ads-SDK: e81e8b009a182dc8dd14951782efdbb30a5e4510
   GoogleAppMeasurement: 3ae505b44174bcc0775f5c86cecc5826259fbb1e
   GoogleMobileAdsMediationAdColony: 739e508a44288b54d59d4deb211340008d46d8f5
+  GoogleMobileAdsMediationFacebook: d0dfe773d6009ddd2ee0dfded681a7a2c56a315b
   GoogleMobileAdsMediationVungle: 967c32401bc395dc66fd4f2f177c594165c3802f
   GoogleUserMessagingPlatform: dce302b8f1b84d6e945812ee7a15c3f65a102cbf
   GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
   nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
   VungleSDK-iOS: 27725029a42dfb9e39c67956637233fde1ee1797
 
-PODFILE CHECKSUM: d46df465acc47b28bcb04963abbd3f6b60e325cd
+PODFILE CHECKSUM: 98c50198b57ecbbdf9253278884df457b1eea769
 
 COCOAPODS: 1.11.2
diff --git a/PoingGodotAdMob/PoingGodotAdMob.xcodeproj/project.pbxproj b/PoingGodotAdMob/PoingGodotAdMob.xcodeproj/project.pbxproj
@@ -1042,6 +1042,19 @@
 					"$(SRCROOT)/../godot/platform/ios",
 					"$(SRCROOT)/../godot",
 				);
+				OTHER_CFLAGS = (
+					"-fcxx-modules",
+					"-g",
+					"-DDEBUG",
+					"-DDEBUG_ENABLED",
+					"-DDEBUG_MEMORY_ALLOC",
+					"-DDISABLE_FORCED_INLINE",
+					"-DTYPED_METHOD_BIND",
+					"-fmodules",
+					"-DIPHONE_ENABLED",
+					"-DUNIX_ENABLED",
+					"-DCOREAUDIO_ENABLED",
+				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1065,6 +1078,10 @@
 					"$(SRCROOT)/../godot/platform/ios",
 					"$(SRCROOT)/../godot",
 				);
+				OTHER_CFLAGS = (
+					"-fcxx-modules",
+					"-fmodules",
+				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

diff --git a/PoingGodotAdMob/src/mediation/meta/PoingGodotAdMobMetaFBAdSettings.h b/PoingGodotAdMob/src/mediation/meta/PoingGodotAdMobMetaFBAdSettings.h
@@ -25,6 +25,7 @@
 
 #include "core/object/class_db.h"
 #include "core/version.h"
+#import <FBAudienceNetwork/FBAudienceNetwork.h>
 
 class PoingGodotAdMobMetaFBAdSettings : public Object {
 
@@ -40,8 +41,6 @@ class PoingGodotAdMobMetaFBAdSettings : public Object {
 
     PoingGodotAdMobMetaFBAdSettings();
     ~PoingGodotAdMobMetaFBAdSettings();
-private:
-    static PoingGodotAdMobMetaFBAdSettings *options;
 };
 
 

diff --git a/PoingGodotAdMob/src/mediation/meta/PoingGodotAdMobMetaFBAdSettings.mm b/PoingGodotAdMob/src/mediation/meta/PoingGodotAdMobMetaFBAdSettings.mm
@@ -21,3 +21,30 @@
 // SOFTWARE.
 
 #import "PoingGodotAdMobMetaFBAdSettings.h"
+
+PoingGodotAdMobMetaFBAdSettings *PoingGodotAdMobMetaFBAdSettings::instance = NULL;
+
+PoingGodotAdMobMetaFBAdSettings::PoingGodotAdMobMetaFBAdSettings() {
+    ERR_FAIL_COND(instance != NULL);
+
+    instance = this;
+}
+
+PoingGodotAdMobMetaFBAdSettings::~PoingGodotAdMobMetaFBAdSettings() {
+    if (instance == this) {
+        instance = NULL;
+    }
+}
+
+PoingGodotAdMobMetaFBAdSettings *PoingGodotAdMobMetaFBAdSettings::get_singleton() {
+    return instance;
+};
+
+void PoingGodotAdMobMetaFBAdSettings::set_advertiser_tracking_enabled(bool tracking_required) {
+    NSLog(@"PoingGodotAdMobMetaFBAdSettings::set_advertiser_tracking_enabled");
+    [FBAdSettings setAdvertiserTrackingEnabled:tracking_required];
+}
+
+void PoingGodotAdMobMetaFBAdSettings::_bind_methods() {
+    ClassDB::bind_method(D_METHOD("set_advertiser_tracking_enabled"), &PoingGodotAdMobMetaFBAdSettings::set_advertiser_tracking_enabled);
+}
diff --git a/PoingGodotAdMob/src/mediation/meta/PoingGodotAdMobMetaModule.mm b/PoingGodotAdMob/src/mediation/meta/PoingGodotAdMobMetaModule.mm
@@ -27,15 +27,15 @@
 #include "core/config/engine.h"
 #include "core/version.h"
 
-PoingGodotAdMobMetaFBAdSettings *poing_godot_admob_meta_app_options;
+PoingGodotAdMobMetaFBAdSettings *poing_godot_admob_meta_fb_ad_settings;
 
-void register_poing_godot_admob_adcolony_types() {
-    poing_godot_admob_meta_app_options = memnew(PoingGodotAdMobMetaFBAdSettings);
-    Engine::get_singleton()->add_singleton(Engine::Singleton("PoingGodotAdMobMetaFBAdSettings", poing_godot_admob_meta_app_options));
+void register_poing_godot_admob_meta_types() {
+    poing_godot_admob_meta_fb_ad_settings = memnew(PoingGodotAdMobMetaFBAdSettings);
+    Engine::get_singleton()->add_singleton(Engine::Singleton("PoingGodotAdMobMetaFBAdSettings", poing_godot_admob_meta_fb_ad_settings));
 }
 
-void unregister_poing_godot_admob_adcolony_types() {
-    if (poing_godot_admob_meta_app_options) {
-        memdelete(poing_godot_admob_meta_app_options);
+void unregister_poing_godot_admob_meta_types() {
+    if (poing_godot_admob_meta_fb_ad_settings) {
+        memdelete(poing_godot_admob_meta_fb_ad_settings);
     }
 }