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

Improve Json Asset development workflow

Browse Source
This commit is contained in:
Wojtek Figat
2022-04-13 21:19:10 +02:00
parent 9fb4624b03
commit a27d69f852
3 changed files with 60 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/Core/Config/GameSettings.cs
View File

@@ -202,7 +202,7 @@ namespace FlaxEditor.Content.Settings
var asset = FlaxEngine.Content.LoadAsync<JsonAsset>(GameSettingsAssetPath);
if (asset && !asset.WaitForLoaded())
{
if (asset.CreateInstance() is GameSettings result)
if (asset.Instance is GameSettings result)
return result;
}
return new GameSettings();
@@ -212,7 +212,7 @@ namespace FlaxEditor.Content.Settings
{
if (asset && !asset.WaitForLoaded())
{
if (asset.CreateInstance() is T result)
if (asset.Instance is T result)
return result;
}
return new T();
@@ -222,7 +222,7 @@ namespace FlaxEditor.Content.Settings
{
if (asset && !asset.WaitForLoaded() && asset.DataTypeName == typename)
{
if (asset.CreateInstance() is SettingsBase result)
if (asset.Instance is SettingsBase result)
return result;
}
return null;
@@ -314,7 +314,7 @@ namespace FlaxEditor.Content.Settings
{
if (e.Value && !e.Value.WaitForLoaded() && e.Value.DataTypeName == type.FullName)
{
var custom = e.Value.CreateInstance();
var custom = e.Value.Instance;
if (custom is T result)
return result;
}