From e7d10d256ee1986e85455c9994eb662afa1d798e Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Sun, 27 Mar 2022 16:12:41 +0300 Subject: [PATCH] wipshit --- .../Settings/EngineSettings/TimeSettings.json | 6 +- Source/Game/Q3MapImporter.cs | 62 ++++++++++++++++++- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/Content/Settings/EngineSettings/TimeSettings.json b/Content/Settings/EngineSettings/TimeSettings.json index 8141f5d..baeb0d1 100644 --- a/Content/Settings/EngineSettings/TimeSettings.json +++ b/Content/Settings/EngineSettings/TimeSettings.json @@ -1,11 +1,11 @@ { "ID": "a55dc3c04da4ea3744b7f1994565beac", "TypeName": "FlaxEditor.Content.Settings.TimeSettings", - "EngineBuild": 6228, + "EngineBuild": 6331, "Data": { - "UpdateFPS": 120.0, + "UpdateFPS": 0.0, "PhysicsFPS": 120.0, - "DrawFPS": 120.0, + "DrawFPS": 0.0, "TimeScale": 1.0, "MaxUpdateDeltaTime": 0.1 } diff --git a/Source/Game/Q3MapImporter.cs b/Source/Game/Q3MapImporter.cs index b311875..f0dce7e 100644 --- a/Source/Game/Q3MapImporter.cs +++ b/Source/Game/Q3MapImporter.cs @@ -1,11 +1,14 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using FlaxEngine; using System.IO; using System.Linq; +using System.Runtime.Serialization; +using FlaxEditor; +using FlaxEditor.Windows; using FlaxEngine.Assertions; using Console = Cabrito.Console; +using Stopwatch = System.Diagnostics.Stopwatch; namespace Game { @@ -187,8 +190,63 @@ namespace Game vertices = new Vector3[0]; } + [OnSerializing] + internal void OnSerializing(StreamingContext context) + { + Debug.Log("OnSerializing: " + Editor.IsPlayMode); + } + + [OnSerialized] + internal void OnSerialized(StreamingContext context) + { + Debug.Log("OnSerialized: " + Editor.IsPlayMode); + } + + [OnDeserializing] + internal void OnDeserializing(StreamingContext context) + { + Debug.Log("OnDeserializing: " + Editor.IsPlayMode); + } + + [OnDeserialized] + internal void OnDeserialized(StreamingContext context) + { + Debug.Log("OnDeserialized: " + Editor.IsPlayMode); + } + public override void OnStart() { +#if false + Action onScriptsReloadBegin = null; + onScriptsReloadBegin = () => + { + Debug.Log("LoadMap ScriptsReloadEnd"); + Actor worldSpawnActor = Actor.GetChild("WorldSpawn"); + if (worldSpawnActor != null) + { + Debug.Log("LoadMap: removing DontSave flag"); + worldSpawnActor.HideFlags &= ~HideFlags.DontSave; + } + ScriptsBuilder.ScriptsReloadBegin -= onScriptsReloadBegin; + }; + ScriptsBuilder.ScriptsReloadBegin += onScriptsReloadBegin; + + Action onScriptsReloadEnd = null; + onScriptsReloadEnd = () => + { + Debug.Log("LoadMap ScriptsReloadEnd"); + Actor worldSpawnActor = Actor.GetChild("WorldSpawn"); + if (worldSpawnActor != null) + { + Debug.Log("LoadMap: restoring DontSave flag"); + worldSpawnActor.HideFlags |= HideFlags.DontSave; + } + ScriptsBuilder.ScriptsReloadEnd -= onScriptsReloadEnd; + }; + ScriptsBuilder.ScriptsReloadEnd += onScriptsReloadEnd; +#endif + + Debug.Log("LoadMap"); LoadMap(false); } @@ -203,7 +261,7 @@ namespace Game } else { - //Console.Print("Map already loaded in the scene"); + Console.Print("Map already loaded in the scene"); return; } }