mirrors/parkan-playground
1
Fork 0
mirror of https://github.com/sampletext32/ParkanPlayground.git synced 2026-08-15 02:57:49 +04:00
Code Issues Activity

fix textures UV. drop leftovers. properly map material_lo.

Browse Source
This commit is contained in:
bird_egop
2026-06-06 23:25:14 +03:00
parent 5baf3f324f
commit 64fd54635e
9 changed files with 36 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MaterialLib/MaterialParser.cs
+1 -25
View File
@@ -1,5 +1,6 @@
using System.Buffers.Binary;
using System.Text;
using Common;
namespace MaterialLib;
@@ -168,28 +169,3 @@ public static class MaterialParser
return $"Интерполируется: {string.Join(", ", parts)} | Остальные компоненты копируются (Flags: 0x{(int)target:X})";
}
}
// Helper extensions
internal static class StreamExtensions
{
public static float ReadFloatLittleEndian(this Stream stream)
{
Span<byte> buffer = stackalloc byte[4];
stream.ReadExactly(buffer);
return BinaryPrimitives.ReadSingleLittleEndian(buffer);
}
public static ushort ReadUInt16LittleEndian(this Stream stream)
{
Span<byte> buffer = stackalloc byte[2];
stream.ReadExactly(buffer);
return BinaryPrimitives.ReadUInt16LittleEndian(buffer);
}
public static uint ReadUInt32LittleEndian(this Stream stream)
{
Span<byte> buffer = stackalloc byte[4];
stream.ReadExactly(buffer);
return BinaryPrimitives.ReadUInt32LittleEndian(buffer);
}
}
MshLib/Msh0x01.cs
-25
View File
@@ -104,11 +104,6 @@ public static class Msh0x01
ushort FallbackKey0x08,
ushort[] Msh02SlotIndicesByStateAndLOD)
{
public bool IsRoot => ParentIndexOrLink == ushort.MaxValue;
public int ParentIndexOrMinusOne =>
ParentIndexOrLink == ushort.MaxValue ? -1 : ParentIndexOrLink;
public ushort ResolveSlotIndex(int state, int lod = 0)
{
@@ -129,26 +124,6 @@ public static class Msh0x01
? Msh02SlotIndicesByStateAndLOD[index]
: ushort.MaxValue;
}
public bool HasGeometrySlot(int lod, int group = 0) =>
ResolveSlotIndex(lod, group) != ushort.MaxValue;
public int CountLodsForGroup(int group = 0)
{
var count = 0;
for (var lod = 0; lod < StateCount; lod++)
{
if (!HasGeometrySlot(lod, group))
{
break;
}
count++;
}
return count;
}
}
}
MshLib/Msh0x0D.cs
+17 -12
View File
@@ -38,21 +38,25 @@ public static class Msh0x0D
return data
.Chunk(ElementSize)
.Select(x => new Batch(
(BatchFlags)BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x00)),
BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x02)),
BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x04)),
BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x06)),
BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x08)),
BinaryPrimitives.ReadUInt32LittleEndian(x.AsSpan(0x0A)),
BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x0E)),
BinaryPrimitives.ReadUInt32LittleEndian(x.AsSpan(0x10))))
Flags: (BatchFlags)BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x00)),
MaterialIndexHi: BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x02)),
MaterialIndexLo: x.AsSpan(0x04)[0],
LightmapIndex: x.AsSpan(0x05)[0],
LocalBatchIndex: BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x06)),
IndexCount0x06: BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x08)),
IndexStart0x06: BinaryPrimitives.ReadUInt32LittleEndian(x.AsSpan(0x0A)),
VertexCount0x03: BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x0E)),
BaseVertex0x03: BinaryPrimitives.ReadUInt16LittleEndian(x.AsSpan(0x10))
)
)
.ToList();
}
/// <summary>MSH batch 0x0D, sizeof 0x14.</summary>
/// <param name="Flags">[0x00..0x02] Флаги batch.</param>
/// <param name="MaterialIndex">[0x02..0x04] Индекс material slot. Может быть overridden CAniMesh::forced_material_index.</param>
/// <param name="Opaque04">[0x04..0x06] Opaque. В GetBatchRenderData попадает в packed field вместе с material/lightmap данными.</param>
/// <param name="MaterialIndexHi">[0x02..0x04] Индекс material slot. Может быть overridden CAniMesh::forced_material_index.</param>
/// <param name="MaterialIndexLo">[0x04..0x05] Индекс материала</param>
/// <param name="LightmapIndex">[0x05..0x06] Индекс карты освещения</param>
/// <param name="LocalBatchIndex">[0x06..0x08] Локальный batch index. В GetBatchRenderData складывается с MSH_piece.local_index_base / batch base.</param>
/// <param name="IndexCount0x06">[0x08..0x0A] Количество индексов из component 0x06.</param>
/// <param name="IndexStart0x06">[0x0A..0x0E] Первый индекс в component 0x06.</param>
@@ -60,8 +64,9 @@ public static class Msh0x0D
/// <param name="BaseVertex0x03">[0x10..0x14] Base vertex в vertex streams, включая position stream 0x03.</param>
public readonly record struct Batch(
BatchFlags Flags,
ushort MaterialIndex,
ushort Opaque04,
ushort MaterialIndexHi,
byte MaterialIndexLo,
byte LightmapIndex,
ushort LocalBatchIndex,
ushort IndexCount0x06,
uint IndexStart0x06,
MshLib/MshConverter.cs
+1 -1
View File
@@ -185,7 +185,7 @@ public sealed class MshConverter
continue;
}
writer.WriteLine($"# batch {batchIndex}, material {batch.MaterialIndex}, flags {batch.Flags}");
writer.WriteLine($"# batch {batchIndex}, material {batch.MaterialIndexLo}, flags {batch.Flags}");
for (var i = 0; i + 2 < batch.IndexCount0x06; i += 3)
{
NResUI/Rendering/Viewport/Msh/MshRestPoseBuilder.cs
+1 -1
View File
@@ -88,7 +88,7 @@ public static class MshRestPoseBuilder
{
try
{
return Convert.ToInt32(node.ParentIndexOrMinusOne);
return Convert.ToInt32(node.ParentIndexOrLink);
}
catch
{
NResUI/Rendering/Viewport/Msh/MshViewportLoader.cs
+3 -3
View File
@@ -134,7 +134,7 @@ public static class MshViewportLoader
var outIndices = new List<uint>();
var batchTriangleCount = 0;
var material = materialLibrary.FindMaterial(batch.MaterialIndex) ?? ViewportMaterial.Untextured;
var material = materialLibrary.FindMaterial(batch.MaterialIndexLo) ?? ViewportMaterial.Untextured;
var vertexColor = material.HasTexture ? Vector3.One : debugColor;
for (var i = 0; i + 2 < batch.IndexCount0x06; i += 3)
@@ -156,7 +156,7 @@ public static class MshViewportLoader
normal = Vector3.UnitY;
else
normal = Vector3.Normalize(normal);
AddTriangleVertex(p0, vertexColor, normal, GetUv(uvs, vertexIndex0), vertices, outIndices, ref boundsMin, ref boundsMax);
AddTriangleVertex(p1, vertexColor, normal, GetUv(uvs, vertexIndex1), vertices, outIndices, ref boundsMin, ref boundsMax);
AddTriangleVertex(p2, vertexColor, normal, GetUv(uvs, vertexIndex2), vertices, outIndices, ref boundsMin, ref boundsMax);
@@ -183,7 +183,7 @@ public static class MshViewportLoader
return Vector2.Zero;
var uv = uvs[vertexIndex];
return new Vector2(uv.U / 1024.0f, 1.0f - uv.V / 1024.0f);
return new Vector2(uv.U / 1024.0f, uv.V / 1024.0f);
}
private static Vector3 ToNumericsVector3(Common.Vector3 position)
NResUI/Rendering/Viewport/Msh/WeaMaterialLibrary.cs
+5 -3
View File
@@ -46,9 +46,9 @@ public sealed class WeaMaterialLibrary
foreach (var materialRef in materialRefs)
{
var texture = TryLoadMaterialTexture(gl, materialFs, parseResult.Archive, materialRef.Name);
var texture = TryLoadMaterialTexture(gl, materialFs, parseResult.Archive, materialRef.Name, out var texm);
result[materialRef.Id] = texture != null
? new ViewportMaterial(materialRef.Name, texture.Value)
? new ViewportMaterial(materialRef.Name, texture.Value, texm)
: new ViewportMaterial(materialRef.Name);
}
@@ -194,9 +194,10 @@ public sealed class WeaMaterialLibrary
}
private static uint? TryLoadMaterialTexture(
GL gl, FileStream materialFs, NResArchive materialArchive, string materialName
GL gl, FileStream materialFs, NResArchive materialArchive, string materialName, out TexmFile? texm
)
{
texm = null;
var entry = FindMaterialEntry(materialArchive, materialName);
if (entry == null)
return null;
@@ -235,6 +236,7 @@ public sealed class WeaMaterialLibrary
if (texmResult.TexmFile == null)
return null;
texm = texmResult.TexmFile;
var rgba = texmResult.TexmFile.GetRgba32BytesFromMipmap(0, out var width, out var height);
return ViewportTextureLoader.CreateRgbaTexture(gl, rgba, width, height);
}
NResUI/Rendering/Viewport/ViewportMaterial.cs
+6 -1
View File
@@ -1,3 +1,5 @@
using TexmLib;
namespace NResUI.Rendering.Viewport;
public sealed class ViewportMaterial
@@ -6,10 +8,13 @@ public sealed class ViewportMaterial
public uint TextureHandle { get; }
public bool HasTexture => TextureHandle != 0;
public ViewportMaterial(string name, uint textureHandle = 0)
public TexmFile? Texm { get; }
public ViewportMaterial(string name, uint textureHandle = 0, TexmFile? texm = null)
{
Name = name;
TextureHandle = textureHandle;
Texm = texm;
}
public static ViewportMaterial Untextured { get; } = new("Untextured");
TexmLib/TexmFile.cs
+2 -2
View File
@@ -277,9 +277,9 @@ public record class TexmFile(
// swap endianess back
// (rawPixel[0], rawPixel[1], rawPixel[2], rawPixel[3]) = (rawPixel[3], rawPixel[2], rawPixel[1], rawPixel[0]);
var r = rawPixel[0];
var b = rawPixel[0];
var g = rawPixel[1];
var b = rawPixel[2];
var r = rawPixel[2];
var a = rawPixel[3];
result[i + 0] = r;