Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

EditorContentManager: Fixed asset reloading

Browse Source 
(thats why unit tests exist... or at least types...)
This commit is contained in:
Simon Lübeß
2023-09-29 18:56:37 +02:00
parent d32bc6c475
commit bad7b08046
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEditor/src/EditorContentManager.bf
+4 -6
View File
@@ -267,14 +267,11 @@ class EditorContentManager : IContentManager
GetResourceAndSubassetName(oldIdentifier, let resourceName, let subassetName);
String filePath = scope .();
GetResourceFilePath(resourceName, filePath);
Result<TreeNode<AssetNode>> resultNode = AssetHierarchy.GetNodeFromPath(filePath);
Result<TreeNode<AssetNode>> resultNode = AssetHierarchy.GetNodeFromAssetHandle(handle);
if (resultNode case .Err)
{
Log.EngineLogger.Error($"Could not find asset \"{filePath}\".");
Log.EngineLogger.Error($"Could not find asset node for asset \"{oldIdentifier}\".");
return;
}
@@ -282,7 +279,7 @@ class EditorContentManager : IContentManager
IAssetLoader assetLoader = GetAssetLoader(file);
Stream stream = GetStream(filePath, true);
Stream stream = OpenStream(file.FilePath, true);
// TODO: Add async loading!
Asset loadedAsset = assetLoader.LoadAsset(stream, file.AssetConfig.Config, resourceName, subassetName, this);
@@ -709,6 +706,7 @@ class EditorContentManager : IContentManager
return .Ok;
}
// Returns a filestream for the given asset file path
private Stream OpenStream(StringView fileName, bool readOnly)
{
FileStream fs = new FileStream();