celisej567/LibBSP
1
0
Fork 0
mirror of https://github.com/celisej567/LibBSP.git synced 2025-12-31 13:48:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add extensions to make constructing Vectors from byte arrays easier.

Browse Source
This commit is contained in:
wfowler
2021-04-15 20:55:44 -06:00
parent d5330228f8
commit 37fc7c5a26
5 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibBSP/Source/Extensions/PlaneExtensions.cs
View File

@@ -279,7 +279,7 @@ namespace LibBSP {
int numObjects = data.Length / structLength;
Lump<Plane> lump = new Lump<Plane>(numObjects, bsp, lumpInfo);
for (int i = 0; i < numObjects; ++i) {
Vector3 normal = new Vector3(BitConverter.ToSingle(data, structLength * i), BitConverter.ToSingle(data, (structLength * i) + 4), BitConverter.ToSingle(data, (structLength * i) + 8));
Vector3 normal = Vector3Extensions.ToVector3(data, structLength * i);
float distance = BitConverter.ToSingle(data, (structLength * i) + 12);
lump.Add(new Plane(normal, distance));
}

10
LibBSP/Source/Extensions/Vector2Extensions.cs
View File

@@ -137,6 +137,16 @@ namespace LibBSP {
return ret;
}
/// <summary>
/// Returns a <see cref="Vector2"/> converted from eight bytes at a specified position in a byte array.
/// </summary>
/// <param name="value">An array of bytes.</param>
/// <param name="startIndex">The starting position within <paramref name="value"/>.</param>
/// <returns>A <see cref="Vector2"/> representing the converted bytes.</returns>
public static Vector2 ToVector2(byte[] value, int startIndex) {
return new Vector2(BitConverter.ToSingle(value, startIndex), BitConverter.ToSingle(value, startIndex + 4));
}
/// <summary>
/// Gets the X component of this <see cref="Vector2"/>.
/// </summary>

10
LibBSP/Source/Extensions/Vector3Extensions.cs
View File

@@ -149,6 +149,16 @@ namespace LibBSP {
return ret;
}
/// <summary>
/// Returns a <see cref="Vector3"/> converted from twelve bytes at a specified position in a byte array.
/// </summary>
/// <param name="value">An array of bytes.</param>
/// <param name="startIndex">The starting position within <paramref name="value"/>.</param>
/// <returns>A <see cref="Vector3"/> representing the converted bytes.</returns>
public static Vector3 ToVector3(byte[] value, int startIndex) {
return new Vector3(BitConverter.ToSingle(value, startIndex), BitConverter.ToSingle(value, startIndex + 4), BitConverter.ToSingle(value, startIndex + 8));
}
/// <summary>
/// Gets the X component of this <see cref="Vector3"/>.
/// </summary>

10
LibBSP/Source/Extensions/Vector4Extensions.cs
View File

@@ -151,6 +151,16 @@ namespace LibBSP {
return ret;
}
/// <summary>
/// Returns a <see cref="Vector4"/> converted from twelve bytes at a specified position in a byte array.
/// </summary>
/// <param name="value">An array of bytes.</param>
/// <param name="startIndex">The starting position within <paramref name="value"/>.</param>
/// <returns>A <see cref="Vector4"/> representing the converted bytes.</returns>
public static Vector4 ToVector4(byte[] value, int startIndex) {
return new Vector4(BitConverter.ToSingle(value, startIndex), BitConverter.ToSingle(value, startIndex + 4), BitConverter.ToSingle(value, startIndex + 8), BitConverter.ToSingle(value, startIndex + 12));
}
/// <summary>
/// Gets the X component of this <see cref="Vector4"/>.
/// </summary>

36
LibBSP/Source/Extensions/VertexExtensions.cs
View File

@@ -92,43 +92,43 @@ namespace LibBSP {
}
case MapType.CoD2:
case MapType.CoD4: {
result.normal = new Vector3(BitConverter.ToSingle(data, 12), BitConverter.ToSingle(data, 16), BitConverter.ToSingle(data, 20));
result.normal = Vector3Extensions.ToVector3(data, 12);
result.color = ColorExtensions.FromArgb(data[27], data[24], data[25], data[26]);
result.uv0 = new Vector2(BitConverter.ToSingle(data, 28), BitConverter.ToSingle(data, 32));
result.uv1 = new Vector2(BitConverter.ToSingle(data, 36), BitConverter.ToSingle(data, 40));
result.uv0 = Vector2Extensions.ToVector2(data, 28);
result.uv1 = Vector2Extensions.ToVector2(data, 36);
// Use these fields to store additional unknown information
result.tangent = new Vector4(BitConverter.ToSingle(data, 44), BitConverter.ToSingle(data, 48), BitConverter.ToSingle(data, 52), BitConverter.ToSingle(data, 56));
result.uv3 = new Vector2(BitConverter.ToSingle(data, 60), BitConverter.ToSingle(data, 64));
result.tangent = Vector4Extensions.ToVector4(data, 44);
result.uv3 = Vector2Extensions.ToVector2(data, 60);
goto case MapType.Quake;
}
case MapType.MOHAA:
case MapType.Quake3:
case MapType.FAKK: {
result.uv0 = new Vector2(BitConverter.ToSingle(data, 12), BitConverter.ToSingle(data, 16));
result.uv1 = new Vector2(BitConverter.ToSingle(data, 20), BitConverter.ToSingle(data, 24));
result.normal = new Vector3(BitConverter.ToSingle(data, 28), BitConverter.ToSingle(data, 32), BitConverter.ToSingle(data, 36));
result.uv0 = Vector2Extensions.ToVector2(data, 12);
result.uv1 = Vector2Extensions.ToVector2(data, 20);
result.normal = Vector3Extensions.ToVector3(data, 28);
result.color = ColorExtensions.FromArgb(data[43], data[40], data[41], data[42]);
goto case MapType.Quake;
}
case MapType.Raven: {
result.uv0 = new Vector2(BitConverter.ToSingle(data, 12), BitConverter.ToSingle(data, 16));
result.uv1 = new Vector2(BitConverter.ToSingle(data, 20), BitConverter.ToSingle(data, 24));
result.uv2 = new Vector2(BitConverter.ToSingle(data, 28), BitConverter.ToSingle(data, 32));
result.uv3 = new Vector2(BitConverter.ToSingle(data, 36), BitConverter.ToSingle(data, 40));
result.normal = new Vector3(BitConverter.ToSingle(data, 52), BitConverter.ToSingle(data, 56), BitConverter.ToSingle(data, 60));
result.uv0 = Vector2Extensions.ToVector2(data, 12);
result.uv1 = Vector2Extensions.ToVector2(data, 20);
result.uv2 = Vector2Extensions.ToVector2(data, 28);
result.uv3 = Vector2Extensions.ToVector2(data, 36);
result.normal = Vector3Extensions.ToVector3(data, 52);
result.color = ColorExtensions.FromArgb(data[67], data[64], data[65], data[66]);
// Use for two more float fields and two more colors.
// There's actually another field that seems to be color but I've only ever seen it be 0xFFFFFFFF.
result.tangent = new Vector4(BitConverter.ToSingle(data, 44), BitConverter.ToSingle(data, 48), BitConverter.ToSingle(data, 68), BitConverter.ToSingle(data, 72));
result.tangent = Vector4Extensions.ToVector4(data, 44);
goto case MapType.Quake;
}
case MapType.STEF2:
case MapType.STEF2Demo: {
result.uv0 = new Vector2(BitConverter.ToSingle(data, 12), BitConverter.ToSingle(data, 16));
result.uv1 = new Vector2(BitConverter.ToSingle(data, 20), BitConverter.ToSingle(data, 24));
result.uv0 = Vector2Extensions.ToVector2(data, 12);
result.uv1 = Vector2Extensions.ToVector2(data, 20);
result.uv2 = new Vector2(BitConverter.ToSingle(data, 28), 0);
result.color = ColorExtensions.FromArgb(data[35], data[32], data[33], data[34]);
result.normal = new Vector3(BitConverter.ToSingle(data, 36), BitConverter.ToSingle(data, 40), BitConverter.ToSingle(data, 44));
result.normal = Vector3Extensions.ToVector3(data, 36);
goto case MapType.Quake;
}
case MapType.Quake:
@@ -150,7 +150,7 @@ namespace LibBSP {
case MapType.Daikatana:
case MapType.Vindictus:
case MapType.DMoMaM: {
result.position = new Vector3(BitConverter.ToSingle(data, 0), BitConverter.ToSingle(data, 4), BitConverter.ToSingle(data, 8));
result.position = Vector3Extensions.ToVector3(data, 0);
break;
}
default: {