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

Preserve provider-authored prefab scale

Browse source
This commit is contained in:
Meta Vens 2026-07-11 17:01:57 +01:00
commit edf8f4fe62
2 changed files with 68 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/org.gamecult.eve.unity-scene/Runtime/EveUnityGameObjectPlayableWorldSceneSink.cs
View file

@ -108,7 +108,8 @@ namespace GameCult.Eve.UnityScene
: $"{entity.EntityId} ({entity.Label})";
instance.transform.localPosition = new Vector3(entity.PositionX, entity.PositionY, entity.PositionZ);
instance.transform.localRotation = Quaternion.Euler(0f, entity.RotationY, 0f);
if (entity.Radius > 0f)
if (entity.Radius > 0f &&
string.Equals(asset.PresentationKind, "unity-generated-placeholder", StringComparison.Ordinal))
instance.transform.localScale = Vector3.one * entity.Radius;
var marker = instance.GetComponent<EveUnityPlayableWorldEntityMarker>();

66
packages/org.gamecult.eve.unity-scene/Tests/Editor/EveUnitySceneSurfaceLowererTests.cs
View file

@ -672,6 +672,40 @@ namespace GameCult.Eve.UnityScene.Tests
}
}
[Test]
public void ProviderPrefabKeepsAuthoredScaleWhileFallbackUsesSemanticRadius()
{
var root = new GameObject("world");
var prefab = new GameObject("provider-prefab");
prefab.transform.localScale = new Vector3(2f, 3f, 4f);
try
{
var providerSink = new EveUnityGameObjectPlayableWorldSceneSink(
root.transform,
new FixedGameObjectAssetProvider(prefab));
var entity = PlayableEntityModel("provider", "prefab.ship", 12f);
providerSink.UpsertEntity(entity, new EveUnityPlayableWorldAssetBinding(
"prefab.ship", "ship", "provider-asset-ref"));
var instance = root.transform.GetChild(0);
Assert.That(instance.localScale, Is.EqualTo(Vector3.one));
Assert.That(instance.GetChild(0).localScale, Is.EqualTo(new Vector3(2f, 3f, 4f)));
var fallbackSink = new EveUnityGameObjectPlayableWorldSceneSink(
root.transform,
new FixedGameObjectAssetProvider(null));
fallbackSink.UpsertEntity(
PlayableEntityModel("fallback", "", 7f),
new EveUnityPlayableWorldAssetBinding("", "ship", "unity-generated-placeholder"));
Assert.That(root.transform.GetChild(1).localScale, Is.EqualTo(Vector3.one * 7f));
}
finally
{
UnityEngine.Object.DestroyImmediate(prefab);
UnityEngine.Object.DestroyImmediate(root);
}
}
[Test]
public void PlayableWorldPresenterInstantiatesUpdatesAndDespawnsProviderEntities()
{
@ -1619,6 +1653,38 @@ namespace GameCult.Eve.UnityScene.Tests
}
}
private static EveUnityPlayableWorldEntity PlayableEntityModel(
string entityId,
string assetRef,
float radius)
{
return new EveUnityPlayableWorldEntity(
entityId,
entityId,
"ship",
entityId,
"player",
assetRef,
0f, 0f, 0f,
0f,
radius,
true,
true,
"", "", "", "");
}
private sealed class FixedGameObjectAssetProvider : IEveUnityGameObjectAssetProvider
{
private readonly GameObject? _prefab;
public FixedGameObjectAssetProvider(GameObject? prefab)
{
_prefab = prefab;
}
public GameObject? ResolvePrefab(EveUnityPlayableWorldAssetBinding asset) => _prefab;
}
private sealed class FakePlayableWorldProviderComponent :
MonoBehaviour,
IEveUnitySceneProviderSurfaceDocumentSource,