GameCult/EveUnity
Archived
Watch
9
0
Fork
You've already forked EveUnity
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve normalized Unity bundle asset names

Browse source
This commit is contained in:
Meta Vens 2026-07-13 23:44:55 +01:00
commit e3ccc75d5e
4 changed files with 55 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/org.gamecult.eve.unity-scene/Runtime/CultMesh/EveUnityCultMeshLiveProviderTransport.cs
View file

@ -566,14 +566,16 @@ namespace GameCult.Eve.UnityScene
if (bundle == null)
throw new InvalidOperationException($"Unity could not load provider asset bundle '{variant.Uri}'.");
_assetBundles.Add(bundle);
var bundleAssetNames = bundle.GetAllAssetNames();
foreach (var selection in group)
{
var value = bundle.LoadAsset(selection.Variant!.AssetKey);
var bundleAssetName = ResolveBundleAssetName(bundleAssetNames, selection.Variant!.AssetKey);
var value = bundleAssetName == null ? null : bundle.LoadAsset(bundleAssetName);
if (value == null)
throw new InvalidOperationException(
$"Provider asset '{selection.Asset.AssetRef}' advertises missing Unity bundle asset " +
$"'{selection.Variant.AssetKey}'. Available assets: " +
string.Join(", ", bundle.GetAllAssetNames()));
string.Join(", ", bundleAssetNames));
_nativeAssets[selection.Asset.AssetRef] = value;
if (selection.Asset.Metadata.TryGetValue("presentationRole", out var role) &&
!string.IsNullOrWhiteSpace(role))
@ -589,6 +591,12 @@ namespace GameCult.Eve.UnityScene
CurrentAssetCatalogVersion = catalog.Version;
}
private static string? ResolveBundleAssetName(IEnumerable<string> bundleAssetNames, string advertisedAssetKey)
{
return bundleAssetNames.FirstOrDefault(assetName =>
string.Equals(assetName, advertisedAssetKey, StringComparison.OrdinalIgnoreCase));
}
private void ReadCameraPolicies(IEnumerable<EveAssetVariant> variants)
{
_renderChannelLayers.Clear();

42
packages/org.gamecult.eve.unity-scene/Tests/Editor/EveUnityCultMeshAssetLookupTests.cs Normal file
View file

@ -0,0 +1,42 @@
using System.Reflection;
using GameCult.Eve.UnityScene;
using NUnit.Framework;
namespace GameCult.Eve.UnityScene.Tests
{
public sealed class EveUnityCultMeshAssetLookupTests
{
[Test]
public void ResolvesUnityNormalizedBundleNamesWithoutChangingLogicalAssetIdentity()
{
var method = typeof(EveUnityCultMeshLiveProviderTransport).GetMethod(
"ResolveBundleAssetName",
BindingFlags.Static | BindingFlags.NonPublic);
Assert.That(method, Is.Not.Null);
var result = method!.Invoke(null, new object[]
{
new[] { "assets/generated/eve/thermal/death.asset" },
"Assets/Generated/Eve/Thermal/Death.asset"
});
Assert.That(result, Is.EqualTo("assets/generated/eve/thermal/death.asset"));
}
[Test]
public void RejectsBundleNamesThatDoNotMatchTheAdvertisedAsset()
{
var method = typeof(EveUnityCultMeshLiveProviderTransport).GetMethod(
"ResolveBundleAssetName",
BindingFlags.Static | BindingFlags.NonPublic);
var result = method!.Invoke(null, new object[]
{
new[] { "assets/generated/eve/thermal/heatstroke.asset" },
"Assets/Generated/Eve/Thermal/Death.asset"
});
Assert.That(result, Is.Null);
}
}
}

2
packages/org.gamecult.eve.unity-scene/Tests/Editor/EveUnityCultMeshAssetLookupTests.cs.meta Normal file
View file

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: d746a249576c8e74696ea8add7a25731

2
packages/org.gamecult.eve.unity-scene/package.json
View file

@ -1,7 +1,7 @@
{
"name": "org.gamecult.eve.unity-scene",
"displayName": "Eve Unity Scene Lowering",
"version": "0.3.11",
"version": "0.3.12",
"unity": "2021.3",
"description": "Provider-agnostic Unity scene shell for gamecult.eve.surface.v1 interactive world surfaces.",
"dependencies": {