Skip to content

Commit 4756b5d

Browse files
TMHSDigitalclaude
andcommitted
fix(showcase): dish the tavern-stool seat, stand the hero level, add a tankard
The seat's sitting dish goes from 6 mm to 14 mm at the centre. Only the last two lathe profile points move, so the ring count and triangle count are unchanged (3040). The dish floor stays 8 mm above the leg tenons wherever a leg enters from below; no audit reads the dish. The hero rolled the stool 6 degrees about X to show the seat. That sank one pair of treads into the floor and lifted the other, against the showcase "level on the stage" rule. The stool now turns about Z only, and the camera sits higher and closer instead. A render-only pewter tankard stands in the dish, with its handle in profile. It is not part of the asset: no budget, no export, and the asset sheet renders the stool without it. The key and a warmer wedge were relit, because the first contact sheet read dark and grey. Also adds scripts/asset_sheet.py SELECT rows for tavern-stool, grindstone and chopping-block. None had one, so the asset-sheet gate could not run on them before. Evidence (live runs, local .scratch binaries): - Blender 5.2.1 LTS: default exits 0 (base 3040 tris, LOD 0.5000 / 0.2197, collider 468, bake FINISHED with data). --output passes framing: fill y 0.794, margins l 0.356 r 0.344 b 0.056 t 0.067. - Blender 4.5.11 LTS: default and --output exit 0, same counts, framing ok. - tests/check_falsifier_targets.py static: 337 falsifiers across 36 pieces pass. --run on both versions: --skip-decimate 9, --stray-vert 15, --lift-z 16, --short-legs 16, --float-stretchers 17, --pipe-ferrule 18, --sink-legs 20, --low-bake 21, all as documented. - Contact sheet: luma 0.260, stage 0.278, warmth +0.091, sat 0.098 (was 0.177 / 0.182 / +0.057 / 0.069 before the relight). The stage sits at the top of the calibration range because the lit floor fills the border. - Asset sheet (docs/gallery/asset-sheets/tavern-stool.webp): plainer than the drone and the shelf, but not the least-designed object in the lineup. 5.1.2 was not run. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
1 parent 94240fc commit 4756b5d

9 files changed

Lines changed: 112 additions & 11 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Budget-conformance props. Not examples. Conventions: [`showcase/README.md`](show
131131
<a href="showcase/chopping-block/"><img src="showcase/chopping-block/preview.webp" width="24%" alt="Chopping block: a bark-sided log round with growth rings and drying checks on its sawn top, a riveted iron hoop, and a felling axe buried in the top, on a dark studio floor" /></a>
132132
<a href="showcase/wooden-bucket/"><img src="showcase/wooden-bucket/preview.webp" width="24%" alt="Wooden bucket: a coopered pail with a three-strand rope bail through iron ear rings and chord-lofted iron hoops on a dark studio floor" /></a>
133133
<a href="showcase/wall-torch/"><img src="showcase/wall-torch/preview.webp" width="24%" alt="Wall torch: a dressed stone plaque with an iron plate and arm holding a cup, a leaning wooden torch with a pitch-wrapped head and a bright flame, on a dark studio floor" /></a>
134-
<a href="showcase/tavern-stool/"><img src="showcase/tavern-stool/preview.webp" width="24%" alt="Tavern stool: a round wooden seat on turned splayed legs with stretchers at two heights and iron ferrules on flat treads, on a dark studio floor" /></a>
134+
<a href="showcase/tavern-stool/"><img src="showcase/tavern-stool/preview.webp" width="24%" alt="Tavern stool: a dished round wooden seat holding a pewter tankard, on turned splayed legs with stretchers at two heights and iron ferrules on flat treads, on a dark studio floor" /></a>
135135
<a href="showcase/iron-cauldron/"><img src="showcase/iron-cauldron/preview.webp" width="24%" alt="Iron cauldron: a round-bellied cast-iron pot hanging by its bail from a timber tripod on a dark studio floor" /></a>
136136
<a href="showcase/wooden-ladder/"><img src="showcase/wooden-ladder/preview.webp" width="24%" alt="Wooden ladder: a raked timber ladder with six evenly spaced turned rungs and iron shoes, leaning on a weathered barn-board wall with a coil of hemp rope hung over a rung" /></a>
137137
<a href="showcase/hay-bale/"><img src="showcase/hay-bale/preview.webp" width="24%" alt="Hay bale: a bound straw bale with two sisal twine belts on a dark studio floor" /></a>
53.4 KB
Loading
4.88 KB
Loading
4.3 KB
Loading

‎scripts/asset_sheet.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@
7070
"street-lantern": (r"^LanternLow$", None),
7171
"hand-pump": (r"^HandPumpLow$", None),
7272
"anvil": (r"^AnvilLow$", None),
73+
"tavern-stool": (r"^StoolLow$", None),
74+
"grindstone": (r"^GrindstoneLow$", None),
75+
"chopping-block": (r"^ChopBlockLow$", None),
7376
# the hero shows a three-section run; the sheet judges the one asset
7477
"fence-kit": (r"^FenceLow$", None),
7578
"wooden-ladder": (r"^LadderLow$", None),

‎showcase/gallery.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
"name": "tavern-stool",
301301
"dir": "showcase/tavern-stool",
302302
"teaches": "A procedural tavern stool with a lathed seat, turned splayed legs, staggered stretchers, and iron ferrules gripping each leg on its own axis over a level tread, through UVs, bake, LOD, collider, and Unity glTF, asserting recomputed budgets rather than an API contract.",
303-
"alt": "A wooden tavern stool with a grained round seat, turned splayed legs, stretcher rungs at two heights, and dark iron ferrules on flat treads.",
303+
"alt": "A wooden tavern stool with a grained, dished round seat holding a pewter tankard, turned splayed legs, stretcher rungs at two heights, and dark iron ferrules on flat treads.",
304304
"witnessesFix": "Recomputed: 3040 tris, two materials with 1168 wood and 576 metal faces, UVs in 0..1 with zero AABB overlap, outer AABB 0.341×0.341×0.470 m, LOD ratios in band, convex collider 468 tris, non-empty glTF. Hygiene all zero, four treads at zmin 0, stretcher-leg gap 0, ferrule grip 1.20 mm on each leg's axis, leg ends 1.1 mm above their treads, bake 22.4 texels per UV cell. --float-stretchers exits 17; --pipe-ferrule 18; --sink-legs 20; --low-bake 21.",
305305
"hero": "docs/gallery/assets/tavern-stool-hero.webp",
306306
"preview": "showcase/tavern-stool/preview.webp",

‎showcase/tavern-stool/README.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ leg ends inside the sleeve, above the tread. The first build ended every leg
1313
3 mm above a vertical ring on the floor, with a 1 mm air gap around the foot.
1414
The front-back and side stretchers sit at different heights, so their tenons
1515
do not meet inside the leg. Each member has its own wood tone and grain.
16+
The seat is dished 14 mm at the centre for sitting, from the same lathe ring
17+
count as the old 6 mm dish, so the triangle count did not move. The dish
18+
floor stays 8 mm above the leg tenons wherever a leg enters from below.
19+
20+
The hero stands the stool level and turns it about Z only. An earlier still
21+
rolled it 6° about X to show the seat, which sank one pair of treads into
22+
the floor and lifted the other; the camera now sits higher instead. A
23+
pewter tankard stands in the dish as render-only dressing. It is not part
24+
of the asset: no budget, no export, and the asset sheet renders the stool
25+
without it.
1626

1727
It asserts **budget conformance** of the generated result. It does not
1828
witness an API contract. "It rendered without error" is not a check.

‎showcase/tavern-stool/preview.webp‎

5.42 KB
Loading

‎showcase/tavern-stool/tavern_stool.py‎

Lines changed: 97 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,11 @@
145145
(0.022, 0.168),
146146
(0.032, 0.170),
147147
(0.040, 0.164),
148-
(0.037, 0.095),
149-
(0.034, 0.000),
148+
# A sitting dish, 14 mm deep at the centre: the same ring count as the
149+
# old 6 mm dish, so the triangle count is unchanged. It stays 8 mm above
150+
# the leg tenons (SEAT_TENON) wherever a leg enters from below.
151+
(0.033, 0.105),
152+
(0.026, 0.000),
150153
)
151154

152155

@@ -1396,6 +1399,85 @@ def wire_normal(mat, tex):
13961399
nt.links.new(nrm.outputs["Normal"], bsdf.inputs["Normal"])
13971400

13981401

1402+
def add_tankard(scene):
1403+
"""Render-only dressing: a pewter tankard standing in the seat dish.
1404+
1405+
Not part of the asset (no budget, no export); it gives the seat a scale
1406+
cue and a use. The foot rests on the dish, whose surface rises from
1407+
DISH_Z at the centre by DISH_RISE per metre of radius.
1408+
"""
1409+
dish_z = SEAT_Z - SEAT_T + SEAT_PROFILE[-1][0]
1410+
dish_rise = (SEAT_PROFILE[-2][0] - SEAT_PROFILE[-1][0]) / SEAT_PROFILE[-2][1]
1411+
foot_r = 0.042
1412+
z0 = dish_z + dish_rise * foot_r - 0.001 # the foot rim bites 1 mm
1413+
cx, cy = 0.030, -0.018
1414+
prof = [(0.000, 0.0), (0.040, 0.0), (foot_r, 0.004), (0.043, 0.010),
1415+
(0.040, 0.016), (0.038, 0.030), (0.037, 0.090), (0.039, 0.112),
1416+
(0.041, 0.118), (0.041, 0.124), (0.035, 0.124), (0.034, 0.012),
1417+
(0.0, 0.012)]
1418+
segs = 32
1419+
me = bpy.data.meshes.new("Tankard")
1420+
bm = bmesh.new()
1421+
try:
1422+
rings = []
1423+
for r, z in prof:
1424+
if r < 1e-9:
1425+
rings.append([bm.verts.new((cx, cy, z0 + z))])
1426+
else:
1427+
rings.append([bm.verts.new((cx + r * math.cos(2 * math.pi * i / segs),
1428+
cy + r * math.sin(2 * math.pi * i / segs),
1429+
z0 + z)) for i in range(segs)])
1430+
for a, b in zip(rings, rings[1:]):
1431+
for i in range(segs):
1432+
j = (i + 1) % segs
1433+
if len(a) == 1:
1434+
f = bm.faces.new((a[0], b[j], b[i]))
1435+
elif len(b) == 1:
1436+
f = bm.faces.new((a[i], a[j], b[0]))
1437+
else:
1438+
f = bm.faces.new((a[i], a[j], b[j], b[i]))
1439+
f.smooth = True
1440+
# handle: a D-shaped bar, turned into profile against the hero camera
1441+
ang = math.radians(20.0)
1442+
ux, uy = math.cos(ang), math.sin(ang)
1443+
pts = []
1444+
for k in range(13):
1445+
t = math.pi * k / 12
1446+
reach = 0.030 * math.sin(t)
1447+
pts.append(Vector((cx + ux * (0.037 + reach), cy + uy * (0.037 + reach),
1448+
z0 + 0.100 - 0.070 * k / 12)))
1449+
hr = 0.0055
1450+
hs = 8
1451+
prev = None
1452+
for k, p in enumerate(pts):
1453+
tan = (pts[min(k + 1, 12)] - pts[max(k - 1, 0)]).normalized()
1454+
side = Vector((-uy, ux, 0.0))
1455+
nrm = tan.cross(side).normalized()
1456+
ring = [bm.verts.new(p + hr * (side * math.cos(2 * math.pi * i / hs)
1457+
+ nrm * math.sin(2 * math.pi * i / hs)))
1458+
for i in range(hs)]
1459+
if prev:
1460+
for i in range(hs):
1461+
j = (i + 1) % hs
1462+
f = bm.faces.new((prev[i], prev[j], ring[j], ring[i]))
1463+
f.smooth = True
1464+
prev = ring
1465+
bmesh.ops.recalc_face_normals(bm, faces=bm.faces)
1466+
bm.to_mesh(me)
1467+
finally:
1468+
bm.free()
1469+
mat = bpy.data.materials.new("Pewter")
1470+
mat.use_nodes = True
1471+
b = mat.node_tree.nodes["Principled BSDF"]
1472+
b.inputs["Base Color"].default_value = (0.62, 0.62, 0.60, 1.0)
1473+
b.inputs["Metallic"].default_value = 1.0
1474+
b.inputs["Roughness"].default_value = 0.46
1475+
me.materials.append(mat)
1476+
ob = bpy.data.objects.new("Tankard", me)
1477+
scene.collection.objects.link(ob)
1478+
return ob
1479+
1480+
13991481
def render_still(low, wood, tex, path, engine):
14001482
scene = bpy.context.scene
14011483
wire_normal(wood, tex)
@@ -1404,8 +1486,12 @@ def render_still(low, wood, tex, path, engine):
14041486
ob.hide_render = True
14051487
ob.hide_viewport = True
14061488

1489+
# Turn about Z only: the old 6 degree roll about X sank one pair of
1490+
# treads into the floor and lifted the other (showcase "level on the
1491+
# stage"). The camera sits higher instead, so the seat dish still reads.
14071492
low.rotation_euler.z = math.radians(-32.0)
1408-
low.rotation_euler.x = math.radians(6.0)
1493+
low.rotation_euler.x = 0.0
1494+
tankard = add_tankard(scene)
14091495

14101496
floor_me = bpy.data.meshes.new("Floor")
14111497
bm = bmesh.new()
@@ -1444,17 +1530,19 @@ def light(name, loc, energy, size, col, rot):
14441530
ob.rotation_euler = tuple(math.radians(a) for a in rot)
14451531
scene.collection.objects.link(ob)
14461532

1447-
light("Key", (-3.6, -5.0, 5.4), 660.0, 4.0, (1.0, 0.94, 0.86), (50, 0, -36))
1448-
light("Fill", (5.0, -3.4, 2.4), 46.0, 8.0, (0.72, 0.82, 1.0), (62, 0, 50))
1449-
light("Wedge", (2.2, 4.0, 3.8), 600.0, 5.5, (1.0, 0.70, 0.40), (-70, 0, 198))
1533+
# the key reads the grain on the seat and the turned legs; the wedge
1534+
# rakes the wall behind the stool so the stage carries the warm pool
1535+
light("Key", (-3.2, -4.4, 5.0), 980.0, 3.6, (1.0, 0.93, 0.84), (50, 0, -36))
1536+
light("Fill", (5.0, -3.4, 2.4), 60.0, 8.0, (0.72, 0.82, 1.0), (62, 0, 50))
1537+
light("Wedge", (1.6, 3.2, 3.2), 780.0, 5.0, (1.0, 0.66, 0.36), (-66, 0, 200))
14501538

14511539
cam_data = bpy.data.cameras.new("Cam")
14521540
cam_data.lens = 50.0
14531541
cam = bpy.data.objects.new("Cam", cam_data)
1454-
cam.location = (1.05, -1.38, 0.92)
1542+
cam.location = (1.00, -1.33, 1.06)
14551543
scene.collection.objects.link(cam)
14561544
aim = bpy.data.objects.new("Aim", None)
1457-
aim.location = (0.0, 0.0, 0.26)
1545+
aim.location = (0.0, 0.0, 0.25)
14581546
scene.collection.objects.link(aim)
14591547
con = cam.constraints.new("TRACK_TO")
14601548
con.target = aim
@@ -1482,7 +1570,7 @@ def light(name, loc, energy, size, col, rot):
14821570
scene.view_settings.view_transform = "Standard"
14831571

14841572
fcode = gallery_framing.check_framing(
1485-
scene, cam, hero=[low], elements=[low], stage=[floor, wall],
1573+
scene, cam, hero=[low], elements=[low, tankard], stage=[floor, wall],
14861574
)
14871575
if fcode:
14881576
return fcode

0 commit comments

Comments
 (0)