Fix game plugins initialization order in Editor play mode to mock the standalone game
#458
This commit is contained in:
@@ -131,12 +131,11 @@ namespace FlaxEditor.States
|
||||
_duplicateScenes.GatherSceneData();
|
||||
Editor.Internal_SetPlayMode(true);
|
||||
IsPaused = false;
|
||||
PluginManager.InitializeGamePlugins();
|
||||
_duplicateScenes.CreateScenes();
|
||||
SceneDuplicated?.Invoke();
|
||||
RestoreSelection();
|
||||
|
||||
PluginManager.InitializeGamePlugins();
|
||||
|
||||
Editor.OnPlayBegin();
|
||||
}
|
||||
|
||||
@@ -165,6 +164,7 @@ namespace FlaxEditor.States
|
||||
// Restore editor scene
|
||||
SceneRestoring?.Invoke();
|
||||
_duplicateScenes.DeletedScenes();
|
||||
PluginManager.DeinitializeGamePlugins();
|
||||
Editor.Internal_SetPlayMode(false);
|
||||
_duplicateScenes.RestoreSceneData();
|
||||
SceneRestored?.Invoke();
|
||||
@@ -177,8 +177,6 @@ namespace FlaxEditor.States
|
||||
IsPaused = true;
|
||||
RestoreSelection();
|
||||
|
||||
PluginManager.DeinitializeGamePlugins();
|
||||
|
||||
Editor.OnPlayEnd();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,10 +82,8 @@ namespace FlaxEngine
|
||||
//return !pluginDesc.DisabledByDefault;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initialize all <see cref="GamePlugin"/>
|
||||
/// </summary>
|
||||
public static void InitializeGamePlugins()
|
||||
#if FLAX_EDITOR
|
||||
internal static void InitializeGamePlugins()
|
||||
{
|
||||
for (var i = 0; i < _gamePlugins.Count; i++)
|
||||
{
|
||||
@@ -93,16 +91,14 @@ namespace FlaxEngine
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Deinitialize all <see cref="GamePlugin"/>
|
||||
/// </summary>
|
||||
public static void DeinitializeGamePlugins()
|
||||
internal static void DeinitializeGamePlugins()
|
||||
{
|
||||
for (var i = _gamePlugins.Count - 1; i >= 0; i--)
|
||||
{
|
||||
InvokeDeinitialize(_gamePlugins[i]);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
private static void InvokeInitialize(Plugin plugin)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user