instanced SMs in umap

2026-08-28 12:24:44 -05:00 · 2023-11-16 20:39:01 +01:00
parent b525796f79
commit d6af826097
4 changed files with 66 additions and 30 deletions
--- a/2
+++ b/2
--- a/FModel/FModel.csproj
+++ b/FModel/FModel.csproj
@@ -140,22 +140,22 @@
  <ItemGroup>
    <PackageReference Include="AdonisUI" Version="1.17.1" />
    <PackageReference Include="AdonisUI.ClassicTheme" Version="1.17.1" />
-    <PackageReference Include="Autoupdater.NET.Official" Version="1.8.3" />
+    <PackageReference Include="Autoupdater.NET.Official" Version="1.8.4" />
    <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
    <PackageReference Include="CSCore" Version="1.2.1.2" />
    <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
-    <PackageReference Include="ImGui.NET" Version="1.89.7.1" />
-    <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.5" />
+    <PackageReference Include="ImGui.NET" Version="1.89.9.3" />
+    <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.6" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
    <PackageReference Include="NVorbis" Version="0.10.5" />
    <PackageReference Include="Oodle.NET" Version="1.0.1" />
    <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
-    <PackageReference Include="OpenTK" Version="4.8.0" />
+    <PackageReference Include="OpenTK" Version="4.8.1" />
    <PackageReference Include="RestSharp" Version="110.2.0" />
-    <PackageReference Include="Serilog" Version="3.0.1" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
    <PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
  </ItemGroup>

--- a/FModel/Framework/ImGuiController.cs
+++ b/FModel/Framework/ImGuiController.cs
@@ -440,7 +440,7 @@ outputColor = color * texture(in_fontTexture, texCoord);
        GL.BindBuffer(BufferTarget.ArrayBuffer, _vertexBuffer);
        for (int i = 0; i < draw_data.CmdListsCount; i++)
        {
-            ImDrawListPtr cmd_list = draw_data.CmdListsRange[i];
+            ImDrawListPtr cmd_list = draw_data.CmdLists[i];

            int vertexSize = cmd_list.VtxBuffer.Size * Unsafe.SizeOf<ImDrawVert>();
            if (vertexSize > _vertexBufferSize)
@@ -490,7 +490,7 @@ outputColor = color * texture(in_fontTexture, texCoord);
        // Render command lists
        for (int n = 0; n < draw_data.CmdListsCount; n++)
        {
-            ImDrawListPtr cmd_list = draw_data.CmdListsRange[n];
+            ImDrawListPtr cmd_list = draw_data.CmdLists[n];

            GL.BufferSubData(BufferTarget.ArrayBuffer, IntPtr.Zero, cmd_list.VtxBuffer.Size * Unsafe.SizeOf<ImDrawVert>(), cmd_list.VtxBuffer.Data);
            CheckGLError($"Data Vert {n}");
--- a/FModel/Views/Snooper/Renderer.cs
+++ b/FModel/Views/Snooper/Renderer.cs
@@ -454,34 +454,57 @@ public class Renderer : IDisposable

    private void WorldMesh(UObject actor, Transform transform)
    {
-        if (!actor.TryGetValue(out FPackageIndex staticMeshComponent, "StaticMeshComponent", "StaticMesh", "Mesh", "LightMesh") ||
-            !staticMeshComponent.TryLoad(out UStaticMeshComponent staticMeshComp) ||
-            !staticMeshComp.GetStaticMesh().TryLoad(out UStaticMesh m) || m.Materials.Length < 1)
-            return;
-
-        var guid = m.LightingGuid;
-        var t = new Transform
+        if (actor.TryGetValue(out FPackageIndex[] instanceComponents, "InstanceComponents"))
        {
-            Relation = transform.Matrix,
-            Position = staticMeshComp.GetOrDefault("RelativeLocation", FVector.ZeroVector) * Constants.SCALE_DOWN_RATIO,
-            Rotation = staticMeshComp.GetOrDefault("RelativeRotation", FRotator.ZeroRotator).Quaternion(),
-            Scale = staticMeshComp.GetOrDefault("RelativeScale3D", FVector.OneVector)
-        };
+            foreach (var component in instanceComponents)
+            {
+                if (!component.TryLoad(out UInstancedStaticMeshComponent staticMeshComp) ||
+                    !staticMeshComp.GetStaticMesh().TryLoad(out UStaticMesh m) || m.Materials.Length < 1)
+                    continue;
+
+                if (staticMeshComp.PerInstanceSMData is { Length: > 0 })
+                {
+
+                    var relation = CalculateTransform(staticMeshComp, transform);
+                    foreach (var perInstanceData in staticMeshComp.PerInstanceSMData)
+                    {
+                        ProcessMesh(actor, staticMeshComp, m, new Transform
+                        {
+                            Relation = relation.Matrix,
+                            Position = perInstanceData.TransformData.Translation * Constants.SCALE_DOWN_RATIO,
+                            Rotation = perInstanceData.TransformData.Rotation,
+                            Scale = perInstanceData.TransformData.Scale3D
+                        });
+                    }
+                }
+                else ProcessMesh(actor, staticMeshComp, m, CalculateTransform(staticMeshComp, transform));
+            }
+        }
+        else if (actor.TryGetValue(out FPackageIndex staticMeshComponent, "StaticMeshComponent", "StaticMesh", "Mesh", "LightMesh") &&
+                 staticMeshComponent.TryLoad(out UStaticMeshComponent staticMeshComp) &&
+                 staticMeshComp.GetStaticMesh().TryLoad(out UStaticMesh m) && m.Materials.Length > 0)
+        {
+            ProcessMesh(actor, staticMeshComp, m, CalculateTransform(staticMeshComp, transform));
+        }
+    }
+
+    private void ProcessMesh(UObject actor, UStaticMeshComponent staticMeshComp, UStaticMesh m, Transform transform)
+    {
+        var guid = m.LightingGuid;

        OverrideVertexColors(staticMeshComp, m);
        if (Options.TryGetModel(guid, out var model))
        {
-            model.AddInstance(t);
+            model.AddInstance(transform);
        }
        else if (m.TryConvert(out var mesh))
        {
-            model = new StaticModel(m, mesh, t);
+            model = new StaticModel(m, mesh, transform);
            model.IsTwoSided = actor.GetOrDefault("bMirrored", staticMeshComp.GetOrDefault("bDisallowMeshPaintPerInstance", model.IsTwoSided));

-            if (actor.TryGetValue(out FPackageIndex baseMaterial, "BaseMaterial") &&
-                actor.TryGetAllValues(out FPackageIndex[] textureData, "TextureData"))
+            if (actor.TryGetAllValues(out FPackageIndex[] textureData, "TextureData"))
            {
-                var material = model.Materials.FirstOrDefault(x => x.Name == baseMaterial.Name);
+                var material = model.Materials.FirstOrDefault();
                if (material is { IsUsed: true })
                {
                    for (int j = 0; j < textureData.Length; j++)
@@ -520,7 +543,9 @@ public class Renderer : IDisposable
                for (var j = 0; j < overrideMaterials.Length && j < model.Sections.Length; j++)
                {
                    var matIndex = model.Sections[j].MaterialIndex;
-                    if (!(model.Materials[matIndex].IsUsed && overrideMaterials[matIndex].Load() is UMaterialInterface unrealMaterial)) continue;
+                    if (matIndex < 0 || matIndex >= model.Materials.Length || matIndex >= overrideMaterials.Length ||
+                        overrideMaterials[matIndex].Load() is not UMaterialInterface unrealMaterial) continue;
+
                    model.Materials[matIndex].SwapMaterial(unrealMaterial);
                }
            }
@@ -531,15 +556,26 @@ public class Renderer : IDisposable
        if (actor.TryGetValue(out FPackageIndex treasureLight, "PointLight", "TreasureLight") &&
            treasureLight.TryLoad(out var pl1) && pl1.Template.TryLoad(out var pl2))
        {
-            Options.Lights.Add(new PointLight(guid, Options.Icons["pointlight"], pl1, pl2, t));
+            Options.Lights.Add(new PointLight(guid, Options.Icons["pointlight"], pl1, pl2, transform));
        }
        if (actor.TryGetValue(out FPackageIndex spotLight, "SpotLight") &&
            spotLight.TryLoad(out var sl1) && sl1.Template.TryLoad(out var sl2))
        {
-            Options.Lights.Add(new SpotLight(guid, Options.Icons["spotlight"], sl1, sl2, t));
+            Options.Lights.Add(new SpotLight(guid, Options.Icons["spotlight"], sl1, sl2, transform));
        }
    }

+    private Transform CalculateTransform(UStaticMeshComponent staticMeshComp, Transform relation)
+    {
+        return new Transform
+        {
+            Relation = relation.Matrix,
+            Position = staticMeshComp.GetOrDefault("RelativeLocation", FVector.ZeroVector) * Constants.SCALE_DOWN_RATIO,
+            Rotation = staticMeshComp.GetOrDefault("RelativeRotation", FRotator.ZeroRotator).Quaternion(),
+            Scale = staticMeshComp.GetOrDefault("RelativeScale3D", FVector.OneVector)
+        };
+    }
+
    private void OverrideVertexColors(UStaticMeshComponent staticMeshComp, UStaticMesh staticMesh)
    {
        if (staticMeshComp.LODData is not { Length: > 0 } || staticMesh.RenderData is not { LODs.Length: > 0 })