marc/libdgf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add DAT unwrapping when extracting texture

Browse source
This commit is contained in:
Yukai Li 2021-03-17 12:55:52 -06:00
parent b019eabcdc
commit 4c802c488c
1 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
LibDgf.Graphics/Mesh/ObjConverter.cs
View file

@ -45,6 +45,11 @@ namespace LibDgf.Graphics.Mesh
}
}
public void ConvertObj(Tdb tdb, StreamWriter sw)
{
WriteObj(tdb, sw, 1);
}
TxmHeader CreateTexture(Tdb tdb, int index, out ulong textureId)
{
var tdbTexture = tdb.Textures[index];
@ -266,7 +271,7 @@ namespace LibDgf.Graphics.Mesh
}
}
public void ExportTextures(StreamWriter mtlWriter, string outputPath)
public void ExportTextures(StreamWriter mtlWriter, string outputPath, bool forceDirect = false)
{
if (disposedValue) throw new ObjectDisposedException(GetType().FullName);
if (textureDat == null) throw new InvalidOperationException("No texture pack supplied.");
@ -290,12 +295,30 @@ namespace LibDgf.Graphics.Mesh
try
{
// Check if TXM is already suitable
if (/*pakTxm.ImageSourcePixelFormat == textureTxm.ImageSourcePixelFormat &&*/
if (forceDirect ||
/*pakTxm.ImageSourcePixelFormat == textureTxm.ImageSourcePixelFormat &&*/
pakTxm.ImageBufferBase == textureTxm.ImageBufferBase &&
pakTxm.ClutPixelFormat == textureTxm.ClutPixelFormat &&
pakTxm.ClutBufferBase == textureTxm.ClutBufferBase)
{
// Use TXM as-is
txmMs.Seek(0, SeekOrigin.Begin);
if (new string(txmBr.ReadChars(4)) == "DAT\0")
{
// Unwrap DAT
txmMs.Seek(0, SeekOrigin.Begin);
using (DatReader txmDat = new DatReader(txmMs))
{
if (txmDat.EntriesCount != 1)
throw new InvalidDataException("Nested texture DAT contains more than one file.");
using (MemoryStream innerStream = new MemoryStream(txmDat.GetData(0)))
{
img = TxmConversion.ConvertTxmToImage(innerStream);
}
}
}
else
{
txmMs.Seek(0, SeekOrigin.Begin);
img = TxmConversion.ConvertTxmToImage(txmMs);
@ -309,6 +332,7 @@ namespace LibDgf.Graphics.Mesh
// }
//}
}
}
else
{
// Generate new TXM