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

Merge pull request #46 from carmineos/update/boundmaterial

Browse Source 
Updated BoundMaterial_s and added BoundsMaterialType To/From byte implicit cast operators
This commit is contained in:
dexyfex 2019-03-07 16:50:14 +11:00 committed by GitHub
commit 3116c049fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 73 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -775,37 +775,81 @@ namespace CodeWalker.GameFiles
} }
} }
[TC(typeof(EXP))] [StructLayout(LayoutKind.Sequential, Pack = 1)] public struct BoundMaterial_s [TC(typeof(EXP))]
public struct BoundMaterial_s
{ {
public BoundsMaterialType Type { get; set; }
public byte ProceduralId { get; set; }
public byte RoomId_and_PedDensity { get; set; }
public EBoundMaterialFlags Flags { get; set; }
public byte MaterialColorIndex { get; set; }
public ushort Unk4 { get; set; }
/// <summary> public uint Data1;
/// Bits 0, 1, 2, 3, 4 of <see cref="RoomId_and_PedDensity"/>, values from 0 to 31 public uint Data2;
/// </summary>
public byte RoomId #region Public Properties
public BoundsMaterialType Type
{ {
get => (byte)(RoomId_and_PedDensity & 0x1F); get => (BoundsMaterialType)(Data1 & 0xFFu);
set => RoomId_and_PedDensity = (byte)((RoomId_and_PedDensity & 0xE0) | (value & 0x1F)); set => Data1 = ((Data1 & 0xFFFFFF00u) | ((byte)value & 0xFFu));
}
public byte ProceduralId
{
get => (byte)((Data1 >> 8) & 0xFFu);
set => Data1 = ((Data1 & 0xFFFF00FFu) | ((value & 0xFFu) << 8));
}
public byte RoomId
{
get => (byte)((Data1 >> 16) & 0x1Fu);
set => Data1 = ((Data1 & 0xFFE0FFFFu) | ((value & 0x1Fu) << 16));
} }
/// <summary>
/// Bits 5, 6, 7 of <see cref="RoomId_and_PedDensity"/>, values from 0 to 7
/// </summary>
public byte PedDensity public byte PedDensity
{ {
get => (byte)((RoomId_and_PedDensity & 0xE0) >> 5); get => (byte)((Data1 >> 21) & 0x7u);
set => RoomId_and_PedDensity = (byte)((RoomId_and_PedDensity & 0x1F) | ((value << 5) & 0xE0)); set => Data1 = ((Data1 & 0xFF1FFFFFu) | ((value & 0x7u) << 21));
}
//public byte Flags1
//{
// get => (byte)((Data1 >> 24) & 0xFFu);
// set => Data1 = ((Data1 & 0xFFFFFFu) | ((value & 0xFFu) << 24));
//}
//public byte Flags2
//{
// get => (byte)((Data2 >> 24) & 0xFFu);
// set => Data2 = ((Data2 & 0xFFFFFFu) | ((value & 0xFFu) << 24));
//}
public EBoundMaterialFlags Flags
{
get => (EBoundMaterialFlags)(((Data1 >> 24) & 0xFFu) | ((Data2 & 0xFFu) << 8));
set
{
Data1 = (Data1 & 0x00FFFFFFu) | (((ushort)value & 0x00FFu) << 24);
Data2 = (Data2 & 0xFFFFFF00u) | (((ushort)value & 0xFF00u) >> 8);
}
}
public byte MaterialColorIndex
{
get => (byte)((Data2 >> 8) & 0xFFu);
set => Data2 = ((Data2 & 0xFFFF00FFu) | (value & 0xFFu));
}
public ushort Unk4
{
get => (ushort)((Data2 >> 16) & 0xFFFFu);
set => Data2 = ((Data2 & 0x0000FFFFu) | ((value & 0xFFFFu) << 16));
} }
public override string ToString() public override string ToString()
{ {
return Type.ToString() + ", " + ProceduralId.ToString() + ", " + RoomId_and_PedDensity.ToString() + ", " + MaterialColorIndex.ToString() + ", " + Flags.ToString() + ", " + Unk4.ToString(); return Data1.ToString() + ", " + Data2.ToString() + ", "
+ Type.ToString() + ", " + ProceduralId.ToString() + ", " + RoomId.ToString() + ", " + PedDensity.ToString() + ", "
+ Flags.ToString() + ", " + MaterialColorIndex.ToString() + ", " + Unk4.ToString();
} }
#endregion
} }
[Flags] public enum EBoundMaterialFlags : ushort [Flags] public enum EBoundMaterialFlags : ushort
@ -1472,6 +1516,16 @@ namespace CodeWalker.GameFiles
{ {
return BoundsMaterialTypes.GetMaterialName(this); return BoundsMaterialTypes.GetMaterialName(this);
} }
public static implicit operator byte(BoundsMaterialType matType)
{
return matType.Index; //implicit conversion
}
public static implicit operator BoundsMaterialType(byte b)
{
return new BoundsMaterialType() { Index = b };
}
} }
[TC(typeof(EXP))] public class BoundsMaterialData [TC(typeof(EXP))] public class BoundsMaterialData