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
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);
}