ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-07-07 18:31:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improved error message for missing .dds files on XML import

Browse Source
This commit is contained in:
dexy 2021-04-14 14:07:37 +10:00
parent fc0d84d9dd
commit d6b4d0b3a5
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CodeWalker.Core/GameFiles/Resources/Texture.cs
View File

@ -553,26 +553,37 @@ namespace CodeWalker.GameFiles
Format = Xml.GetChildEnumInnerText<TextureFormat>(node, "Format"); Format = Xml.GetChildEnumInnerText<TextureFormat>(node, "Format");
var filename = Xml.GetChildInnerText(node, "FileName"); var filename = Xml.GetChildInnerText(node, "FileName");
try
if ((!string.IsNullOrEmpty(filename)) && (!string.IsNullOrEmpty(ddsfolder)))
{ {
var filepath = Path.Combine(ddsfolder, filename); var filepath = Path.Combine(ddsfolder, filename);
if (File.Exists(filepath)) if (File.Exists(filepath))
{ {
var dds = File.ReadAllBytes(filepath); try
var tex = DDSIO.GetTexture(dds);
if (tex != null)
{ {
Data = tex.Data; var dds = File.ReadAllBytes(filepath);
Width = tex.Width; var tex = DDSIO.GetTexture(dds);
Height = tex.Height; if (tex != null)
Depth = tex.Depth; {
Levels = tex.Levels; Data = tex.Data;
Format = tex.Format; Width = tex.Width;
Stride = tex.Stride; Height = tex.Height;
Depth = tex.Depth;
Levels = tex.Levels;
Format = tex.Format;
Stride = tex.Stride;
}
}
catch
{
throw new Exception("Texture file format not supported:\n" + filepath);
} }
} }
else
{
throw new Exception("Texture file not found:\n" + filepath);
}
} }
catch { }
} }