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/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