Skip to content

Commit f599efa

Browse files
juicycleffjuicycleff
committed
refactor: refactored unity controller to a global singleton that lives outside a widget
1 parent 7f55bc2 commit f599efa

25 files changed

+2622
-1802
lines changed

‎example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>9.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
346346
GCC_WARN_UNUSED_FUNCTION = YES;
347347
GCC_WARN_UNUSED_VARIABLE = YES;
348-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
348+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
349349
MTL_ENABLE_DEBUG_INFO = NO;
350350
SDKROOT = iphoneos;
351351
SUPPORTED_PLATFORMS = iphoneos;
@@ -361,6 +361,7 @@
361361
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
362362
CLANG_ENABLE_MODULES = YES;
363363
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
364+
DEVELOPMENT_TEAM = L23W97HT75;
364365
ENABLE_BITCODE = NO;
365366
FRAMEWORK_SEARCH_PATHS = (
366367
"$(inherited)",
@@ -376,7 +377,7 @@
376377
"$(inherited)",
377378
"$(PROJECT_DIR)/Flutter",
378379
);
379-
PRODUCT_BUNDLE_IDENTIFIER = com.xraph.plugin.fuwPluginExample;
380+
PRODUCT_BUNDLE_IDENTIFIER = com.xraph.plugin.fuwPluginExampleRex;
380381
PRODUCT_NAME = "$(TARGET_NAME)";
381382
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
382383
SWIFT_VERSION = 5.0;
@@ -431,7 +432,7 @@
431432
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
432433
GCC_WARN_UNUSED_FUNCTION = YES;
433434
GCC_WARN_UNUSED_VARIABLE = YES;
434-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
435+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
435436
MTL_ENABLE_DEBUG_INFO = YES;
436437
ONLY_ACTIVE_ARCH = YES;
437438
SDKROOT = iphoneos;
@@ -480,7 +481,7 @@
480481
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
481482
GCC_WARN_UNUSED_FUNCTION = YES;
482483
GCC_WARN_UNUSED_VARIABLE = YES;
483-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
484+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
484485
MTL_ENABLE_DEBUG_INFO = NO;
485486
SDKROOT = iphoneos;
486487
SUPPORTED_PLATFORMS = iphoneos;
@@ -514,7 +515,7 @@
514515
"$(inherited)",
515516
"$(PROJECT_DIR)/Flutter",
516517
);
517-
PRODUCT_BUNDLE_IDENTIFIER = com.xraph.plugin.fuwPluginExample;
518+
PRODUCT_BUNDLE_IDENTIFIER = com.xraph.plugin.fuwPluginExampleRex;
518519
PRODUCT_NAME = "$(TARGET_NAME)";
519520
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
520521
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -530,6 +531,7 @@
530531
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
531532
CLANG_ENABLE_MODULES = YES;
532533
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
534+
DEVELOPMENT_TEAM = L23W97HT75;
533535
ENABLE_BITCODE = NO;
534536
FRAMEWORK_SEARCH_PATHS = (
535537
"$(inherited)",
@@ -545,7 +547,7 @@
545547
"$(inherited)",
546548
"$(PROJECT_DIR)/Flutter",
547549
);
548-
PRODUCT_BUNDLE_IDENTIFIER = com.xraph.plugin.fuwPluginExample;
550+
PRODUCT_BUNDLE_IDENTIFIER = com.xraph.plugin.fuwPluginExampleRex;
549551
PRODUCT_NAME = "$(TARGET_NAME)";
550552
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
551553
SWIFT_VERSION = 5.0;

‎example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:Runner.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:Runner.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Profile"

‎example/ios/Runner/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>$(DEVELOPMENT_LANGUAGE)</string>
79
<key>CFBundleDisplayName</key>
@@ -43,7 +45,5 @@
4345
</array>
4446
<key>UIViewControllerBasedStatusBarAppearance</key>
4547
<false/>
46-
<key>CADisableMinimumFrameDurationOnPhone</key>
47-
<true/>
4848
</dict>
4949
</plist>

‎example/lib/screens/api_screen.dart‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class ApiScreen extends StatefulWidget {
1010
}
1111

1212
class _ApiScreenState extends State<ApiScreen> {
13-
UnityWidgetController _unityWidgetController;
13+
// UnityWidgetController _unityWidgetController;
1414
double _sliderValue = 0.0;
1515

1616
@override
@@ -20,7 +20,7 @@ class _ApiScreenState extends State<ApiScreen> {
2020

2121
@override
2222
void dispose() {
23-
_unityWidgetController.dispose();
23+
GlobalUnityController.instance.dispose();
2424
super.dispose();
2525
}
2626

@@ -78,25 +78,25 @@ class _ApiScreenState extends State<ApiScreen> {
7878
children: [
7979
MaterialButton(
8080
onPressed: () {
81-
_unityWidgetController.quit();
81+
GlobalUnityController.instance.quit();
8282
},
8383
child: Text("Quit"),
8484
),
8585
MaterialButton(
8686
onPressed: () {
87-
_unityWidgetController.create();
87+
GlobalUnityController.instance.create();
8888
},
8989
child: Text("Create"),
9090
),
9191
MaterialButton(
9292
onPressed: () {
93-
_unityWidgetController.pause();
93+
GlobalUnityController.instance.pause();
9494
},
9595
child: Text("Pause"),
9696
),
9797
MaterialButton(
9898
onPressed: () {
99-
_unityWidgetController.resume();
99+
GlobalUnityController.instance.resume();
100100
},
101101
child: Text("Resume"),
102102
),
@@ -109,20 +109,20 @@ class _ApiScreenState extends State<ApiScreen> {
109109
children: [
110110
MaterialButton(
111111
onPressed: () async {
112-
await _unityWidgetController
112+
await GlobalUnityController.instance
113113
.openInNativeProcess();
114114
},
115115
child: Text("Open Native"),
116116
),
117117
MaterialButton(
118118
onPressed: () {
119-
_unityWidgetController.unload();
119+
GlobalUnityController.instance.unload();
120120
},
121121
child: Text("Unload"),
122122
),
123123
MaterialButton(
124124
onPressed: () {
125-
_unityWidgetController.quit();
125+
GlobalUnityController.instance.quit();
126126
},
127127
child: Text("Silent Quit"),
128128
),
@@ -141,7 +141,7 @@ class _ApiScreenState extends State<ApiScreen> {
141141
}
142142

143143
void setRotationSpeed(String speed) {
144-
_unityWidgetController.postMessage(
144+
GlobalUnityController.instance.postMessage(
145145
'Cube',
146146
'SetRotationSpeed',
147147
speed,
@@ -159,6 +159,6 @@ class _ApiScreenState extends State<ApiScreen> {
159159

160160
// Callback that connects the created controller to the unity controller
161161
void onUnityCreated(controller) {
162-
this._unityWidgetController = controller;
162+
// this._unityWidgetController = controller;
163163
}
164164
}

0 commit comments

Comments
 (0)