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

Start of new materials, disable async asset loading

Browse Source
This commit is contained in:
Simon Lübeß
2024-11-30 16:21:00 +01:00
parent cf1f2a9a7b
commit 577cca5886
6 changed files with 203 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/Content/AssetType.bf
+2 -1
View File
@@ -5,5 +5,6 @@ enum AssetType : uint16
Unknown,
Texture,
Sprite,
Shader
Shader,
Material
}
GlitchyEngine/src/Content/ContentManager.bf
+13 -8
View File
@@ -94,27 +94,27 @@ namespace GlitchyEngine.Content
}
/// Loads the specified asset with the given contentManager or the current applications content manager.
public static T GetAsset<T>(AssetHandle handle, IContentManager contentManager = null) where T : Asset
public static T GetAsset<T>(AssetHandle handle, IContentManager contentManager = null, bool blocking = false) where T : Asset
{
var contentManager;
if (contentManager == null)
contentManager = Application.Get().ContentManager;
Asset asset = contentManager.GetAsset(typeof(T), handle);
Asset asset = contentManager.GetAsset(typeof(T), handle, blocking);
return (T)asset;
}
/// Loads the specified asset with the given contentManager or the current applications content manager.
public static Asset GetAsset(AssetHandle handle, IContentManager contentManager = null)
public static Asset GetAsset(AssetHandle handle, IContentManager contentManager = null, bool blocking = false)
{
var contentManager;
if (contentManager == null)
contentManager = Application.Instance.ContentManager;
Asset asset = contentManager.GetAsset(null, handle);
Asset asset = contentManager.GetAsset(null, handle, blocking);
return asset;
}
@@ -142,20 +142,25 @@ namespace GlitchyEngine.Content
interface IContentManager
{
/// Loads the Asset with the given handle and returns the handle.
/// Loads the Asset with the given identifier and returns the handle.
/// @param assetIdentifier The identifier of the asset to load.
/// @param blocking If false, the AssetHandle might represent a placeholder until the asset is finished loading.
/// If true, LoadAsset will wait until the Asset is loaded and the handle represents the actual asset.
/// @return An AssetHandle representing the Asset identifierd by the specified assetIdentifier or a placeholder.
/// If the asset doesn't exist or loading failed, the Handle will represent an error-placeholder.
AssetHandle LoadAsset(StringView assetIdentifier, bool blocking = false);
/// Loads the Asset with the given handle and returns the handle. Returns .Invalid, if the asset handle doesn't exist.
AssetHandle LoadAsset(AssetHandle handle, bool blocking = false);
/// Returns the asset for the given handle or null, if it isn't loaded.
Asset GetAsset(AssetHandle handle)
Asset GetAsset(AssetHandle handle, bool blocking = false)
{
return GetAsset(null, handle);
return GetAsset(null, handle, blocking);
}
/// Returns the asset for the given handle or the default asset of the given type.
Asset GetAsset(Type assetType, AssetHandle handle);
Asset GetAsset(Type assetType, AssetHandle handle, bool blocking = false);
/// The content manager will manage the asset (e.g. provide it when LoadAsset is called with the assets identifier)
AssetHandle ManageAsset(Asset asset);