Skip to content

Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.

feat(verse): walk into an armed hangar shuttle; fix its wings and ramp (#898)

Ruben Lütke87657e4de344
diff --git a/art/verse/LEVELS.md b/art/verse/LEVELS.md
index c306baa5ef..d324b885dd 100644
--- a/art/verse/LEVELS.md
+++ b/art/verse/LEVELS.md
@@ -71,7 +71,7 @@ A long main corridor (the hexagonal-profile corridor) with rooms off both sides.
| Area | Rect | Contents |
|---|---|---|
| Hangar wall | 0–100, 0–3 | Full-height hangar wall: huge closed blast doors with a pressure frame, gantry rails, deck lights. |
-| Flight deck | 3–97, 3–46 | Vast floor of large plates with painted landing markings; a recessed launch well in the floor (30 × 12 m) covered by a faint blue containment field over darkness (never stars); the shuttle (≈ 20 m, original design, wings folded) on a pad (`SOCKET_spawn_arrival` at its ramp); cargo containers and pallets in ordered rows; fuel lines; tow drone. |
+| Flight deck | 3–97, 3–46 | Vast floor of large plates with painted landing markings; a recessed launch well in the floor (30 × 12 m) covered by a faint blue containment field over darkness (never stars); the shuttle (≈ 20 m, original armed design, swept wings out) on a pad (`SOCKET_spawn_arrival` at its ramp), its cabin walkable up the ramp (room `shuttle`: ramp corridor, troop bay, cockpit); cargo containers and pallets in ordered rows; fuel lines; tow drone. |
| Control booth | 3–25, 47–60 | Raised booth behind a window wall (cut at 1.1 m) with consoles facing −z toward the flight deck (an exception: seen from behind). |
| Arrivals desk | 40–60, 47–60 | Counter and terminal (station kind `create_agent`): new agents come off the shuttle and report here. |
| Turbolift lobby | 64–76, 48–60 | Lift, spawn. |
diff --git a/art/verse/decks/hangar/build.py b/art/verse/decks/hangar/build.py
index c9f4b06203..aced2f2a25 100644
--- a/art/verse/decks/hangar/build.py
+++ b/art/verse/decks/hangar/build.py
@@ -76,6 +76,19 @@ def _rooms() -> None:
)
ax0, ax1, az0, az1 = L.ARMOURY
kit.room("armoury", "Armoury", L.rect_xy(ax0, ax1, az0 + 0.3, az1), probe_at=probe(89.0, 52.4))
+ # The shuttle's cabin nests in the flight deck; its height band keeps the
+ # hull's outside on the flight deck (lib.cook.in_height_band).
+ from kit.props.industrial import shuttle
+
+ sx, sz = L.SHUTTLE_C
+ kit.room(
+ "shuttle",
+ "Shuttle Cabin",
+ [(sx + x, -sz + y) for x, y in shuttle.cabin_outline()],
+ z=shuttle.CABIN_FLOOR,
+ ceiling=shuttle.CABIN_CEILING_M,
+ probe_at=B(sx, sz - 1.0, shuttle.CABIN_FLOOR + 1.4),
+ )
def _yaw_toward(a, b) -> float:
diff --git a/art/verse/decks/hangar/hangar_layout.py b/art/verse/decks/hangar/hangar_layout.py
index 2361251684..c451af4811 100644
--- a/art/verse/decks/hangar/hangar_layout.py
+++ b/art/verse/decks/hangar/hangar_layout.py
@@ -48,7 +48,7 @@ PAD_C = (50.0, 23.6)
PAD_R = 8.4
SHUTTLE_C = (50.0, 23.6) # piece origin of the shuttle (nose toward the doors)
SHUTTLE_L = 20.0
-RAMP_FOOT = (50.0, 38.14) # SOCKET_spawn_arrival (the shuttle piece's ramp foot)
+RAMP_FOOT = (50.0, 38.1) # SOCKET_spawn_arrival (the shuttle piece's ramp foot)
WALKWAY_X = (48.6, 51.4)
WALKWAY_Z = (39.0, 48.6)
FORMATION_L = (36.6, 46.2, 35.4, 42.6)
diff --git a/art/verse/kit/props/industrial/README.md b/art/verse/kit/props/industrial/README.md
index f842a0dd47..3086894e42 100644
--- a/art/verse/kit/props/industrial/README.md
+++ b/art/verse/kit/props/industrial/README.md
@@ -58,7 +58,7 @@ degrees) at 96 px/m plus a 3x crop, and the reactor and hangar vignettes;
| SM_Eng_DroneDock | 1.5 x 1.7 x 1.6 | block | spawn drone | charging pad and mast |
| SM_Eng_WallMachinery_A | 5.2 x 1.6 x 7.2 | block | - | hull-wall bay: transformer + pump |
| SM_Eng_WallMachinery_B | 5.2 x 1.6 x 7.2 | block | - | hull-wall bay: tank pair + ladder |
-| SM_Hangar_Shuttle | 11 x 24.7 x 9.2 | block | spawn arrival, waypoint ramp_top, light cabin | original faceted shuttle, gull wings folded, ramp down, lit cabin |
+| SM_Hangar_Shuttle | 17 x 24.7 x 7 | block (cabin walk) | spawn arrival, waypoint ramp_top, light cabin, holo tactical | original faceted gunship, swept wings out, ramp down; armed (chin and dorsal turrets, wingtip cannons, missile pods); hollow hull with a walkable cabin (ramp corridor, troop bay, cockpit), its room outline from `shuttle.cabin_outline()` |
| SM_Hangar_Container_L_Charcoal/Olive/Grey | 6.0 x 2.4 x 2.6 | block | - | corrugated containers with stencils |
| SM_Hangar_Container_M_Gunmetal/Charcoal | 3.6 x 2.4 x 2.4 | block | - | |
| SM_Hangar_Container_S_Grey/Charcoal | 2.4 x 1.6 x 1.6 | block | - | |
diff --git a/art/verse/kit/props/industrial/shuttle.py b/art/verse/kit/props/industrial/shuttle.py
index 58dae582f3..0673ac3194 100644
--- a/art/verse/kit/props/industrial/shuttle.py
+++ b/art/verse/kit/props/industrial/shuttle.py
@@ -1,9 +1,16 @@
-"""The arrival shuttle of the main hangar (deck 4): an original ~20 m design.
+"""The arrival shuttle of the main hangar (deck 4): an original ~20 m gunship.
-A faceted wedge-nosed transport parked on three landing legs with its two
-gull wings folded up, two aft engine nacelles and a lit rear ramp lowered to
-the deck. New agents walk down the ramp: ``SOCKET_spawn_arrival`` sits at its
-foot.
+A faceted wedge-nosed transport parked on three landing legs, its swept wings
+out with a little anhedral, two aft engine nacelles and a lit rear ramp
+lowered to the deck. It is armed: a twin cannon chin turret, a dorsal turret,
+wingtip cannons and missile pods on the sponsons.
+
+The hull is hollow and the cabin is walkable: up the ramp, through the ramp
+corridor between the engine housings, into the troop bay (crew seats, weapon
+racks, a tactical table), up two steps and through the passage into the
+cockpit under the canopy. The hull shell is one object whose inner skin faces
+into the cabin, so the nav cook sees a closed solid with a cavity: roof above
+the cabin, floor pan below it (see `lib.cook._column_floor`).
Piece-local frame: nose toward +Y (away from the camera), ramp toward -Y (the
camera side), centred on X, deck at Z = 0.
@@ -31,6 +38,7 @@ STATIONS = (
(9.4, 1.45, 1.95, 3.6),
(10.3, 0.95, 2.3, 3.1),
)
+# (station, facet) pairs under the canopy glass: the hull is open there.
COCKPIT_FACETS = {
(4, 3),
(4, 4),
@@ -45,11 +53,54 @@ COCKPIT_FACETS = {
(6, 6),
}
+# Cabin (piece-local metres). Floors are the walk surfaces' tops.
+CABIN_FLOOR = 1.6
+COCKPIT_FLOOR = 2.0
+PLATE_T = 0.025 # walk plates on the floor pans
+CORRIDOR_Y = (-9.6, -5.0) # ramp corridor between the engine housings
+BAY_Y = (-5.0, 4.33) # troop bay (ends off the nav sample grid)
+PASSAGE_Y = (4.33, 5.4) # passage up into the cockpit
+COCKPIT_Y = (5.4, 8.4) # cockpit under the canopy, dash at its front
+STEPS = ((3.5, 3.9, 1.8), (3.9, 4.33, 2.0)) # (y0, y1, top z) up to the passage
+# Shell thickness per facet group: bottom, sides, top (the top leaves room
+# for the roof grilles and the spine inside the shell).
+INSET = (0.12, 0.2, 0.4)
+CORRIDOR = (
+ (-0.85, 0.0),
+ (0.85, 0.0),
+ (0.98, 0.13),
+ (0.98, 1.85),
+ (0.6, 2.35),
+ (-0.6, 2.35),
+ (-0.98, 1.85),
+ (-0.98, 0.13),
+) # (x, height above CABIN_FLOOR), the same order as a hull section
+PASSAGE = (
+ (-0.75, 0.0),
+ (0.75, 0.0),
+ (0.88, 0.13),
+ (0.88, 1.7),
+ (0.55, 2.15),
+ (-0.55, 2.15),
+ (-0.88, 1.7),
+ (-0.88, 0.13),
+) # (x, height above COCKPIT_FLOOR)
+CABIN_CEILING_M = 3.4 # height band of the cabin room above CABIN_FLOOR
+TABLE_Y = -1.0 # tactical table in the troop bay
RAMP_WIDTH = 1.76
-RAMP_HINGE = (-9.6, 1.5) # (y, z)
+RAMP_HINGE = (-9.6, CABIN_FLOOR) # (y, z)
RAMP_LENGTH = 4.4
-WING_FOLD_DEG = 56.0
+
+# Wings: swept back, out in flight position with a slight anhedral.
+WING_FOLD_DEG = -6.0 # positive folds the tips up
+WING_HINGE_X = 2.75
+WING_SPAN = 5.2
+WING_ROOT = (2.4, -6.2) # (leading, trailing) edge y at the root
+WING_TIP = (-3.4, -6.0) # at the tip
+
+
+# ---------------------------------------------------------------- sections
def _section(y, w, z0, z1):
@@ -71,13 +122,131 @@ def _sections():
return [_section(*s) for s in STATIONS]
+def hull_at(y: float):
+ """Hull section at any y between the first and last station (linear between)."""
+ for a, b in zip(STATIONS, STATIONS[1:], strict=False):
+ if a[0] <= y <= b[0]:
+ t = (y - a[0]) / (b[0] - a[0])
+ return _section(y, *(a[i] + (b[i] - a[i]) * t for i in (1, 2, 3)))
+ raise ValueError(f"y {y} outside the hull")
+
+
+def _line_offset(p, q, d):
+ """Edge p->q of a counter-clockwise XZ polygon moved inward by d: (point, direction)."""
+ dx, dz = q[0] - p[0], q[1] - p[1]
+ n = math.hypot(dx, dz)
+ nx, nz = -dz / n, dx / n # inward normal of a CCW polygon
+ return (p[0] + nx * d, p[1] + nz * d), (dx, dz)
+
+
+def _intersect(l1, l2):
+ (px, pz), (dx, dz) = l1
+ (qx, qz), (ex, ez) = l2
+ det = dx * (-ez) - dz * (-ex)
+ t = ((qx - px) * (-ez) - (qz - pz) * (-ex)) / det
+ return px + dx * t, pz + dz * t
+
+
+def cavity_at(y: float, floor: float):
+ """Cabin cross-section at y: the hull section moved inward by INSET, cut by the floor.
+
+ Returns 8 (x, y, z) points in hull-section order; the first two lie on the floor.
+ """
+ sec = [(p[0], p[2]) for p in hull_at(y)]
+ bottom, side, top = INSET
+ insets = (bottom, bottom, side, top, top, top, side, bottom)
+ lines = [_line_offset(sec[j], sec[(j + 1) % 8], insets[j]) for j in range(8)]
+ pts = [_intersect(lines[j - 1], lines[j]) for j in range(8)]
+ if floor <= pts[1][1] or floor >= pts[2][1]:
+ raise ValueError(f"floor {floor} outside the lower bevel at y {y}")
+ flat = ((0.0, floor), (1.0, 0.0))
+ right = _intersect(flat, lines[1])
+ left = _intersect(flat, lines[7])
+ out = [left, right, *pts[2:]]
+ return [(x, y, z) for x, z in out]
+
+
+def _fixed(profile, y, floor):
+ return [(x, y, floor + h) for x, h in profile]
+
+
+def bay_at(y: float):
+ return cavity_at(y, CABIN_FLOOR)
+
+
+def cabin_outline():
+ """Floor outline of the whole cabin (piece-local XY, counter-clockwise), for its room."""
+ c0, c1 = CORRIDOR_Y
+ b1 = BAY_Y[1]
+ p1 = PASSAGE_Y[1]
+ k1 = COCKPIT_Y[1] - 0.3
+ bw0, bw1 = bay_at(c1 + 0.01)[1][0], bay_at(b1)[1][0]
+ kw0, kw1 = cavity_at(p1, COCKPIT_FLOOR)[1][0], cavity_at(k1, COCKPIT_FLOOR)[1][0]
+ cw, pw = CORRIDOR[1][0], PASSAGE[1][0]
+ right = [(cw, c0), (cw, c1), (bw0, c1), (bw1, b1), (pw, b1), (pw, p1), (kw0, p1), (kw1, k1)]
+ left = [(-x, y) for x, y in reversed(right)]
+ return [*right, *left]
+
+
+# ---------------------------------------------------------------- mesh helpers
+
+
+def _face(mb, pts, want, material):
+ """Add a planar-ish polygon whose normal points along `want` (flipped if needed)."""
+ vs = [Vector(p) for p in pts]
+ n = Vector()
+ for i, a in enumerate(vs): # Newell normal
+ b = vs[(i + 1) % len(vs)]
+ n += Vector(
+ ((a.y - b.y) * (a.z + b.z), (a.z - b.z) * (a.x + b.x), (a.x - b.x) * (a.y + b.y))
+ )
+ if n.length < 1e-9:
+ return
+ if n.dot(Vector(want)) < 0:
+ vs.reverse()
+ mb._add(vs, [tuple(range(len(vs)))], material)
+
+
+def _centre(sec):
+ xs = [p[0] for p in sec]
+ zs = [p[2] for p in sec]
+ return Vector((0.0, sec[0][1], (min(zs) + max(zs)) / 2)) if xs else Vector()
+
+
+def _band(mb, a, b, materials, inward, skip=()):
+ """Quads between two 8-point sections; normals toward (inward) or away from the axis."""
+ ca, cb = _centre(a), _centre(b)
+ for j in range(8):
+ if j in skip:
+ continue
+ j2 = (j + 1) % 8
+ quad = [a[j], a[j2], b[j2], b[j]]
+ mid = sum((Vector(p) for p in quad), Vector()) / 4
+ axis = (ca + cb) / 2
+ axis.y = mid.y
+ want = (axis - mid) if inward else (mid - axis)
+ _face(mb, quad, want, materials[j])
+
+
+def _annulus(mb, outer, inner, want, material, skip=()):
+ """Planar ring between two 8-point sections at the same y."""
+ for j in range(8):
+ if j in skip:
+ continue
+ j2 = (j + 1) % 8
+ _face(mb, [outer[j], outer[j2], inner[j2], inner[j]], want, material)
+
+
def _slab(mb, quad, lift, material):
"""Raised plate on a quad: top face lifted along its normal, with sides."""
q = [Vector(p) for p in quad]
n = (q[1] - q[0]).cross(q[2] - q[1]).normalized()
+ q = [p + n * 0.002 for p in q] # off the skin: a coplanar underside would hide from rays
top = [p + n * lift for p in q]
mb._add(
- [*q, *top], [(4, 5, 6, 7), (0, 1, 5, 4), (1, 2, 6, 5), (2, 3, 7, 6), (3, 0, 4, 7)], material
+ [*q, *top],
+ [(3, 2, 1, 0), (4, 5, 6, 7), (0, 1, 5, 4), (1, 2, 6, 5), (2, 3, 7, 6), (3, 0, 4, 7)],
+ material,
)
@@ -92,70 +261,81 @@ def _cell(a, b, c, d, u0, u1, v0, v1, inset):
return [q + (centre - q).normalized() * min(inset, (centre - q).length * 0.4) for q in p]
-def _plate_hull(mb, secs, rnd):
- """Panel plating on every facet: raised plates, vents and hatches."""
- hull, steel = m("hull_paint"), m("dark_steel")
- for s in range(len(secs) - 1):
- for j in range(8):
- if (s, j) in COCKPIT_FACETS:
- continue
- a, b = Vector(secs[s][j]), Vector(secs[s][(j + 1) % 8])
- d, c = Vector(secs[s + 1][j]), Vector(secs[s + 1][(j + 1) % 8])
- span = (d - a).length
- width = (b - a).length
- if j == 0 or width < 0.4: # belly: plain
- continue
- rows = max(1, round(span / 1.6))
- cols = max(1, round(width / 1.4))
- for r in range(rows):
- for k in range(cols):
- roll = rnd.random()
- if roll < 0.12:
- continue
- quad = _cell(
- a, b, c, d, k / cols, (k + 1) / cols, r / rows, (r + 1) / rows, 0.035
- )
- _slab(
- mb,
- quad[::-1],
- 0.018 if roll < 0.85 else 0.03,
- hull if roll < 0.9 else steel,
- )
+def _toward(p, c, d):
+ """Point p moved distance d toward c (XZ plane, same y)."""
+ v = Vector((c[0] - p[0], 0.0, c[2] - p[2]))
+ if v.length < 1e-9:
+ return Vector(p)
+ return Vector(p) + v.normalized() * d
+
+
+# ---------------------------------------------------------------- the piece
def build_shuttle() -> None:
- """Original faceted shuttle, wings folded, ramp down, lit cabin."""
+ """Original faceted gunship: hollow walkable hull, ramp down, armed, lit cabin."""
rnd = G.rng("shuttle")
secs = _sections()
- hull = m("hull_paint")
+
+ shell = K.MeshBuilder() # explicit winding: the inner skin faces into the cabin
+ _shell(shell, secs)
+ shell.build("SM_Hangar_Shuttle_shell", bevel_width=0.015, angle_deg=25.0, recalc_normals=False)
body = K.MeshBuilder()
- G.loft(body, secs, hull, closed_ends=False)
- body._add([Vector(p) for p in secs[-1]], [tuple(range(8))], hull) # nose cap
- _rear_bulkhead(body, secs[0])
- _plate_hull(body, secs, rnd)
- _spine(body)
+ _door_frame(body)
_sponsons(body, rnd)
_nacelles(body)
_hinges_and_wings(body)
body.build("SM_Hangar_Shuttle_hull", bevel_width=0.02, angle_deg=25.0)
+ # Skin details and roof gear: none of it reaches down to a floor's
+ # headroom, and its open or coplanar faces would confuse the nav rays.
+ skin = K.MeshBuilder()
+ _plate_hull(skin, secs, rnd)
+ _spine(skin)
+ _canopy_frame(skin, secs)
+ _dorsal_turret(skin)
+ skin.build("SM_Hangar_Shuttle_skin", bevel_width=0.02, angle_deg=25.0, nav="none")
+
+ arms = K.MeshBuilder()
+ _chin_turret(arms)
+ _missile_pods(arms)
+ arms.build("SM_Hangar_Shuttle_weapons", bevel_width=0.008, angle_deg=30.0)
+
gear = K.MeshBuilder()
for x, y, z in ((0.0, 7.0, STATIONS[4][2]), (-2.0, -5.0, 1.33), (2.0, -5.0, 1.33)):
_leg(gear, x, y, z)
gear.build("SM_Hangar_Shuttle_gear", bevel_width=0.01, nav="block")
ramp = K.MeshBuilder()
_ramp(ramp)
- ramp.build("SM_Hangar_Shuttle_ramp", bevel_width=0.01, nav="walk") # crew walk down it
+ ramp.build("SM_Hangar_Shuttle_ramp", bevel_width=0.01, nav="walk") # crew walk up it
intake = K.MeshBuilder() # fuel intake on the starboard sponson (hoses end here)
intake.box((3.05, -5.9, 1.55), (3.1, -5.1, 2.05), m("dark_steel"))
intake.tube((3.1, -5.5, 1.8), (3.28, -5.5, 1.8), 0.11, m("gunmetal"), 14)
intake.box((3.06, -5.95, 2.1), (3.1, -5.05, 2.16), m("hazard"))
# dorsal service hatch with grab handle (port side of the spine)
- intake.box((-1.35, 0.4, 5.1), (-0.75, 1.5, 5.15), m("dark_steel"))
+ intake.box((-1.35, 0.4, 5.105), (-0.75, 1.5, 5.15), m("dark_steel"))
intake.box((-1.2, 0.6, 5.15), (-0.9, 0.66, 5.19), m("gunmetal"))
intake.build("SM_Hangar_Shuttle_intake", bevel_width=0.006, nav="block")
+ floors = K.MeshBuilder()
+ _cabin_floors(floors)
+ floors.build("SM_Hangar_Shuttle_floor", bevel_width=0.004, recalc_normals=False, nav="walk")
+
+ cabin = K.MeshBuilder()
+ frames = K.MeshBuilder() # ribs and panels: explicit winding, open strips
+ _corridor_fit(cabin, frames)
+ _bay_fit(cabin, frames)
+ _cockpit_fit(cabin)
+ cabin.build("SM_Hangar_Shuttle_cabin", bevel_width=0.006, angle_deg=30.0, nav="block")
+ frames.build(
+ "SM_Hangar_Shuttle_frames",
+ bevel_width=0.006,
+ angle_deg=30.0,
+ recalc_normals=False,
+ nav="block",
+ )
+
glass = K.MeshBuilder()
_cockpit(glass, secs)
glass.build("SM_Hangar_Shuttle_glass", bevel_width=0.0, nav="none")
@@ -168,7 +348,7 @@ def build_shuttle() -> None:
_markings(marks, secs)
marks.build("SM_Hangar_Shuttle_marks", bevel_width=0.0, nav="none")
- _cabin_light()
+ _cabin_lights()
hy, hz = RAMP_HINGE
foot = hy - RAMP_LENGTH * math.cos(math.asin(hz / RAMP_LENGTH))
K.socket("spawn", "arrival", K.socket_matrix((0.0, foot - 0.8, 0.0), (0, 0, 1), up=(0, 1, 0)))
@@ -177,35 +357,127 @@ def build_shuttle() -> None:
_occluders(secs)
-def _rear_bulkhead(mb, sec):
- """Aft face with the door opening (x +-ramp/2, from the belly to 3.5 m)."""
- hw = RAMP_WIDTH / 2
- y = sec[0][1]
- top = 3.5
- pts = [sec[0], (-hw, y, sec[0][2]), (-hw, y, top), (hw, y, top), (hw, y, sec[0][2]), *sec[1:]]
- mb._add([Vector(p) for p in pts], [tuple(reversed(range(len(pts))))], m("hull_paint"))
- # heavy door frame and a cabin box (open toward -Y)
+# ---------------------------------------------------------------- shell
+
+
+SHELL_MATS = {
+ # cavity facet j -> material: floor pan, kick bevels, walls, upper chines, ceiling
+ "bay": (
+ "M_Wall_PaintedDark",
+ "M_Wall_Charcoal",
+ "M_Wall_PaintedDark",
+ "M_Wall_Charcoal",
+ "M_Ceiling_Panel",
+ "M_Wall_Charcoal",
+ "M_Wall_PaintedDark",
+ "M_Wall_Charcoal",
+ ),
+}
+
+
+def _shell(mb, secs):
+ """Outer skin, aft face around the door, and the cabin's inner skin, one solid."""
+ hull = m("hull_paint")
+ inner = SHELL_MATS["bay"]
+ bulkhead = "M_Wall_PaintedDark"
+ # outer skin, open under the canopy
+ for s in range(len(secs) - 1):
+ skip = {j for (ss, j) in COCKPIT_FACETS if ss == s}
+ _band(mb, secs[s], secs[s + 1], [hull] * 8, inward=False, skip=skip)
+ _face(mb, secs[-1], (0, 1, 0), hull) # nose cap
+
+ c0, c1 = CORRIDOR_Y
+ corridor_a = _fixed(CORRIDOR, c0, CABIN_FLOOR)
+ corridor_b = _fixed(CORRIDOR, c1, CABIN_FLOOR)
+ _annulus(mb, secs[0], corridor_a, (0, -1, 0), hull) # aft face, the door is the corridor
+ _band(mb, corridor_a, corridor_b, inner, inward=True)
+
+ bay_ys = (BAY_Y[0], -2.4, 2.4, BAY_Y[1])
+ bay = [bay_at(y) for y in bay_ys]
+ _annulus(mb, bay[0], corridor_b, (0, 1, 0), bulkhead) # aft bay bulkhead
+ for a, b in zip(bay, bay[1:], strict=False):
+ _band(mb, a, b, inner, inward=True)
+
+ p0, p1 = PASSAGE_Y
+ passage_a = _fixed(PASSAGE, p0, COCKPIT_FLOOR)
+ passage_b = _fixed(PASSAGE, p1, COCKPIT_FLOOR)
+ _annulus(mb, bay[-1], passage_a, (0, -1, 0), bulkhead) # forward bay bulkhead
+ _band(mb, passage_a, passage_b, inner, inward=True)
+
+ # cockpit: open top under the canopy; a sill joins its walls to the hull opening
+ ys = (COCKPIT_Y[0], STATIONS[5][0], COCKPIT_Y[1])
+ pit = [cavity_at(y, COCKPIT_FLOOR) for y in ys]
+ rim = [hull_at(y) for y in ys]
+ for a, b in zip(pit, pit[1:], strict=False):
+ _band(mb, a, b, inner, inward=True, skip={3, 4, 5})
+ for a, b, ra, rb in zip(pit, pit[1:], rim, rim[1:], strict=False):
+ for j in (3, 6):
+ _face(mb, [a[j], ra[j], rb[j], b[j]], (0, 0, 1), "M_Wall_Charcoal")
+ # header over the passage: from the passage top up to the canopy's aft edge
+ hd, pa = rim[0], pit[0]
+ _face(mb, [passage_b[1], pa[1], pa[2], passage_b[2]], (0, 1, 0), bulkhead)
+ _face(mb, [passage_b[0], pa[0], pa[7], passage_b[7]], (0, 1, 0), bulkhead)
+ _face(mb, [passage_b[2], pa[2], pa[3], passage_b[3]], (0, 1, 0), bulkhead)
+ _face(mb, [passage_b[7], pa[7], pa[6], passage_b[6]], (0, 1, 0), bulkhead)
+ _face(mb, [passage_b[3], pa[3], hd[3], hd[4], passage_b[4]], (0, 1, 0), bulkhead)
+ _face(mb, [passage_b[4], hd[4], hd[5], passage_b[5]], (0, 1, 0), bulkhead)
+ _face(mb, [passage_b[5], hd[5], hd[6], pa[6], passage_b[6]], (0, 1, 0), bulkhead)
+ # dash front, glare shield, and the deck under the nose window
+ end = pit[-1]
+ _face(mb, [end[0], end[1], end[2], end[3], end[6], end[7]], (0, -1, 0), "M_Console_Body")
+ n6 = secs[6]
+ _face(mb, [end[6], end[3], n6[3], n6[6]], (0, 0, 1), "M_Console_Body")
+ _face(mb, [rim[-1][3], end[3], n6[3]], (0, 0, 1), "M_Console_Body")
+ _face(mb, [rim[-1][6], end[6], n6[6]], (0, 0, 1), "M_Console_Body")
+ _face(mb, [n6[2], n6[3], n6[6], n6[7]], (0, 1, 0), "M_Console_Body")
+ n7 = secs[7]
+ _face(mb, [n6[7], n6[2], n7[2], n7[7]], (0, 0, 1), "M_Console_Body")
+
+
+def _door_frame(mb):
+ """Heavy frame around the aft door, amber-striped threshold."""
steel = m("dark_steel")
- z0 = sec[0][2]
- mb.box((-hw - 0.22, y - 0.12, z0), (-hw, y + 0.02, top + 0.22), steel)
- mb.box((hw, y - 0.12, z0), (hw + 0.22, y + 0.02, top + 0.22), steel)
- mb.box((-hw - 0.22, y - 0.12, top), (hw + 0.22, y + 0.02, top + 0.22), steel)
- cab = m("panel_light")
- depth = 4.2
- mb.box((-hw - 0.05, y, z0 - 0.08), (hw + 0.05, y + depth, z0), m("panel_dark"))
- mb.box((-hw - 0.08, y, z0), (-hw, y + depth, top), cab)
- mb.box((hw, y, z0), (hw + 0.08, y + depth, top), cab)
- mb.box((-hw, y + depth, z0), (hw, y + depth + 0.08, top), cab)
- mb.box((-hw - 0.05, y, top), (hw + 0.05, y + depth, top + 0.08), cab)
- for i in range(4): # cabin seats along both walls
- yy = y + 0.7 + i * 0.85
- for sx in (-1, 1):
- x0 = sx * (hw - 0.05)
- mb.box(
- (min(x0, x0 - sx * 0.45), yy - 0.25, z0 + 0.42),
- (max(x0, x0 - sx * 0.45), yy + 0.25, z0 + 0.5),
- m("panel_dark"),
- )
+ y = CORRIDOR_Y[0]
+ z0 = CABIN_FLOOR
+ top = z0 + CORRIDOR[4][1]
+ hw = CORRIDOR[2][0]
+ mb.box((-hw - 0.24, y - 0.16, z0 - 0.1), (-hw, y + 0.04, top + 0.1), steel)
+ mb.box((hw, y - 0.16, z0 - 0.1), (hw + 0.24, y + 0.04, top + 0.1), steel)
+ mb.box((-hw - 0.24, y - 0.16, top - 0.12), (hw + 0.24, y + 0.04, top + 0.2), steel)
+
+
+# ---------------------------------------------------------------- outer details
+
+
+def _plate_hull(mb, secs, rnd):
+ """Panel plating on every facet: raised plates, vents and hatches."""
+ hull, steel = m("hull_paint"), m("dark_steel")
+ for s in range(len(secs) - 1):
+ for j in range(8):
+ if (s, j) in COCKPIT_FACETS:
+ continue
+ a, b = Vector(secs[s][j]), Vector(secs[s][(j + 1) % 8])
+ d, c = Vector(secs[s + 1][j]), Vector(secs[s + 1][(j + 1) % 8])
+ span = (d - a).length
+ width = (b - a).length
+ if j == 0 or width < 0.4: # belly: plain
+ continue
+ rows = max(1, round(span / 1.6))
+ cols = max(1, round(width / 1.4))
+ for r in range(rows):
+ for k in range(cols):
+ roll = rnd.random()
+ if roll < 0.12:
+ continue
+ quad = _cell(
+ a, b, c, d, k / cols, (k + 1) / cols, r / rows, (r + 1) / rows, 0.035
+ )
+ _slab(
+ mb,
+ quad[::-1],
+ 0.018 if roll < 0.85 else 0.03,
+ hull if roll < 0.9 else steel,
+ )
def _spine(mb):
@@ -227,8 +499,8 @@ def _spine(mb):
for k in range(14):
yy = -7.85 + k * 0.27
mb.box((x0 + 0.05, yy, roof - 0.02), (x1 - 0.05, yy + 0.12, roof + 0.05), metal)
- mb.tube((0.25, -6.2, roof + 0.3), (0.25, -6.2, roof + 1.4), 0.025, metal, 8)
- mb.tube((-0.25, -6.6, roof + 0.3), (-0.25, -6.6, roof + 1.0), 0.02, metal, 8)
+ mb.tube((0.25, -8.1, roof + 0.3), (0.25, -8.1, roof + 1.4), 0.025, metal, 8)
+ mb.tube((-0.25, -8.4, roof + 0.3), (-0.25, -8.4, roof + 1.0), 0.02, metal, 8)
def _nacelles(mb):
@@ -283,27 +555,44 @@ def _wing_mesh(mb, root, tip, span, t_root, t_tip, material):
_slab(mb, list(reversed(quad)), 0.014, material)
+def _wingtip_cannon(mb, span, tip):
+ """Long-barrelled cannon pod on the wing tip, firing forward."""
+ steel, metal = m("dark_steel"), m("gunmetal")
+ lead, trail = tip
+ x = span + 0.1
+ G.chamfer_box(
+ mb, (span - 0.12, trail + 0.1, -0.17), (span + 0.32, lead + 0.7, 0.17), 0.07, steel
+ )
+ y0, y1 = lead + 0.7, lead + 3.6
+ mb.tube((x, y0, 0.0), (x, y1, 0.0), 0.065, metal, 14)
+ for k in range(4): # cooling rings
+ yy = y0 + 0.25 + k * 0.32
+ mb.tube((x, yy, 0.0), (x, yy + 0.08, 0.0), 0.1, steel, 14)
+ mb.tube((x, y1 - 0.05, 0.0), (x, y1 + 0.3, 0.0), 0.095, steel, 14) # muzzle brake
+ mb.box((x - 0.12, y1 + 0.12, -0.025), (x + 0.12, y1 + 0.2, 0.025), metal)
+
+
def _hinges_and_wings(mb):
- """Gull wings hinged at the upper chines, folded up and outward."""
+ """Wing roots at the upper chines; swept wings out, cannons on the tips."""
hull, steel, metal = m("hull_paint"), m("dark_steel"), m("gunmetal")
z_hinge = STATIONS[2][2] + 0.58 * (STATIONS[2][3] - STATIONS[2][2])
for sx in (-1, 1):
- x_h = sx * 2.62
- mb.tube((x_h, -6.4, z_hinge), (x_h, 1.8, z_hinge), 0.3, metal, 16)
+ x_h = sx * WING_HINGE_X
+ mb.tube((x_h, -6.4, z_hinge), (x_h, 2.0, z_hinge), 0.22, metal, 16)
for yy in (-5.6, -2.2, 1.0):
G.chamfer_box(
mb,
- (x_h - 0.35, yy - 0.4, z_hinge - 0.55),
- (x_h + 0.35, yy + 0.4, z_hinge + 0.3),
- 0.12,
+ (x_h - 0.28, yy - 0.4, z_hinge - 0.5),
+ (x_h + 0.28, yy + 0.4, z_hinge + 0.28),
+ 0.1,
steel,
)
frame = G.T(x_h, 0.0, z_hinge) @ G.Ry(-sx * WING_FOLD_DEG)
if sx < 0:
frame = frame @ G.S(-1.0, 1.0, 1.0)
with G.xf(mb, frame):
- _wing_mesh(mb, (1.6, -6.2), (-0.8, -4.6), 5.4, 0.42, 0.18, hull)
- mb.box((5.3, -4.7, -0.14), (5.55, -0.7, 0.14), steel) # tip rail
+ _wing_mesh(mb, WING_ROOT, WING_TIP, WING_SPAN, 0.42, 0.16, hull)
+ _wingtip_cannon(mb, WING_SPAN, WING_TIP)
def _sponsons(mb, rnd):
@@ -328,6 +617,64 @@ def _sponsons(mb, rnd):
mb.box((xa + 0.15, y, 2.85), (xb - 0.15, y + 0.18, 2.88), steel)
+def _chin_turret(mb):
+ """Twin heavy cannons in a ball mount under the nose."""
+ steel, metal = m("dark_steel"), m("gunmetal")
+ cx, cy, cz = 0.0, 8.3, 1.62
+ with G.xf(mb, G.T(cx, cy, cz)):
+ G.lathe(
+ mb,
+ [(0.0, -0.42), (0.3, -0.38), (0.46, -0.2), (0.5, 0.05), (0.42, 0.28), (0.0, 0.32)],
+ steel,
+ 24,
+ )
+ mb.box((-0.36, cy - 0.3, cz + 0.2), (0.36, cy + 0.4, STATIONS[5][2] + 0.08), steel)
+ for sx in (-1, 1):
+ x = sx * 0.2
+ mb.box((x - 0.11, cy + 0.2, cz - 0.15), (x + 0.11, cy + 0.9, cz + 0.08), metal)
+ mb.tube((x, cy + 0.9, cz - 0.04), (x, cy + 3.1, cz - 0.04), 0.055, metal, 14)
+ mb.tube((x, cy + 0.9, cz - 0.04), (x, cy + 1.8, cz - 0.04), 0.085, steel, 14)
+ mb.tube((x, cy + 3.0, cz - 0.04), (x, cy + 3.3, cz - 0.04), 0.08, steel, 14)
+
+
+def _dorsal_turret(mb):
+ """Twin-barrel turret on the aft spine."""
+ steel, metal = m("dark_steel"), m("gunmetal")
+ top = 5.42
+ cy = -5.6
+ with G.xf(mb, G.T(0.0, cy, top)):
+ G.lathe(mb, [(0.0, 0.0), (0.72, 0.0), (0.72, 0.12), (0.62, 0.22), (0.0, 0.22)], metal, 32)
+ G.chamfer_box(mb, (-0.58, cy - 0.7, top + 0.2), (0.58, cy + 0.75, top + 0.68), 0.16, steel)
+ G.chamfer_box(mb, (-0.4, cy - 0.5, top + 0.66), (0.4, cy + 0.4, top + 0.8), 0.06, metal)
+ for sx in (-1, 1):
+ x = sx * 0.24
+ mb.box((x - 0.1, cy + 0.7, top + 0.36), (x + 0.1, cy + 1.2, top + 0.56), metal)
+ mb.tube((x, cy + 1.2, top + 0.46), (x, cy + 3.4, top + 0.46), 0.05, metal, 12)
+ mb.tube((x, cy + 1.2, top + 0.46), (x, cy + 2.0, top + 0.46), 0.08, steel, 12)
+ mb.tube((x, cy + 3.3, top + 0.46), (x, cy + 3.55, top + 0.46), 0.075, steel, 12)
+
+
+def _missile_pods(mb):
+ """Missile pods on the forward ends of the sponsons, six cells each."""
+ steel, void = m("dark_steel"), m("void_black")
+ for sx in (-1, 1):
+ xa, xb = sorted((sx * 2.5, sx * 3.0))
+ y0, y1 = 2.6, 4.5
+ z0, z1 = 2.85, 3.28
+ G.chamfer_box(mb, (xa, y0, z0), (xb, y1, z1), 0.06, steel)
+ w, h = (xb - xa) / 3, (z1 - z0) / 2
+ for i in range(3):
+ for k in range(2):
+ cx = xa + w * (i + 0.5)
+ cz = z0 + h * (k + 0.5)
+ mb.box(
+ (cx - w * 0.36, y1 - 0.02, cz - h * 0.34),
+ (cx + w * 0.36, y1 + 0.01, cz + h * 0.34),
+ void,
+ )
+ mb.box((xa + 0.05, y0 - 0.05, z0 + 0.06), (xb - 0.05, y0 + 0.02, z1 - 0.06), m("gunmetal"))
+
+
def _leg(mb, x, y, z_belly):
"""Landing leg: oleo strut, drag brace, foot pad and gear bay doors."""
metal, steel = m("gunmetal"), m("dark_steel")
@@ -354,7 +701,7 @@ def _ramp(mb):
hy, hz = RAMP_HINGE
ang = math.asin(hz / RAMP_LENGTH)
hw = RAMP_WIDTH / 2
- frame = G.T(0.0, hy, hz) @ G.Rx(-math.degrees(ang))
+ frame = G.T(0.0, hy, hz) @ G.Rx(math.degrees(ang)) # the free end down on the deck
metal = m("gunmetal")
with G.xf(mb, frame):
mb.box((-hw, -RAMP_LENGTH, -0.14), (hw, 0.0, 0.0), m("panel_dark"))
@@ -380,7 +727,7 @@ def _ramp(mb):
def _cockpit(mb, secs):
"""Canopy panes on the nose's upper facets with mullions between them."""
- glass = m("glass_dark")
+ glass = "M_Glass_Viewport" # see-through: the hangar lights the cockpit, the crew look out
for s, j in sorted(COCKPIT_FACETS):
a, b = Vector(secs[s][j]), Vector(secs[s][(j + 1) % 8])
d, c = Vector(secs[s + 1][j]), Vector(secs[s + 1][(j + 1) % 8])
@@ -389,18 +736,428 @@ def _cockpit(mb, secs):
mb.quad([p + n * 0.01 for p in quad], glass)
+def _canopy_frame(mb, secs):
+ """Hull-white mullions along the canopy's facet edges (the panes sit between them)."""
+ hull = m("hull_paint")
+ edges = set()
+ for s, j in COCKPIT_FACETS:
+ for a, b in (
+ ((s, j), (s, (j + 1) % 8)),
+ ((s + 1, j), (s + 1, (j + 1) % 8)),
+ ((s, j), (s + 1, j)),
+ ((s, (j + 1) % 8), (s + 1, (j + 1) % 8)),
+ ):
+ edges.add(tuple(sorted((a, b))))
+ for (s0, j0), (s1, j1) in sorted(edges):
+ p, q = Vector(secs[s0][j0]), Vector(secs[s1][j1])
+ mid = (p + q) / 2
+ up = (mid - Vector((0.0, mid.y, 2.6))).normalized()
+ G.beam(mb, p + up * 0.012, q + up * 0.012, 0.15, 0.035, hull, up=up)
+
+
+# ---------------------------------------------------------------- cabin
+
+
+def _plate(mb, poly_xy, z0, z1, material):
+ """Prism with explicit outward faces: the nav cook reads the top's normal."""
+ lo = [(x, y, z0) for x, y in poly_xy]
+ hi = [(x, y, z1) for x, y in poly_xy]
+ cx = sum(x for x, _ in poly_xy) / len(poly_xy)
+ cy = sum(y for _, y in poly_xy) / len(poly_xy)
+ _face(mb, hi, (0, 0, 1), material)
+ _face(mb, lo, (0, 0, -1), material)
+ n = len(poly_xy)
+ for i in range(n):
+ a, b = poly_xy[i], poly_xy[(i + 1) % n]
+ out = ((a[0] + b[0]) / 2 - cx, (a[1] + b[1]) / 2 - cy, 0.0)
+ _face(mb, [lo[i], lo[(i + 1) % n], hi[(i + 1) % n], hi[i]], out, material)
+
+
+def _rect(mb, lo, hi, material):
+ (x0, y0, z0), (x1, y1, z1) = lo, hi
+ _plate(mb, [(x0, y0), (x1, y0), (x1, y1), (x0, y1)], z0, z1, material)
+
+
+def _cabin_floors(mb):
+ """Walk plates: corridor tread, bay deck with a grating aisle, steps, cockpit deck."""
+ t = PLATE_T
+ c0, c1 = CORRIDOR_Y
+ cw = CORRIDOR[1][0]
+ _rect(mb, (-cw, c0 - 0.05, CABIN_FLOOR - t), (cw, c1 + 0.05, CABIN_FLOOR), m("tread"))
+ b0, b1 = BAY_Y
+ ys = (b0, -2.4, 2.4, b1)
+ right = [(bay_at(y)[1][0], y) for y in ys]
+ poly = [*right, *[(-x, y) for x, y in reversed(right)]]
+ _plate(mb, poly, CABIN_FLOOR - t, CABIN_FLOOR, m("floor"))
+ _rect(mb, (-0.42, b0, CABIN_FLOOR), (0.42, STEPS[0][0], CABIN_FLOOR + 0.006), m("grating"))
+ pw = PASSAGE[1][0] + 0.1
+ for y0, y1, top in STEPS:
+ _rect(mb, (-pw, y0, CABIN_FLOOR - t), (pw, y1, top), m("tread"))
+ p0, p1 = PASSAGE_Y
+ pw = PASSAGE[1][0]
+ _rect(mb, (-pw, p0 - 0.02, COCKPIT_FLOOR - t), (pw, p1 + 0.05, COCKPIT_FLOOR), m("tread"))
+ ys = (COCKPIT_Y[0], STATIONS[5][0], COCKPIT_Y[1])
+ right = [(cavity_at(y, COCKPIT_FLOOR)[1][0], y) for y in ys]
+ poly = [*right, *[(-x, y) for x, y in reversed(right)]]
+ _plate(mb, poly, COCKPIT_FLOOR - t, COCKPIT_FLOOR, m("floor"))
+
+
+def _rib(mb, sec, y, depth, inset, material, joints=(1, 2, 3, 4, 5, 6, 7)):
+ """Structural frame hugging a cabin section's walls and ceiling (not the floor)."""
+ c = _centre(sec)
+ c.y = y
+ pts = [_toward(Vector((p[0], y, p[2])), c, 0.003) for p in sec] # off the skin
+ inner = [_toward(p, c, inset) for p in pts]
+ for j in joints:
+ a, b = pts[j], pts[(j + 1) % 8]
+ ia, ib = inner[j], inner[(j + 1) % 8]
+ if (b - a).length < 0.05:
+ continue
+ y0, y1 = y - depth / 2, y + depth / 2
+
+ def at(p, yy):
+ return Vector((p.x, yy, p.z))
+
+ mid = (ia + ib) / 2
+ _face(mb, [at(ia, y0), at(ib, y0), at(ib, y1), at(ia, y1)], c - mid, material)
+ _face(mb, [at(a, y0), at(b, y0), at(ib, y0), at(ia, y0)], (0, -1, 0), material)
+ _face(mb, [at(a, y1), at(b, y1), at(ib, y1), at(ia, y1)], (0, 1, 0), material)
+ _face(mb, [at(a, y0), at(b, y0), at(b, y1), at(a, y1)], (a + b) / 2 - c, material)
+
+
+def _wall_panels(mb, a, b, j, material, rows=1, cols=1, lift=0.012):
+ """Inset panels on facet j between two cabin sections (faces into the cabin)."""
+ pa, pb = Vector(a[j]), Vector(a[(j + 1) % 8])
+ pd, pc = Vector(b[j]), Vector(b[(j + 1) % 8])
+ c = (_centre(a) + _centre(b)) / 2
+ for r in range(rows):
+ for k in range(cols):
+ quad = _cell(pa, pb, pc, pd, r / rows, (r + 1) / rows, k / cols, (k + 1) / cols, 0.06)
+ n = (quad[1] - quad[0]).cross(quad[2] - quad[1])
+ mid = sum(quad, Vector()) / 4
+ c.y = mid.y
+ if n.dot(c - mid) < 0:
+ quad = quad[::-1]
+ _slab(mb, quad, lift, material)
+
+
+def _lerp_sec(a, b, t):
+ return [
+ tuple(pa[i] + (pb[i] - pa[i]) * t for i in range(3)) for pa, pb in zip(a, b, strict=True)
+ ]
+
+
+def _corridor_fit(mb, frames):
+ """Ramp corridor: frames, wall panels, a door control panel, low red guide lights."""
+ c0, c1 = CORRIDOR_Y
+ metal = "M_Struct_Gunmetal"
+ for k in range(1, 5):
+ y = c0 + k * (c1 - c0) / 5
+ _rib(frames, _fixed(CORRIDOR, y, CABIN_FLOOR), y, 0.14, 0.07, metal)
+ a, b = _fixed(CORRIDOR, c0 + 0.2, CABIN_FLOOR), _fixed(CORRIDOR, c1 - 0.2, CABIN_FLOOR)
+ for j in (2, 6):
+ _wall_panels(frames, a, b, j, "M_Wall_PaintedMid", rows=1, cols=5)
+ # door control panel on the starboard wall, by the door
+ x = CORRIDOR[2][0]
+ z = CABIN_FLOOR + 1.15
+ mb.box((x - 0.06, c0 + 0.5, z), (x - 0.01, c0 + 0.95, z + 0.55), "M_Console_Body")
+ mb.box((x - 0.065, c0 + 0.56, z + 0.2), (x - 0.06, c0 + 0.89, z + 0.48), "M_Screen")
+ mb.box((x - 0.07, c0 + 0.6, z + 0.06), (x - 0.06, c0 + 0.85, z + 0.15), "M_Console_Keys")
+ # fire suppression bottle on the port wall
+ xp = -CORRIDOR[2][0] + 0.12
+ mb.tube(
+ (xp, c1 - 0.6, CABIN_FLOOR + 0.25),
+ (xp, c1 - 0.6, CABIN_FLOOR + 0.85),
+ 0.09,
+ "M_Paint_TrimRed",
+ 14,
+ )
+
+
+def _crew_seat(mb, x_wall, y, sx):
+ """Fold-down crew seat against the wall at x_wall (sx: side, +1 starboard)."""
+ z0 = CABIN_FLOOR
+ metal, pad = "M_Struct_Gunmetal", "M_Seat_Upholstery"
+ xw = x_wall - sx * 0.02
+
+ def xs(a, b):
+ p, q = xw - sx * a, xw - sx * b
+ return min(p, q), max(p, q)
+
+ x0, x1 = xs(0.0, 0.1)
+ mb.box((x0, y - 0.28, z0 + 0.2), (x1, y + 0.28, z0 + 1.55), metal) # back frame
+ x0, x1 = xs(0.08, 0.2)
+ mb.box((x0, y - 0.24, z0 + 0.52), (x1, y + 0.24, z0 + 1.3), pad) # back pad
+ mb.box((x0, y - 0.16, z0 + 1.36), (x1, y + 0.16, z0 + 1.62), pad) # head rest
+ x0, x1 = xs(0.1, 0.58)
+ mb.box((x0, y - 0.25, z0 + 0.44), (x1, y + 0.25, z0 + 0.53), pad) # seat pan
+ x0, x1 = xs(0.1, 0.6)
+ mb.box((x0, y - 0.27, z0 + 0.38), (x1, y + 0.27, z0 + 0.44), metal)
+ for dy in (-0.25, 0.25): # legs
+ xx = xw - sx * 0.54
+ mb.tube((xx, y + dy, z0 + 0.38), (xx, y + dy, z0 + 0.01), 0.025, metal, 8)
+ for dy in (-0.11, 0.11): # harness straps over the pad
+ x0, x1 = xs(0.2, 0.215)
+ mb.box((x0, y + dy - 0.03, z0 + 0.6), (x1, y + dy + 0.03, z0 + 1.32), "M_Rubber_Black")
+
+
+def _rifle(mb, x_wall, y, z, sx):
+ """Blaster rifle stowed upright in a wall clamp."""
+ x = x_wall - sx * 0.12
+ dark, metal = "M_Plastic_BlackSatin", "M_Struct_Gunmetal"
+ mb.box((x - 0.035, y - 0.05, z), (x + 0.035, y + 0.05, z + 0.32), dark) # stock
+ mb.box((x - 0.045, y - 0.07, z + 0.32), (x + 0.045, y + 0.07, z + 0.68), metal) # body
+ mb.box((x - 0.03, y + 0.06, z + 0.4), (x + 0.03, y + 0.16, z + 0.55), dark) # magazine
+ mb.tube((x, y, z + 0.68), (x, y, z + 1.05), 0.018, metal, 8) # barrel
+ mb.box((x - 0.025, y - 0.035, z + 0.7), (x + 0.025, y + 0.035, z + 0.82), dark) # sight
+
+
+def _bay_fit(mb, frames):
+ """Troop bay: frames, panels, crew seats, lockers, weapon racks, tactical table."""
+ b0, b1 = BAY_Y
+ metal = "M_Struct_Gunmetal"
+ ys = (b0, -2.4, 2.4, b1)
+ secs = [bay_at(y) for y in ys]
+
+ def sec_at(y):
+ for (ya, a), (yb, b) in zip(
+ zip(ys, secs, strict=True), zip(ys[1:], secs[1:], strict=True), strict=False
+ ):
+ if ya <= y <= yb:
+ return _lerp_sec(a, b, (y - ya) / (yb - ya))
+ raise ValueError(y)
+
+ ribs = [b0 + 0.25 + k * 1.2 for k in range(8)]
+ for y in ribs:
+ _rib(frames, sec_at(y), y, 0.16, 0.09, metal)
+ for ya, yb in zip(ribs, ribs[1:], strict=False):
+ a, b = sec_at(ya + 0.1), sec_at(yb - 0.1)
+ for j in (3, 5):
+ _wall_panels(frames, a, b, j, "M_Wall_PaintedMid")
+ # conduits along the upper chines
+ for j in (3, 6):
+ pts = []
+ for y in (b0 + 0.1, b1 - 0.1):
+ s = sec_at(y)
+ c = _centre(s)
+ c.y = y
+ pts.append(_toward(s[j], c, 0.16))
+ mb.tube(pts[0], pts[1], 0.06, "M_Hull_PipeInsulated", 12)
+ mb.tube(pts[0] + Vector((0, 0, -0.14)), pts[1] + Vector((0, 0, -0.14)), 0.035, metal, 10)
+ # crew seats and overhead lockers along both walls
+ seat_ys = [b0 + 0.85 + k * 0.92 for k in range(6)]
+ for sx in (-1, 1):
+ for y in seat_ys:
+ s = sec_at(y)
+ _crew_seat(mb, sx * abs(s[2][0]), y, sx)
+ ya, yb = seat_ys[0] - 0.4, seat_ys[-1] + 0.4
+ s = sec_at((ya + yb) / 2)
+ xw = abs(s[3][0])
+ z0 = s[3][2] - 0.55
+ x0, x1 = sorted((sx * (xw - 0.02), sx * (xw - 0.5)))
+ mb.box((x0, ya, z0), (x1, yb, z0 + 0.5), "M_Wall_PaintedDark")
+ for k in range(5):
+ yy = ya + 0.1 + k * (yb - ya - 0.2) / 5
+ xa, xb = sorted((sx * (xw - 0.5), sx * (xw - 0.52)))
+ mb.box(
+ (xa, yy + 0.04, z0 + 0.04),
+ (xb, yy + (yb - ya - 0.2) / 5 - 0.04, z0 + 0.46),
+ "M_Wall_PaintedMid",
+ )
+ mb.box(
+ (xa - 0.01 * sx, yy + 0.25, z0 + 0.06), (xb - 0.01 * sx, yy + 0.4, z0 + 0.1), metal
+ )
+ # weapon racks forward of the seats
+ rack_y = (seat_ys[-1] + 0.6, BAY_Y[1] - 1.0)
+ for sx in (-1, 1):
+ s = sec_at(sum(rack_y) / 2)
+ xw = sx * abs(s[2][0])
+ x0, x1 = sorted((xw, xw - sx * 0.06))
+ mb.box(
+ (x0, rack_y[0], CABIN_FLOOR + 0.5),
+ (x1, rack_y[1], CABIN_FLOOR + 1.85),
+ "M_Wall_Charcoal",
+ )
+ x0, x1 = sorted((xw - sx * 0.06, xw - sx * 0.2))
+ for z in (CABIN_FLOOR + 0.62, CABIN_FLOOR + 1.45):
+ mb.box((x0, rack_y[0] + 0.05, z), (x1, rack_y[1] - 0.05, z + 0.05), metal)
+ n = 4
+ for k in range(n):
+ y = rack_y[0] + (k + 0.5) * (rack_y[1] - rack_y[0]) / n
+ _rifle(mb, xw, y, CABIN_FLOOR + 0.6, sx)
+ # tactical table: pedestal, ring, glass top over a screen, a live hologram above
+ ty = TABLE_Y
+ with G.xf(mb, G.T(0.0, ty, CABIN_FLOOR)):
+ G.lathe(
+ mb,
+ [(0.0, 0.0), (0.5, 0.0), (0.5, 0.06), (0.26, 0.14), (0.22, 0.78), (0.0, 0.78)],
+ "M_Console_Body",
+ 24,
+ )
+ G.lathe(
+ mb,
+ [(0.0, 0.78), (0.6, 0.78), (0.62, 0.86), (0.62, 0.92), (0.0, 0.92)],
+ "M_Console_Deck",
+ 32,
+ )
+ with G.xf(mb, G.T(0.0, ty, CABIN_FLOOR + 0.925)):
+ G.lathe(mb, [(0.0, 0.0), (0.5, 0.0), (0.5, 0.004), (0.0, 0.004)], "M_Screen", 32)
+ K.socket(
+ "holo",
+ "tactical",
+ K.socket_matrix((0.0, ty, CABIN_FLOOR + 0.93), (0, 0, 1), up=(0, 1, 0)),
+ radius=0.5,
+ height=0.8,
+ )
+ # big screens on the forward bulkhead, either side of the passage
+ for sx in (-1, 1):
+ x0, x1 = sorted((sx * 1.0, sx * 1.75))
+ y = BAY_Y[1] - 0.03
+ mb.box(
+ (x0 - 0.05, y - 0.04, CABIN_FLOOR + 0.95),
+ (x1 + 0.05, y, CABIN_FLOOR + 1.85),
+ "M_Console_Body",
+ )
+ mb.box((x0, y - 0.05, CABIN_FLOOR + 1.0), (x1, y - 0.04, CABIN_FLOOR + 1.8), "M_Screen")
+ # passage frame
+ pw = PASSAGE[2][0]
+ y = BAY_Y[1]
+ top = COCKPIT_FLOOR + PASSAGE[4][1]
+ for sx in (-1, 1):
+ x0, x1 = sorted((sx * pw, sx * (pw + 0.16)))
+ mb.box((x0, y - 0.12, CABIN_FLOOR), (x1, y + 0.02, top + 0.12), metal)
+ mb.box((-pw - 0.16, y - 0.12, top), (pw + 0.16, y + 0.02, top + 0.14), metal)
+ # aft bulkhead: equipment lockers either side of the corridor opening
+ y = BAY_Y[0]
+ cw = CORRIDOR[2][0]
+ for sx in (-1, 1):
+ s = sec_at(y + 0.4)
+ xo = abs(s[2][0]) - 0.05
+ x0, x1 = sorted((sx * (cw + 0.2), sx * xo))
+ mb.box((x0, y, CABIN_FLOOR), (x1, y + 0.45, CABIN_FLOOR + 2.0), "M_Wall_PaintedDark")
+ for k in range(2):
+ xa = min(x0, x1) + 0.05 + k * (abs(x1 - x0) - 0.1) / 2
+ xb = xa + (abs(x1 - x0) - 0.1) / 2 - 0.04
+ mb.box(
+ (xa, y + 0.45, CABIN_FLOOR + 0.08),
+ (xb, y + 0.47, CABIN_FLOOR + 1.92),
+ "M_Wall_PaintedMid",
+ )
+ mb.box(
+ (xb - 0.08, y + 0.47, CABIN_FLOOR + 0.9),
+ (xb - 0.05, y + 0.5, CABIN_FLOOR + 1.2),
+ metal,
+ )
+
+
+def _pilot_seat(mb, x, y):
+ """Flight seat on a pedestal, with arm consoles."""
+ z0 = COCKPIT_FLOOR
+ metal, pad = "M_Struct_Gunmetal", "M_Seat_Upholstery"
+ mb.box((x - 0.14, y - 0.14, z0), (x + 0.14, y + 0.14, z0 + 0.42), metal)
+ mb.box((x - 0.3, y - 0.3, z0 + 0.42), (x + 0.3, y + 0.28, z0 + 0.56), pad)
+ mb.box((x - 0.28, y - 0.42, z0 + 0.5), (x + 0.28, y - 0.28, z0 + 1.3), pad)
+ mb.box((x - 0.16, y - 0.44, z0 + 1.32), (x + 0.16, y - 0.3, z0 + 1.55), pad)
+ mb.box((x - 0.3, y - 0.46, z0 + 0.46), (x + 0.3, y - 0.42, z0 + 1.34), metal)
+ for sx in (-1, 1): # arm consoles
+ xa = x + sx * 0.36
+ mb.box((xa - 0.07, y - 0.25, z0 + 0.4), (xa + 0.07, y + 0.35, z0 + 0.72), "M_Console_Body")
+ mb.box((xa - 0.06, y - 0.1, z0 + 0.72), (xa + 0.06, y + 0.3, z0 + 0.735), "M_Console_Keys")
+
+
+def _cockpit_fit(mb):
+ """Cockpit: two flight seats, centre console, the dash with its screens."""
+ k0, k1 = COCKPIT_Y
+ end = cavity_at(k1, COCKPIT_FLOOR)
+ seat_y = k1 - 1.55
+ for sx in (-1, 1):
+ _pilot_seat(mb, sx * 0.7, seat_y)
+ # centre console between the seats
+ mb.box(
+ (-0.2, seat_y - 0.4, COCKPIT_FLOOR), (0.2, k1 - 0.6, COCKPIT_FLOOR + 0.7), "M_Console_Body"
+ )
+ mb.box(
+ (-0.17, seat_y - 0.3, COCKPIT_FLOOR + 0.7),
+ (0.17, k1 - 0.7, COCKPIT_FLOOR + 0.715),
+ "M_Console_Keys",
+ )
+ # dash: a sloped deck below the glare shield with a screen per seat and a centre stack
+ zt = end[3][2]
+ xw = abs(end[2][0]) - 0.05
+ yb = k1 - 0.6
+ zb = COCKPIT_FLOOR + 0.75
+ G.wedge_x(
+ mb,
+ [(yb, COCKPIT_FLOOR), (k1, COCKPIT_FLOOR), (k1, zt - 0.02), (yb, zb)],
+ -xw,
+ xw,
+ "M_Console_Body",
+ )
+ for x0, x1 in ((-1.05, -0.35), (-0.25, 0.25), (0.35, 1.05)):
+ t0, t1 = 0.15, 0.85
+ p = [
+ (x0, yb + (k1 - yb) * t0, zb + (zt - 0.02 - zb) * t0),
+ (x1, yb + (k1 - yb) * t0, zb + (zt - 0.02 - zb) * t0),
+ (x1, yb + (k1 - yb) * t1, zb + (zt - 0.02 - zb) * t1),
+ (x0, yb + (k1 - yb) * t1, zb + (zt - 0.02 - zb) * t1),
+ ]
+ n = Vector((0.0, -(zt - 0.02 - zb), k1 - yb)).normalized() * 0.012
+ _face(mb, [Vector(q) + n for q in p], n, "M_Screen")
+
+
def _cabin_and_lamps(mb):
- hw = RAMP_WIDTH / 2
- hy, hz = RAMP_HINGE
- mb.box((-hw + 0.2, hy + 0.3, 3.38), (hw - 0.2, hy + 4.0, 3.42), m("cabin_glow"))
- for sx in (-1, 1): # nav lights at the wing tips and nacelle tops
+ """Emitters: cabin ceiling strips, floor guide lights, step nosings, nav lights."""
+ c0, c1 = CORRIDOR_Y
+ zc = CABIN_FLOOR + CORRIDOR[4][1] - 0.012
+ mb.box((-0.22, c0 + 0.25, zc - 0.01), (0.22, c1 - 0.25, zc), "M_Light_CeilingPanel")
+ cw = CORRIDOR[1][0] - 0.04
+ for sx in (-1, 1): # low red guide lights along the corridor
+ x0, x1 = sorted((sx * cw, sx * (cw - 0.03)))
+ mb.box(
+ (x0, c0 + 0.1, CABIN_FLOOR + 0.14),
+ (x1, c1 - 0.1, CABIN_FLOOR + 0.17),
+ "M_Light_RedTrim",
+ )
+ b0, b1 = BAY_Y
+ for y0, y1 in zip(
+ [b0 + 0.25 + k * 1.2 for k in range(7)],
+ [b0 + 0.25 + k * 1.2 for k in range(1, 8)],
+ strict=True,
+ ):
+ for x in (-0.55, 0.55):
+ ya, yb = y0 + 0.14, y1 - 0.14
+ z = min(bay_at(ya)[4][2], bay_at(yb)[4][2]) - 0.015
+ mb.box((x - 0.14, ya, z - 0.01), (x + 0.14, yb, z), "M_Light_CeilingPanel")
+ seat_ys = [b0 + 0.85 + k * 0.92 for k in range(6)]
+ ya, yb = seat_ys[0] - 0.35, seat_ys[-1] + 0.35
+ s = bay_at((ya + yb) / 2)
+ xw, z0 = abs(s[3][0]), s[3][2] - 0.55
+ for sx in (-1, 1): # warm strips under the overhead lockers, a blue lamp per seat
+ x0, x1 = sorted((sx * (xw - 0.42), sx * (xw - 0.47)))
+ mb.box((x0, ya, z0 - 0.012), (x1, yb, z0), "M_Light_Maint_Amber")
+ for y in seat_ys:
+ x0, x1 = sorted((sx * (xw - 0.49), sx * (xw - 0.505)))
+ mb.box((x0, y - 0.05, z0 + 0.2), (x1, y + 0.05, z0 + 0.26), "M_Indicator_Blue")
+ for x in (-0.44, 0.44): # floor inlays along the grating aisle
+ mb.box(
+ (x - 0.015, b0 + 0.1, CABIN_FLOOR),
+ (x + 0.015, STEPS[0][0] - 0.1, CABIN_FLOOR + 0.008),
+ "M_Light_FloorInlay",
+ )
+ pw = PASSAGE[1][0] + 0.1
+ for y0, _y1, top in STEPS: # step nosings
+ mb.box((-pw, y0, top - 0.03), (pw, y0 + 0.02, top), "M_Light_Maint_Amber")
+ # amber lamp over the aft door, inside and out
+ top = CABIN_FLOOR + CORRIDOR[4][1]
+ mb.box((-0.5, c0 - 0.17, top - 0.02), (0.5, c0 - 0.16, top + 0.06), m("lamp_amber"))
+ mb.box((-0.3, c0 + 0.05, top - 0.12), (0.3, c0 + 0.09, top - 0.06), "M_Light_Maint_Amber")
+ for sx in (-1, 1): # nav lights on the nacelle tops
mb.box(
(sx * 1.95 - 0.06, -10.0, 3.75),
(sx * 1.95 + 0.06, -9.8, 3.8),
m("lamp_red" if sx < 0 else "lamp_green"),
)
- mb.box((-0.08, -8.6, 5.42), (0.08, -8.4, 5.47), m("lamp_white"))
- mb.box((-hw - 0.2, hy - 0.13, 3.6), (hw + 0.2, hy - 0.12, 3.66), m("lamp_amber"))
+ mb.box((-0.08, -8.9, 5.42), (0.08, -8.7, 5.47), m("lamp_white"))
def _markings(mb, secs):
@@ -419,7 +1176,7 @@ def _markings(mb, secs):
)
G.text(mb, "FLT-2207", 0.32, stencil, G.T(1.2, 3.0, 5.0) @ G.Rz(90.0))
for sx in (-1, 1):
- G.text(mb, "NO STEP", 0.18, stencil, G.T(sx * 1.2, -6.1, 5.12))
+ G.text(mb, "NO STEP", 0.18, stencil, G.T(sx * 1.2, -7.1, 5.0))
mb.quad(
[
(sx * 2.0 - 0.05, -9.95, 2.0),
@@ -431,18 +1188,34 @@ def _markings(mb, secs):
)
-def _cabin_light():
- """Warm light inside the cabin spilling down the ramp (part of the piece)."""
- data = bpy.data.lights.new("SM_Hangar_Shuttle_cabin_light", "AREA")
+def _area_light(name, location, size, energy, color, rot=(0.0, 0.0, 0.0)):
+ data = bpy.data.lights.new(name, "AREA")
data.shape = "RECTANGLE"
- data.size, data.size_y = 1.4, 3.2
- data.energy = 220.0
- data.color = (1.0, 0.86, 0.7)
+ data.size, data.size_y = size
+ data.energy = energy
+ data.color = color
ob = bpy.data.objects.new(data.name, data)
- hy, _ = RAMP_HINGE
- ob.location = (0.0, hy + 2.0, 3.3)
+ ob.location = location
+ ob.rotation_euler = rot
ob.visible_camera = False
K.link(ob)
+ return ob
+
+
+def _cabin_lights():
+ """Light inside the cabin (part of the piece); the corridor's spills down the ramp."""
+ cool, warm = (0.86, 0.93, 1.0), (1.0, 0.86, 0.7)
+ c0, c1 = CORRIDOR_Y
+ zc = CABIN_FLOOR + CORRIDOR[4][1] - 0.05
+ _area_light("SM_Hangar_Shuttle_cabin_light", (0.0, (c0 + c1) / 2, zc), (0.5, 3.6), 80.0, warm)
+ b0, b1 = BAY_Y
+ for k, y in enumerate((b0 + 1.6, (b0 + b1) / 2, b1 - 1.6)):
+ z = bay_at(y)[4][2] - 0.06
+ _area_light(f"SM_Hangar_Shuttle_bay_light_{k}", (0.0, y, z), (1.4, 2.2), 70.0, cool)
+ k0, k1 = COCKPIT_Y
+ _area_light(
+ "SM_Hangar_Shuttle_cockpit_light", (0.0, (k0 + k1) / 2 - 0.3, 4.0), (1.6, 1.4), 160.0, cool
+ )
def _occluders(secs):
@@ -458,15 +1231,19 @@ def _occluders(secs):
proxy = K.mesh_object("_tmp_ucx", verts, faces, m("dark_steel"))
K.occluder(proxy, nav="block")
bpy.data.objects.remove(proxy, do_unlink=True)
- z_h = 3.6
- c, s = math.cos(math.radians(WING_FOLD_DEG)), math.sin(math.radians(WING_FOLD_DEG))
+ z_h = 3.5
+ reach = WING_SPAN * math.cos(math.radians(WING_FOLD_DEG)) + 0.3
+ drop = WING_SPAN * math.sin(math.radians(WING_FOLD_DEG))
for sx in (-1, 1):
- x0, x1 = sorted((sx * 2.62, sx * (2.62 + 5.4 * c)))
- K.occluder(((x0, -6.2, z_h - 0.3), (x1, 1.6, z_h + 5.4 * s)), nav="block")
+ x0, x1 = sorted((sx * WING_HINGE_X, sx * (WING_HINGE_X + reach)))
+ K.occluder(
+ ((x0, WING_TIP[1], z_h + min(drop, 0.0) - 0.2), (x1, WING_ROOT[0], z_h + 0.2)),
+ nav="block",
+ )
K.occluder(((-2.9, -10.5, 1.75), (2.9, -5.2, 3.75)), nav="block")
-K.register_variant("SM_Hangar_Shuttle", build_shuttle, dims=(11.0, 24.7, 9.2), nav="block")
+K.register_variant("SM_Hangar_Shuttle", build_shuttle, dims=(17.0, 24.7, 7.0), nav="block")
LOOKDEV = {
"SM_Hangar_Shuttle": {"focus": (0.0, -9.6, 3.0), "crop_size": (4.0, 2.6), "max_px": 2400},
diff --git a/art/verse/lib/cook.py b/art/verse/lib/cook.py
index cd1b71632e..b88a5339ca 100644
--- a/art/verse/lib/cook.py
+++ b/art/verse/lib/cook.py
@@ -691,11 +691,31 @@ def _inside_centre(polygon: list[tuple[float, float]]) -> tuple[float, float]:
return round(float(x), 4), round(float(y), 4)
-def _room_at(x: float, y: float, rooms: list[Room]) -> str | None:
+def _room_at(x: float, y: float, rooms: list[Room], z: float | None = None) -> str | None:
+ """The smallest room whose outline holds (x, y) and, given z, whose height band holds z.
+
+ Rooms may nest (the shuttle cabin on the flight deck), so the smallest wins.
+ """
+ best = None
for room in rooms:
- if _point_in_polygon(x, y, room.polygon):
- return room.id
- return None
+ if not _point_in_polygon(x, y, room.polygon):
+ continue
+ if z is not None and not in_height_band(room, z):
+ continue
+ if best is None or room.area < best.area:
+ best = room
+ return best.id if best is not None else None
+
+
+ROOM_BAND_BELOW_M = 0.3 # a room's height band starts this far below its floor
+
+
+def in_height_band(room: Room, z: float) -> bool:
+ """True when z lies in the room's height band; a room without a `ceiling` prop has none."""
+ ceiling = room.props.get("ceiling")
+ if ceiling is None:
+ return True
+ return room.z - ROOM_BAND_BELOW_M <= z <= room.z + float(ceiling)
def _main_room(rooms: list[Room]) -> Room:
@@ -747,7 +767,7 @@ def _socket_json(obj: bpy.types.Object, parsed: naming.SocketName, rooms: list[R
rotation = matrix.to_3x3().normalized()
position = matrix.translation
forward = rotation @ Vector((0.0, -1.0, 0.0))
- room = obj.get("room") or _room_at(position.x, position.y, rooms)
+ room = obj.get("room") or _room_at(position.x, position.y, rooms, position.z)
entry: dict = {
"id": parsed.id,
"kind": parsed.kind,
diff --git a/art/verse/lib/realtime.py b/art/verse/lib/realtime.py
index 59c73fbcfb..e20785d9eb 100644
--- a/art/verse/lib/realtime.py
+++ b/art/verse/lib/realtime.py
@@ -631,8 +631,8 @@ def _item(obj: bpy.types.Object) -> Item:
def _assign_rooms(items: list[Item], rooms: list[cook.Room]) -> None:
"""The room each object belongs to (by its centre), for page grouping."""
for item in items:
- x, y, _ = item.centre
- item.room = cook._room_at(x, y, rooms) or _nearest_room(x, y, rooms)
+ x, y, z = item.centre
+ item.room = cook._room_at(x, y, rooms, z) or _nearest_room(x, y, rooms)
def _nearest_room(x: float, y: float, rooms: list[cook.Room]) -> str:
@@ -1301,7 +1301,7 @@ def _object_corners(obj: bpy.types.Object, page: int, rooms: list[cook.Room]) ->
face_n = np.cross(tri[:, 1] - tri[:, 0], tri[:, 2] - tri[:, 0])
face_n /= np.maximum(np.linalg.norm(face_n, axis=1, keepdims=True), 1e-12)
probe = tri.mean(axis=1) + face_n * 0.08
- room_of = _rooms_of(probe[:, 0], probe[:, 1], rooms)
+ room_of = _rooms_of(probe[:, 0], probe[:, 1], rooms, probe[:, 2])
names = [_base_name(m.name) if m is not None else "M_Default" for m in mesh.materials]
out: dict = {}
for m in np.unique(mat_index):
@@ -1318,11 +1318,22 @@ def _to_three(v: np.ndarray) -> np.ndarray:
return np.stack([v[:, 0], v[:, 2], -v[:, 1]], axis=1)
-def _rooms_of(x: np.ndarray, y: np.ndarray, rooms: list[cook.Room]) -> np.ndarray:
- """Index of the room polygon containing each point (Blender XY); the nearest centre outside."""
+def _rooms_of(
+ x: np.ndarray, y: np.ndarray, rooms: list[cook.Room], z: np.ndarray | None = None
+) -> np.ndarray:
+ """Index of the room containing each point (Blender XYZ); the nearest centre outside.
+
+ A nested room wins over the room around it (smallest first); a room with
+ a `ceiling` prop holds only points inside its height band.
+ """
result = np.full(len(x), -1, dtype=np.int32)
- for index, room in enumerate(rooms):
+ for index in sorted(range(len(rooms)), key=lambda i: rooms[i].area):
+ room = rooms[index]
inside = _points_in_polygon(x, y, room.polygon)
+ ceiling = room.props.get("ceiling")
+ if z is not None and ceiling is not None:
+ low = room.z - cook.ROOM_BAND_BELOW_M
+ inside &= (z >= low) & (z <= room.z + float(ceiling))
result[(result < 0) & inside] = index
missing = result < 0
if missing.any():
diff --git a/docs/verse/pipeline.md b/docs/verse/pipeline.md
index ed8330d150..58d9f3df62 100644
--- a/docs/verse/pipeline.md
+++ b/docs/verse/pipeline.md
@@ -112,6 +112,11 @@ Custom properties (set with `scene.tag()`):
- Rooms: `ROOM_<id>` with `name`, optionally `main=True` (env map location)
and `probe_at=(x, y, z)` (Blender metres) when the centroid is a bad probe
spot; other properties (e.g. `kind`) are exported as `rooms[].props`.
+ Rooms may nest (the shuttle cabin inside the hangar's flight deck): a point
+ belongs to the smallest room around it. A nested room with a `ceiling`
+ property (metres above its floor) holds only points from 0.3 m below its
+ floor up to that height, so the hull's outside stays on the room around it
+ (sockets, realtime chunks and their reflection probe).
Cutaway (BRIEF §5): east–west walls with walkable space behind them are built
1.1 m high with the section cap on top. Their upper part goes into `Ceiling`
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/env.hdr b/dodaios/ui/web/frontend/public/verse/decks/hangar/env.hdr
index ee1afd4891..ad74b3aaba 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/env.hdr and b/dodaios/ui/web/frontend/public/verse/decks/hangar/env.hdr differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/manifest.json b/dodaios/ui/web/frontend/public/verse/decks/hangar/manifest.json
index 30248e70af..228de2a7cd 100644
--- a/dodaios/ui/web/frontend/public/verse/decks/hangar/manifest.json
+++ b/dodaios/ui/web/frontend/public/verse/decks/hangar/manifest.json
@@ -80,7 +80,7 @@
"height_step": 0.025,
"max_step": 0.3,
"clearance": 0.25,
- "walkable_cells": 99439
+ "walkable_cells": 100106
},
"env": {
"url": "env.hdr",
@@ -102,49 +102,49 @@
],
"sh": [
[
- 0.29407,
- 0.28329,
- 0.2849
+ 0.31382,
+ 0.3009,
+ 0.30176
],
[
- 0.02212,
- 0.0242,
- 0.01275
+ 0.02567,
+ 0.02763,
+ 0.01655
],
[
- -0.17284,
- -0.16937,
- -0.15787
+ -0.16865,
+ -0.16565,
+ -0.15416
],
[
- -0.02186,
- -0.02012,
- -0.01986
+ 0.00346,
+ 0.00287,
+ 0.00297
],
[
- -0.01072,
- -0.01012,
- -0.00972
+ 0.00184,
+ 0.00123,
+ 0.0014
],
[
- -0.21231,
- -0.20609,
- -0.19887
+ -0.20996,
+ -0.204,
+ -0.19676
],
[
- 0.08062,
- 0.08086,
- 0.07184
+ 0.0699,
+ 0.07143,
+ 0.06274
],
[
- 0.00796,
- 0.00772,
- 0.00699
+ 0.00635,
+ 0.00637,
+ 0.00567
],
[
- 0.0036,
- 0.00372,
- 0.00087
+ 0.01458,
+ 0.01363,
+ 0.01094
]
]
},
@@ -157,49 +157,49 @@
],
"sh": [
[
- 0.34772,
- 0.31557,
- 0.31753
+ 0.42638,
+ 0.38598,
+ 0.3863
],
[
- -0.19071,
- -0.17174,
- -0.17323
+ -0.18747,
+ -0.16833,
+ -0.16932
],
[
- -0.15066,
- -0.13648,
- -0.13479
+ -0.07451,
+ -0.06793,
+ -0.06806
],
[
- 0.02115,
- 0.01953,
- 0.01897
+ 0.01439,
+ 0.01342,
+ 0.01293
],
[
- 0.00982,
- 0.00894,
- 0.00887
+ 0.0095,
+ 0.0086,
+ 0.00846
],
[
- -0.02742,
- -0.02475,
- -0.02412
+ -0.00433,
+ -0.00393,
+ -0.00382
],
[
- 0.01637,
- 0.01477,
- 0.012
+ 0.06939,
+ 0.06273,
+ 0.05953
],
[
- -0.0122,
- -0.01151,
- -0.01095
+ -0.00969,
+ -0.0092,
+ -0.00867
],
[
- 0.0126,
- 0.01286,
- 0.01364
+ 0.03961,
+ 0.03732,
+ 0.03763
]
]
},
@@ -212,49 +212,49 @@
],
"sh": [
[
- 0.18586,
- 0.17465,
- 0.17819
+ 0.19288,
+ 0.18356,
+ 0.18881
],
[
- -0.04807,
- -0.04597,
- -0.04964
+ -0.0512,
+ -0.04816,
+ -0.05116
],
[
- -0.11757,
- -0.10798,
- -0.10842
+ -0.04067,
+ -0.04266,
+ -0.04757
],
[
- 0.01567,
- 0.01173,
- 0.01238
+ -0.00356,
+ -0.005,
+ -0.0032
],
[
- 0.01167,
- 0.01075,
- 0.01005
+ 0.0044,
+ 0.00451,
+ 0.00422
],
[
- -0.00336,
- -0.00214,
- -0.00097
+ 0.01197,
+ 0.01046,
+ 0.01058
],
[
- 0.07551,
- 0.06795,
- 0.06804
+ 0.08205,
+ 0.07808,
+ 0.08102
],
[
- -0.0546,
- -0.05025,
- -0.04871
+ -0.02285,
+ -0.02264,
+ -0.0228
],
[
- 0.06235,
- 0.05935,
- 0.05638
+ 0.06498,
+ 0.06222,
+ 0.05953
]
]
},
@@ -267,49 +267,49 @@
],
"sh": [
[
- 0.3117,
- 0.2802,
- 0.2748
+ 0.35673,
+ 0.3209,
+ 0.31538
],
[
- -0.14666,
- -0.13056,
- -0.12565
+ -0.13943,
+ -0.12413,
+ -0.11947
],
[
- -0.10823,
- -0.09872,
- -0.0995
+ -0.06375,
+ -0.05873,
+ -0.06122
],
[
- 0.07441,
- 0.06797,
- 0.06803
+ 0.08725,
+ 0.07898,
+ 0.07864
],
[
- -0.02478,
- -0.02312,
- -0.0228
+ -0.02371,
+ -0.02226,
+ -0.02206
],
[
- -0.02194,
- -0.02041,
- -0.01997
+ -0.00848,
+ -0.00841,
+ -0.00823
],
[
- 0.08062,
- 0.07088,
- 0.06765
+ 0.11895,
+ 0.10518,
+ 0.10143
],
[
- 0.00031,
- -0.00058,
- -0.00176
+ 0.02268,
+ 0.02033,
+ 0.01866
],
[
- 0.01015,
- 0.01084,
- 0.01286
+ 0.03957,
+ 0.03755,
+ 0.03969
]
]
},
@@ -322,49 +322,49 @@
],
"sh": [
[
- 0.37601,
- 0.34483,
- 0.34841
+ 0.42634,
+ 0.39217,
+ 0.39774
],
[
- 0.08646,
- 0.07611,
- 0.07087
+ 0.10677,
+ 0.09533,
+ 0.09106
],
[
- -0.28058,
- -0.25337,
- -0.24876
+ -0.23287,
+ -0.20886,
+ -0.20319
],
[
- 0.05191,
- 0.04672,
- 0.04471
+ 0.0287,
+ 0.02495,
+ 0.02224
],
[
- 0.03261,
- 0.02975,
- 0.02927
+ 0.02141,
+ 0.01922,
+ 0.01816
],
[
- -0.17651,
- -0.15944,
- -0.15713
+ -0.15113,
+ -0.13545,
+ -0.13222
],
[
- 0.16839,
- 0.1508,
- 0.14623
+ 0.19249,
+ 0.17302,
+ 0.16883
],
[
- 0.00636,
- 0.00567,
- 0.0065
+ 0.01998,
+ 0.01812,
+ 0.01912
],
[
- 0.03018,
- 0.02651,
- 0.02436
+ 0.05271,
+ 0.04782,
+ 0.04671
]
]
},
@@ -377,49 +377,104 @@
],
"sh": [
[
- 0.70971,
- 0.64773,
- 0.64235
+ 0.83318,
+ 0.75937,
+ 0.75219
],
[
- 0.19921,
- 0.17807,
- 0.17102
+ 0.23287,
+ 0.2084,
+ 0.20074
],
[
- -0.86563,
- -0.78526,
- -0.77059
+ -0.77081,
+ -0.69962,
+ -0.68636
],
[
- -0.01389,
- -0.01204,
- -0.01237
+ 0.00543,
+ 0.00499,
+ 0.00394
],
[
- -0.00066,
- -0.00075,
- -0.00086
+ 0.00651,
+ 0.0057,
+ 0.00542
],
[
- -0.4916,
- -0.44417,
- -0.43585
+ -0.45357,
+ -0.40983,
+ -0.40213
],
[
- 0.8521,
- 0.77309,
- 0.75728
+ 0.90474,
+ 0.82084,
+ 0.80477
],
[
- 0.01315,
- 0.01123,
- 0.01214
+ -0.02849,
+ -0.02619,
+ -0.0243
],
[
- 0.06256,
- 0.05753,
- 0.05695
+ 0.14611,
+ 0.13288,
+ 0.13069
+ ]
+ ]
+ },
+ {
+ "room": "shuttle",
+ "position": [
+ 50.0,
+ 3.0,
+ 22.6
+ ],
+ "sh": [
+ [
+ 2.80344,
+ 2.6091,
+ 2.65861
+ ],
+ [
+ 2.26084,
+ 2.03715,
+ 2.02153
+ ],
+ [
+ 0.20549,
+ 0.19099,
+ 0.19538
+ ],
+ [
+ 0.00724,
+ 0.00695,
+ 0.00709
+ ],
+ [
+ 0.00071,
+ 0.00051,
+ 0.00035
+ ],
+ [
+ 0.20068,
+ 0.18188,
+ 0.18197
+ ],
+ [
+ -0.46385,
+ -0.44677,
+ -0.46823
+ ],
+ [
+ -0.00521,
+ -0.00464,
+ -0.0048
+ ],
+ [
+ -2.71983,
+ -2.52242,
+ -2.56447
]
]
}
@@ -628,6 +683,89 @@
"room": "lift_lobby",
"nav": "walk"
}
+ },
+ {
+ "id": "shuttle",
+ "name": "Shuttle Cabin",
+ "floor_y": 1.6,
+ "polygon": [
+ [
+ 50.85,
+ 33.2
+ ],
+ [
+ 50.85,
+ 28.6
+ ],
+ [
+ 51.9343,
+ 28.6
+ ],
+ [
+ 51.7749,
+ 19.27
+ ],
+ [
+ 50.75,
+ 19.27
+ ],
+ [
+ 50.75,
+ 18.2
+ ],
+ [
+ 52.0516,
+ 18.2
+ ],
+ [
+ 51.4611,
+ 15.5
+ ],
+ [
+ 48.5389,
+ 15.5
+ ],
+ [
+ 47.9484,
+ 18.2
+ ],
+ [
+ 49.25,
+ 18.2
+ ],
+ [
+ 49.25,
+ 19.27
+ ],
+ [
+ 48.2251,
+ 19.27
+ ],
+ [
+ 48.0657,
+ 28.6
+ ],
+ [
+ 49.15,
+ 28.6
+ ],
+ [
+ 49.15,
+ 33.2
+ ]
+ ],
+ "centre": [
+ 50.0,
+ 1.6,
+ 23.5978
+ ],
+ "area_m2": 53.52,
+ "main": false,
+ "props": {
+ "room": "shuttle",
+ "nav": "walk",
+ "ceiling": 3.4
+ }
}
],
"sockets": [
@@ -661,6 +799,23 @@
"width": 2.0
}
},
+ {
+ "id": "Shuttle__tactical",
+ "kind": "holo",
+ "position": [
+ 50.0,
+ 2.53,
+ 24.6
+ ],
+ "yaw_deg": 0.0,
+ "room": "flight_deck",
+ "props": {
+ "socket_kind": "holo",
+ "owner": "Shuttle",
+ "radius": 0.5,
+ "height": 0.8
+ }
+ },
{
"id": "main",
"kind": "lift",
@@ -1528,7 +1683,7 @@
"position": [
50.0,
0.0,
- 38.1364
+ 38.0988
],
"yaw_deg": 0.0,
"room": "flight_deck",
@@ -1604,7 +1759,7 @@
"position": [
47.0,
0.0,
- 38.74
+ 38.7
],
"yaw_deg": 90.0,
"room": "flight_deck"
@@ -1615,7 +1770,7 @@
"position": [
47.0,
0.0,
- 40.54
+ 40.5
],
"yaw_deg": 90.0,
"room": "flight_deck"
@@ -1626,7 +1781,7 @@
"position": [
47.0,
0.0,
- 42.34
+ 42.3
],
"yaw_deg": 90.0,
"room": "flight_deck"
@@ -1637,7 +1792,7 @@
"position": [
47.0,
0.0,
- 44.14
+ 44.1
],
"yaw_deg": 90.0,
"room": "flight_deck"
@@ -1648,7 +1803,7 @@
"position": [
53.0,
0.0,
- 38.74
+ 38.7
],
"yaw_deg": -90.0,
"room": "flight_deck"
@@ -1659,7 +1814,7 @@
"position": [
53.0,
0.0,
- 40.54
+ 40.5
],
"yaw_deg": -90.0,
"room": "flight_deck"
@@ -1670,7 +1825,7 @@
"position": [
53.0,
0.0,
- 42.34
+ 42.3
],
"yaw_deg": -90.0,
"room": "flight_deck"
@@ -1681,7 +1836,7 @@
"position": [
53.0,
0.0,
- 44.14
+ 44.1
],
"yaw_deg": -90.0,
"room": "flight_deck"
@@ -1977,7 +2132,7 @@
"kind": "waypoint",
"position": [
50.0,
- 1.5,
+ 1.6,
32.2
],
"yaw_deg": 0.0,
@@ -2167,23 +2322,23 @@
"stats": {
"samples": 192,
"blender": "5.0.1",
- "plate_s": 1592.53,
- "nav_s": 18.8,
- "occluders_s": 0.2,
- "lighting_s": 8.24,
- "blender_s": 1628.0,
- "package_s": 166.91,
- "plate_bytes": 3615652,
- "bytes": 22806769
+ "plate_s": 2641.3,
+ "nav_s": 31.94,
+ "occluders_s": 1.09,
+ "lighting_s": 15.52,
+ "blender_s": 2708.8,
+ "package_s": 359.94,
+ "plate_bytes": 3987709,
+ "bytes": 24547749
},
"realtime": {
"version": 1,
"quality": "final",
"scene": {
"url": "realtime/scene.glb",
- "vertices": 1076985,
- "triangles": 1086962,
- "chunks": 197
+ "vertices": 1143314,
+ "triangles": 1137598,
+ "chunks": 261
},
"lightmaps": {
"encoding": "rgbm2",
@@ -2343,6 +2498,28 @@
4.7,
61.6
]
+ },
+ {
+ "room": "shuttle",
+ "url": "realtime/probe_shuttle.webp",
+ "w": 1024,
+ "h": 512,
+ "range": 32.0,
+ "position": [
+ 50.0,
+ 3.0,
+ 22.6
+ ],
+ "box_min": [
+ 47.9484,
+ 1.6,
+ 15.5
+ ],
+ "box_max": [
+ 52.0516,
+ 4.4237,
+ 33.2
+ ]
}
],
"materials": {
@@ -2394,6 +2571,22 @@
"opacity": 1.0,
"collide": true
},
+ "M_Console_Keys": {
+ "roughness": 0.5,
+ "metalness": 0.0,
+ "color": [
+ 0.0,
+ 0.0,
+ 0.0
+ ],
+ "clearcoat": 0.0,
+ "clearcoat_roughness": 0.05,
+ "specular": 0.5,
+ "detail": "none",
+ "transparent": false,
+ "opacity": 1.0,
+ "collide": true
+ },
"M_Crate_Paint": {
"roughness": 0.46,
"metalness": 0.0,
@@ -2634,6 +2827,22 @@
"opacity": 1.0,
"collide": true
},
+ "M_Hull_PipeInsulated": {
+ "roughness": 0.69,
+ "metalness": 0.0,
+ "color": [
+ 0.0,
+ 0.0,
+ 0.0
+ ],
+ "clearcoat": 0.0,
+ "clearcoat_roughness": 0.05,
+ "specular": 0.5,
+ "detail": "none",
+ "transparent": false,
+ "opacity": 1.0,
+ "collide": true
+ },
"M_Hull_Structure": {
"roughness": 0.5,
"metalness": 0.75,
@@ -2730,6 +2939,22 @@
"opacity": 1.0,
"collide": false
},
+ "M_Light_CeilingPanel": {
+ "roughness": 0.6,
+ "metalness": 0.0,
+ "color": [
+ 0.0,
+ 0.0,
+ 0.0
+ ],
+ "clearcoat": 0.0,
+ "clearcoat_roughness": 0.05,
+ "specular": 0.25,
+ "detail": "none",
+ "transparent": false,
+ "opacity": 1.0,
+ "collide": false
+ },
"M_Light_FloorInlay": {
"roughness": 0.6,
"metalness": 0.0,
@@ -2746,6 +2971,38 @@
"opacity": 1.0,
"collide": false
},
+ "M_Light_Maint_Amber": {
+ "roughness": 0.6,
+ "metalness": 0.0,
+ "color": [
+ 0.0,
+ 0.0,
+ 0.0
+ ],
+ "clearcoat": 0.0,
+ "clearcoat_roughness": 0.05,
+ "specular": 0.25,
+ "detail": "none",
+ "transparent": false,
+ "opacity": 1.0,
+ "collide": false
+ },
+ "M_Light_RedTrim": {
+ "roughness": 0.6,
+ "metalness": 0.0,
+ "color": [
+ 0.0,
+ 0.0,
+ 0.0
+ ],
+ "clearcoat": 0.0,
+ "clearcoat_roughness": 0.05,
+ "specular": 0.25,
+ "detail": "none",
+ "transparent": false,
+ "opacity": 1.0,
+ "collide": false
+ },
"M_Light_WallStrip": {
"roughness": 0.6,
"metalness": 0.0,
@@ -2890,22 +3147,6 @@
"opacity": 1.0,
"collide": true
},
- "M_TMP_PropsInd_CabinGlow": {
- "roughness": 0.6,
- "metalness": 0.0,
- "color": [
- 0.0,
- 0.0,
- 0.0
- ],
- "clearcoat": 0.0,
- "clearcoat_roughness": 0.05,
- "specular": 0.25,
- "detail": "none",
- "transparent": false,
- "opacity": 1.0,
- "collide": false
- },
"M_TMP_PropsInd_ContainerGrey": {
"roughness": 0.5,
"metalness": 0.0,
@@ -3083,13 +3324,13 @@
"collide": true
}
},
- "bytes": 18735354,
+ "bytes": 20076712,
"stats": {
- "objects": 290,
- "triangles": 1086962,
- "vertices": 1076985,
- "chunks": 197,
- "area_m2": 80049.9,
+ "objects": 296,
+ "triangles": 1137598,
+ "vertices": 1143314,
+ "chunks": 261,
+ "area_m2": 80823.6,
"hidden_objects": 9,
"hidden_area_m2": 6906.1,
"far_split": 13,
@@ -3102,15 +3343,15 @@
],
"samples": 512,
"blender": "5.0.1",
- "realise_s": 2.64,
- "visibility_s": 28.61,
- "unwrap_s": 4.73,
- "join_s": 0.36,
- "bake_s": 531.26,
- "probes_s": 32.99,
- "geometry_s": 10.14,
- "blender_s": 613.8,
- "package_s": 114.74
+ "realise_s": 4.52,
+ "visibility_s": 89.92,
+ "unwrap_s": 8.81,
+ "join_s": 0.72,
+ "bake_s": 1297.59,
+ "probes_s": 54.16,
+ "geometry_s": 17.44,
+ "blender_s": 1483.4,
+ "package_s": 352.72
}
}
}
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/nav.png b/dodaios/ui/web/frontend/public/verse/decks/hangar/nav.png
index cbd3ea72a2..4a8d1a4b0d 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/nav.png and b/dodaios/ui/web/frontend/public/verse/decks/hangar/nav.png differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/occluders.glb b/dodaios/ui/web/frontend/public/verse/decks/hangar/occluders.glb
index 46664f550e..2711a24c75 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/occluders.glb and b/dodaios/ui/web/frontend/public/verse/decks/hangar/occluders.glb differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_0.avif
index 65f99a8322..64f8a3e237 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_1.avif
index b4fd6c18cb..823e5d3d40 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_2.avif
index 95489f110c..0f0215cdc4 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_3.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_3.avif
index 294fa0d0b5..5aeb8a3b11 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_3.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_3.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_4.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_4.avif
index dd77a18c74..00736bb9fd 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_4.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_4.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_5.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_5.avif
index 037fdc2426..d9906829e0 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_5.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_0_5.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_0.avif
index 99d5d977ed..a29bb8744b 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_1.avif
index 9c0e6d21a8..35e2958c5b 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_2.avif
index 3abe47840b..58928a8f49 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_3.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_3.avif
index 4e985cef04..3aac1281c8 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_3.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_3.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_4.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_4.avif
index 3937e427e3..4f8f882bdc 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_4.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_4.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_5.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_5.avif
index de2260c7a8..ae2c8d96b2 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_5.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_1_5.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_0.avif
index 7bda8dd98f..f18472fcc6 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_1.avif
index 3b367b17e4..1755540000 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_2.avif
index 7e90541ed9..2771c883d2 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_3.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_3.avif
index d7ba238a29..5f4f459154 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_3.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_3.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_4.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_4.avif
index 15dd748af7..36875d08b7 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_4.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_4.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_5.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_5.avif
index e217b92765..6d2c79eedf 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_5.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_2_5.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_0.avif
index 685b18be4c..43a1705146 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_1.avif
index e89f3b014c..6dbffc33dd 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_2.avif
index 31a2718e7e..72c3a78bf1 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_3.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_3.avif
index e4017dda50..13ed770ec5 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_3.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_3.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_4.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_4.avif
index 39f03394d1..af8a6751e3 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_4.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_4.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_5.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_5.avif
index e16454de0c..868b31261b 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_5.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_3_5.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_0.avif
index cc1afab17d..df0dba8717 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_1.avif
index 0a9e87da93..d5176be453 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_2.avif
index 1c7e37d37c..2e279ededa 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_3.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_3.avif
index 36503ff07c..a13f36875a 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_3.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_3.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_4.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_4.avif
index 4b94b941fe..1d6d651273 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_4.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_4.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_5.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_5.avif
index a6374d98f9..3d5e3b37b4 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_5.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_4_5.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_0.avif
index af7522d91d..fcb07f8d57 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_1.avif
index 25258642af..c7e8d140a1 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_2.avif
index 2c631a09aa..5c1a1f9291 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_3.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_3.avif
index 8f3e4f6925..d0b2c30a3d 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_3.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_3.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_4.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_4.avif
index 1b5b317fc7..0393826963 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_4.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_4.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_5.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_5.avif
index 039392bd34..b3470ebcd5 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_5.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_5_5.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_0.avif
index af4c3e6af4..ba710aac30 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_1.avif
index ab07ffbc67..6f4a437d9f 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_2.avif
index 1432adbf07..832eb1f0ba 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_3.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_3.avif
index 45a6c3557f..e488a609ed 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_3.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_3.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_4.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_4.avif
index a44d11f62b..c944b5cc47 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_4.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_4.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_5.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_5.avif
index 86d17a17b3..de23bbd48a 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_5.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_6_5.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_0.avif
index 2ff817458d..12b1c0abef 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_1.avif
index 2c5f96fa39..58e7f96605 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_2.avif
index ead4850e67..6f05ff31d6 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_3.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_3.avif
index 51c3cd95cb..8dac86a442 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_3.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_3.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_4.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_4.avif
index f0e22642ee..0b42b238d8 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_4.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_4.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_5.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_5.avif
index 06a4b9fc15..82766763da 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_5.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_7_5.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_0.avif
index c91c6f76b6..6339d57073 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_1.avif
index f1915386a3..e043f047a6 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_2.avif
index 5fb3c1d330..e03e1e33eb 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_3.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_3.avif
index 7c12b00b30..cab7f36286 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_3.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_3.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_4.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_4.avif
index d69a2ba725..cecfef6436 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_4.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_4.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_5.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_5.avif
index d75de596f5..605e8bd643 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_5.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_8_5.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_0.avif
index bbf1de7aa0..f3ca198eba 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_1.avif
index bdad8b3d47..e7827cb077 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_2.avif
index d512de829f..ccd08b2df4 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_3.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_3.avif
index 1eac9d31f2..d530569eba 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_3.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_3.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_4.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_4.avif
index 2d964c9654..1be568e0ca 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_4.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_4.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_5.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_5.avif
index 4bded7b0cf..84284f3f3d 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_5.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L0_9_5.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L1.avif
index 94c74e431f..6006c959d6 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/L1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_0.avif
index 0dd5acd460..11488e154b 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_1.avif
index a9dd701227..a7bc9a98fc 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_2.avif
index b07e050165..9277e1e68d 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_0_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_0.avif
index aa6d03ebec..6a39a93314 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_1.avif
index 75bfbf7cf9..5cdd96149d 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_2.avif
index 1bfd509cf1..31c781724a 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_1_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_0.avif
index 77a03d0df5..ecc513f37a 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_1.avif
index bd4cf9e0ca..598b07de67 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_2.avif
index 0a2cd69baf..d78bbf3941 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_2_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_0.avif
index 9851da75c2..f42afd3f44 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_1.avif
index e289360380..9bb989b38e 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_2.avif
index 3d55f0f8a1..5f5267bdf5 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_3_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_0.avif
index 38c5b4db86..e3356788c3 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_1.avif
index e1d244862b..eaba478b2a 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_2.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_2.avif
index 207d09b8d2..ab69cf0373 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_2.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M2_4_2.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_0_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_0_0.avif
index 03cdc05394..3d9b16ee3e 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_0_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_0_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_0_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_0_1.avif
index 631a0f18ab..11c14398a3 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_0_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_0_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_1_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_1_0.avif
index 3e4cada7fd..ca16578b83 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_1_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_1_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_1_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_1_1.avif
index f3c23fb894..f055f35288 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_1_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_1_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_2_0.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_2_0.avif
index e760031a58..929bec17e3 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_2_0.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_2_0.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_2_1.avif b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_2_1.avif
index 10c546a010..ba83ee66ae 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_2_1.avif and b/dodaios/ui/web/frontend/public/verse/decks/hangar/plate/M4_2_1.avif differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_0.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_0.webp
index 3ffb3bda46..2024835d76 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_0.webp and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_0.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_1.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_1.webp
index f392574349..190e6cd503 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_1.webp and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_1.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_2.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_2.webp
index ae673012cf..a5809bffc6 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_2.webp and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_2.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_3.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_3.webp
index d7c25235af..6e228bec07 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_3.webp and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/lm_3.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_armoury.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_armoury.webp
index 35904c6488..44771b68af 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_armoury.webp and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_armoury.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_arrivals.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_arrivals.webp
index 717a48093d..f0c2d102f5 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_arrivals.webp and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_arrivals.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_booth.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_booth.webp
index 05f8caff90..538a6d7276 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_booth.webp and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_booth.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_crew_bay.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_crew_bay.webp
index 075a2ac2d3..8188a68942 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_crew_bay.webp and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_crew_bay.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_flight_deck.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_flight_deck.webp
index b902adc6d6..3e4fc585e2 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_flight_deck.webp and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_flight_deck.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_lift_lobby.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_lift_lobby.webp
index d8e9213eba..51765d6229 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_lift_lobby.webp and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_lift_lobby.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_shuttle.webp b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_shuttle.webp
new file mode 100644
index 0000000000..65ef953a00
Binary files /dev/null and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/probe_shuttle.webp differ
diff --git a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/scene.glb b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/scene.glb
index 07c1829cf7..5ab4ce56bb 100644
Binary files a/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/scene.glb and b/dodaios/ui/web/frontend/public/verse/decks/hangar/realtime/scene.glb differ
diff --git a/tests/verse/test_verse_content.py b/tests/verse/test_verse_content.py
index e4107acf8a..fcf7f88f6b 100644
--- a/tests/verse/test_verse_content.py
+++ b/tests/verse/test_verse_content.py
@@ -292,3 +292,51 @@ def test_validator_rejects_a_nav_grid_without_walkable_cells(tmp_path: Path) ->
manifest["nav"]["walkable_cells"] = 0
(deck / "manifest.json").write_text(json.dumps(manifest), encoding="utf-8")
assert any("walkable_cells" in p for p in validate.validate_deck_dir(deck))
+
+
+def test_hangar_shuttle_cabin_is_walkable_from_the_ramp() -> None:
+ """Up the ramp, through the corridor and the troop bay, up the steps into the cockpit."""
+ from collections import deque
+
+ import numpy as np
+ from PIL import Image
+
+ deck_dir = validate.PUBLIC_VERSE / "decks" / "hangar"
+ if not (deck_dir / "manifest.json").is_file():
+ pytest.skip("hangar not cooked")
+ manifest = json.loads((deck_dir / "manifest.json").read_text(encoding="utf-8"))
+ nav = manifest["nav"]
+ img = np.array(Image.open(deck_dir / nav.get("url", "nav.png")))
+ img = img[..., 0] if img.ndim == 3 else img
+ heights = np.where(
+ img > 0, (img.astype(float) - nav["height_zero"]) * nav["height_step"], np.nan
+ )
+ cell = nav["cell"]
+
+ def cell_of(x: float, z: float) -> tuple[int, int]:
+ return int((z - nav["origin_z"]) / cell), int((x - nav["origin_x"]) / cell)
+
+ arrival = next(s for s in manifest["sockets"] if s["id"] == "arrival")["position"]
+ start = cell_of(arrival[0], arrival[2])
+ reached = np.zeros(img.shape, dtype=bool)
+ reached[start] = True
+ queue = deque([start])
+ while queue:
+ r, c = queue.popleft()
+ for dr, dc in ((1, 0), (-1, 0), (0, 1), (0, -1)):
+ rr, cc = r + dr, c + dc
+ if not (0 <= rr < img.shape[0] and 0 <= cc < img.shape[1]) or reached[rr, cc]:
+ continue
+ if np.isnan(heights[rr, cc]) or abs(heights[rr, cc] - heights[r, c]) > nav["max_step"]:
+ continue
+ reached[rr, cc] = True
+ queue.append((rr, cc))
+ cabin = next(r for r in manifest["rooms"] if r["id"] == "shuttle")
+ xs = [p[0] for p in cabin["polygon"]]
+ zs = [p[1] for p in cabin["polygon"]]
+ r0, c0 = cell_of(min(xs), min(zs))
+ r1, c1 = cell_of(max(xs), max(zs))
+ inside = reached[r0 : r1 + 1, c0 : c1 + 1]
+ floors = heights[r0 : r1 + 1, c0 : c1 + 1][inside]
+ assert np.count_nonzero((floors > 1.5) & (floors < 1.7)) * cell * cell > 6.0 # bay floor
+ assert np.count_nonzero(floors > 1.9) * cell * cell > 2.0 # cockpit floor