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

Fix for Bounds XML not exporting null composite children

Browse Source
This commit is contained in:
dexy 2021-12-14 02:54:59 +11:00
parent 70ebdd8360
commit a6a2acab75
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
CodeWalker.Core/GameFiles/Resources/Bounds.cs
View File

@ -100,6 +100,7 @@ namespace CodeWalker.GameFiles
public enum BoundsType : byte
{
None = 255, //not contained in files, but used as a placeholder in XML conversion
Sphere = 0,
Capsule = 1,
Box = 3,
@ -466,10 +467,16 @@ namespace CodeWalker.GameFiles
}
public static void WriteXmlNode(Bounds b, StringBuilder sb, int indent, string name = "Bounds")
{
if (b == null) return;
YbnXml.OpenTag(sb, indent, name + " type=\"" + b.Type.ToString() + "\"");
b.WriteXml(sb, indent + 1);
YbnXml.CloseTag(sb, indent, name);
if (b == null)
{
YbnXml.SelfClosingTag(sb, indent, "Item type=\"" + BoundsType.None.ToString() + "\"");
}
else
{
YbnXml.OpenTag(sb, indent, name + " type=\"" + b.Type.ToString() + "\"");
b.WriteXml(sb, indent + 1);
YbnXml.CloseTag(sb, indent, name);
}
}
public static Bounds ReadXmlNode(XmlNode node, object owner = null, BoundComposite parent = null)
{
@ -498,6 +505,7 @@ namespace CodeWalker.GameFiles
{
switch (type)
{
case BoundsType.None: return null;
case BoundsType.Sphere: return new BoundSphere();
case BoundsType.Capsule: return new BoundCapsule();
case BoundsType.Box: return new BoundBox();
@ -2657,14 +2665,7 @@ namespace CodeWalker.GameFiles
YbnXml.OpenTag(sb, indent, "Children");
foreach (var child in c)
{
if (c == null)
{
YbnXml.SelfClosingTag(sb, cind, "Item");
}
else
{
Bounds.WriteXmlNode(child, sb, cind, "Item");
}
Bounds.WriteXmlNode(child, sb, cind, "Item");
}
YbnXml.CloseTag(sb, indent, "Children");
}
@ -2682,15 +2683,8 @@ namespace CodeWalker.GameFiles
var blist = new List<Bounds>();
foreach (XmlNode inode in cnodes)
{
if (inode.HasChildNodes)
{
var b = Bounds.ReadXmlNode(inode, Owner, this);
blist.Add(b);
}
else
{
blist.Add(null);
}
var b = Bounds.ReadXmlNode(inode, Owner, this);
blist.Add(b);
}
var arr = blist.ToArray();
Children = new ResourcePointerArray64<Bounds>();