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

Engine barely starts again

Browse Source
This commit is contained in:
Simon Lübeß
2024-11-21 18:16:41 +01:00
parent ad73abd4ea
commit bcf75bf8cb
32 changed files with 299 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEditor/resources/Shaders/ACES.hlsl.ass
+9 -3
View File
@@ -1,5 +1,11 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 5360037389314667000
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = null,
AssetHandle = 5221334043827499251
}
GlitchyEditor/resources/Shaders/ClearUInt.hlsl.ass
+3 -3
View File
@@ -1,6 +1,6 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
@@ -9,5 +9,5 @@
ExporterConfig = {
_compression = .None
},
AssetHandle = 7951861132321655812
AssetHandle = 8512375832990505152
}
GlitchyEditor/resources/Shaders/GammaCorrect.hlsl.ass
+11 -3
View File
@@ -1,5 +1,13 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 7082287996527160060
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = {
_compression = .None
},
AssetHandle = 4332390465159443321
}
GlitchyEditor/resources/Shaders/GlitchyEngine.hlsl.ass
+9 -3
View File
@@ -1,5 +1,11 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 17297254839128368932
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = null,
AssetHandle = 9285471614459748654
}
GlitchyEditor/resources/Shaders/LightingFunctions.hlsl.ass
+9 -3
View File
@@ -1,5 +1,11 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 17917061300990589192
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = null,
AssetHandle = 1287916870077203420
}
GlitchyEditor/resources/Shaders/PBR.hlsl.ass
+9 -3
View File
@@ -1,5 +1,11 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 8336560834161185660
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = null,
AssetHandle = 9019615224633186177
}
GlitchyEditor/resources/Shaders/RenderTargetGroupViewer.hlsl.ass
+11 -3
View File
@@ -1,5 +1,13 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 1518912886664733757
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = {
_compression = .None
},
AssetHandle = 5246795156071151642
}
GlitchyEditor/resources/Shaders/ShaderHelpers.hlsl.ass
+9 -3
View File
@@ -1,5 +1,11 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 13663488523997149295
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = null,
AssetHandle = 10014069858860408945
}
GlitchyEditor/resources/Shaders/SimpleTonemapping.hlsl.ass
+11 -3
View File
@@ -1,5 +1,13 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 9450907808112906391
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = {
_compression = .None
},
AssetHandle = 6905134680069212587
}
GlitchyEditor/resources/Shaders/circlebatch.hlsl.ass
+11 -3
View File
@@ -1,5 +1,13 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 4086392147967882920
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = {
_compression = .None
},
AssetHandle = 4179932137221776017
}
GlitchyEditor/resources/Shaders/lineShader.hlsl.ass
+11 -3
View File
@@ -1,5 +1,13 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 3929078354809894230
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = {
_compression = .None
},
AssetHandle = 8912920142436784175
}
GlitchyEditor/resources/Shaders/linebatch.hlsl.ass
+11 -3
View File
@@ -1,5 +1,13 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 5414648614681927202
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = {
_compression = .None
},
AssetHandle = 18151489828256118978
}
GlitchyEditor/resources/Shaders/msdfShader.hlsl.ass
+11 -3
View File
@@ -1,5 +1,13 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 17001330646928133106
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = {
_compression = .None
},
AssetHandle = 8655864411897316846
}
GlitchyEditor/resources/Shaders/myEffect.hlsl.ass
+11 -3
View File
@@ -1,5 +1,13 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 2913314865396454015
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = {
_compression = .None
},
AssetHandle = 8873320878521542705
}
GlitchyEditor/resources/Shaders/simpleLight.hlsl.ass
+11 -3
View File
@@ -1,5 +1,13 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 9047671870217222298
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = {
_compression = .None
},
AssetHandle = 14993433232700867484
}
GlitchyEditor/resources/Shaders/spritebatch.hlsl.ass
+3 -3
View File
@@ -1,6 +1,6 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
@@ -9,5 +9,5 @@
ExporterConfig = {
_compression = .None
},
AssetHandle = 959631876667366082
AssetHandle = 9671561114069837759
}
GlitchyEditor/resources/Shaders/textureViewerShader.hlsl.ass
+11 -3
View File
@@ -1,5 +1,13 @@
{
AssetLoader = "EffectAssetLoader",
Config = (GlitchyEditor.Assets.EffectAssetLoaderConfig){}/* No reflection data for GlitchyEditor.Assets.EffectAssetLoaderConfig. Add [BonTarget] or force it */,
AssetHandle = 10276018270467402814
AssetLoader = null,
Config = null,
Importer = "ShaderImporter",
ImporterConfig = null,
Processor = null,
ProcessorConfig = null,
Exporter = null,
ExporterConfig = {
_compression = .None
},
AssetHandle = 13990953346248142933
}
GlitchyEditor/src/EditWindows/AssetViewer.bf
+6 -6
View File
@@ -566,23 +566,23 @@ class TexturererViewerer
// Int Texture
_renderTargetEffect.Variables["Mode"].SetData(1);
_renderTargetEffect.SetTexture("IntTexture", viewedTexture);
_renderTargetEffect.SetTexture("UIntTexture", null);
_renderTargetEffect.SetTexture("Texture", null);
_renderTargetEffect.SetTexture("UIntTexture", (Texture)null);
_renderTargetEffect.SetTexture("Texture", (Texture)null);
}
else if (format.IsUInt())
{
// UInt Texture
_renderTargetEffect.Variables["Mode"].SetData(2);
_renderTargetEffect.SetTexture("IntTexture", null);
_renderTargetEffect.SetTexture("IntTexture", (Texture)null);
_renderTargetEffect.SetTexture("UIntTexture", viewedTexture);
_renderTargetEffect.SetTexture("Texture", null);
_renderTargetEffect.SetTexture("Texture", (Texture)null);
}
else
{
// Float Texture
_renderTargetEffect.Variables["Mode"].SetData(0);
_renderTargetEffect.SetTexture("IntTexture", null);
_renderTargetEffect.SetTexture("UIntTexture", null);
_renderTargetEffect.SetTexture("IntTexture", (Texture)null);
_renderTargetEffect.SetTexture("UIntTexture", (Texture)null);
_renderTargetEffect.SetTexture("Texture", viewedTexture);
}
GlitchyEditor/src/EditorContentManager.bf
+8 -1
View File
@@ -971,7 +971,10 @@ class EditorContentManager : IContentManager
TreeNode<AssetNode> assetNode = TrySilent!(AssetHierarchy.GetNodeFromAssetHandle(handle));
_assetConverter.QueueForProcessing(assetNode->AssetFile, isBlocking);
var isBlocking;
isBlocking = true;
if (isBlocking)
{
asset = _assetCache.GetCacheEntry(handle);
@@ -1017,6 +1020,10 @@ class EditorContentManager : IContentManager
return placeholder;
}
var isBlocking;
isBlocking = true;
if (isBlocking)
return InternalLoad(asset);
else