The intermittent white-cottage-walls failure has NEVER produced a log line: every dat-read failure on the walls-relevant paths exits silently, and the failed result is cached for the session (mesh batches build once). Today it reproduced on a probe-free launch with a 35-line, zero-error log — so the prior heavy-probes-starve-the-dat-reader framing is not the whole story. Tripwires (print ONLY on anomaly; zero cost healthy; keep until #105 closes): - [dat-miss] DatDatabaseWrapper.TryGet — a miss for an id whose BTree entry EXISTS (re-probed under the same lock); legit not-found fallbacks stay quiet. - [tex-miss] TextureCache.DecodeFromDats x3 — render-thread decode fell back to magenta (Surface / SurfaceTexture / RenderSurface miss). - [cell-miss] GameWindow interior hydration x2 — EnvCell or Environment read returned null, so a cell''s WALLS are silently never registered while its statics still draw (the exact observed geometry signature). Color discriminates the layer on the next occurrence: magenta = TextureCache; see-through + [tex-skip]/[dat-miss] = mesh build; see-through + [cell-miss] = hydration; broken with NO tripwire output = GL-side upload/residency. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
191 lines
7.1 KiB
C#
191 lines
7.1 KiB
C#
using DatReaderWriter;
|
|
using DatReaderWriter.Enums;
|
|
using DatReaderWriter.Lib.IO;
|
|
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Collections.Generic;
|
|
using System.Collections.ObjectModel;
|
|
using System.Diagnostics.CodeAnalysis;
|
|
|
|
namespace AcDream.App.Rendering.Wb;
|
|
|
|
/// <summary>
|
|
/// Adapts acdream's <see cref="DatCollection"/> to WB's <see cref="IDatReaderWriter"/> interface.
|
|
///
|
|
/// O-D7 fallback path: taken because ObjectMeshManager has 26 _dats.X call sites (threshold is 20),
|
|
/// making a full refactor to DatCollection larger than spec permits in a single task.
|
|
/// This adapter lets ObjectMeshManager stay byte-identical to the WB original while
|
|
/// routing all DAT I/O through our single DatCollection. The adapter is dropped in T7
|
|
/// when the WorldBuilder project reference is removed entirely.
|
|
/// </summary>
|
|
internal sealed class DatCollectionAdapter : IDatReaderWriter
|
|
{
|
|
private readonly DatCollection _dats;
|
|
private readonly DatDatabaseWrapper _portal;
|
|
private readonly DatDatabaseWrapper _cell;
|
|
private readonly DatDatabaseWrapper _highRes;
|
|
private readonly DatDatabaseWrapper _language;
|
|
private readonly ReadOnlyDictionary<uint, IDatDatabase> _cellRegions;
|
|
|
|
public DatCollectionAdapter(DatCollection dats)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(dats);
|
|
_dats = dats;
|
|
_portal = new DatDatabaseWrapper(dats.Portal);
|
|
_cell = new DatDatabaseWrapper(dats.Cell);
|
|
_highRes = new DatDatabaseWrapper(dats.HighRes);
|
|
_language = new DatDatabaseWrapper(dats.Local);
|
|
|
|
// DatCollection has a single Cell, not multiple cell regions.
|
|
// Expose it as region 0 to satisfy callers that iterate CellRegions.
|
|
var regions = new Dictionary<uint, IDatDatabase> { [0u] = _cell };
|
|
_cellRegions = new ReadOnlyDictionary<uint, IDatDatabase>(regions);
|
|
}
|
|
|
|
/// <summary>Source directory of the underlying DatCollection.</summary>
|
|
public string SourceDirectory => _dats.Options.DatDirectory ?? string.Empty;
|
|
|
|
public IDatDatabase Portal => _portal;
|
|
public ReadOnlyDictionary<uint, IDatDatabase> CellRegions => _cellRegions;
|
|
public IDatDatabase HighRes => _highRes;
|
|
public IDatDatabase Language => _language;
|
|
|
|
// RegionFileMap is used by some WB internals but not by ObjectMeshManager.
|
|
public ReadOnlyDictionary<uint, uint> RegionFileMap =>
|
|
new ReadOnlyDictionary<uint, uint>(new Dictionary<uint, uint>());
|
|
|
|
// Iteration properties — not used by ObjectMeshManager, so delegate to 0.
|
|
public int PortalIteration => 0;
|
|
public int CellIteration => 0;
|
|
public int HighResIteration => 0;
|
|
public int LanguageIteration => 0;
|
|
|
|
public bool TryGetFileBytes(uint regionId, uint fileId, ref byte[] bytes, out int bytesRead)
|
|
{
|
|
// Route to cell db (the only region we expose)
|
|
return _dats.Cell.TryGetFileBytes(fileId, ref bytes, out bytesRead);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Resolves a DAT id to all databases that contain it, along with the DBObjType.
|
|
/// Mirrors DefaultDatReaderWriter.ResolveId — checks each underlying DatDatabase
|
|
/// via DatDatabase.TypeFromId (which reads the type range tables).
|
|
/// </summary>
|
|
public IEnumerable<IDatReaderWriter.IdResolution> ResolveId(uint id)
|
|
{
|
|
var results = new List<IDatReaderWriter.IdResolution>();
|
|
|
|
void CheckDb(DatDatabaseWrapper wrapper)
|
|
{
|
|
var rawDb = wrapper.RawDatabase;
|
|
if (rawDb.Tree.TryGetFile(id, out _))
|
|
{
|
|
var type = rawDb.TypeFromId(id);
|
|
if (type != DBObjType.Unknown)
|
|
results.Add(new IDatReaderWriter.IdResolution(wrapper, type));
|
|
}
|
|
}
|
|
|
|
// Match DefaultDatReaderWriter ordering: HighRes → Portal → Language → Cell
|
|
CheckDb(_highRes);
|
|
CheckDb(_portal);
|
|
CheckDb(_language);
|
|
CheckDb(_cell);
|
|
|
|
return results;
|
|
}
|
|
|
|
public bool TrySave<T>(T obj, int iteration = 0) where T : IDBObj =>
|
|
throw new NotSupportedException("DatCollectionAdapter is read-only.");
|
|
|
|
public bool TrySave<T>(uint regionId, T obj, int iteration = 0) where T : IDBObj =>
|
|
throw new NotSupportedException("DatCollectionAdapter is read-only.");
|
|
|
|
public void Dispose()
|
|
{
|
|
// The underlying DatCollection is owned by the caller — do not dispose it here.
|
|
// Individual wrapper objects hold no unmanaged resources.
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Wraps a <see cref="DatDatabase"/> as <see cref="IDatDatabase"/>.
|
|
/// Mirrors WorldBuilder.Shared.Services.DefaultDatDatabase but lives in our namespace
|
|
/// so the WorldBuilder project reference can be dropped in T7.
|
|
/// </summary>
|
|
internal sealed class DatDatabaseWrapper : IDatDatabase
|
|
{
|
|
private readonly DatDatabase _db;
|
|
private readonly ConcurrentDictionary<(Type, uint), IDBObj> _cache = new();
|
|
private readonly object _lock = new();
|
|
|
|
public DatDatabaseWrapper(DatDatabase db)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(db);
|
|
_db = db;
|
|
}
|
|
|
|
/// <summary>Exposes the raw DatDatabase for ResolveId's Tree.TryGetFile + TypeFromId calls.</summary>
|
|
internal DatDatabase RawDatabase => _db;
|
|
|
|
public DatDatabase Db => _db;
|
|
public int Iteration => _db.Iteration?.CurrentIteration ?? 0;
|
|
|
|
public IEnumerable<uint> GetAllIdsOfType<T>() where T : IDBObj =>
|
|
_db.GetAllIdsOfType<T>();
|
|
|
|
public bool TryGet<T>(uint fileId, [MaybeNullWhen(false)] out T value) where T : IDBObj
|
|
{
|
|
if (_cache.TryGetValue((typeof(T), fileId), out var cached))
|
|
{
|
|
value = (T)cached;
|
|
return true;
|
|
}
|
|
|
|
lock (_lock)
|
|
{
|
|
if (_db.TryGet<T>(fileId, out value))
|
|
{
|
|
_cache.TryAdd((typeof(T), fileId), value);
|
|
return true;
|
|
}
|
|
|
|
// TEMP diagnostic (dat-race investigation 2026-06-09, strip with fix):
|
|
// a miss for an id whose BTree entry EXISTS is always an anomaly —
|
|
// either Unpack returned false or the lookup flickered transiently.
|
|
// Legit not-found probes (e.g. Portal→HighRes fallback) stay silent.
|
|
if (_db.Tree.TryGetFile(fileId, out _))
|
|
{
|
|
Console.WriteLine(
|
|
$"[dat-miss] {typeof(T).Name} 0x{fileId:X8} entry EXISTS but TryGet failed " +
|
|
$"(thread={Environment.CurrentManagedThreadId})");
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
public bool TryGetFileBytes(uint fileId, [MaybeNullWhen(false)] out byte[] value)
|
|
{
|
|
lock (_lock)
|
|
{
|
|
return _db.TryGetFileBytes(fileId, out value);
|
|
}
|
|
}
|
|
|
|
public bool TryGetFileBytes(uint fileId, ref byte[] bytes, out int bytesRead)
|
|
{
|
|
lock (_lock)
|
|
{
|
|
return _db.TryGetFileBytes(fileId, ref bytes, out bytesRead);
|
|
}
|
|
}
|
|
|
|
public bool TrySave<T>(T obj, int iteration = 0) where T : IDBObj =>
|
|
throw new NotSupportedException("DatDatabaseWrapper is read-only.");
|
|
|
|
public void Dispose()
|
|
{
|
|
// The underlying DatDatabase is owned by DatCollection — do not dispose here.
|
|
}
|
|
}
|