Skip to content

Commit

Permalink
replaces overloads with optionals in SceneLoader.
Browse files Browse the repository at this point in the history 
This allows defaults and explicit values to be used in any combination,
and makes those defaults clear.
  • Loading branch information
@bowlercaptain @svermeulen
bowlercaptain authored and svermeulen committed May 5, 2019
1 parent 029112e commit 7f2e1ab
Showing 1 changed file with 17 additions and 119 deletions.
136 changes: 17 additions & 119 deletions UnityProject/Assets/Plugins/Zenject/Source/Util/ZenjectSceneLoader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<DiContainer> extraBindings)
{
LoadScene(sceneName, loadMode, extraBindings, LoadSceneRelationship.None);
}

public void LoadScene(
string sceneName,
LoadSceneMode loadMode,
Action<DiContainer> extraBindings,
LoadSceneRelationship containerMode)
{
LoadScene(sceneName, loadMode, extraBindings, containerMode, null);
}

public void LoadScene(
string sceneName,
LoadSceneMode loadMode,
Action<DiContainer> extraBindings,
LoadSceneRelationship containerMode,
Action<DiContainer> extraBindingsLate)
LoadSceneMode loadMode = LoadSceneMode.Single,
Action<DiContainer> extraBindings = null,
LoadSceneRelationship containerMode = LoadSceneRelationship.None,
Action<DiContainer> extraBindingsLate = null)
{
PrepareForLoadScene(loadMode, extraBindings, extraBindingsLate, containerMode);

Expand All @@ -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<DiContainer> extraBindings)
{
return LoadSceneAsync(sceneName, loadMode, extraBindings, LoadSceneRelationship.None);
}

public AsyncOperation LoadSceneAsync(
public AsyncOperation LoadSceneAsync(
string sceneName,
LoadSceneMode loadMode,
Action<DiContainer> extraBindings,
LoadSceneRelationship containerMode)
{
return LoadSceneAsync(
sceneName, loadMode, extraBindings, containerMode, null);
}

public AsyncOperation LoadSceneAsync(
string sceneName,
LoadSceneMode loadMode,
Action<DiContainer> extraBindings,
LoadSceneRelationship containerMode,
Action<DiContainer> extraBindingsLate)
LoadSceneMode loadMode = LoadSceneMode.Single,
Action<DiContainer> extraBindings = null,
LoadSceneRelationship containerMode = LoadSceneRelationship.None,
Action<DiContainer> extraBindingsLate = null)
{
PrepareForLoadScene(loadMode, extraBindings, extraBindingsLate, containerMode);

Expand Down Expand Up @@ -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<DiContainer> extraBindings)
{
LoadScene(sceneIndex, loadMode, extraBindings, LoadSceneRelationship.None);
}

public void LoadScene(
int sceneIndex,
LoadSceneMode loadMode,
Action<DiContainer> extraBindings,
LoadSceneRelationship containerMode)
{
LoadScene(sceneIndex, loadMode, extraBindings, containerMode, null);
}

public void LoadScene(
int sceneIndex,
LoadSceneMode loadMode,
Action<DiContainer> extraBindings,
LoadSceneRelationship containerMode,
Action<DiContainer> extraBindingsLate)
LoadSceneMode loadMode = LoadSceneMode.Single,
Action<DiContainer> extraBindings = null,
LoadSceneRelationship containerMode = LoadSceneRelationship.None,
Action<DiContainer> extraBindingsLate = null)
{
PrepareForLoadScene(loadMode, extraBindings, extraBindingsLate, containerMode);

Expand All @@ -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<DiContainer> extraBindings)
{
return LoadSceneAsync(sceneIndex, loadMode, extraBindings, LoadSceneRelationship.None);
}

public AsyncOperation LoadSceneAsync(
int sceneIndex,
LoadSceneMode loadMode,
Action<DiContainer> extraBindings,
LoadSceneRelationship containerMode)
{
return LoadSceneAsync(
sceneIndex, loadMode, extraBindings, containerMode, null);
}

public AsyncOperation LoadSceneAsync(
int sceneIndex,
LoadSceneMode loadMode,
Action<DiContainer> extraBindings,
LoadSceneRelationship containerMode,
Action<DiContainer> extraBindingsLate)
LoadSceneMode loadMode = LoadSceneMode.Single,
Action<DiContainer> extraBindings = null,
LoadSceneRelationship containerMode = LoadSceneRelationship.None,
Action<DiContainer> extraBindingsLate = null)
{
PrepareForLoadScene(loadMode, extraBindings, extraBindingsLate, containerMode);

Expand Down

0 comments on commit 7f2e1ab

Please sign in to comment.