mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 09:42:21 +00:00
fix(ui): neighbours exactly two gaps from a midpoint obstacle join its block, and the band beside it stays inside the rail's own edges
Co-authored-by: Manjunath Paparaju <[email protected]>
This commit is contained in:
1 parent
81df2c8c42
commit
378df7b613
3 files changed
+30
-4
No files matched your search
@@ -387,6 +387,24 @@ test('HUD rail layout counts obstacles beside those across the midpoint', () =>
|
||||
// them against 70 above, and with a taller one only 60, so above.
|
||||
assert.deepEqual(band([[120, 260], [380, 420]]), [270, 370]);
|
||||
assert.deepEqual(band([[120, 260], [340, 420]]), [40, 110]);
|
||||
// Neighbours exactly two gaps away leave no room between: one block, 100
|
||||
// to 400, and a tie (50px a side) goes above.
|
||||
assert.deepEqual(band([[100, 180], [200, 300], [320, 400]]), [40, 90]);
|
||||
});
|
||||
|
||||
test('HUD rail layout keeps a band beside a midpoint obstacle inside its own edges', () => {
|
||||
const layout = resolveHudRailLayout({
|
||||
viewportHeight: 480,
|
||||
panelHeight: 80,
|
||||
laneLeft: 20,
|
||||
laneRight: 340,
|
||||
baseTop: 350,
|
||||
baseBottom: 460,
|
||||
gap: 10,
|
||||
obstacles: [{ left: 0, right: 400, top: 100, bottom: 260 }],
|
||||
});
|
||||
assert.equal(layout.safeTop, 350);
|
||||
assert.equal(layout.safeBottom, 460);
|
||||
});
|
||||
|
||||
test('HUD rail layout can anchor controls to the start of the safe corridor', () => {
|
||||
|
||||
@@ -106,7 +106,7 @@ export function bandBesideMidpointObstacles({
|
||||
grown = false;
|
||||
for (const rect of obstacles) {
|
||||
const touches =
|
||||
rect.top < blockBottom + 2 * gap && rect.bottom > blockTop - 2 * gap;
|
||||
rect.top <= blockBottom + 2 * gap && rect.bottom >= blockTop - 2 * gap;
|
||||
if (touches && (rect.top < blockTop || rect.bottom > blockBottom)) {
|
||||
blockTop = Math.min(blockTop, rect.top);
|
||||
blockBottom = Math.max(blockBottom, rect.bottom);
|
||||
@@ -122,8 +122,16 @@ export function bandBesideMidpointObstacles({
|
||||
else if (rect.top >= blockBottom)
|
||||
belowBottom = Math.min(belowBottom, rect.top - gap);
|
||||
}
|
||||
const above = { side: 'above', top: aboveTop, bottom: blockTop - gap };
|
||||
const below = { side: 'below', top: blockBottom + gap, bottom: belowBottom };
|
||||
const above = {
|
||||
side: 'above',
|
||||
top: aboveTop,
|
||||
bottom: Math.min(bottom, blockTop - gap),
|
||||
};
|
||||
const below = {
|
||||
side: 'below',
|
||||
top: Math.max(top, blockBottom + gap),
|
||||
bottom: belowBottom,
|
||||
};
|
||||
const roomAbove = above.bottom - above.top;
|
||||
const roomBelow = below.bottom - below.top;
|
||||
if (roomBelow > roomAbove && roomBelow > 0) return below;
|
||||
|
||||
@@ -283,7 +283,7 @@ test('the left corridor counts cards beside those across the midpoint', () => {
|
||||
f.options.obstacles = [element('card', { top: 300, height: 120 })];
|
||||
f.run();
|
||||
assert(Number(f.stack.dataset.safeBottomPct) * 7 <= 300);
|
||||
assert(Number(f.stack.dataset.safeTopPct) * 7 < 0.26 * 700);
|
||||
assert(Number(f.stack.dataset.safeTopPct) * 7 <= 30);
|
||||
// No room on either side: the card is read as before.
|
||||
f.options.windowRef.innerHeight = 480;
|
||||
f.options.obstacles = [element('card', { top: 0, height: 480 })];
|
||||
|
||||
Reference in new issue
Block a user