Skip to content

Commit

Permalink
HPD: Wrangled so XML conversion works again
Browse files Browse the repository at this point in the history
  • Loading branch information
@Greavesy1899
Greavesy1899 committed Jan 18, 2024
1 parent 84929a2 commit 398b65b
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 87 deletions.
180 changes: 103 additions & 77 deletions Mafia2Libs/ResourceTypes/FileTypes/Navigation/HPD.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,47 @@
using Utils.StringHelpers;
using Utils.Helpers.Reflection;
using Utils.Logging;
using Utils.MathHelpers;

namespace ResourceTypes.Navigation
{
[PropertyClassAllowReflection, PropertyClassCheckInherited]
public class HPDData : INavigationData
{
[PropertyClassAllowReflection, PropertyClassCheckInherited]
public class ADDITIONNALDATADESC
{
public uint ID { get; set; }
public uint Offset { get; set; }
public uint Size { get; set; }

public void ReadFromFile(BinaryReader Reader)
{
ID = Reader.ReadUInt32();
Offset = Reader.ReadUInt32();
Size = Reader.ReadUInt32();
}

public void WriteToFile(BinaryWriter Writer)
{
Writer.Write(ID);
Writer.Write(Offset);
Writer.Write(Size);
}
}

public int Unk0 { get; set; }
public byte[] UnkHeader { get; set; } // 132, todo, figure out what they are
public int ProjectType { get; set; }
public float BalancedDirect_OriginX { get; set; }
public float BalancedDirect_OriginY { get; set; }
public float BalancedDirect_OriginZ { get; set; }
public float BalancedDirect_EdgeLength { get; set; }
public ADDITIONNALDATADESC[] NodesAdditionalData { get; set; }
public ADDITIONNALDATADESC[] EdgesAdditionalData { get; set; }
public uint ConcreteNodeTotalSize { get; set; }
public uint ConcreteEdgeTotalSize { get; set; }
public uint AiMeshManagement { get; set; }
public uint NumPODEntries { get; set; }
public HPDEntry[] HPDEntries { get; set; }
public string Unk2 { get; set; }
public int Unk3 { get; set; }
Expand All @@ -22,18 +55,18 @@ public class HPDData : INavigationData
public class HPDEntry
{
/* Unk00 and Unk01 is Nodes bounding box */
public int FileID { get; set; }
public int UniqueID { get; set; }
public Vector3 BBoxMin { get; set; } // Calculated from OBJ_DATA Nodes
public Vector3 BBoxMax { get; set; } // Calculated from OBJ_DATA Nodes
public int Unk2 { get; set; } // 0
public int FileSize { get; set; }
public int AccumulatingSize { get; set; }
public int Unk5 { get; set; } // 100412
public int Flags { get; set; }
public int Level { get; set; } // 0
public uint FileSize { get; set; }
public uint FileOffset { get; set; }
public uint Tag1 { get; set; } // 100412
public uint Tag2 { get; set; }

public override string ToString()
{
return string.Format("{0} {1} {2}", FileID, BBoxMin.ToString(), BBoxMax.ToString());
return string.Format("{0} {1} {2}", UniqueID, BBoxMin.ToString(), BBoxMax.ToString());
}
}

Expand All @@ -45,37 +78,55 @@ public void ReadFromFile(BinaryReader reader)
{
Unk0 = reader.ReadInt32();
int entryCount = reader.ReadInt32();
UnkHeader = reader.ReadBytes(132);
ProjectType = reader.ReadInt32();
BalancedDirect_OriginX = reader.ReadSingle();
BalancedDirect_OriginY = reader.ReadSingle();
BalancedDirect_OriginZ = reader.ReadSingle();
BalancedDirect_EdgeLength = reader.ReadSingle();

NodesAdditionalData = new ADDITIONNALDATADESC[4];
EdgesAdditionalData = new ADDITIONNALDATADESC[4];
for(uint i = 0; i < NodesAdditionalData.Length; i++)
{
NodesAdditionalData[i] = new ADDITIONNALDATADESC();
NodesAdditionalData[i].ReadFromFile(reader);
}

for (uint i = 0; i < EdgesAdditionalData.Length; i++)
{
EdgesAdditionalData[i] = new ADDITIONNALDATADESC();
EdgesAdditionalData[i].ReadFromFile(reader);
}

ConcreteNodeTotalSize = reader.ReadUInt32();
ConcreteEdgeTotalSize = reader.ReadUInt32();
AiMeshManagement = reader.ReadUInt32();
NumPODEntries = reader.ReadUInt32();


HPDEntries = new HPDEntry[entryCount];

for (int i = 0; i < entryCount; i++)
{
HPDEntry data = new HPDEntry();
data.FileID = reader.ReadInt32();
data.UniqueID = reader.ReadInt32();

// The bounding box here is stored as X X -Y -Y Z Z
// So we have to take this into account, rather than using or util function.
float minX = reader.ReadSingle();
float maxX = reader.ReadSingle();
float minY = -reader.ReadSingle();
float maxY = -reader.ReadSingle();
float minY = reader.ReadSingle();
float maxY = reader.ReadSingle();
float minZ = reader.ReadSingle();
float maxZ = reader.ReadSingle();
data.BBoxMin = new Vector3(minX, minY, minZ);
data.BBoxMax = new Vector3(maxX, maxY, maxZ);

// And then after we have deserialized it properly we have to swap it, using a
// util function only specific to this type of navigation file.
data.BBoxMin = SwapVector3(data.BBoxMin);
data.BBoxMax = SwapVector3(data.BBoxMax);

data.Unk2 = reader.ReadInt32();
data.FileSize = reader.ReadInt32();
data.AccumulatingSize = reader.ReadInt32();
data.Unk5 = reader.ReadInt32();
data.Flags = reader.ReadInt32();
data.Level = reader.ReadInt32();
data.FileSize = reader.ReadUInt32();
data.FileOffset = reader.ReadUInt32();
data.Tag1 = reader.ReadUInt32();
data.Tag2 = reader.ReadUInt32();
HPDEntries[i] = data;
}

Expand All @@ -90,72 +141,47 @@ public void WriteToFile(BinaryWriter writer)
{
writer.Write(Unk0);
writer.Write(HPDEntries.Length);
writer.Write(UnkHeader);
writer.Write(ProjectType);
writer.Write(BalancedDirect_OriginX);
writer.Write(BalancedDirect_OriginY);
writer.Write(BalancedDirect_OriginZ);
writer.Write(BalancedDirect_EdgeLength);

for (int i = 0; i < HPDEntries.Length; i++)
for(uint i = 0; i < NodesAdditionalData.Length; i++)
{
var data = HPDEntries[i];
writer.Write(data.FileID);
NodesAdditionalData[i].WriteToFile(writer);
}

// We have to do the opposite; so flip Z and Y and inverse Y.
Vector3 min = SwapVector3(data.BBoxMin);
Vector3 max = SwapVector3(data.BBoxMax);
for (uint i = 0; i < EdgesAdditionalData.Length; i++)
{
EdgesAdditionalData[i].WriteToFile(writer);
}

// And then serialize it as usual; X X -Y -Y Z Z
writer.Write(min.X);
writer.Write(max.X);
writer.Write(-min.Y);
writer.Write(-max.Y);
writer.Write(min.Z);
writer.Write(max.Z);
writer.Write(ConcreteNodeTotalSize);
writer.Write(ConcreteEdgeTotalSize);
writer.Write(AiMeshManagement);
writer.Write(NumPODEntries);

writer.Write(data.Unk2);
for (int i = 0; i < HPDEntries.Length; i++)
{
var data = HPDEntries[i];
writer.Write(data.UniqueID);
writer.Write(data.BBoxMin.X);
writer.Write(data.BBoxMax.X);
writer.Write(data.BBoxMin.Y);
writer.Write(data.BBoxMax.Y);
writer.Write(data.BBoxMin.Z);
writer.Write(data.BBoxMax.Z);
writer.Write(data.Level);
writer.Write(data.FileSize);
writer.Write(data.AccumulatingSize);
writer.Write(data.Unk5);
writer.Write(data.Flags);
writer.Write(data.FileOffset);
writer.Write(data.Tag1);
writer.Write(data.Tag2);
}

StringHelpers.WriteString(writer, Unk2);
writer.Write(Unk3);
writer.Write(Unk4);
}

private Vector3 SwapVector3(Vector3 vector)
{
Vector3 pos = vector;
float y = pos.Y;
pos.Y = -pos.Z;
pos.Z = y;
return pos;
}

private void DebugWriteToFile()
{
StreamWriter writer = new StreamWriter("NAV_HPD_DATA content.txt");
writer.WriteLine(Unk0);
writer.WriteLine(HPDEntries.Length);
writer.WriteLine("");

for(int i = 0; i < HPDEntries.Length; i++)
{
var data = HPDEntries[i];
writer.WriteLine(string.Format("FileID: {0}", data.FileID));
writer.WriteLine(string.Format("Unk00: {0}", data.BBoxMin));
writer.WriteLine(string.Format("Unk01: {0}", data.BBoxMax));
writer.WriteLine(string.Format("Unk02: {0}", data.Unk2));
writer.WriteLine(string.Format("FileSize: {0}", data.FileSize));
writer.WriteLine(string.Format("AccumulatingSize: {0}", data.AccumulatingSize));
writer.WriteLine(string.Format("Unk5: {0}", data.Unk5));
writer.WriteLine(string.Format("FileFlags: {0}", data.Flags));
writer.WriteLine("");
}

writer.WriteLine("");
writer.WriteLine(Unk2);
writer.WriteLine(Unk3);
writer.WriteLine(Unk4);
writer.Close();
}
}
}
20 changes: 13 additions & 7 deletions Mafia2Libs/ResourceTypes/FileTypes/Navigation/NAV_AI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public class INavigationData
//Type 10: AI Action Point 3?
//Type 11: AI Hiding Place
//Type 12: AI Action Point 4?
[PropertyClassAllowReflection]
public class NAVData
{
//unk01_flags could be types; AIWORLDS seem to have 1005, while OBJDATA is 3604410608.
Expand All @@ -33,7 +32,7 @@ public class NAVData
int fileSize; //size - 4;

public uint Flags { get; set; }
public byte[] Filename { get; set; }
public string Filename { get; set; }
public INavigationData Data { get; set; }

public NAVData(BinaryReader reader)
Expand All @@ -55,6 +54,11 @@ public NAVData(FileInfo info)
}
}

public NAVData()
{
// empty, for reflection system
}

public void WriteToFile(bool bIsTest = true)
{
string OutputName = file.FullName;
Expand All @@ -77,8 +81,8 @@ public void ReadFromFile(BinaryReader reader)
//file name seems to be earlier.
if (Flags == 3604410608)
{
int NumChars = reader.ReadInt32();
Filename = reader.ReadBytes(NumChars);
Filename = StringHelpers.ReadString32(reader);
Filename = Filename.Replace('\0', '_');

long start = reader.BaseStream.Position;
string hpdString = new string(reader.ReadChars(11));
Expand Down Expand Up @@ -112,8 +116,10 @@ public void WriteToFile(NavigationWriter writer)

if (Flags == 3604410608)
{
writer.Write(Filename.Length);
writer.Write(Filename);
writer.Write(88);
writer.Write(("BRNB-KYNAPSE-02 12.05.2010 16:14:31 /kynapserelease/missions/city_trick/city_trick.hpd").ToCharArray());
writer.Write('\0');
writer.Write('a');
if (Data is OBJData)
{
(Data as OBJData).WriteToFile(writer);
Expand All @@ -124,7 +130,7 @@ public void WriteToFile(NavigationWriter writer)

// Our HPD file here actually should subtract 12 of the total.
writer.BaseStream.Position = 0;
writer.Write((uint)(writer.BaseStream.Length - 12));
writer.Write((uint)(writer.BaseStream.Length - 4));
return;
}
}
Expand Down
12 changes: 9 additions & 3 deletions Mafia2Libs/Utils/Helpers/Reflection/ReflectionHelpers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@ public static T ConvertToPropertyFromXML<T>(XElement Node)
TypedObject.GetType().GetProperty(Info.Name).SetValue(TypedObject, ArrayObject);
continue;
}
else if(Info.PropertyType.IsClass && AllowClassReflection(Info.PropertyType))
{
object ClassObject = InternalConvertProperty(Node.Element(Info.Name), Info.PropertyType);
Info.SetValue(TypedObject, ClassObject);
continue;
}
else if (Info.PropertyType.IsClass)
{
object ClassObject = InternalConvertProperty(Node.Element(Info.Name), Info.PropertyType);
Expand Down Expand Up @@ -206,9 +212,9 @@ private static object InternalConvertProperty(XElement Node, Type ElementType)
}
else if(ElementType.IsClass && CheckForDerivedClass(ElementType))
{
string NameSpace = ElementType.Namespace;
string Name = Node.Name.LocalName;
Type Test = Type.GetType(NameSpace + "." + Name, true);
XAttribute TypeAttribute = Node.Attribute("Type");
string Name = TypeAttribute.Value;
Type Test = GetTypeByName(Name);
if(Test.IsAssignableTo(ElementType))
{
ElementType = Test;
Expand Down

0 comments on commit 398b65b

Please sign in to comment.