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

Particles resource packing improvements

Browse Source
This commit is contained in:
dexy 2020-03-20 04:54:59 +11:00
parent 57f6b71bf8
commit 767e54fa1f
4 changed files with 73 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CodeWalker.Core/GameFiles/Resources/Drawable.cs
View File

@ -5198,11 +5198,13 @@ namespace CodeWalker.GameFiles
drawablehashes.Add(h); drawablehashes.Add(h);
} }
} }
if (drawables.Count > 0)
{
Hashes = drawablehashes.ToArray(); Hashes = drawablehashes.ToArray();
Drawables = new ResourcePointerArray64<DrawablePtfx>(); Drawables = new ResourcePointerArray64<DrawablePtfx>();
Drawables.data_items = drawables.ToArray(); Drawables.data_items = drawables.ToArray();
} }
}
public static void WriteXmlNode(DrawablePtfxDictionary d, StringBuilder sb, int indent, string ddsfolder, string name = "DrawableDictionary") public static void WriteXmlNode(DrawablePtfxDictionary d, StringBuilder sb, int indent, string ddsfolder, string name = "DrawableDictionary")
{ {
if (d == null) return; if (d == null) return;

91
CodeWalker.Core/GameFiles/Resources/Particle.cs
View File

@ -2059,8 +2059,8 @@ namespace CodeWalker.GameFiles
public uint VFT2 { get; set; } = 0x4060e3e8; // 0x4060e3e8, 0x40610408 public uint VFT2 { get; set; } = 0x4060e3e8; // 0x4060e3e8, 0x40610408
public uint Unknown_34h = 1; // 0x00000001 public uint Unknown_34h = 1; // 0x00000001
public ulong EventEmittersPointer { get; set; } public ulong EventEmittersPointer { get; set; }
public ushort EventEmittersCount1 { get; set; } public ushort EventEmittersCount { get; set; }
public ushort EventEmittersCount2 { get; set; } = 32; //always 32 public ushort EventEmittersCapacity { get; set; } = 32; //always 32
public uint Unknown_44h; // 0x00000000 public uint Unknown_44h; // 0x00000000
public ulong UnknownData1Pointer { get; set; } public ulong UnknownData1Pointer { get; set; }
public uint Unknown_50h { get; set; } // 0, 0xffffffff public uint Unknown_50h { get; set; } // 0, 0xffffffff
@ -2095,8 +2095,8 @@ namespace CodeWalker.GameFiles
public ParticleKeyframeProp KeyframeProp3 { get; set; } public ParticleKeyframeProp KeyframeProp3 { get; set; }
public ParticleKeyframeProp KeyframeProp4 { get; set; } public ParticleKeyframeProp KeyframeProp4 { get; set; }
public ulong KeyframePropsPointer { get; set; } //pointer to a list, which is pointing back to above items public ulong KeyframePropsPointer { get; set; } //pointer to a list, which is pointing back to above items
public ushort KeyframePropsCount1 { get; set; } = 5; //always 5 public ushort KeyframePropsCount { get; set; } = 5; //always 5
public ushort KeyframePropsCount2 { get; set; } = 16; //always 16 public ushort KeyframePropsCapacity { get; set; } = 16; //always 16
public uint Unknown_39Ch; // 0x00000000 public uint Unknown_39Ch; // 0x00000000
public uint Unknown_3A0h { get; set; } // eg. 0x00090100 public uint Unknown_3A0h { get; set; } // eg. 0x00090100
public uint Unknown_3A4h; // 0x00000000 public uint Unknown_3A4h; // 0x00000000
@ -2129,8 +2129,8 @@ namespace CodeWalker.GameFiles
this.VFT2 = reader.ReadUInt32(); this.VFT2 = reader.ReadUInt32();
this.Unknown_34h = reader.ReadUInt32(); this.Unknown_34h = reader.ReadUInt32();
this.EventEmittersPointer = reader.ReadUInt64(); this.EventEmittersPointer = reader.ReadUInt64();
this.EventEmittersCount1 = reader.ReadUInt16(); this.EventEmittersCount = reader.ReadUInt16();
this.EventEmittersCount2 = reader.ReadUInt16(); this.EventEmittersCapacity = reader.ReadUInt16();
this.Unknown_44h = reader.ReadUInt32(); this.Unknown_44h = reader.ReadUInt32();
this.UnknownData1Pointer = reader.ReadUInt64(); this.UnknownData1Pointer = reader.ReadUInt64();
this.Unknown_50h = reader.ReadUInt32(); this.Unknown_50h = reader.ReadUInt32();
@ -2165,8 +2165,8 @@ namespace CodeWalker.GameFiles
this.KeyframeProp3 = reader.ReadBlock<ParticleKeyframeProp>(); this.KeyframeProp3 = reader.ReadBlock<ParticleKeyframeProp>();
this.KeyframeProp4 = reader.ReadBlock<ParticleKeyframeProp>(); this.KeyframeProp4 = reader.ReadBlock<ParticleKeyframeProp>();
this.KeyframePropsPointer = reader.ReadUInt64(); this.KeyframePropsPointer = reader.ReadUInt64();
this.KeyframePropsCount1 = reader.ReadUInt16(); this.KeyframePropsCount = reader.ReadUInt16();
this.KeyframePropsCount2 = reader.ReadUInt16(); this.KeyframePropsCapacity = reader.ReadUInt16();
this.Unknown_39Ch = reader.ReadUInt32(); this.Unknown_39Ch = reader.ReadUInt32();
this.Unknown_3A0h = reader.ReadUInt32(); this.Unknown_3A0h = reader.ReadUInt32();
this.Unknown_3A4h = reader.ReadUInt32(); this.Unknown_3A4h = reader.ReadUInt32();
@ -2177,9 +2177,9 @@ namespace CodeWalker.GameFiles
// read reference data // read reference data
this.Name = reader.ReadBlockAt<string_r>(this.NamePointer); this.Name = reader.ReadBlockAt<string_r>(this.NamePointer);
this.EventEmitters = reader.ReadBlockAt<ResourcePointerArray64<ParticleEventEmitter>>(this.EventEmittersPointer, this.EventEmittersCount1); this.EventEmitters = reader.ReadBlockAt<ResourcePointerArray64<ParticleEventEmitter>>(this.EventEmittersPointer, this.EventEmittersCapacity);
this.UnknownData = reader.ReadBlockAt<ParticleUnknown1>(this.UnknownData1Pointer); this.UnknownData = reader.ReadBlockAt<ParticleUnknown1>(this.UnknownData1Pointer);
this.KeyframeProps = reader.ReadBlockAt<ResourcePointerArray64<ParticleKeyframeProp>>(this.KeyframePropsPointer, this.KeyframePropsCount1); this.KeyframeProps = reader.ReadBlockAt<ResourcePointerArray64<ParticleKeyframeProp>>(this.KeyframePropsPointer, this.KeyframePropsCapacity);
if (!string.IsNullOrEmpty(Name?.Value)) if (!string.IsNullOrEmpty(Name?.Value))
{ {
@ -2507,17 +2507,6 @@ namespace CodeWalker.GameFiles
this.UnknownData1Pointer = (ulong)(this.UnknownData != null ? this.UnknownData.FilePosition : 0); this.UnknownData1Pointer = (ulong)(this.UnknownData != null ? this.UnknownData.FilePosition : 0);
this.KeyframePropsPointer = (ulong)(this.KeyframeProps != null ? this.KeyframeProps.FilePosition : 0); this.KeyframePropsPointer = (ulong)(this.KeyframeProps != null ? this.KeyframeProps.FilePosition : 0);
if (KeyframeProps?.data_items != null)
{
var kfplist = new List<ulong>();
foreach (var kf in KeyframeProps?.data_items)
{
kfplist.Add((ulong)kf.FilePosition);//manually write pointers for this
}
for (int i = kfplist.Count; i < 16; i++) kfplist.Add(0);
KeyframeProps.data_pointers = kfplist.ToArray();
}
// write structure data // write structure data
writer.Write(this.VFT); writer.Write(this.VFT);
writer.Write(this.Unknown_4h); writer.Write(this.Unknown_4h);
@ -2530,8 +2519,8 @@ namespace CodeWalker.GameFiles
writer.Write(this.VFT2); writer.Write(this.VFT2);
writer.Write(this.Unknown_34h); writer.Write(this.Unknown_34h);
writer.Write(this.EventEmittersPointer); writer.Write(this.EventEmittersPointer);
writer.Write(this.EventEmittersCount1); writer.Write(this.EventEmittersCount);
writer.Write(this.EventEmittersCount2); writer.Write(this.EventEmittersCapacity);
writer.Write(this.Unknown_44h); writer.Write(this.Unknown_44h);
writer.Write(this.UnknownData1Pointer); writer.Write(this.UnknownData1Pointer);
writer.Write(this.Unknown_50h); writer.Write(this.Unknown_50h);
@ -2566,8 +2555,8 @@ namespace CodeWalker.GameFiles
writer.WriteBlock(this.KeyframeProp3); writer.WriteBlock(this.KeyframeProp3);
writer.WriteBlock(this.KeyframeProp4); writer.WriteBlock(this.KeyframeProp4);
writer.Write(this.KeyframePropsPointer); writer.Write(this.KeyframePropsPointer);
writer.Write(this.KeyframePropsCount1); writer.Write(this.KeyframePropsCount);
writer.Write(this.KeyframePropsCount2); writer.Write(this.KeyframePropsCapacity);
writer.Write(this.Unknown_39Ch); writer.Write(this.Unknown_39Ch);
writer.Write(this.Unknown_3A0h); writer.Write(this.Unknown_3A0h);
writer.Write(this.Unknown_3A4h); writer.Write(this.Unknown_3A4h);
@ -2603,11 +2592,15 @@ namespace CodeWalker.GameFiles
YptXml.ValueTag(sb, indent, "Unknown3A0", YptXml.UintString(Unknown_3A0h)); YptXml.ValueTag(sb, indent, "Unknown3A0", YptXml.UintString(Unknown_3A0h));
if (EventEmitters?.data_items != null) if (EventEmitters?.data_items != null)
{ {
YptXml.WriteItemArray(sb, EventEmitters.data_items, indent, "EventEmitters"); var ee = new ParticleEventEmitter[EventEmittersCount];//trim the unused items from this array
Array.Copy(EventEmitters.data_items, 0, ee, 0, EventEmittersCount);
YptXml.WriteItemArray(sb, ee, indent, "EventEmitters");
} }
if (KeyframeProps?.data_items != null) if (KeyframeProps?.data_items != null)
{ {
YptXml.WriteItemArray(sb, KeyframeProps.data_items, indent, "KeyframeProperties"); var kp = new ParticleKeyframeProp[KeyframePropsCount];//trim the unused items from this array
Array.Copy(KeyframeProps.data_items, 0, kp, 0, KeyframePropsCount);
YptXml.WriteItemArray(sb, kp, indent, "KeyframeProperties");
} }
if (UnknownData != null) if (UnknownData != null)
{ {
@ -2644,7 +2637,7 @@ namespace CodeWalker.GameFiles
Unknown_3A0h = Xml.GetChildUIntAttribute(node, "Unknown3A0"); Unknown_3A0h = Xml.GetChildUIntAttribute(node, "Unknown3A0");
var emlist = XmlMeta.ReadItemArray<ParticleEventEmitter>(node, "EventEmitters")?.ToList() ?? new List<ParticleEventEmitter>(); var emlist = XmlMeta.ReadItemArray<ParticleEventEmitter>(node, "EventEmitters")?.ToList() ?? new List<ParticleEventEmitter>();
EventEmittersCount1 = (ushort)emlist.Count; EventEmittersCount = (ushort)emlist.Count;
for (int i = emlist.Count; i < 32; i++) emlist.Add(null); for (int i = emlist.Count; i < 32; i++) emlist.Add(null);
EventEmitters = new ResourcePointerArray64<ParticleEventEmitter>(); EventEmitters = new ResourcePointerArray64<ParticleEventEmitter>();
EventEmitters.data_items = emlist.ToArray(); EventEmitters.data_items = emlist.ToArray();
@ -2663,9 +2656,12 @@ namespace CodeWalker.GameFiles
KeyframeProp2 = (kflist.Count > 2) ? kflist[2] : new ParticleKeyframeProp(); KeyframeProp2 = (kflist.Count > 2) ? kflist[2] : new ParticleKeyframeProp();
KeyframeProp3 = (kflist.Count > 3) ? kflist[3] : new ParticleKeyframeProp(); KeyframeProp3 = (kflist.Count > 3) ? kflist[3] : new ParticleKeyframeProp();
KeyframeProp4 = (kflist.Count > 4) ? kflist[4] : new ParticleKeyframeProp(); KeyframeProp4 = (kflist.Count > 4) ? kflist[4] : new ParticleKeyframeProp();
for (int i = kflist.Count; i < 16; i++) kflist.Add(null);
KeyframeProps = new ResourcePointerArray64<ParticleKeyframeProp>(); KeyframeProps = new ResourcePointerArray64<ParticleKeyframeProp>();
KeyframeProps.data_items = kflist.ToArray(); KeyframeProps.data_items = kflist.ToArray();
KeyframePropsCount1 = 5;//this should always be 5....... KeyframeProps.ManualReferenceOverride = true;
KeyframePropsCount = 5;//this should always be 5.......
KeyframePropsCapacity = 16;//should always be 16...
var udnode = node.SelectSingleNode("UnknownData"); var udnode = node.SelectSingleNode("UnknownData");
if (udnode != null) if (udnode != null)
@ -2684,8 +2680,7 @@ namespace CodeWalker.GameFiles
if (UnknownData != null) list.Add(UnknownData); if (UnknownData != null) list.Add(UnknownData);
if (KeyframeProps != null) if (KeyframeProps != null)
{ {
KeyframeProps.ManualPointerOverride = true; KeyframeProps.ManualReferenceOverride = true;
KeyframeProps.data_pointers = new ulong[16];
list.Add(KeyframeProps); list.Add(KeyframeProps);
} }
return list.ToArray(); return list.ToArray();
@ -3606,17 +3601,6 @@ namespace CodeWalker.GameFiles
this.KeyframeProps2Pointer = (ulong)(this.KeyframeProps2 != null ? this.KeyframeProps2.FilePosition : 0); this.KeyframeProps2Pointer = (ulong)(this.KeyframeProps2 != null ? this.KeyframeProps2.FilePosition : 0);
//this.refcnt2 = (ushort)(this.refs != null ? this.refs.Count : 0); //this.refcnt2 = (ushort)(this.refs != null ? this.refs.Count : 0);
if ((KeyframeProps1 != null) && (KeyframeProps2 != null))
{
var kfplist = new List<ulong>();
foreach (var kf in KeyframeProps1)
{
kfplist.Add((ulong)kf.FilePosition);//manually write pointers for this
}
for (int i = kfplist.Count; i < 10; i++) kfplist.Add(0);
KeyframeProps2.data_pointers = kfplist.ToArray();
}
// write structure data // write structure data
writer.Write(this.VFT); writer.Write(this.VFT);
@ -3679,7 +3663,8 @@ namespace CodeWalker.GameFiles
} }
KeyframeProps2 = new ResourcePointerArray64<ParticleKeyframeProp>(); KeyframeProps2 = new ResourcePointerArray64<ParticleKeyframeProp>();
KeyframeProps2.data_items = KeyframeProps1;//just temporary to make correct block length KeyframeProps2.data_items = KeyframeProps1;
KeyframeProps2.ManualReferenceOverride = true;
} }
public override IResourceBlock[] GetReferences() public override IResourceBlock[] GetReferences()
@ -3691,8 +3676,7 @@ namespace CodeWalker.GameFiles
if (Domain3 != null) list.Add(Domain3); if (Domain3 != null) list.Add(Domain3);
if (KeyframeProps2 != null) if (KeyframeProps2 != null)
{ {
KeyframeProps2.ManualPointerOverride = true; KeyframeProps2.ManualReferenceOverride = true;
KeyframeProps2.data_pointers = new ulong[10];
list.Add(KeyframeProps2); list.Add(KeyframeProps2);
} }
return list.ToArray(); return list.ToArray();
@ -4205,8 +4189,6 @@ namespace CodeWalker.GameFiles
public enum ParticleDomainType : byte public enum ParticleDomainType : byte
{ {
Box = 0, Box = 0,
@ -4445,6 +4427,7 @@ namespace CodeWalker.GameFiles
public override Tuple<long, IResourceBlock>[] GetParts() public override Tuple<long, IResourceBlock>[] GetParts()
{ {
KeyframeProps.ManualCountOverride = true; KeyframeProps.ManualCountOverride = true;
KeyframeProps.ManualReferenceOverride = true;
KeyframeProps.EntriesCount = 4; KeyframeProps.EntriesCount = 4;
KeyframeProps.EntriesCapacity = 16; KeyframeProps.EntriesCapacity = 16;
@ -4569,6 +4552,7 @@ namespace CodeWalker.GameFiles
this.Unknown_28h = reader.ReadUInt64(); this.Unknown_28h = reader.ReadUInt64();
KeyframeProps.ManualCountOverride = true; //incase re-saving again KeyframeProps.ManualCountOverride = true; //incase re-saving again
KeyframeProps.ManualReferenceOverride = true;
//if (Unknown_4h != 1) //if (Unknown_4h != 1)
//{ }//no hit //{ }//no hit
@ -4676,19 +4660,30 @@ namespace CodeWalker.GameFiles
public void CreateKeyframeProps(params ParticleKeyframeProp[] props) public void CreateKeyframeProps(params ParticleKeyframeProp[] props)
{ {
var plist = props.ToList(); var plist = props.ToList();
if (plist.Count > 0)
{
for (int i = plist.Count; i < 16; i++) for (int i = plist.Count; i < 16; i++)
{ {
plist.Add(null); plist.Add(null);
} }
}
KeyframeProps = new ResourcePointerList64<ParticleKeyframeProp>(); KeyframeProps = new ResourcePointerList64<ParticleKeyframeProp>();
KeyframeProps.data_items = plist.ToArray(); KeyframeProps.data_items = plist.ToArray();
KeyframeProps.ManualCountOverride = true; KeyframeProps.ManualCountOverride = true;
KeyframeProps.ManualReferenceOverride = true;
KeyframeProps.EntriesCount = (ushort)(props?.Length ?? 0); KeyframeProps.EntriesCount = (ushort)(props?.Length ?? 0);
KeyframeProps.EntriesCapacity = 16; KeyframeProps.EntriesCapacity = (ushort)((plist.Count > 0) ? 16 : 0);
} }
public override Tuple<long, IResourceBlock>[] GetParts()
{
return new Tuple<long, IResourceBlock>[] {
new Tuple<long, IResourceBlock>(0x10, KeyframeProps)
};
}
} }
[TC(typeof(EXP))] public class ParticleBehaviourAge : ParticleBehaviour [TC(typeof(EXP))] public class ParticleBehaviourAge : ParticleBehaviour

9
CodeWalker.Core/GameFiles/Resources/ResourceAnalyzer.cs
View File

@ -31,13 +31,16 @@ namespace CodeWalker.GameFiles
public override string ToString() public override string ToString()
{ {
var type = "########## ??? ##########"; var type = "########## ??? ##########";
var val = "";
if (SystemBlock != null) if (SystemBlock != null)
{ {
type = SystemBlock.GetType().Name; type = SystemBlock.GetType().Name;
//val = SystemBlock.ToString();
} }
else if (GraphicsBlock != null) else if (GraphicsBlock != null)
{ {
type = GraphicsBlock.GetType().Name; type = GraphicsBlock.GetType().Name;
//val = GraphicsBlock.ToString();
} }
else if (Array != null) else if (Array != null)
{ {
@ -45,9 +48,11 @@ namespace CodeWalker.GameFiles
} }
else if (String != null) else if (String != null)
{ {
type = "string - \"" + String + "\""; type = "string";
val = "\"" + String + "\"";
} }
return Offset.ToString() + " - " + Length.ToString() + " - " + type + (Overlapping ? " (embedded)" : ""); var valstr = (string.IsNullOrEmpty(val) ? "" : " - " + val);
return Offset.ToString() + " - " + Length.ToString() + " - " + type + valstr + (Overlapping ? " (embedded)" : "");
} }
} }

17
CodeWalker.Core/GameFiles/Resources/ResourceBaseTypes.cs
View File

@ -1383,10 +1383,6 @@ namespace CodeWalker.GameFiles
{ {
get get
{ {
if (ManualPointerOverride)
{
return (data_pointers != null) ? 8 * data_pointers.Length : 0;
}
return (data_items != null) ? 8 * data_items.Length : 0; return (data_items != null) ? 8 * data_items.Length : 0;
} }
} }
@ -1395,8 +1391,7 @@ namespace CodeWalker.GameFiles
public ulong[] data_pointers { get; set; } public ulong[] data_pointers { get; set; }
public T[] data_items { get; set; } public T[] data_items { get; set; }
public bool ManualPointerOverride = false;//use this to manually write data_pointers public bool ManualReferenceOverride = false;//use this if the items are embedded in something else
public ResourcePointerArray64() public ResourcePointerArray64()
@ -1423,8 +1418,6 @@ namespace CodeWalker.GameFiles
public override void Write(ResourceDataWriter writer, params object[] parameters) public override void Write(ResourceDataWriter writer, params object[] parameters)
{ {
// update... // update...
if (ManualPointerOverride == false)
{
var list = new List<ulong>(); var list = new List<ulong>();
foreach (var x in data_items) foreach (var x in data_items)
{ {
@ -1438,7 +1431,7 @@ namespace CodeWalker.GameFiles
} }
} }
data_pointers = list.ToArray(); data_pointers = list.ToArray();
}
// write... // write...
foreach (var x in data_pointers) foreach (var x in data_pointers)
@ -1450,7 +1443,7 @@ namespace CodeWalker.GameFiles
{ {
var list = new List<IResourceBlock>(); var list = new List<IResourceBlock>();
if (ManualPointerOverride == false) if (ManualReferenceOverride == false)
{ {
foreach (var x in data_items) foreach (var x in data_items)
{ {
@ -1571,6 +1564,7 @@ namespace CodeWalker.GameFiles
public T[] data_items { get; set; } public T[] data_items { get; set; }
public bool ManualCountOverride = false; //use this to manually specify the count public bool ManualCountOverride = false; //use this to manually specify the count
public bool ManualReferenceOverride = false; //use this if the items are embedded in something else
private ResourcePointerArray64<T> data_block;//used for saving. private ResourcePointerArray64<T> data_block;//used for saving.
@ -1587,7 +1581,7 @@ namespace CodeWalker.GameFiles
// this.EntriesCount // this.EntriesCount
//); //);
data_pointers = reader.ReadUlongsAt(EntriesPointer, EntriesCount); data_pointers = reader.ReadUlongsAt(EntriesPointer, EntriesCapacity);
data_items = new T[EntriesCount]; data_items = new T[EntriesCount];
for (int i = 0; i < EntriesCount; i++) for (int i = 0; i < EntriesCount; i++)
{ {
@ -1623,6 +1617,7 @@ namespace CodeWalker.GameFiles
{ {
data_block = new ResourcePointerArray64<T>(); data_block = new ResourcePointerArray64<T>();
data_block.data_items = data_items; data_block.data_items = data_items;
data_block.ManualReferenceOverride = ManualReferenceOverride;
list.Add(data_block); list.Add(data_block);
} }
else else