Keep terrain overlay material mesh codes

esnya · esnya · commit 983afead7586 · 2026-06-03T04:02:56.000+09:00
diff --git a/src/PlateauResoniteLink/Application/Importing/CityGmlSurfaceMaterialResolver.cs b/src/PlateauResoniteLink/Application/Importing/CityGmlSurfaceMaterialResolver.cs
@@ -140,7 +140,9 @@ internal static MaterialBinding CreateMaterialBinding(
     {
         TerrainOverlayMaterialBinding? terrainOverlayMaterial = representativeSurface.Material.TerrainOverlay is null
             ? null
-            : new TerrainOverlayMaterialBinding(representativeSurface.Material.TerrainOverlay);
+            : new TerrainOverlayMaterialBinding(
+                ThirdRegionalMeshCode.Parse(actualMeshCode),
+                representativeSurface.Material.TerrainOverlay);
         ColorRgba baseColor = representativeSurface.Material.TerrainOverlay is null
             ? ToContractColor(representativeSurface.Surface.BaseColor)
             : new ColorRgba(1.0, 1.0, 1.0, 1.0);
diff --git a/src/PlateauResoniteLink/Application/Importing/SceneImportContractTypes.cs b/src/PlateauResoniteLink/Application/Importing/SceneImportContractTypes.cs
@@ -200,14 +200,22 @@ public enum MaterialReuseScope
 
 public sealed record TerrainOverlayMaterialBinding
 {
-    public TerrainOverlayMaterialBinding(TerrainTextureOverlay overlay)
+    public TerrainOverlayMaterialBinding(
+        ThirdRegionalMeshCode meshCode,
+        TerrainTextureOverlay overlay)
     {
+        if (!ThirdRegionalMeshCode.TryParse(meshCode.Value, out _))
+        {
+            throw new ArgumentException("Terrain overlay material mesh code must be a valid third regional mesh code.", nameof(meshCode));
+        }
+
+        MeshCode = meshCode;
         Overlay = overlay ?? throw new ArgumentNullException(nameof(overlay));
     }
 
-    public TerrainTextureOverlay Overlay { get; init; }
+    public ThirdRegionalMeshCode MeshCode { get; }
 
-    public ThirdRegionalMeshCode MeshCode => Overlay.MeshCode;
+    public TerrainTextureOverlay Overlay { get; }
 }
 
 public sealed record MaterialBinding(
diff --git a/src/PlateauResoniteLink/Targets/Resonite/ResoniteQueuedTexturePreparer.cs b/src/PlateauResoniteLink/Targets/Resonite/ResoniteQueuedTexturePreparer.cs
@@ -44,7 +44,7 @@ public async Task<PreparedTextureReference[]> PrepareAsync(
             .Select((material, materialIndex) => (Material: material, MaterialIndex: materialIndex))
             .Where(static entry => entry.Material.TerrainOverlayMaterial is not null)
             .Select(entry => (
-                TerrainMeshCode: entry.Material.TerrainOverlayMaterial!.Overlay.MeshCode,
+                TerrainMeshCode: entry.Material.TerrainOverlayMaterial!.MeshCode,
                 TerrainOverlay: entry.Material.TerrainOverlayMaterial!.Overlay))
             .Distinct()
             .OrderBy(static entry => entry.TerrainMeshCode.Value, StringComparer.Ordinal)
diff --git a/tests/PlateauResoniteLink.Tests/Profiles/CityGmlSurfaceMaterialResolverTests.cs b/tests/PlateauResoniteLink.Tests/Profiles/CityGmlSurfaceMaterialResolverTests.cs
@@ -40,7 +40,7 @@ public void EnumerateSurfacesPreservesLazyScanAfterFirstGeneratedDemSurface()
     }
 
     [Fact]
-    public void CreateMaterialBindingUsesTerrainOverlayMeshCodeWithoutMatchingActualMeshCode()
+    public void CreateMaterialBindingKeepsMaterialMeshCodeSeparateFromTerrainOverlayMeshCode()
     {
         ResolvedSurfaceMaterial representativeSurface = new(
             CreateSurface(),
@@ -60,7 +60,7 @@ public void CreateMaterialBindingUsesTerrainOverlayMeshCodeWithoutMatchingActual
             representativeSurface,
             materialIndex: 0);
 
-        Assert.Equal("53394525", binding.TerrainMeshCode);
+        Assert.Equal("53394600", binding.TerrainMeshCode);
         Assert.Same(representativeSurface.Material.TerrainOverlay, binding.TerrainOverlay);
     }
 
diff --git a/tests/PlateauResoniteLink.Tests/Profiles/ImportedDynamicMaterialUvNormalizerTests.cs b/tests/PlateauResoniteLink.Tests/Profiles/ImportedDynamicMaterialUvNormalizerTests.cs
@@ -279,6 +279,6 @@ private static MaterialBinding CreateDynamicUvMaterial(
             TextureOffset: textureOffset,
             TerrainOverlayMaterial: terrainOverlay is null
                 ? null
-                : new TerrainOverlayMaterialBinding(terrainOverlay));
+                : new TerrainOverlayMaterialBinding(terrainOverlay.MeshCode, terrainOverlay));
     }
 }
diff --git a/tests/PlateauResoniteLink.Tests/Profiles/LocalCityGmlObjectProjectionTests.cs b/tests/PlateauResoniteLink.Tests/Profiles/LocalCityGmlObjectProjectionTests.cs
@@ -1501,7 +1501,7 @@ public void ProjectCityObjectUsesPerObjectAlbedoOnlyMaterialForTexturelessDemTer
     }
 
     [Fact]
-    public void ProjectCityObjectUsesProvidedTerrainOverlayMeshCodeForTexturelessRoof()
+    public void ProjectCityObjectKeepsMaterialMeshCodeForMismatchedTerrainOverlayRoof()
     {
         CoordinateReferenceSystem referenceSystem = CoordinateReferenceSystem.Parse("http://www.opengis.net/def/crs/EPSG/0/6697");
         TerrainTextureOverlay mismatchedOverlay = CreateThirdMeshOverlay("53394526");
@@ -1523,7 +1523,7 @@ public void ProjectCityObjectUsesProvidedTerrainOverlayMeshCodeForTexturelessRoo
 
         MaterialBinding material = Assert.Single(projected.Materials);
         Assert.Same(mismatchedOverlay, material.TerrainOverlay);
-        Assert.Equal("53394526", material.TerrainMeshCode);
+        Assert.Equal("53394525", material.TerrainMeshCode);
         Assert.Equal(TextureSourceKind.Dataset, material.TextureSourceKind);
     }
 
diff --git a/tests/PlateauResoniteLink.Tests/Targets/NonDemCityObjectBakerTests.cs b/tests/PlateauResoniteLink.Tests/Targets/NonDemCityObjectBakerTests.cs
@@ -844,7 +844,7 @@ public async Task TryBufferAsyncPreservesTerrainOverlayAlbedoOnlyProviderWithGen
                     DepthOffset: null,
                     SubmeshIndices: [0],
                     AssetScope: ResoniteMaterialAssetScope.Common,
-                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay),
+                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay.MeshCode, overlay),
                     CommonMaterial: CommonMaterialCatalog.Create().Generic.Uv),
             ],
         };
diff --git a/tests/PlateauResoniteLink.Tests/Targets/ResoniteDynamicMaterialUvNormalizerTests.cs b/tests/PlateauResoniteLink.Tests/Targets/ResoniteDynamicMaterialUvNormalizerTests.cs
@@ -298,6 +298,6 @@ private static ResoniteMaterialBinding CreateDynamicUvMaterial(
             AssetScope: ResoniteMaterialAssetScope.PresentationSlotScoped,
             TerrainOverlayMaterial: terrainOverlay is null
                 ? null
-                : new TerrainOverlayMaterialBinding(terrainOverlay));
+                : new TerrainOverlayMaterialBinding(terrainOverlay.MeshCode, terrainOverlay));
     }
 }
diff --git a/tests/PlateauResoniteLink.Tests/Targets/ResoniteLiveSceneImportTargetLifecycleTests.cs b/tests/PlateauResoniteLink.Tests/Targets/ResoniteLiveSceneImportTargetLifecycleTests.cs
@@ -1121,7 +1121,7 @@ private static ResoniteConstructionCityObject CreateDemCityObject(
                     ResoniteMaterialProjection.Uv,
                     null,
                     [0],
-                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay)),
+                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay.MeshCode, overlay)),
             ],
             CollisionEnabled: true,
             SourceFileRelativePath: sourceFileRelativePath);
diff --git a/tests/PlateauResoniteLink.Tests/Targets/ResoniteLiveSceneImportTargetTests.cs b/tests/PlateauResoniteLink.Tests/Targets/ResoniteLiveSceneImportTargetTests.cs
@@ -68,7 +68,7 @@ public async Task ExecuteAsyncImportsGeneratedDemTerrainTextureWithCanvasTransfo
                     TextureOffset: null,
                     DepthOffset: null,
                     SubmeshIndices: [0],
-                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay)),
+                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay.MeshCode, overlay)),
             ],
             SourceFileRelativePath: $"udx/dem/533945/plateau_{DatasetName}_dem_533945.gml");
 
@@ -363,7 +363,7 @@ await ResoniteLiveSceneImportTargetTestSupport.ExecuteSceneAsync(
     }
 
     [Fact]
-    public async Task ExecuteAsyncUsesTerrainOverlayMeshCodeWithoutRecheckingOverlayBoundsAgainstActualMeshCode()
+    public async Task ExecuteAsyncKeepsMaterialMeshCodeWhenOverlayBoundsUseDifferentMeshCode()
     {
         using TemporaryDirectory datasetDirectory = new();
         using SceneSinkRecordingClient client = new();
@@ -401,7 +401,7 @@ await ResoniteLiveSceneImportTargetTestSupport.ExecuteSceneAsync(
         AddComponent terrainTexture = Assert.Single(
             client.AddedComponents,
             request => string.Equals(request.Data.ComponentType, "[FrooxEngine]FrooxEngine.StaticTexture2D", StringComparison.Ordinal)
-                && client.SlotPaths[request.ContainerSlotId].Contains("/Assets/Terrain Textures/53394526", StringComparison.Ordinal));
+                && client.SlotPaths[request.ContainerSlotId].Contains("/Assets/Terrain Textures/53394525", StringComparison.Ordinal));
         Assert.StartsWith(
             "resdb:///texture/",
             Assert.IsType<Field_Uri>(terrainTexture.Data.Members["URL"]).Value.ToString(),
@@ -457,7 +457,7 @@ public async Task ExecuteAsyncDoesNotReuseExistingGenericCommonMaterialForTerrai
                     Projection: ResoniteMaterialProjection.Uv,
                     DepthOffset: null,
                     SubmeshIndices: [0],
-                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay)),
+                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay.MeshCode, overlay)),
             ],
             SourceFileRelativePath: $"udx/dem/533945/plateau_{DatasetName}_dem_533945.gml");
 
@@ -840,7 +840,7 @@ public async Task ExecuteAsyncAppliesTerrainOverlayUvTransformToGridMeshInsteadO
                     Projection: ResoniteMaterialProjection.Uv,
                     DepthOffset: null,
                     SubmeshIndices: [0],
-                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay)),
+                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay.MeshCode, overlay)),
             ],
             SourceFileRelativePath: $"udx/dem/533945/plateau_{DatasetName}_dem_533945.gml");
 
@@ -951,7 +951,7 @@ public void EstimateCityObjectWorkingSetBytesCountsTerrainOverlayCanvasBudget()
                     Projection: ResoniteMaterialProjection.Uv,
                     DepthOffset: null,
                     SubmeshIndices: [0],
-                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay)),
+                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay.MeshCode, overlay)),
             ]
         );
         ResoniteConstructionCityObject withoutOverlay = withOverlay with
@@ -1702,7 +1702,7 @@ private static ResoniteConstructionCityObject CreateTerrainOverlayCityObject(
                     TextureOffset: null,
                     DepthOffset: null,
                     SubmeshIndices: [0],
-                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay)),
+                    TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(ThirdRegionalMeshCode.Parse(meshCode), overlay)),
             ],
             SourceFileRelativePath: $"udx/{packageName}/{meshCode}/plateau_{DatasetName}_{packageName}_{meshCode}.gml");
     }
diff --git a/tests/PlateauResoniteLink.Tests/Targets/ResoniteMaterialComponentPolicyTests.cs b/tests/PlateauResoniteLink.Tests/Targets/ResoniteMaterialComponentPolicyTests.cs
@@ -190,6 +190,13 @@ public void CreateMembersCreatesUvMaterialWithoutTransformAfterNormalization()
     [Fact]
     public void CreateMembersRejectsOffsetOnlyUvTransformBeforeNormalization()
     {
+        TerrainTextureOverlay overlay = new(
+            PackageName: "dem",
+            MeshCode: ThirdRegionalMeshCode.Parse("53394525"),
+            UrlTemplate: "https://example.invalid/{z}/{x}/{y}.png",
+            ZoomLevel: 17,
+            GeographicBounds: new GeographicRectangle(35.68, 35.69, 139.69, 139.70),
+            MaxTextureSize: 512);
         ResoniteMaterialBinding material = new(
             BaseColor: new ResoniteColor(1.0, 1.0, 1.0, 1.0),
             MaterialType: ResoniteMaterialType.Standard,
@@ -199,13 +206,7 @@ public void CreateMembersRejectsOffsetOnlyUvTransformBeforeNormalization()
             DepthOffset: null,
             SubmeshIndices: [0],
             TextureOffset: new ResoniteFloat2(0.125, 0.75),
-            TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(new TerrainTextureOverlay(
-                PackageName: "dem",
-            MeshCode: ThirdRegionalMeshCode.Parse("53394525"),
-                UrlTemplate: "https://example.invalid/{z}/{x}/{y}.png",
-                ZoomLevel: 17,
-                GeographicBounds: new GeographicRectangle(35.68, 35.69, 139.69, 139.70),
-                    MaxTextureSize: 512)),
+            TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay.MeshCode, overlay),
             AssetScope: ResoniteMaterialAssetScope.PresentationSlotScoped);
 
         InvalidOperationException error = Assert.Throws<InvalidOperationException>(
diff --git a/tests/PlateauResoniteLink.Tests/Targets/ResoniteMaterialPlanningTests.cs b/tests/PlateauResoniteLink.Tests/Targets/ResoniteMaterialPlanningTests.cs
@@ -242,7 +242,7 @@ public void ResolveTerrainTextureCanvasMaterialComposesExistingTransformWithCanv
             SubmeshIndices: [0],
             TextureScale: new ResoniteFloat2(0.4, 0.8),
             TextureOffset: new ResoniteFloat2(0.1, 0.2),
-            TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay));
+            TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay.MeshCode, overlay));
         Dictionary<TerrainTextureOverlay, GeneratedTerrainTexture> preparedTerrainTextures = new()
         {
             [overlay] = new GeneratedTerrainTexture(
@@ -330,7 +330,7 @@ public void ResolveTerrainTextureCanvasMaterialIntroducesScaleOnlyWhenMaterialHa
             Projection: ResoniteMaterialProjection.Uv,
             DepthOffset: null,
             SubmeshIndices: [0],
-            TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay));
+            TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay.MeshCode, overlay));
         Dictionary<TerrainTextureOverlay, GeneratedTerrainTexture> preparedTerrainTextures = new()
         {
             [overlay] = new GeneratedTerrainTexture(
diff --git a/tests/PlateauResoniteLink.Tests/Targets/ResoniteSceneMaterialConventionsTests.cs b/tests/PlateauResoniteLink.Tests/Targets/ResoniteSceneMaterialConventionsTests.cs
@@ -311,7 +311,7 @@ public void NormalizeBatchGroupedMaterialBinding_KeepsTerrainOverlayProviderInde
             Projection: ResoniteMaterialProjection.Uv,
             DepthOffset: null,
             SubmeshIndices: [0],
-            TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay),
+            TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay.MeshCode, overlay),
             Family: null,
             AssetScope: ResoniteMaterialAssetScope.Common,
             CommonMaterial: CommonMaterialCatalog.Create().Generic.Uv);
diff --git a/tests/PlateauResoniteLink.Tests/Targets/SceneImportContractMapperTests.cs b/tests/PlateauResoniteLink.Tests/Targets/SceneImportContractMapperTests.cs
@@ -86,7 +86,7 @@ public void ToInternalMaterialBindingsKeepsTerrainOverlaySharedScopeIndependentF
                 DepthOffset: null,
                 SubmeshIndices: [0],
                 ReuseScope: MaterialReuseScope.Shared,
-                TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay),
+                TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(ThirdRegionalMeshCode.Parse("53394525"), overlay),
                 CommonMaterial: commonMaterial),
         ];
 
@@ -121,7 +121,7 @@ public void ToInternalMaterialBindingsKeepsSharedTerrainOverlayWithoutCommonMate
                 DepthOffset: null,
                 SubmeshIndices: [0],
                 ReuseScope: MaterialReuseScope.Shared,
-                TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(overlay)),
+                TerrainOverlayMaterial: new TerrainOverlayMaterialBinding(ThirdRegionalMeshCode.Parse("53394525"), overlay)),
         ];
 
         ResoniteMaterialBinding mapped = Assert.Single(SceneImportContractMapper.ToInternal(bindings));

Original file line number	Diff line number	Diff line change
`@@ -200,14 +200,22 @@ public enum MaterialReuseScope`
`200`	`200`
`201`	`201`	`public sealed record TerrainOverlayMaterialBinding`
`202`	`202`	`{`
`203`		`- public TerrainOverlayMaterialBinding(TerrainTextureOverlay overlay)`
	`203`	`+ public TerrainOverlayMaterialBinding(`
	`204`	`+ ThirdRegionalMeshCode meshCode,`
	`205`	`+ TerrainTextureOverlay overlay)`
`204`	`206`	`{`
	`207`	`+ if (!ThirdRegionalMeshCode.TryParse(meshCode.Value, out _))`
	`208`	`+ {`
	`209`	`+ throw new ArgumentException("Terrain overlay material mesh code must be a valid third regional mesh code.", nameof(meshCode));`
	`210`	`+ }`
	`211`	`+`
	`212`	`+ MeshCode = meshCode;`
`205`	`213`	`Overlay = overlay ?? throw new ArgumentNullException(nameof(overlay));`
`206`	`214`	`}`
`207`	`215`
`208`		`- public TerrainTextureOverlay Overlay { get; init; }`
	`216`	`+ public ThirdRegionalMeshCode MeshCode { get; }`
`209`	`217`
`210`		`- public ThirdRegionalMeshCode MeshCode => Overlay.MeshCode;`
	`218`	`+ public TerrainTextureOverlay Overlay { get; }`
`211`	`219`	`}`
`212`	`220`
`213`	`221`	`public sealed record MaterialBinding(`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void EnumerateSurfacesPreservesLazyScanAfterFirstGeneratedDemSurface()`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`[Fact]`
`43`		`- public void CreateMaterialBindingUsesTerrainOverlayMeshCodeWithoutMatchingActualMeshCode()`
	`43`	`+ public void CreateMaterialBindingKeepsMaterialMeshCodeSeparateFromTerrainOverlayMeshCode()`
`44`	`44`	`{`
`45`	`45`	`ResolvedSurfaceMaterial representativeSurface = new(`
`46`	`46`	`CreateSurface(),`
`@@ -60,7 +60,7 @@ public void CreateMaterialBindingUsesTerrainOverlayMeshCodeWithoutMatchingActual`
`60`	`60`	`representativeSurface,`
`61`	`61`	`materialIndex: 0);`
`62`	`62`
`63`		`- Assert.Equal("53394525", binding.TerrainMeshCode);`
	`63`	`+ Assert.Equal("53394600", binding.TerrainMeshCode);`
`64`	`64`	`Assert.Same(representativeSurface.Material.TerrainOverlay, binding.TerrainOverlay);`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,6 @@ private static MaterialBinding CreateDynamicUvMaterial(`
`279`	`279`	`TextureOffset: textureOffset,`
`280`	`280`	`TerrainOverlayMaterial: terrainOverlay is null`
`281`	`281`	`? null`
`282`		`- : new TerrainOverlayMaterialBinding(terrainOverlay));`
	`282`	`+ : new TerrainOverlayMaterialBinding(terrainOverlay.MeshCode, terrainOverlay));`
`283`	`283`	`}`
`284`	`284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1501,7 +1501,7 @@ public void ProjectCityObjectUsesPerObjectAlbedoOnlyMaterialForTexturelessDemTer`
`1501`	`1501`	`}`
`1502`	`1502`
`1503`	`1503`	`[Fact]`
`1504`		`- public void ProjectCityObjectUsesProvidedTerrainOverlayMeshCodeForTexturelessRoof()`
	`1504`	`+ public void ProjectCityObjectKeepsMaterialMeshCodeForMismatchedTerrainOverlayRoof()`
`1505`	`1505`	`{`
`1506`	`1506`	`CoordinateReferenceSystem referenceSystem = CoordinateReferenceSystem.Parse("http://www.opengis.net/def/crs/EPSG/0/6697");`
`1507`	`1507`	`TerrainTextureOverlay mismatchedOverlay = CreateThirdMeshOverlay("53394526");`
`@@ -1523,7 +1523,7 @@ public void ProjectCityObjectUsesProvidedTerrainOverlayMeshCodeForTexturelessRoo`
`1523`	`1523`
`1524`	`1524`	`MaterialBinding material = Assert.Single(projected.Materials);`
`1525`	`1525`	`Assert.Same(mismatchedOverlay, material.TerrainOverlay);`
`1526`		`- Assert.Equal("53394526", material.TerrainMeshCode);`
	`1526`	`+ Assert.Equal("53394525", material.TerrainMeshCode);`
`1527`	`1527`	`Assert.Equal(TextureSourceKind.Dataset, material.TextureSourceKind);`
`1528`	`1528`	`}`
`1529`	`1529`
Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,6 @@ private static ResoniteMaterialBinding CreateDynamicUvMaterial(`
`298`	`298`	`AssetScope: ResoniteMaterialAssetScope.PresentationSlotScoped,`
`299`	`299`	`TerrainOverlayMaterial: terrainOverlay is null`
`300`	`300`	`? null`
`301`		`- : new TerrainOverlayMaterialBinding(terrainOverlay));`
	`301`	`+ : new TerrainOverlayMaterialBinding(terrainOverlay.MeshCode, terrainOverlay));`
`302`	`302`	`}`
`303`	`303`	`}`