Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replaces overloads with optionals in SceneLoader. #611

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

replaces overloads with optionals in SceneLoader. #611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 17 additions & 119 deletions UnityProject/Assets/Plugins/Zenject/Source/Util/ZenjectSceneLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,37 +34,12 @@ public 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(
// 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 @@ void PrepareForLoadScene(
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(
// 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