From 7f2e1abb505d7d850cd8d90f62b076d5f1c4ac16 Mon Sep 17 00:00:00 2001 From: Robert Mock Date: Tue, 26 Feb 2019 16:01:35 -0800 Subject: [PATCH] replaces overloads with optionals in SceneLoader. This allows defaults and explicit values to be used in any combination, and makes those defaults clear. --- .../Zenject/Source/Util/ZenjectSceneLoader.cs | 136 +++--------------- 1 file changed, 17 insertions(+), 119 deletions(-) diff --git a/UnityProject/Assets/Plugins/Zenject/Source/Util/ZenjectSceneLoader.cs b/UnityProject/Assets/Plugins/Zenject/Source/Util/ZenjectSceneLoader.cs index 372ba2ff2..87980f3ed 100644 --- a/UnityProject/Assets/Plugins/Zenject/Source/Util/ZenjectSceneLoader.cs +++ b/UnityProject/Assets/Plugins/Zenject/Source/Util/ZenjectSceneLoader.cs @@ -34,37 +34,12 @@ public class ZenjectSceneLoader _sceneContainer = sceneRoot == null ? null : sceneRoot.Container; } - public void LoadScene(string sceneName) - { - LoadScene(sceneName, LoadSceneMode.Single); - } - - public void LoadScene(string sceneName, LoadSceneMode loadMode) - { - LoadScene(sceneName, loadMode, null); - } - - public void LoadScene( - string sceneName, LoadSceneMode loadMode, Action extraBindings) - { - LoadScene(sceneName, loadMode, extraBindings, LoadSceneRelationship.None); - } - public void LoadScene( string sceneName, - LoadSceneMode loadMode, - Action extraBindings, - LoadSceneRelationship containerMode) - { - LoadScene(sceneName, loadMode, extraBindings, containerMode, null); - } - - public void LoadScene( - string sceneName, - LoadSceneMode loadMode, - Action extraBindings, - LoadSceneRelationship containerMode, - Action extraBindingsLate) + LoadSceneMode loadMode = LoadSceneMode.Single, + Action extraBindings = null, + LoadSceneRelationship containerMode = LoadSceneRelationship.None, + Action extraBindingsLate = null) { PrepareForLoadScene(loadMode, extraBindings, extraBindingsLate, containerMode); @@ -78,38 +53,12 @@ public void LoadScene(string sceneName, LoadSceneMode loadMode) // we can't do that in this case since the scene isn't loaded until the next frame } - public AsyncOperation LoadSceneAsync(string sceneName) - { - return LoadSceneAsync(sceneName, LoadSceneMode.Single); - } - - public AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode loadMode) - { - return LoadSceneAsync(sceneName, loadMode, null); - } - - public AsyncOperation LoadSceneAsync( - string sceneName, LoadSceneMode loadMode, Action extraBindings) - { - return LoadSceneAsync(sceneName, loadMode, extraBindings, LoadSceneRelationship.None); - } - - public AsyncOperation LoadSceneAsync( + public AsyncOperation LoadSceneAsync( string sceneName, - LoadSceneMode loadMode, - Action extraBindings, - LoadSceneRelationship containerMode) - { - return LoadSceneAsync( - sceneName, loadMode, extraBindings, containerMode, null); - } - - public AsyncOperation LoadSceneAsync( - string sceneName, - LoadSceneMode loadMode, - Action extraBindings, - LoadSceneRelationship containerMode, - Action extraBindingsLate) + LoadSceneMode loadMode = LoadSceneMode.Single, + Action extraBindings = null, + LoadSceneRelationship containerMode = LoadSceneRelationship.None, + Action extraBindingsLate = null) { PrepareForLoadScene(loadMode, extraBindings, extraBindingsLate, containerMode); @@ -163,37 +112,12 @@ public AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode loadMode) SceneContext.ExtraBindingsLateInstallMethod = extraBindingsLate; } - public void LoadScene(int sceneIndex) - { - LoadScene(sceneIndex, LoadSceneMode.Single); - } - - public void LoadScene(int sceneIndex, LoadSceneMode loadMode) - { - LoadScene(sceneIndex, loadMode, null); - } - - public void LoadScene( - int sceneIndex, LoadSceneMode loadMode, Action extraBindings) - { - LoadScene(sceneIndex, loadMode, extraBindings, LoadSceneRelationship.None); - } - public void LoadScene( int sceneIndex, - LoadSceneMode loadMode, - Action extraBindings, - LoadSceneRelationship containerMode) - { - LoadScene(sceneIndex, loadMode, extraBindings, containerMode, null); - } - - public void LoadScene( - int sceneIndex, - LoadSceneMode loadMode, - Action extraBindings, - LoadSceneRelationship containerMode, - Action extraBindingsLate) + LoadSceneMode loadMode = LoadSceneMode.Single, + Action extraBindings = null, + LoadSceneRelationship containerMode = LoadSceneRelationship.None, + Action extraBindingsLate = null) { PrepareForLoadScene(loadMode, extraBindings, extraBindingsLate, containerMode); @@ -207,38 +131,12 @@ public void LoadScene(int sceneIndex, LoadSceneMode loadMode) // we can't do that in this case since the scene isn't loaded until the next frame } - public AsyncOperation LoadSceneAsync(int sceneIndex) - { - return LoadSceneAsync(sceneIndex, LoadSceneMode.Single); - } - - public AsyncOperation LoadSceneAsync(int sceneIndex, LoadSceneMode loadMode) - { - return LoadSceneAsync(sceneIndex, loadMode, null); - } - - public AsyncOperation LoadSceneAsync( - int sceneIndex, LoadSceneMode loadMode, Action extraBindings) - { - return LoadSceneAsync(sceneIndex, loadMode, extraBindings, LoadSceneRelationship.None); - } - public AsyncOperation LoadSceneAsync( int sceneIndex, - LoadSceneMode loadMode, - Action extraBindings, - LoadSceneRelationship containerMode) - { - return LoadSceneAsync( - sceneIndex, loadMode, extraBindings, containerMode, null); - } - - public AsyncOperation LoadSceneAsync( - int sceneIndex, - LoadSceneMode loadMode, - Action extraBindings, - LoadSceneRelationship containerMode, - Action extraBindingsLate) + LoadSceneMode loadMode = LoadSceneMode.Single, + Action extraBindings = null, + LoadSceneRelationship containerMode = LoadSceneRelationship.None, + Action extraBindingsLate = null) { PrepareForLoadScene(loadMode, extraBindings, extraBindingsLate, containerMode);