Implement numeric HUD rendering
This commit is contained in:
@@ -24,6 +24,13 @@ public readonly record struct SurfaceTransitionState(long CommandKey, int Target
|
||||
public readonly record struct ColorTransitionState(long Current, long Target,
|
||||
long DelayMs, long DurationMs, long StartMs, double Progress, bool Active);
|
||||
|
||||
/// <summary>One EngineCtx numeric-glyph style registered by opcode 0x13a.</summary>
|
||||
public readonly record struct NumericGlyphStyle(int SurfaceSlot, int AtlasX, int AtlasY,
|
||||
int DigitWidth, int DigitHeight)
|
||||
{
|
||||
public bool Registered => SurfaceSlot != 0;
|
||||
}
|
||||
|
||||
/// <summary>A renderable view of one visible gfx object — the host composites these in ascending-handle order
|
||||
/// (= the engine's z-order) each frame. Built by <see cref="GfxState.SnapshotVisibleObjects"/>; the surface
|
||||
/// resId/colorkey are resolved from the object's live source slot at snapshot time (see docs/engine-re.md,
|
||||
@@ -119,6 +126,7 @@ public sealed class GfxState
|
||||
// Populated lazily by the geometry SET ops and draw-texture. Op 0x215 queries this same native map and
|
||||
// returns the object's live source slot (obj+4), or -1 when the handle has not been drawn/bound yet.
|
||||
private readonly Dictionary<long, GfxObject> _objects = new();
|
||||
private readonly NumericGlyphStyle[] _numericGlyphStyles = new NumericGlyphStyle[11];
|
||||
|
||||
// Ops 0x229-0x22e address one embedded gfx-object record outside the ordinary object map. Its sampled
|
||||
// matrix is post-multiplied onto only the selected handle range during native composition. FIELD uses
|
||||
@@ -626,6 +634,75 @@ public sealed class GfxState
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Op 0x13a: replace one of the native engine's eleven decimal-glyph atlas styles.</summary>
|
||||
public bool RegisterNumericGlyphStyle(int styleIndex, int surfaceSlot, int atlasX, int atlasY,
|
||||
int digitWidth, int digitHeight)
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
if ((uint)styleIndex >= (uint)_numericGlyphStyles.Length) return false;
|
||||
_numericGlyphStyles[styleIndex] =
|
||||
new NumericGlyphStyle(surfaceSlot, atlasX, atlasY, digitWidth, digitHeight);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Op 0x23b: erase a destination handle range, split a signed 32-bit value into decimal
|
||||
/// digits, and bind one retained object per displayed atlas cell. Returns false for an invalid or
|
||||
/// unregistered style, matching the native handler's script-error path.</summary>
|
||||
public bool DrawDecimalGlyphs(long baseHandle, int styleIndex, int value, int x, int y,
|
||||
int digitCapacity, int flags)
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
if ((uint)styleIndex >= (uint)_numericGlyphStyles.Length
|
||||
|| !_numericGlyphStyles[styleIndex].Registered) return false;
|
||||
|
||||
NumericGlyphStyle style = _numericGlyphStyles[styleIndex];
|
||||
EraseRange(baseHandle, digitCapacity);
|
||||
|
||||
int remaining = value;
|
||||
int handleOffset = 0;
|
||||
int digitCount = 1;
|
||||
for (int n = remaining / 10; n != 0; n /= 10) digitCount++;
|
||||
|
||||
for (int slot = digitCapacity - 1; slot >= 0; slot--)
|
||||
{
|
||||
int digit = remaining % 10;
|
||||
int drawX;
|
||||
bool draw;
|
||||
|
||||
if ((flags & 0x2) != 0)
|
||||
{
|
||||
draw = slot == digitCapacity - 1 || remaining != 0;
|
||||
drawX = unchecked(x + style.DigitWidth * slot
|
||||
- (digitCapacity - digitCount) * style.DigitWidth / 2);
|
||||
}
|
||||
else if ((flags & 0x4) != 0)
|
||||
{
|
||||
digitCount--;
|
||||
draw = slot == digitCapacity - 1 || remaining != 0;
|
||||
drawX = unchecked(x + style.DigitWidth * digitCount);
|
||||
}
|
||||
else
|
||||
{
|
||||
draw = (flags & 0x1) != 0 || slot == digitCapacity - 1 || remaining != 0;
|
||||
drawX = unchecked(x + style.DigitWidth * slot);
|
||||
}
|
||||
|
||||
if (draw)
|
||||
{
|
||||
int srcX = unchecked(style.AtlasX + digit * style.DigitWidth);
|
||||
BindDraw(baseHandle + handleOffset, style.SurfaceSlot,
|
||||
srcX, style.AtlasY, style.DigitWidth, style.DigitHeight, drawX, y);
|
||||
handleOffset++;
|
||||
}
|
||||
remaining /= 10;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Op 0x1fd: immediately replace the object's current scale matrix. Script operands are
|
||||
/// integer percentages; native divides them by 100 before matrix4_make_scale at obj+0x6c.</summary>
|
||||
public void SetCurrentScale(long handle, (long X, long Y, long Z) percent)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using Age.Engine.Diagnostics;
|
||||
using Age.Engine.Hosting;
|
||||
using Age.Engine.Model;
|
||||
using System.Text;
|
||||
namespace Age.Engine.Vm;
|
||||
|
||||
/// <summary>A stable identity/snapshot of the exact script frame currently executing.</summary>
|
||||
@@ -22,6 +23,7 @@ public sealed class VirtualMachine
|
||||
private readonly OpcodeTable _t;
|
||||
private readonly IHost _host;
|
||||
private readonly VmOptions _o;
|
||||
private readonly Encoding _nativeStringEncoding;
|
||||
private readonly IScriptProvider? _provider;
|
||||
private static readonly bool _diagSetTexture = System.Environment.GetEnvironmentVariable("AGE_DIAG_SETTEX") == "1";
|
||||
private ExecFrame _cur = null!;
|
||||
@@ -87,8 +89,12 @@ public sealed class VirtualMachine
|
||||
public VirtualMachine(Script s, OpcodeTable t, IHost host, VmOptions? o = null,
|
||||
IScriptProvider? provider = null, ITraceSink? sink = null,
|
||||
AdvTextHistory? textHistory = null)
|
||||
{ _s = s; _t = t; _host = host; _o = o ?? new VmOptions(); _provider = provider;
|
||||
_sink = sink ?? NullTraceSink.Instance; TextHistory = textHistory ?? new AdvTextHistory(); }
|
||||
{
|
||||
_s = s; _t = t; _host = host; _o = o ?? new VmOptions(); _provider = provider;
|
||||
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
|
||||
_nativeStringEncoding = Encoding.GetEncoding(_o.NativeStringCodePage);
|
||||
_sink = sink ?? NullTraceSink.Instance; TextHistory = textHistory ?? new AdvTextHistory();
|
||||
}
|
||||
|
||||
/// <summary>Queue global writes and return only the identified active frame at its next opcode boundary.
|
||||
/// Writes are copied here and applied by the VM thread before another opcode executes.</summary>
|
||||
@@ -315,6 +321,12 @@ public sealed class VirtualMachine
|
||||
}
|
||||
}
|
||||
|
||||
private int NativeStringByteLength(string value)
|
||||
{
|
||||
int nul = value.IndexOf('\0');
|
||||
return _nativeStringEncoding.GetByteCount(nul < 0 ? value : value[..nul]);
|
||||
}
|
||||
|
||||
private static VmAddress Ga(Dictionary<int, VmAddress> d, int k)
|
||||
=> d.TryGetValue(k, out var value) ? value : VmAddress.Global(0);
|
||||
|
||||
@@ -657,6 +669,9 @@ public sealed class VirtualMachine
|
||||
if (IsStr(a[0]) || IsStr(a[1])) WriteStr(a[0], ReadStr(a[1]));
|
||||
else Write(a[0], Read(a[1]));
|
||||
return pc + 1;
|
||||
case "halve-strlen": // 0x1a6: strlen(native encoded bytes) >> 1
|
||||
Write(a[0], NativeStringByteLength(ReadStr(a[1])) >> 1);
|
||||
return pc + 1;
|
||||
case "lookup-array":
|
||||
LookupStore(a[0], BaseAddr(a[1]).Offset(Read(a[2]))); return pc + 1;
|
||||
case "lookup-array-2d":
|
||||
@@ -1347,6 +1362,34 @@ public sealed class VirtualMachine
|
||||
(int)Read(a[4]), (int)Read(a[5]), (int)Read(a[6]), (int)Read(a[7]));
|
||||
_host.DrawTexture((int)Read(a[1]), (int)Read(a[2]), (int)Read(a[3]), (int)Read(a[4]),
|
||||
(int)Read(a[5]), (int)Read(a[6]), (int)Read(a[7])); return pc + 1; // IHost seam (oracle log; Godot no-ops)
|
||||
case "u0041F3A0":
|
||||
case "register-numeric-glyph-style": // 0x13a: (style)(surface)(atlas x/y)(digit w/h)
|
||||
{
|
||||
int styleIndex = unchecked((int)Read(a[0]));
|
||||
if (!Gfx.RegisterNumericGlyphStyle(styleIndex, unchecked((int)Read(a[1])),
|
||||
unchecked((int)Read(a[2])), unchecked((int)Read(a[3])),
|
||||
unchecked((int)Read(a[4])), unchecked((int)Read(a[5]))))
|
||||
{
|
||||
HaltReason ??= $"numeric-glyph-style-index-out-of-range:{styleIndex}";
|
||||
return HALT;
|
||||
}
|
||||
return pc + 1;
|
||||
}
|
||||
case "u00422460":
|
||||
case "draw-decimal-glyphs": // 0x23b: retained decimal glyph draw
|
||||
{
|
||||
int styleIndex = unchecked((int)Read(a[1]));
|
||||
if (!Gfx.DrawDecimalGlyphs(Read(a[0]), styleIndex, unchecked((int)Read(a[2])),
|
||||
unchecked((int)Read(a[3])), unchecked((int)Read(a[4])),
|
||||
unchecked((int)Read(a[5])), unchecked((int)Read(a[6]))))
|
||||
{
|
||||
HaltReason ??= (uint)styleIndex >= 11
|
||||
? $"numeric-glyph-style-index-out-of-range:{styleIndex}"
|
||||
: $"numeric-glyph-style-unregistered:{styleIndex}";
|
||||
return HALT;
|
||||
}
|
||||
return pc + 1;
|
||||
}
|
||||
case "get-texture-size": // 0x208 (slot) (out_w) (out_h)
|
||||
{
|
||||
var (gw, gh) = _host.GetTextureSize((int)Read(a[0]));
|
||||
|
||||
@@ -8,5 +8,8 @@ namespace Age.Engine.Vm;
|
||||
/// (Godot) and for the dialogue-coverage sweep that deliberately walks every page.</param>
|
||||
/// <param name="IgnoreExitRequests">Debug-only divergence: treat op 0x1 as a no-op so unreachable
|
||||
/// post-exit bytecode can be explored. Leave false for native-faithful execution.</param>
|
||||
/// <param name="NativeStringCodePage">Encoding used when an opcode measures the engine's byte-string
|
||||
/// representation. SYS4 defaults to CP932; another container frontend can select its own code page.</param>
|
||||
public sealed record VmOptions(int EmitCap = 2, long MaxSteps = 2_000_000, int CallDepthCap = 64,
|
||||
bool HaltAtWaitForInput = false, bool IgnoreExitRequests = false);
|
||||
bool HaltAtWaitForInput = false, bool IgnoreExitRequests = false,
|
||||
int NativeStringCodePage = 932);
|
||||
|
||||
Reference in New Issue
Block a user