From a0e95358b8349983bcef8e8ccbc096c1ab7aad27 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Fri, 29 May 2026 23:44:45 +0100 Subject: [PATCH] Align geometry document fingerprints with Rust --- .../CultGeometryDocuments.cs | 53 +++++++------------ .../GeometryDocumentTests.cs | 16 ++++++ 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/GameCult.Geometry/CultGeometryDocuments.cs b/src/GameCult.Geometry/CultGeometryDocuments.cs index cd8d6cdb..7a1677b3 100644 --- a/src/GameCult.Geometry/CultGeometryDocuments.cs +++ b/src/GameCult.Geometry/CultGeometryDocuments.cs @@ -83,23 +83,19 @@ namespace GameCult.Geometry public string StableFingerprint() { - var builder = new StringBuilder() - .Append(Name).Append('\u001f') - .Append(Kind).Append('\u001f') - .Append(Seed.ToString(CultureInfo.InvariantCulture)).Append('\u001f') - .AppendVector(Translation).Append('\u001f') - .AppendVector(RotationXyzw); - foreach (var claim in Claims) + var parts = new[] { - builder.Append('\u001e').Append(claim.StableFingerprint()); + Name, + Kind, + StableVector(Translation), + StableVector(RotationXyzw), + Seed.ToString(CultureInfo.InvariantCulture) } + .Concat(Claims.Select(claim => claim.StableFingerprint())) + .Concat(Children.Select(child => child.StableFingerprint())) + .ToArray(); - foreach (var child in Children) - { - builder.Append('\u001d').Append(child.StableFingerprint()); - } - - return builder.ToString(); + return StableArray(parts); } } @@ -133,16 +129,16 @@ namespace GameCult.Geometry [Key(7)] public string LoweringPolicy { get; set; } = string.Empty; - public string StableFingerprint() => new StringBuilder() - .Append(Name).Append('\u001f') - .Append(Kind).Append('\u001f') - .Append(Material.ToString(CultureInfo.InvariantCulture)).Append('\u001f') - .Append(LoweringPolicy).Append('\u001f') - .AppendVector(Translation).Append('\u001f') - .AppendVector(RotationXyzw).Append('\u001f') - .AppendVector(SupportCenter).Append('\u001f') - .AppendVector(SupportSize) - .ToString(); + public string StableFingerprint() => StableArray([ + Name, + StableVector(Translation), + StableVector(RotationXyzw), + StableVector(SupportCenter), + StableVector(SupportSize), + Kind, + Material.ToString(CultureInfo.InvariantCulture), + LoweringPolicy + ]); } /// @@ -423,13 +419,4 @@ namespace GameCult.Geometry return string.Join("\u001e", values); } } - - internal static class CultGeometryStringBuilderExtensions - { - public static StringBuilder AppendVector(this StringBuilder builder, float[] values) - { - builder.Append(StableVector(values)); - return builder; - } - } } diff --git a/tests/GameCult.Geometry.Tests/GeometryDocumentTests.cs b/tests/GameCult.Geometry.Tests/GeometryDocumentTests.cs index 343fa279..9513ca0a 100644 --- a/tests/GameCult.Geometry.Tests/GeometryDocumentTests.cs +++ b/tests/GameCult.Geometry.Tests/GeometryDocumentTests.cs @@ -70,6 +70,22 @@ namespace GameCult.Geometry.Tests .Should().Be(CultGeometryChunkArtifact.CreateRecordKey(chunk)); } + [Test] + public void FeatureClaim_StableFingerprint_UsesRustCanonicalOrder() + { + var claim = SampleDomain().Root.Children[0].Claims[0]; + + claim.StableFingerprint().Should().Be(string.Join('\u001e', + "column-support-shell", + "0,0,0", + "0,0,0,1", + "0,0,45", + "18,18,96", + "SupportShell", + "10", + "RenderAndCollider")); + } + [Test] public async Task ChunkArtifact_Replicates_ThroughCultNetRawDocumentLane() {