End of Phase O extraction. Final cleanup: - Dropped <ProjectReference> entries to WorldBuilder.Shared and Chorizite.OpenGLSDLBackend from both AcDream.App.csproj and AcDream.Core.csproj. - Added Chorizite.Core NuGet PackageReference to AcDream.Core.csproj (needed by Core.Rendering.Wb.TextureHelpers for TextureFormat enum; previously transitive through the WB project ref). - Added BCnEncoder.Net.ImageSharp (1.1.2) + SixLabors.ImageSharp (3.1.12) as direct PackageReferences to AcDream.App.csproj — previously transitive via Chorizite.OpenGLSDLBackend project; used directly by ObjectMeshManager. Item A (BaseObjectRenderManager static fields): - Inlined CurrentAtlas/CurrentVAO/CurrentIBO into a new RenderStateCache.cs static class (AcDream.App.Rendering.Wb namespace) — the 4 consumers (ManagedGLIndexBuffer, ManagedGLTexture, ManagedGLTextureArray, ParticleBatcher) all reference RenderStateCache.* instead of BaseObjectRenderManager.*. - Dropped using Chorizite.OpenGLSDLBackend.Lib from all 4 consumers and from WbDrawDispatcher (which had it only as a dead import). Item B (ActiveParticleEmitter.ObjectLandblock): - ObjectLandblock? erased to object?; WorldBuilder.Shared.Models.ObjectId? erased to ulong? — both fields are stored but never read by any consumer in our codebase. - Dropped both WB using directives from ActiveParticleEmitter.cs. Item C (IDatReaderWriter / IDatDatabase): - Verbatim copy of both interfaces into IDatReaderWriter.cs in AcDream.App.Rendering.Wb namespace — DatCollectionAdapter and ObjectMeshManager already live in that namespace, so no using changes needed. - Dropped using WorldBuilder.Shared.Services from DatCollectionAdapter.cs and ObjectMeshManager.cs. Additional extractions required by the reference drop: - GeometryUtils.cs: verbatim copy of WorldBuilder.Shared.Lib.GeometryUtils (float-precision overloads only; Vector3d double-precision overloads omitted — ObjectMeshManager uses only the float versions). - Dropped using WorldBuilder.Shared.Lib from ObjectMeshManager.cs. WbMeshAdapter.cs cleanup (spec O-D12): - Deleted _wbDats (DefaultDatReaderWriter) field + ctor init + Dispose call. - Deleted the [indoor-upload] NULL_RESULT diagnostic block (lines ~205-262) — its Phase 2 cell-resolution investigation is complete; its _wbDats.ResolveId dependency goes with this commit. - Deleted _pendingEnvCellRequests field + isPendingEnvCell tracking in Tick(). - Simplified Tick() to a clean drain loop. Deleted SplitFormulaDivergenceTest.cs — one-time N.5b data-collection sweep; job done. Verified acceptance criteria: - Zero <ProjectReference> to WorldBuilder.* / Chorizite.OpenGLSDLBackend.* in any csproj. - Zero 'using WorldBuilder.*' / 'using Chorizite.OpenGLSDLBackend.*' in src/. - DefaultDatReaderWriter referenced in zero places in src/ (comments only). Build green (0 warnings, 0 errors). Tests: 1154 total (-1 from deleted SplitFormulaDivergenceTest), 1146 pass, 8 pre-existing failures (unchanged from baseline — physics/input tests unrelated to this change). Spec: docs/superpowers/specs/2026-05-21-phase-o-dat-path-unification-design.md Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
180 lines
6.5 KiB
C#
180 lines
6.5 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;
|
|
}
|
|
}
|
|
|
|
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.
|
|
}
|
|
}
|