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

Fixed Textures in Materials

Browse Source
This commit is contained in:
Simon Lübeß
2023-03-16 23:32:02 +01:00
parent cfa046d2ea
commit 7b6662cbc4
4 changed files with 38 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEditor/src/Assets/MaterialAssetLoader.bf
+8 -8
View File
@@ -84,11 +84,10 @@ class MaterialAssetPropertiesEditor : AssetPropertiesEditor
{
StringView path = .((char8*)payload.Data, (int)payload.DataSize);
AssetHandle<Texture2D> newTexture = Content.LoadAsset(path);//new Texture2D(path, true))
AssetHandle<Texture2D> newTexture = Content.LoadAsset(path);
newTexture.Get().SamplerState = SamplerStateManager.AnisotropicWrap;
material.SetTexture(texture.key, newTexture);
// TODO!!!
material.SetTexture(texture.key, newTexture.Cast<Texture>());
}
ImGui.EndDragDropTarget();
@@ -98,7 +97,6 @@ class MaterialAssetPropertiesEditor : AssetPropertiesEditor
private void ShowVariables(Material material, Effect effect)
{
for (let (name, arguments) in effect.[Friend]_variableDescriptions)
{
let variable = effect.Variables[name];
@@ -350,9 +348,9 @@ class MaterialAssetLoader : IAssetLoader, IAssetSaver //, IReloadingAssetLoader
for (let (slotName, textureIdentifier) in materialFile.Textures)
{
Texture texture = Content.GetAsset<Texture>(contentManager.LoadAsset(textureIdentifier), contentManager);
AssetHandle<Texture> texture = contentManager.LoadAsset(textureIdentifier);
if (texture == null)
if (texture.IsInvalid)
{
Log.EngineLogger.Error($"Failed to load texture \"{textureIdentifier}\".");
// TODO: LoadAsset should return an error texture.
@@ -408,7 +406,9 @@ class MaterialAssetLoader : IAssetLoader, IAssetSaver //, IReloadingAssetLoader
for (let (slotName, texture) in material.[Friend]_textures)
{
materialFile.Textures.Add(new String(slotName), new String(texture?.Identifier ?? ""));
Texture textureAsset = texture.Get();
materialFile.Textures.Add(new String(slotName), new String(textureAsset?.Identifier ?? ""));
}
Effect effect = material.Effect;
GlitchyEditor/src/EditWindows/PropertiesWindow.bf
-9
View File
@@ -19,7 +19,6 @@ class PropertiesWindow : EditorWindow
private append String _selectedFileName = .();
private AssetHandle _currentAssetHandle;
//private Asset _currentAsset;
public this(Editor editor)
{
@@ -83,14 +82,6 @@ class PropertiesWindow : EditorWindow
_currentAssetHandle = _editor.ContentManager.LoadAsset(assetFile.Identifier);
}
/*if (asset != _currentAsset)
{
_currentAsset?.ReleaseRef();
_currentAsset = asset;
_currentAsset?.AddRef();
}*/
// TODO: allow changing AssetLoader
// assetFile.AssetConfig.AssetLoade