Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update Texture reload to prevent crash due to wrong type. #2251

Merged
merged 6 commits into from
May 18, 2024
Merged

fix: Update Texture reload to prevent crash due to wrong type. #2251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3fccfc7
Add method to validate type from url
Doprez May 16, 2024
77d6c0a
added type validation
Doprez May 16, 2024
dc0c7cf
added Texture reload
Doprez May 16, 2024
29b5a7e
fixed unneseccary nesting
Doprez May 16, 2024
d2d3e97
eiderens suggestions
Doprez May 18, 2024
9046c59
removed double check
Doprez May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions sources/core/Stride.Core.Serialization/Serialization/Contents/ContentManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,18 @@ private object DeserializeObject(string initialUrl, string newUrl, Type type, ob
return result;
}

public bool TryGetLoadedAsset(string url, out object asset)
{
if (LoadedAssetUrls.TryGetValue(url, out var reference))
{
asset = reference.Object;
return true;
}

asset = null;
return false;
}

internal Reference FindDeserializedObject(string url, Type objType)
{
// Try to find already loaded object
Expand Down
15 changes: 12 additions & 3 deletions sources/engine/Stride.Graphics/Data/TextureContentSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,18 @@ internal static void Serialize(ArchiveMode mode, SerializationStream stream, Tex
{
var assetManager = services.GetService<ContentManager>();
assetManager.TryGetAssetUrl(graphicsResource, out var url);
var textureDataReloaded = assetManager.Load<Image>(url);
((Texture)graphicsResource).Recreate(textureDataReloaded.ToDataBox());
assetManager.Unload(textureDataReloaded);
var textureDataReloaded = assetManager.Load<object>(url);

if (textureDataReloaded is Image image)
{
((Texture)graphicsResource).Recreate(image.ToDataBox());
assetManager.Unload(textureDataReloaded);
}
else if (textureDataReloaded is Texture)
{
((Texture)graphicsResource).Recreate();
assetManager.Unload(textureDataReloaded);
}
};
}
}
Expand Down