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

Improved ResourceBuilder performance and cleaned up old code

Browse Source
This commit is contained in:
dexy 2020-03-19 23:14:59 +11:00
parent 140510c67c
commit 57f6b71bf8
1 changed files with 83 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

367
CodeWalker.Core/GameFiles/Resources/ResourceBuilder.cs
View File

@ -15,6 +15,73 @@ namespace CodeWalker.GameFiles
private const int SKIP_SIZE = 16;//512;//256;//64; private const int SKIP_SIZE = 16;//512;//256;//64;
private const int ALIGN_SIZE = 16;//512;//64; private const int ALIGN_SIZE = 16;//512;//64;
public class ResourceBuilderBlock
{
public IResourceBlock Block;
public long Length;
public ResourceBuilderBlock(IResourceBlock block)
{
Block = block;
Length = block?.BlockLength ?? 0;
}
}
public class ResourceBuilderBlockSet
{
public bool IsSystemSet = false;
public ResourceBuilderBlock RootBlock = null;
public LinkedList<ResourceBuilderBlock> BlockList = new LinkedList<ResourceBuilderBlock>();
public Dictionary<ResourceBuilderBlock, LinkedListNode<ResourceBuilderBlock>> BlockDict = new Dictionary<ResourceBuilderBlock, LinkedListNode<ResourceBuilderBlock>>();
public int Count => BlockList.Count;
public ResourceBuilderBlockSet(IList<IResourceBlock> blocks, bool sys)
{
IsSystemSet = sys;
if (sys && (blocks.Count > 0))
{
RootBlock = new ResourceBuilderBlock(blocks[0]);
}
var list = new List<ResourceBuilderBlock>();
int start = sys ? 1 : 0;
for (int i = start; i < blocks.Count; i++)
{
var bb = new ResourceBuilderBlock(blocks[i]);
list.Add(bb);
}
list.Sort((a, b) => b.Length.CompareTo(a.Length));
foreach (var bb in list)
{
var ln = BlockList.AddLast(bb);
BlockDict[bb] = ln;
}
}
public ResourceBuilderBlock FindBestBlock(long maxSize)
{
var n = BlockList.First;
while ((n != null) && (n.Value.Length > maxSize))
{
n = n.Next;
}
return n?.Value;
}
public ResourceBuilderBlock TakeBestBlock(long maxSize)
{
var r = FindBestBlock(maxSize);
if (r != null)
{
if (BlockDict.TryGetValue(r, out LinkedListNode<ResourceBuilderBlock> ln))
{
BlockList.Remove(ln);
BlockDict.Remove(r);
}
}
return r;
}
}
public static void GetBlocks(IResourceBlock rootBlock, out IList<IResourceBlock> sys, out IList<IResourceBlock> gfx) public static void GetBlocks(IResourceBlock rootBlock, out IList<IResourceBlock> sys, out IList<IResourceBlock> gfx)
{ {
@ -23,69 +90,6 @@ namespace CodeWalker.GameFiles
var processed = new HashSet<IResourceBlock>(); var processed = new HashSet<IResourceBlock>();
//var protectedBlocks = new List<IResourceBlock>();
//var stack = new Stack<IResourceBlock>();
//stack.Push(rootBlock);
//processed.Add(rootBlock);
//while (stack.Count > 0)
//{
// var block = stack.Pop();
// if (block == null)
// continue;
// if (block is IResourceSystemBlock)
// {
// if (!systemBlocks.Contains(block))
// systemBlocks.Add(block);
// // for system blocks, also process references...
// var references = ((IResourceSystemBlock)block).GetReferences();
// //Array.Reverse(references);
// foreach (var reference in references)
// if (!processed.Contains(reference))
// {
// stack.Push(reference);
// processed.Add(reference);
// }
// var subs = new Stack<IResourceSystemBlock>();
// foreach (var part in ((IResourceSystemBlock)block).GetParts())
// subs.Push((IResourceSystemBlock)part.Item2);
// while (subs.Count > 0)
// {
// var sub = subs.Pop();
// foreach (var x in sub.GetReferences())
// if (!processed.Contains(x))
// {
// stack.Push(x);
// processed.Add(x);
// }
// foreach (var x in sub.GetParts())
// subs.Push((IResourceSystemBlock)x.Item2);
// protectedBlocks.Add(sub);
// }
// }
// else
// {
// if (!graphicBlocks.Contains(block))
// graphicBlocks.Add(block);
// }
//}
//// there are now sys-blocks in the list that actually
//// only substructures and therefore must not get
//// a new position!
//// -> remove them from the list
//foreach (var q in protectedBlocks)
// if (systemBlocks.Contains(q))
// systemBlocks.Remove(q);
void addBlock(IResourceBlock block) void addBlock(IResourceBlock block)
{ {
if (block is IResourceSystemBlock) if (block is IResourceSystemBlock)
@ -123,9 +127,6 @@ namespace CodeWalker.GameFiles
addChildren(rootBlock); addChildren(rootBlock);
sys = new List<IResourceBlock>(); sys = new List<IResourceBlock>();
foreach (var s in systemBlocks) foreach (var s in systemBlocks)
{ {
@ -138,196 +139,15 @@ namespace CodeWalker.GameFiles
} }
} }
public static void AssignPositions(IList<IResourceBlock> blocks, uint basePosition, ref int pageSize, out int pageCount)
{
IResourceBlock getFirstBlock()
{
if (blocks.Count > 0)
{
return blocks[0];
}
return null;
}
HashSet<IResourceBlock> getBlockSet()
{
var blockset = new HashSet<IResourceBlock>();
for (int i = 1; i < blocks.Count; i++)
{
blockset.Add(blocks[i]);
}
return blockset;
}
IResourceBlock takeBestBlock(long maxSize, HashSet<IResourceBlock> blockset)
{
if (maxSize <= 0) return null;
IResourceBlock r = null;
long rlen = 0;
foreach (var block in blockset)
{
var blockLength = block.BlockLength;
if ((blockLength <= maxSize) && (blockLength > rlen))
{
r = block;
rlen = blockLength;
}
}
if (r != null)
{
blockset.Remove(r);
}
return r;
}
// find largest structure
long largestBlockSize = 0;
foreach (var block in blocks)
{
if (largestBlockSize < block.BlockLength)
largestBlockSize = block.BlockLength;
}
// find minimum page size
long currentPageSize = pageSize;// 0x2000;
while (currentPageSize < largestBlockSize)
currentPageSize *= 2;
long currentPageCount = 0;
long currentPosition = 0;
while (true)
{
if (blocks.Count == 0) break;
// reset all positions
foreach (var block in blocks)
block.FilePosition = -1;
//currentPageCount = 0;
//currentPosition = 0;
//foreach (var block in blocks)
//{
// //if (block.FilePosition != -1)
// // throw new Exception("Block was already assigned a position!");
// //if (block.Length == 0)
// // throw new Exception("A length of 0 is not allowed!");
//
// // check if new page is necessary...
// // if yes, add a new page and align to it
// long maxSpace = currentPageCount * currentPageSize - currentPosition;
// if (maxSpace < (block.BlockLength + SKIP_SIZE))
// {
// currentPageCount++;
// currentPosition = currentPageSize * (currentPageCount - 1);
// }
//
// // set position
// block.FilePosition = basePosition + currentPosition;
// currentPosition += block.BlockLength + SKIP_SIZE;
//
// // align...
// if ((currentPosition % ALIGN_SIZE) != 0)
// currentPosition += (ALIGN_SIZE - (currentPosition % ALIGN_SIZE));
//}
currentPageCount = 1;
currentPosition = 0;
var blockset = getBlockSet();
while (true)
{
var maxSize = currentPageCount * currentPageSize - currentPosition;
var isroot = (currentPosition == 0);
var block = isroot ? getFirstBlock() : takeBestBlock(maxSize, blockset);
if (block != null)
{
block.FilePosition = basePosition + currentPosition;
currentPosition += block.BlockLength;
if ((currentPosition % ALIGN_SIZE) != 0)
{
currentPosition += (ALIGN_SIZE - (currentPosition % ALIGN_SIZE));
}
}
else if (blockset.Count > 0)
{
currentPosition = currentPageSize * currentPageCount;
currentPageCount++;
}
else
{
break;
}
}
// break if everything fits...
if (currentPageCount < 128)
break;
currentPageSize *= 2;
}
pageSize = (int)currentPageSize;
pageCount = (int)currentPageCount;
}
public static void AssignPositions(IList<IResourceBlock> blocks, uint basePosition, out RpfResourcePageFlags pageFlags) public static void AssignPositions(IList<IResourceBlock> blocks, uint basePosition, out RpfResourcePageFlags pageFlags)
{ {
var sys = (basePosition == 0x50000000); var sys = (basePosition == 0x50000000);
IResourceBlock getRootBlock()
{
if (sys && (blocks.Count > 0))
{
return blocks[0];
}
return null;
}
HashSet<IResourceBlock> getBlockSet()
{
var blockset = new HashSet<IResourceBlock>();
int start = sys ? 1 : 0;
for (int i = start; i < blocks.Count; i++)
{
blockset.Add(blocks[i]);
}
return blockset;
}
IResourceBlock findBestBlock(long maxSize, HashSet<IResourceBlock> blockset)
{
if (maxSize <= 0) return null;
IResourceBlock r = null;
long rlen = 0;
foreach (var block in blockset)
{
var blockLength = block.BlockLength;
if ((blockLength <= maxSize) && (blockLength > rlen))
{
r = block;
rlen = blockLength;
}
}
return r;
}
IResourceBlock takeBestBlock(long maxSize, HashSet<IResourceBlock> blockset)
{
var r = findBestBlock(maxSize, blockset);
if (r != null)
{
blockset.Remove(r);
}
return r;
}
long pad(long p) long pad(long p)
{ {
return ((ALIGN_SIZE - (p % ALIGN_SIZE)) % ALIGN_SIZE); return ((ALIGN_SIZE - (p % ALIGN_SIZE)) % ALIGN_SIZE);
} }
long largestBlockSize = 0; // find largest structure long largestBlockSize = 0; // find largest structure
long startPageSize = BASE_SIZE;// 0x2000; // find starting page size long startPageSize = BASE_SIZE;// 0x2000; // find starting page size
long totalBlockSize = 0; long totalBlockSize = 0;
@ -348,24 +168,24 @@ namespace CodeWalker.GameFiles
pageFlags = new RpfResourcePageFlags(); pageFlags = new RpfResourcePageFlags();
var pageSizeMult = 1;
while (true) while (true)
{ {
if (blocks.Count == 0) break; if (blocks.Count == 0) break;
var blockset = new ResourceBuilderBlockSet(blocks, sys);
var rootblock = blockset.RootBlock;
var currentPosition = 0L; var currentPosition = 0L;
var currentPageSize = startPageSize; var currentPageSize = startPageSize;
var currentPageStart = 0L; var currentPageStart = 0L;
var currentPageSpace = startPageSize; var currentPageSpace = startPageSize;
var currentRemainder = totalBlockSize; var currentRemainder = totalBlockSize;
var rootblock = getRootBlock();
var blockset = getBlockSet();
var pageCount = 1; var pageCount = 1;
var pageCounts = new uint[9]; var pageCounts = new uint[9];
var pageCountIndex = 0; var pageCountIndex = 0;
var targetPageSize = Math.Max(65536, startPageSize >> 5); var targetPageSize = Math.Max(65536 * pageSizeMult, startPageSize >> (sys ? 5 : 2));
var minPageSize = Math.Max(512, Math.Min(targetPageSize, startPageSize) >> 4); var minPageSize = Math.Max(512 * pageSizeMult, Math.Min(targetPageSize, startPageSize) >> 4);
var baseShift = 0u; var baseShift = 0u;
var baseSize = 512; var baseSize = 512;
while (baseSize < minPageSize) while (baseSize < minPageSize)
@ -386,12 +206,12 @@ namespace CodeWalker.GameFiles
while (true) while (true)
{ {
var isroot = sys && (currentPosition == 0); var isroot = sys && (currentPosition == 0);
var block = isroot ? rootblock : takeBestBlock(currentPageSpace, blockset); var block = isroot ? rootblock : blockset.TakeBestBlock(currentPageSpace);
var blockLength = block?.BlockLength ?? 0; var blockLength = block?.Length ?? 0;
if (block != null) if (block != null)
{ {
//add this block to the current page. //add this block to the current page.
block.FilePosition = basePosition + currentPosition; block.Block.FilePosition = basePosition + currentPosition;
var opos = currentPosition; var opos = currentPosition;
currentPosition += blockLength; currentPosition += blockLength;
currentPosition += pad(currentPosition); currentPosition += pad(currentPosition);
@ -405,8 +225,8 @@ namespace CodeWalker.GameFiles
//allocate a new page //allocate a new page
currentPageStart += currentPageSize; currentPageStart += currentPageSize;
currentPosition = currentPageStart; currentPosition = currentPageStart;
block = findBestBlock(long.MaxValue, blockset);//just find the biggest block block = blockset.FindBestBlock(long.MaxValue); //just find the biggest block
blockLength = block?.BlockLength ?? 0; blockLength = block?.Length ?? 0;
while (blockLength <= (currentPageSize >> 1))//determine best new page size while (blockLength <= (currentPageSize >> 1))//determine best new page size
{ {
if (currentPageSize <= minPageSize) break; if (currentPageSize <= minPageSize) break;
@ -435,6 +255,7 @@ namespace CodeWalker.GameFiles
} }
startPageSize *= 2; startPageSize *= 2;
pageSizeMult *= 2;
} }
} }
@ -448,15 +269,6 @@ namespace CodeWalker.GameFiles
IList<IResourceBlock> systemBlocks; IList<IResourceBlock> systemBlocks;
IList<IResourceBlock> graphicBlocks; IList<IResourceBlock> graphicBlocks;
GetBlocks(fileBase, out systemBlocks, out graphicBlocks); GetBlocks(fileBase, out systemBlocks, out graphicBlocks);
//int systemPageSize = BASE_SIZE;// *4;
//int systemPageCount;
//AssignPositions(systemBlocks, 0x50000000, ref systemPageSize, out systemPageCount);
//int graphicsPageSize = BASE_SIZE;
//int graphicsPageCount;
//AssignPositions(graphicBlocks, 0x60000000, ref graphicsPageSize, out graphicsPageCount);
RpfResourcePageFlags systemPageFlags; RpfResourcePageFlags systemPageFlags;
AssignPositions(systemBlocks, 0x50000000, out systemPageFlags); AssignPositions(systemBlocks, 0x50000000, out systemPageFlags);
@ -465,14 +277,8 @@ namespace CodeWalker.GameFiles
AssignPositions(graphicBlocks, 0x60000000, out graphicsPageFlags); AssignPositions(graphicBlocks, 0x60000000, out graphicsPageFlags);
fileBase.FilePagesInfo.SystemPagesCount = (byte)systemPageFlags.Count;
fileBase.FilePagesInfo.GraphicsPagesCount = (byte)graphicsPageFlags.Count;
//fileBase.FilePagesInfo.SystemPagesCount = 0;
//if (systemPageCount > 0)
// fileBase.FilePagesInfo.SystemPagesCount = 1; // (byte)systemPageCount; //1
fileBase.FilePagesInfo.SystemPagesCount = (byte)systemPageFlags.Count;// systemPageCount;
fileBase.FilePagesInfo.GraphicsPagesCount = (byte)graphicsPageFlags.Count;// graphicsPageCount;
var systemStream = new MemoryStream(); var systemStream = new MemoryStream();
@ -512,14 +318,14 @@ namespace CodeWalker.GameFiles
var sysDataSize = (int)systemPageFlags.Size;// systemPageCount * systemPageSize; var sysDataSize = (int)systemPageFlags.Size;
var sysData = new byte[sysDataSize]; var sysData = new byte[sysDataSize];
systemStream.Flush(); systemStream.Flush();
systemStream.Position = 0; systemStream.Position = 0;
systemStream.Read(sysData, 0, (int)systemStream.Length); systemStream.Read(sysData, 0, (int)systemStream.Length);
var gfxDataSize = (int)graphicsPageFlags.Size;// graphicsPageCount * graphicsPageSize; var gfxDataSize = (int)graphicsPageFlags.Size;
var gfxData = new byte[gfxDataSize]; var gfxData = new byte[gfxDataSize];
graphicsStream.Flush(); graphicsStream.Flush();
graphicsStream.Position = 0; graphicsStream.Position = 0;
@ -530,11 +336,6 @@ namespace CodeWalker.GameFiles
uint uv = (uint)version; uint uv = (uint)version;
uint sv = (uv >> 4) & 0xF; uint sv = (uv >> 4) & 0xF;
uint gv = (uv >> 0) & 0xF; uint gv = (uv >> 0) & 0xF;
//uint sf = RpfResourceFileEntry.GetFlagsFromSize(sysDataSize, sv);
//uint gf = RpfResourceFileEntry.GetFlagsFromSize(gfxDataSize, gv); //TODO: might be broken...
//uint sf = RpfResourceFileEntry.GetFlagsFromBlocks((uint)systemPageCount, (uint)systemPageSize, sv);
//uint gf = RpfResourceFileEntry.GetFlagsFromBlocks((uint)graphicsPageCount, (uint)graphicsPageSize, gv);
uint sf = systemPageFlags.Value + (sv << 28); uint sf = systemPageFlags.Value + (sv << 28);
uint gf = graphicsPageFlags.Value + (gv << 28); uint gf = graphicsPageFlags.Value + (gv << 28);
@ -548,7 +349,7 @@ namespace CodeWalker.GameFiles
var cdata = compress ? Compress(tdata) : tdata; var cdata = compress ? Compress(tdata) : tdata;
var dataSize = 16 + cdata.Length;// sysDataSize + gfxDataSize; var dataSize = 16 + cdata.Length;
var data = new byte[dataSize]; var data = new byte[dataSize];
byte[] h1 = BitConverter.GetBytes((uint)0x37435352); byte[] h1 = BitConverter.GetBytes((uint)0x37435352);
@ -560,8 +361,6 @@ namespace CodeWalker.GameFiles
Buffer.BlockCopy(h3, 0, data, 8, 4); Buffer.BlockCopy(h3, 0, data, 8, 4);
Buffer.BlockCopy(h4, 0, data, 12, 4); Buffer.BlockCopy(h4, 0, data, 12, 4);
Buffer.BlockCopy(cdata, 0, data, 16, cdata.Length); Buffer.BlockCopy(cdata, 0, data, 16, cdata.Length);
//Buffer.BlockCopy(sysData, 0, data, 16, sysDataSize);
//Buffer.BlockCopy(gfxData, 0, data, 16 + sysDataSize, gfxDataSize);
return data; return data;
} }