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

Fix.

Browse Source
This commit is contained in:
Jean-Baptiste Perrier
2021-05-20 20:03:58 +02:00
parent 316590ec59
commit 8eb6fd2b6b
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Editor/Editor.cs
View File

@@ -1320,9 +1320,18 @@ namespace FlaxEditor
AnimGraphDebugFlow?.Invoke(debugFlow); AnimGraphDebugFlow?.Invoke(debugFlow);
} }
internal static void Internal_RequestStartPlay() private static void RequestStartPlayOnStartup()
{ {
Instance.Simulation.RequestStartPlay(); if (Instance.StateMachine.IsEditMode)
{
Instance.Simulation.RequestStartPlay();
Instance.StateMachine.StateChanged -= RequestStartPlayOnStartup;
}
}
internal static void Internal_RequestStartPlayOnStartup()
{
Instance.StateMachine.StateChanged += RequestStartPlayOnStartup;
} }
[MethodImpl(MethodImplOptions.InternalCall)] [MethodImpl(MethodImplOptions.InternalCall)]

12
Source/Editor/Managed/ManagedEditor.cpp
View File

@@ -35,7 +35,7 @@ MMethod* Internal_GetGameWindowSize = nullptr;
MMethod* Internal_OnAppExit = nullptr; MMethod* Internal_OnAppExit = nullptr;
MMethod* Internal_OnVisualScriptingDebugFlow = nullptr; MMethod* Internal_OnVisualScriptingDebugFlow = nullptr;
MMethod* Internal_OnAnimGraphDebugFlow = nullptr; MMethod* Internal_OnAnimGraphDebugFlow = nullptr;
MMethod* Internal_RequestStartPlay = nullptr; MMethod* Internal_RequestStartPlayOnStartup = nullptr;
void OnLightmapsBake(ShadowsOfMordor::BuildProgressStep step, float stepProgress, float totalProgress, bool isProgressEvent) void OnLightmapsBake(ShadowsOfMordor::BuildProgressStep step, float stepProgress, float totalProgress, bool isProgressEvent)
{ {
@@ -232,7 +232,7 @@ void ManagedEditor::Init()
args[0] = &isHeadless; args[0] = &isHeadless;
args[1] = &skipCompile; args[1] = &skipCompile;
Guid sceneId; Guid sceneId;
if (Guid::Parse(CommandLine::Options.Game.GetValue(), sceneId)) if (CommandLine::Options.Game.HasValue() && Guid::Parse(CommandLine::Options.Game.GetValue(), sceneId))
{ {
sceneId = Guid::Empty; sceneId = Guid::Empty;
} }
@@ -492,12 +492,12 @@ void ManagedEditor::RequestStartPlay()
{ {
if (!HasManagedInstance()) if (!HasManagedInstance())
return; return;
if (Internal_RequestStartPlay == nullptr) if (Internal_RequestStartPlayOnStartup == nullptr)
{ {
Internal_RequestStartPlay = GetClass()->GetMethod("Internal_RequestStartPlay"); Internal_RequestStartPlayOnStartup = GetClass()->GetMethod("Internal_RequestStartPlayOnStartup");
ASSERT(Internal_RequestStartPlay); ASSERT(Internal_RequestStartPlayOnStartup);
} }
Internal_RequestStartPlay->Invoke(GetManagedInstance(), nullptr, nullptr); Internal_RequestStartPlayOnStartup->Invoke(GetManagedInstance(), nullptr, nullptr);
} }
void ManagedEditor::OnEditorAssemblyLoaded(MAssembly* assembly) void ManagedEditor::OnEditorAssemblyLoaded(MAssembly* assembly)