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

Fix dds and texture cube import

Browse Source
This commit is contained in:
Simon Lübeß
2024-06-03 00:46:55 +02:00
parent 108b31399a
commit 1b38a41dfc
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEditor/src/Assets/Importers/DdsImporter.bf
+5
View File
@@ -728,6 +728,11 @@ static class DdsImporter
{ {
height = 1; height = 1;
} }
if (depth == 0)
{
depth = 1;
}
offset += numBytes; offset += numBytes;
} }
GlitchyEditor/src/Assets/Importers/TextureImporter.bf
+8 -3
View File
@@ -359,14 +359,18 @@ class ProcessedTexture : ProcessedResource
public void SetSurfaceCount(int arraySize, int mipMapCount) public void SetSurfaceCount(int arraySize, int mipMapCount)
{ {
ArraySize = arraySize;
if (IsCubeMap)
ArraySize *= 6;
Log.EngineLogger.AssertDebug(Surfaces == null || arraySize > Surfaces.GetLength(0)); Log.EngineLogger.AssertDebug(Surfaces == null || arraySize > Surfaces.GetLength(0));
Log.EngineLogger.AssertDebug(Surfaces == null ||mipMapCount > Surfaces.GetLength(1)); Log.EngineLogger.AssertDebug(Surfaces == null ||mipMapCount > Surfaces.GetLength(1));
ArraySize = arraySize;
MipMapCount = mipMapCount; MipMapCount = mipMapCount;
TextureSurface[,] oldSurfaces = Surfaces; TextureSurface[,] oldSurfaces = Surfaces;
Surfaces = new TextureSurface[arraySize, mipMapCount]; Surfaces = new TextureSurface[ArraySize, MipMapCount];
if (oldSurfaces != null) if (oldSurfaces != null)
{ {
@@ -415,7 +419,8 @@ class TextureProcessor : IAssetProcessor
{ {
ProcessedTexture.TextureSurface surface = new .(loadedSurface.Width, loadedSurface.Height, loadedSurface.Depth, ProcessedTexture.TextureSurface surface = new .(loadedSurface.Width, loadedSurface.Height, loadedSurface.Depth,
loadedSurface.Data, loadedSurface.MipLevel, loadedSurface.ArrayIndex, loadedSurface.Pitch, loadedSurface.SlicePitch); loadedSurface.Data, loadedSurface.MipLevel, loadedSurface.ArrayIndex, loadedSurface.Pitch, loadedSurface.SlicePitch);
processedTexture.Surfaces[loadedSurface.ArrayIndex, loadedSurface.MipLevel] = surface;
processedTexture.Surfaces[loadedSurface.ArrayIndex * (processedTexture.IsCubeMap ? 6 : 1) + loadedSurface.CubeFace, loadedSurface.MipLevel] = surface;
} }
if (!(config.GenerateMipMaps case .No)) if (!(config.GenerateMipMaps case .No))