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

Tweaks / Cleanup.

Browse Source
This commit is contained in:
Jean-Baptiste Perrier
2021-05-20 17:28:55 +02:00
parent 66c1201786
commit 9fb2952996
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Editor/Editor.cs
View File

@@ -46,6 +46,7 @@ namespace FlaxEditor
private bool _isAfterInit, _areModulesInited, _areModulesAfterInitEnd, _isHeadlessMode;
private string _projectToOpen;
private float _lastAutoSaveTimer;
private Guid _startupSceneCmdLine;
private const string ProjectDataLastScene = "LastScene";
private const string ProjectDataLastSceneSpawn = "LastSceneSpawn";
@@ -271,14 +272,11 @@ namespace FlaxEditor
module.OnEndInit();
}
private Guid _startupSceneArgument;
internal void Init(bool isHeadless, bool skipCompile, Guid sceneId)
internal void Init(bool isHeadless, bool skipCompile, Guid startupScene)
{
Debug.Log("sceneId string : " + JsonSerializer.GetStringID(sceneId));
EnsureState<LoadingState>();
_isHeadlessMode = isHeadless;
_startupSceneArgument = sceneId;
_startupSceneCmdLine = startupScene;
Log("Editor init");
if (isHeadless)
Log("Running in headless mode");
@@ -338,11 +336,11 @@ namespace FlaxEditor
// Load scene
// scene cmd line argument
var scene = ContentDatabase.Find(_startupSceneArgument);
var scene = ContentDatabase.Find(_startupSceneCmdLine);
if (scene is SceneItem)
{
Editor.Log("Loading scene specified in command line");
Scene.OpenScene(_startupSceneArgument);
Scene.OpenScene(_startupSceneCmdLine);
return;
}