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

Updated MetaTypes init data, Fixed XmlMeta not importing some things

Browse Source
This commit is contained in:
dexyfex 2018-03-05 20:37:51 +11:00
parent 6da590530b
commit da24d38812
3 changed files with 1205 additions and 637 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
CodeWalker.Core/GameFiles/GameFileCache.cs
View File

@ -139,6 +139,7 @@ namespace CodeWalker.GameFiles
InitDlc(); InitDlc();
//TestMetas();
//TestYcds(); //TestYcds();
//TestYmaps(); //TestYmaps();
//TestPlacements(); //TestPlacements();
@ -2106,6 +2107,56 @@ namespace CodeWalker.GameFiles
public void TestMetas()
{
//find all RSC meta files and generate the MetaTypes init code
MetaTypes.Clear();
foreach (RpfFile file in AllRpfs)
{
foreach (RpfEntry entry in file.AllEntries)
{
try
{
var n = entry.NameLower;
if (n.EndsWith(".ymap"))
{
UpdateStatus(string.Format(entry.Path));
YmapFile ymapfile = RpfMan.GetFile<YmapFile>(entry);
if ((ymapfile != null) && (ymapfile.Meta != null))
{
MetaTypes.EnsureMetaTypes(ymapfile.Meta);
}
}
else if (n.EndsWith(".ytyp"))
{
UpdateStatus(string.Format(entry.Path));
YtypFile ytypfile = RpfMan.GetFile<YtypFile>(entry);
if ((ytypfile != null) && (ytypfile.Meta != null))
{
MetaTypes.EnsureMetaTypes(ytypfile.Meta);
}
}
else if (n.EndsWith(".ymt"))
{
UpdateStatus(string.Format(entry.Path));
YmtFile ymtfile = RpfMan.GetFile<YmtFile>(entry);
if ((ymtfile != null) && (ymtfile.Meta != null))
{
MetaTypes.EnsureMetaTypes(ymtfile.Meta);
}
}
}
catch (Exception ex)
{
UpdateStatus("Error! " + ex.ToString());
}
}
}
string str = MetaTypes.GetTypesInitString();
}
public void TestYcds() public void TestYcds()
{ {
foreach (RpfFile file in AllRpfs) foreach (RpfFile file in AllRpfs)

1405
CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs
View File

File diff suppressed because it is too large Load Diff

46
CodeWalker.Core/GameFiles/MetaTypes/XmlMeta.cs
View File

@ -549,9 +549,10 @@ namespace CodeWalker.GameFiles
for (int i = 0; i < split.Length; i++) for (int i = 0; i < split.Length; i++)
{ {
if (!string.IsNullOrEmpty(split[i])) var ts = split[i]?.Trim();
if (!string.IsNullOrEmpty(ts))
{ {
var val = Convert.ToSingle(split[i]); var val = FloatUtil.Parse(ts);// Convert.ToSingle(split[i]);
data.Add(val); data.Add(val);
} }
} }
@ -564,21 +565,42 @@ namespace CodeWalker.GameFiles
{ {
var items = new List<Vector4>(); var items = new List<Vector4>();
foreach (XmlNode cnode in node.ChildNodes)
{
var split = Regex.Split(node.InnerText, @",\s"); var split = node.InnerText.Split('\n');// Regex.Split(node.InnerText, @"[\s\r\n\t]");
float x = FloatUtil.Parse(split[0]);
float y = FloatUtil.Parse(split[1]); float x = 0f;
float z = FloatUtil.Parse(split[2]); float y = 0f;
float z = 0f;
float w = 0f; float w = 0f;
var val = new Vector4(x, y, z, w); for (int i = 0; i < split.Length; i++)
{
items.Add(val); var s = split[i]?.Trim();
break; if (string.IsNullOrEmpty(s)) continue;
var split2 = Regex.Split(s, @"[\s\t]");
int c = 0;
x = 0f; y = 0f; z = 0f;
for (int n = 0; n < split2.Length; n++)
{
var ts = split2[n]?.Trim();
if (string.IsNullOrEmpty(ts)) continue;
var f = FloatUtil.Parse(ts);
switch (c)
{
case 0: x = f; break;
case 1: y = f; break;
case 2: z = f; break;
} }
c++;
}
if (c >= 3)
{
var val = new Vector4(x, y, z, w);
items.Add(val);
}
}
return mb.AddPaddedVector3ArrayPtr(items.ToArray()); return mb.AddPaddedVector3ArrayPtr(items.ToArray());
} }