erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

perf(content): remove exception-driven setup probes

Browse source
This commit is contained in:
Erik 2026-07-24 15:12:21 +02:00
parent f05afc07c1
commit 230a7df454
11 changed files with 598 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/AcDream.App/Composition/LivePresentationComposition.cs
View file

@ -1,4 +1,5 @@
using System.Numerics;
using AcDream.Content;
using AcDream.App.Diagnostics;
using AcDream.App.Input;
using AcDream.App.Interaction;
@ -196,11 +197,35 @@ internal sealed class LivePresentationCompositionPhase
var componentLifecycle =
new DeferredLiveEntityRuntimeComponentLifecycle();
var wbSpawnAdapter = new LandblockSpawnAdapter(foundation.MeshAdapter);
Setup? LoadPreparedSetup(uint sourceId)
{
if (!content.Dats.TryResolvePreferred(
sourceId,
out IDatDatabase? database,
out DatReaderWriter.Enums.DBObjType type)
|| type != DatReaderWriter.Enums.DBObjType.Setup)
{
return null;
}
return database.TryGet<Setup>(
sourceId,
out Setup? setup)
? setup
: null;
}
var setupResolver = new PreparedSetupResolver(
content.PreparedAssets,
LoadPreparedSetup,
message => Console.Error.WriteLine(
$"setup activation: {message}"));
AnimationSequencer SequencerFactory(WorldEntity entity)
{
Setup? setup = content.Dats.Get<Setup>(entity.SourceGfxObjOrSetupId);
if (setup is not null)
if (setupResolver.TryResolve(
entity.SourceGfxObjOrSetupId,
out Setup? setup))
{
uint motionTableId = (uint)setup.DefaultMotionTable;
if (motionTableId != 0
@ -247,38 +272,33 @@ internal sealed class LivePresentationCompositionPhase
ScriptActivationInfo? ResolveActivation(WorldEntity entity)
{
try
{
Setup? setup = content.Dats.Get<Setup>(
entity.SourceGfxObjOrSetupId);
if (setup is null)
return null;
uint scriptId = setup.DefaultScript.DataId;
if (entity.IndexedPartTransforms.Count == 0)
{
var indexed = IndexedSetupPartPoseBuilder.Build(setup, entity);
entity.SetIndexedPartPoses(indexed.Poses, indexed.Available);
}
bool usesStaticAnimationWorkset = entity.ServerGuid == 0
|| (liveEntities?.TryGetRecord(
entity.ServerGuid,
out LiveEntityRecord liveRecord) == true
&& (liveRecord.FinalPhysicsState
& PhysicsStateFlags.Static) != 0);
return new ScriptActivationInfo(
scriptId,
entity.IndexedPartTransforms,
EntityEffectProfile.CreateDatStatic(setup),
entity.IndexedPartAvailable,
setup,
(uint)setup.DefaultAnimation,
usesStaticAnimationWorkset);
}
catch
if (!setupResolver.TryResolve(
entity.SourceGfxObjOrSetupId,
out Setup? setup))
{
return null;
}
uint scriptId = setup.DefaultScript.DataId;
if (entity.IndexedPartTransforms.Count == 0)
{
var indexed = IndexedSetupPartPoseBuilder.Build(setup, entity);
entity.SetIndexedPartPoses(indexed.Poses, indexed.Available);
}
bool usesStaticAnimationWorkset = entity.ServerGuid == 0
|| (liveEntities?.TryGetRecord(
entity.ServerGuid,
out LiveEntityRecord liveRecord) == true
&& (liveRecord.FinalPhysicsState
& PhysicsStateFlags.Static) != 0);
return new ScriptActivationInfo(
scriptId,
entity.IndexedPartTransforms,
EntityEffectProfile.CreateDatStatic(setup),
entity.IndexedPartAvailable,
setup,
(uint)setup.DefaultAnimation,
usesStaticAnimationWorkset);
}
var entityScriptActivator = new EntityScriptActivator(

101
src/AcDream.App/Composition/PreparedSetupResolver.cs Normal file
View file

@ -0,0 +1,101 @@
using System.Collections.Concurrent;
using System.Diagnostics.CodeAnalysis;
using AcDream.Content;
using AcDream.Content.Pak;
using DatReaderWriter.DBObjs;
namespace AcDream.App.Composition;
/// <summary>
/// Resolves Setup presentation metadata only when the immutable prepared
/// catalog proves that the source DID is a Setup. Ordinary GfxObj IDs never
/// reach the DAT deserializer, so absence is ordinary control flow rather
/// than an exception.
/// </summary>
internal sealed class PreparedSetupResolver
{
private readonly IPreparedAssetSource _preparedAssets;
private readonly Func<uint, Setup?> _loadSetup;
private readonly Action<string> _diagnostic;
private readonly ConcurrentDictionary<uint, byte> _diagnosed = new();
public PreparedSetupResolver(
IPreparedAssetSource preparedAssets,
Func<uint, Setup?> loadSetup,
Action<string> diagnostic)
{
_preparedAssets = preparedAssets
?? throw new ArgumentNullException(nameof(preparedAssets));
_loadSetup = loadSetup
?? throw new ArgumentNullException(nameof(loadSetup));
_diagnostic = diagnostic
?? throw new ArgumentNullException(nameof(diagnostic));
}
public bool TryResolve(
uint sourceId,
[NotNullWhen(true)] out Setup? setup)
{
PreparedAssetPresence presence =
_preparedAssets.Probe(PakAssetType.SetupMesh, sourceId);
if (presence == PreparedAssetPresence.Missing)
{
setup = null;
return false;
}
if (presence == PreparedAssetPresence.Corrupt)
{
throw new InvalidDataException(
$"Prepared Setup entry 0x{sourceId:X8} is corrupt; " +
"activation cannot safely infer presentation metadata.");
}
try
{
setup = _loadSetup(sourceId);
if (setup is not null)
return true;
DiagnoseOnce(
sourceId,
$"Prepared Setup entry 0x{sourceId:X8} exists but its " +
"matching DAT record could not be loaded; activation skipped.");
return false;
}
catch (InvalidDataException ex)
{
return DiagnoseCorruptData(sourceId, ex, out setup);
}
catch (EndOfStreamException ex)
{
return DiagnoseCorruptData(sourceId, ex, out setup);
}
catch (ArgumentOutOfRangeException ex)
{
// DatReaderWriter's verified malformed-record failure:
// QualifiedDataId<T>.Unpack / Setup.Unpack can surface an
// ArgumentOutOfRangeException for invalid record contents.
return DiagnoseCorruptData(sourceId, ex, out setup);
}
}
private bool DiagnoseCorruptData(
uint sourceId,
Exception exception,
out Setup? setup)
{
setup = null;
DiagnoseOnce(
sourceId,
$"Setup DAT record 0x{sourceId:X8} is malformed " +
$"({exception.GetType().Name}: {exception.Message}); " +
"activation skipped.");
return false;
}
private void DiagnoseOnce(uint sourceId, string message)
{
if (_diagnosed.TryAdd(sourceId, 0))
_diagnostic(message);
}
}