GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'reload-scene' of https://github.com/Tryibion/FlaxEngine into Tryibion-reload-scene

Browse Source
This commit is contained in:
Wojtek Figat
2024-11-05 10:44:13 +01:00
parent 854aa2fca6 bd344e8137
commit b393cb70bf
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Source/Editor/States/ChangingScenesState.cs
View File

@@ -109,29 +109,42 @@ namespace FlaxEditor.States
private void TryEnter()
{
// Remove redundant scene changes
for (int i = 0; i < _scenesToUnload.Count; i++)
// Reload existing scene if only 1 scene exists
bool reloadExistingScene = false;
if (Level.Scenes.Length == 1 && _scenesToLoad.Count == 1)
{
var id = _scenesToUnload[i].ID;
for (int j = 0; j < _scenesToLoad.Count; j++)
if (Level.FindScene(_scenesToLoad[0]))
{
if (_scenesToLoad[j] == id)
{
_scenesToLoad.RemoveAt(j--);
_scenesToUnload.RemoveAt(i);
break;
}
reloadExistingScene = true;
}
}
// Skip already loaded scenes
for (int j = 0; j < _scenesToLoad.Count; j++)
if (!reloadExistingScene)
{
if (Level.FindScene(_scenesToLoad[j]))
// Remove redundant scene changes
for (int i = 0; i < _scenesToUnload.Count; i++)
{
_scenesToLoad.RemoveAt(j--);
if (_scenesToLoad.Count == 0)
break;
var id = _scenesToUnload[i].ID;
for (int j = 0; j < _scenesToLoad.Count; j++)
{
if (_scenesToLoad[j] == id)
{
_scenesToLoad.RemoveAt(j--);
_scenesToUnload.RemoveAt(i);
break;
}
}
}
// Skip already loaded scenes
for (int j = 0; j < _scenesToLoad.Count; j++)
{
if (Level.FindScene(_scenesToLoad[j]))
{
_scenesToLoad.RemoveAt(j--);
if (_scenesToLoad.Count == 0)
break;
}
}
}