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

Separate handling for hlsl and fx files

Browse Source
This commit is contained in:
Simon Lübeß
2025-02-11 23:07:04 +01:00
parent 06b981e88a
commit 7a306cac69
52 changed files with 155 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEditor/src/Assets/AssetThumbnailManager.bf
+5 -4
View File
@@ -18,14 +18,15 @@ class AssetThumbnailManager
if (assetNode.Path.EndsWith(".scene"))
return _icons.File_Scene;
if (assetNode.Path.EndsWith(".mat"))
return _icons.File_Material;
if (assetNode.Path.EndsWith(".cs"))
return _icons.File_CSharpScript;
if (assetNode.Path.EndsWith(".hlsl"))
return _icons.File_Shader;
return _icons.File_Hlsl;
if (assetNode.Path.EndsWith(".fx"))
return _icons.File_Effect;
if (assetNode.Path.EndsWith(".mat"))
return _icons.File_Material;
return _icons.File;
}
GlitchyEditor/src/Assets/Importers/ShaderImporter.bf
+1 -1
View File
@@ -28,7 +28,7 @@ class ShaderImporterConfig : AssetImporterConfig
class ShaderImporter : IAssetImporter
{
private static readonly List<StringView> _fileExtensions = new .(){".hlsl"} ~ delete _;
private static readonly List<StringView> _fileExtensions = new .(){".fx"} ~ delete _;
public static List<StringView> FileExtensions => _fileExtensions;
GlitchyEditor/src/Assets/Processors/ShaderCompiler.bf
+1
View File
@@ -201,6 +201,7 @@ extension ShaderCompiler
{
StringView str = StringView((char8*)errorBlob.GetBufferPointer(), (int)errorBlob.GetBufferSize());
Log.EngineLogger.Error($"Failed to compile Shader: Error Code({(int)result}): {result} | Error Message: {str}");
return .Err;
}
}
GlitchyEditor/src/Assets/Processors/ShaderProcessor.bf
+8 -1
View File
@@ -121,10 +121,17 @@ class ShaderProcessor : IAssetProcessor
// Name in Shader -> Name in Engine
Dictionary<StringView, StringView> engineBuffers = scope .();
ProcessedShader processedShader = null;
defer
{
ClearDictionaryAndDeleteValues!(variables);
ClearAndDeleteItems!(bufferNames);
if (@return case .Err)
{
delete processedShader;
}
}
String code = new String(importedShader.HlslCode);
@@ -138,7 +145,7 @@ class ShaderProcessor : IAssetProcessor
return .Ok;
}
ProcessedShader processedShader = new ProcessedShader(new AssetIdentifier(importedShader.AssetIdentifier), config.AssetHandle);
processedShader = new ProcessedShader(new AssetIdentifier(importedShader.AssetIdentifier), config.AssetHandle);
Try!(CompileAndReflect(vsName, psName, importedShader, code, processedShader));