celisej567/LibBSP
1
0
Fork 0
mirror of https://github.com/celisej567/LibBSP.git synced 2026-01-05 10:10:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add texture scale information to TextureInfo.

Browse Source 
This is only useful in MAPBrushSides, BSPs compile the scales into the axes themselves.
This commit is contained in:
wfowler1
2016-08-30 19:11:05 -06:00
parent aa144a0f4c
commit 45c4de4094
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LibBSP/Source/Structs/BSP/Texture.cs
View File

@@ -56,7 +56,7 @@ namespace LibBSP {
case MapType.Quake2:
case MapType.SoF:
case MapType.Daikatana: {
texAxes = new TextureInfo(new Vector3(BitConverter.ToSingle(data, 0), BitConverter.ToSingle(data, 4), BitConverter.ToSingle(data, 8)), BitConverter.ToSingle(data, 12), new Vector3(BitConverter.ToSingle(data, 16), BitConverter.ToSingle(data, 20), BitConverter.ToSingle(data, 24)), BitConverter.ToSingle(data, 28), -1, -1);
texAxes = new TextureInfo(new Vector3(BitConverter.ToSingle(data, 0), BitConverter.ToSingle(data, 4), BitConverter.ToSingle(data, 8)), BitConverter.ToSingle(data, 12), 1, new Vector3(BitConverter.ToSingle(data, 16), BitConverter.ToSingle(data, 20), BitConverter.ToSingle(data, 24)), BitConverter.ToSingle(data, 28), 1, -1, -1);
flags = BitConverter.ToInt32(data, 32);
name = data.ToNullTerminatedString(40, 32);
break;
@@ -94,7 +94,7 @@ namespace LibBSP {
break;
}
case MapType.SiN: {
texAxes = new TextureInfo(new Vector3(BitConverter.ToSingle(data, 0), BitConverter.ToSingle(data, 4), BitConverter.ToSingle(data, 8)), BitConverter.ToSingle(data, 12), new Vector3(BitConverter.ToSingle(data, 16), BitConverter.ToSingle(data, 20), BitConverter.ToSingle(data, 24)), BitConverter.ToSingle(data, 28), -1, -1);
texAxes = new TextureInfo(new Vector3(BitConverter.ToSingle(data, 0), BitConverter.ToSingle(data, 4), BitConverter.ToSingle(data, 8)), BitConverter.ToSingle(data, 12), 1, new Vector3(BitConverter.ToSingle(data, 16), BitConverter.ToSingle(data, 20), BitConverter.ToSingle(data, 24)), BitConverter.ToSingle(data, 28), 1, -1, -1);
flags = BitConverter.ToInt32(data, 32);
name = data.ToNullTerminatedString(36, 64);
break;

21
LibBSP/Source/Structs/BSP/TextureInfo.cs
View File

@@ -36,6 +36,7 @@ namespace LibBSP {
public Vector3[] axes { get; private set; }
public float[] shifts { get; private set; }
public float[] scales { get; private set; }
public int flags { get; private set; }
public int texture { get; private set; }
@@ -59,6 +60,8 @@ namespace LibBSP {
shifts[S] = BitConverter.ToSingle(data, 12);
axes[T] = new Vector3(BitConverter.ToSingle(data, 16), BitConverter.ToSingle(data, 20), BitConverter.ToSingle(data, 24));
shifts[T] = BitConverter.ToSingle(data, 28);
// Texture scaling information is compiled into the axes by changing their length.
scales = new float[] { 1, 1 };
switch (type) {
// Excluded engines: Quake 2-based, Quake 3-based
case MapType.Source17:
@@ -99,25 +102,29 @@ namespace LibBSP {
/// Creates a new <see cref="TextureInfo"/> object using the passed data.
/// </summary>
/// <param name="s">The S texture axis.</param>
/// <param name="SShift">The texture shift on the S axis.</param>
/// <param name="sShift">The texture shift on the S axis.</param>
/// <param name="sScale">The texture scale on the S axis.</param>
/// <param name="t">The T texture axis.</param>
/// <param name="TShift">The texture shift on the T axis.</param>
/// <param name="tShift">The texture shift on the T axis.</param>
/// <param name="tScale">The texture scale on the T axis.</param>
/// <param name="flags">The flags for this <see cref="TextureInfo"/>.</param>
/// <param name="texture">Index into the texture list for the texture this <see cref="TextureInfo"/> uses.</param>
public TextureInfo(Vector3 s, float SShift, Vector3 t, float TShift, int flags, int texture) {
public TextureInfo(Vector3 s, float sShift, float sScale, Vector3 t, float tShift, float tScale, int flags, int texture) {
axes = new Vector3[2];
axes[S] = s;
axes[T] = t;
shifts = new float[2];
shifts[S] = SShift;
shifts[T] = TShift;
shifts[S] = sShift;
shifts[T] = tShift;
scales[S] = sScale;
scales[T] = tScale;
this.flags = flags;
this.texture = texture;
}
/// <summary>
/// Adapted from code in the Quake III Arena source code. Stolen without
/// permission because it falls under the terms of the GPL v2 license, because I'm not making
/// Adapted from code in the Quake III Arena source code. Stolen without permission
/// because it falls under the terms of the GPL v2 license, and because I'm not making
/// any money, just awesome tools.
/// </summary>
/// <param name="p"><see cref="Plane"/> of the surface.</param>