@things-factory/figure-ui 10.1.88 → 10.1.90

package/client/modeller/editor.ts

@@ -35,6 +35,8 @@ import { ScrollbarStyles } from '@operato/styles'
 import { alignChanges, boxOf, canMirror, mirrorChanges, type AlignTool } from './align.js'
 import type { FigurePaletteKind, FigurePartRow } from './figure-parts.js'
 import { paletteRecipe } from './palette.js'
+import { apexOver, drawnOf } from './section-drawing.js'
+import { END_FACE } from './section-controls.js'
 import type { FigureCanvas } from './canvas.js'
 import { nudgeOf, placementOf, type ScaleAnchor } from './stage-model.js'
 
@@ -1785,20 +1787,41 @@ export class FigureEditor extends LitElement {
   private renderSectionEditor(geometry: readonly { id: string }[]) {
     const part = geometry.find(g => ownerOf(g.id) === this.selected) as { id: string; shape: FigureEvaluatedShape } | undefined
     /* A door frame's section is its own width, height, jamb and head: its fields edit it, not an outline. */
-    if (!part?.shape?.extrusion || part.shape.dimensions.jamb !== undefined) return nothing
+    const drawn = part?.shape && drawnOf(part.shape)
+    if (!part || !drawn || part.shape.dimensions.jamb !== undefined) return nothing
     const asset = this.asset() as FigureAsset
     const measures = figureSectionMeasuresOf(asset, this.selected)
-    const kept = figureScaleAnchorOf(asset, this.selected)?.[part.shape.extrusion.axis]
+    const kept = figureScaleAnchorOf(asset, this.selected)?.[drawn.axis]
     return html`<figure-section-editor
       .body=${{ ...part, id: this.selected }}
       .measures=${measures}
       .kept=${kept}
+      .pointBlocked=${this.pointBlockedOf(drawn)}
       .revision=${this.session?.read().revision ?? 0}
       @command=${(e: CustomEvent) => this.linkCommand(e.detail.action)}
       @command-live=${(e: CustomEvent) => this.holdAction(e.detail.action)}
       @section-editor-close=${() => this.closeSectionEditor()}
     ></figure-section-editor>`
   }
+  /**
+   * Why a drawn push's end cannot be drawn to one point now: the kernel's own refusal of that command on a copy (what is
+   * fastened to the end face), said as the face. Asked once per figure revision and part.
+   */
+  private pointBlocked?: { key: string; words: string }
+  private pointBlockedOf(drawn: NonNullable<ReturnType<typeof drawnOf>>): string {
+    if (drawn.apex || drawn.section.kind !== 'polygon' || !this.session) return ''
+    const key = `${this.session.read().revision}|${this.selected}`
+    if (this.pointBlocked?.key === key) return this.pointBlocked.words
+    let words = ''
+    try {
+      this.session.previewCommand({ kind: 'set-section', part: this.selected!, apex: apexOver(drawn.section.points, drawn.axis) })
+    } catch (error) {
+      if ((error as { code?: string }).code === 'FEATURE_MAPPING_REQUIRED')
+        words = i18next.t('figure.text.section-editor-apex-blocked', { face: i18next.t('figure.label.face-' + END_FACE(drawn.axis, 'end')) })
+    }
+    this.pointBlocked = { key, words }
+    return words
+  }
   private renderStart() {
     const shapes: FigurePaletteKind[] = ['box', 'cylinder', 'plate']
     /* Where it is authored from, chosen before any part (ADR-0097): the figure's own setting, no room made up for it. */
@@ -2234,9 +2257,12 @@ export class FigureEditor extends LitElement {
   private renderSingle(name: string, field: FieldLike, unavailable: boolean) {
     /* A drawn section's point is called by its number and axis, as the section editor calls it (ADR-0100 §2.1, Q9). */
     const point = /^point\.p(\d+)\.([xyz])$/.exec(name)
+    const apex = /^apex\.([xyz])$/.exec(name)
     const words = point
       ? [i18next.t('figure.label.section-editor-coordinate', { point: point[1]!, axis: point[2]!.toUpperCase() })]
-      : name.split('.').map(part => i18next.t('figure.label.field-' + part, { defaultValue: part }))
+      : apex
+        ? [`${i18next.t('figure.label.section-editor-apex-mark')} ${apex[1]!.toUpperCase()}`]
+        : name.split('.').map(part => i18next.t('figure.label.field-' + part, { defaultValue: part }))
     return html`<span ?scrub=${!unavailable} @pointerdown=${(e: PointerEvent) => this.scrub(field as never, e, unavailable)}>${words.join(' · ')} (${field.unit})</span
       ><input
         aria-label=${field.id}

package/client/modeller/figure-parts.ts

@@ -46,6 +46,7 @@ const KIND_ICON: Record<string, string> = {
   'rounded-box': 'crop_square',
   'hollow-box': 'check_box_outline_blank',
   polygon: 'pentagon',
+  pyramid: 'details',
   portal: 'door_front'
 }
 
@@ -62,6 +63,7 @@ const RECIPES: Array<{ kind: FigurePaletteKind; icon: string; label: string }> =
   { kind: 'sphere', icon: 'circle', label: 'figure.label.primitive-sphere' },
   { kind: 'frustum', icon: 'change_history', label: 'figure.label.primitive-frustum' },
   { kind: 'polygon', icon: 'hexagon', label: 'figure.label.primitive-polygon' },
+  { kind: 'pyramid', icon: 'details', label: 'figure.label.primitive-pyramid' },
   { kind: 'plate', icon: 'check_box_outline_blank', label: 'figure.label.primitive-plate' },
   { kind: 'wall', icon: 'crop_portrait', label: 'figure.label.primitive-wall' },
   { kind: 'portal', icon: 'door_front', label: 'figure.label.primitive-portal' }

package/client/modeller/figure-section-editor.ts

@@ -6,7 +6,7 @@ import { i18next, localize } from '@operato/i18n'
 import { figureCavitySectionOf, figureSectionSidesOf } from '@hatiolab/figure-model'
 import type { FigureAuthoringAction, FigureEvaluatedShape, FigureSection, FigureSectionMeasure, FigureSectionPoint } from '@hatiolab/figure-model'
 import { SidePanelStyles } from './side-panel-styles.js'
-import { insertAfter, markedBy, movePoint, pointLabel, removePoint, sectionOf, workingIssuesOf, workingOf, type SectionWorking } from './section-drawing.js'
+import { apexOver, drawnOf, insertAfter, markedBy, movePoint, pointLabel, removePoint, sectionOf, workingIssuesOf, workingOf, type SectionWorking } from './section-drawing.js'
 import { END_FACE } from './section-controls.js'
 
 type Axis = 'x' | 'y' | 'z'
@@ -28,6 +28,10 @@ export const NARROW_BELOW = 900
  * part's placement or fastening keeps (§4.1: read here, changed elsewhere). A measure that follows another value is
  * shown and not offered.
  *
+ * A drawn section's end can be drawn to one point -- a pyramid, a tetrahedron from three points (§4.1.1, A5-1): the
+ * apex is dragged or typed like a point, and is not offered while something is fastened to the end it takes away (the
+ * kernel's own refusal, `pointBlocked`).
+ *
  * What the kernel would refuse is marked on the outline and said in the list; apply is held back, and the solid shows
  * the last valid state, which the caption names. Apply sends one `set-section` command (one step of the history); cancel
  * or Esc sends nothing and lets the preview go. The undo here is the editor's own. If the figure changes while the editor
@@ -150,6 +154,15 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
       min-width: 0;
       font: inherit;
     }
+    label[apex] {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      grid-column: 1 / -1;
+    }
+    label[apex] small {
+      flex-basis: 100%;
+    }
     ol[points] {
       list-style: none;
       margin: 0;
@@ -226,6 +239,8 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
   @property({ attribute: false }) measures?: { measures: Record<Axis, FigureSectionMeasure>; round: boolean }
   /** Along the push, the face a length change keeps: 1 its start, -1 its end, 0 its centre; undefined when it cannot be said. */
   @property({ attribute: false }) kept?: -1 | 0 | 1
+  /** Why a push's end cannot be drawn to a point now, in the kernel's words (what is fastened to it); empty when it can. */
+  @property({ attribute: false }) pointBlocked = ''
   /** The figure's revision now; the editor remembers the one it opened at. */
   @property({ type: Number }) revision = 0
   /** Narrow: the outline or the solid behind. */
@@ -237,7 +252,7 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
     if (!this.narrow) this.show = 'outline'
   })
 
-  @state() private working: SectionWorking = { points: [], across: {}, length: 0 }
+  @state() private working: SectionWorking = { points: [], across: {}, length: 0, apex: null }
   @state() private selected: string | null = null
   @state() private note = ''
   private opened!: SectionWorking
@@ -250,10 +265,10 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
   private extent = 200
 
   private get axis(): Axis {
-    return (this.body?.shape.extrusion?.axis ?? 'y') as Axis
+    return ((this.body && drawnOf(this.body.shape)?.axis) ?? 'y') as Axis
   }
   private get kind() {
-    return this.body?.shape.extrusion?.section.kind
+    return this.body && drawnOf(this.body.shape)?.section.kind
   }
 
   connectedCallback() {
@@ -276,7 +291,12 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
   /** How far the drawing reaches from the origin: the outline's farthest point with room around, in 50 mm steps. */
   private extentOf(w: SectionWorking): number {
     const [h, v] = SCREEN[this.axis]
-    const far = Math.max(1, ...w.points.flatMap(p => [Math.abs(p[h] ?? 0), Math.abs(p[v] ?? 0)]), ...Object.values(w.across).map(a => (a ?? 0) / 2))
+    const far = Math.max(
+      1,
+      ...w.points.flatMap(p => [Math.abs(p[h] ?? 0), Math.abs(p[v] ?? 0)]),
+      ...Object.values(w.across).map(a => (a ?? 0) / 2),
+      ...Object.values(w.apex ?? {}).map(a => Math.abs(a ?? 0))
+    )
     return Math.ceil((far * 1.4 + 40) / 50) * 50
   }
 
@@ -336,12 +356,14 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
     const o = this.opened
     const changed = (a: number | undefined, b: number | undefined) => Math.abs((a ?? 0) - (b ?? 0)) > 1e-9
     const across = Object.fromEntries(Object.entries(w.across).filter(([k, v]) => changed(v, o.across[k as Axis])))
+    const apexMoved = !w.apex !== !o.apex || (!!w.apex && Object.entries(w.apex).some(([k, v]) => changed(v, o.apex![k as Axis])))
     return {
       kind: 'set-section',
       part: this.body!.id,
       ...(this.kind === 'polygon' ? { points: w.points.map(p => ({ ...p })) } : {}),
       ...(Object.keys(across).length ? { across } : {}),
-      ...(changed(w.length, o.length) ? { length: w.length } : {})
+      ...(changed(w.length, o.length) ? { length: w.length } : {}),
+      ...(apexMoved ? { apex: w.apex ? { ...w.apex } : null } : {})
     }
   }
 
@@ -469,7 +491,9 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
           const handle = /^handle:(.)$/.exec(this.dragging)
           this.working = handle
             ? this.across(handle[1] as Axis, Math.max(1, 2 * Math.abs(handle[1] === h ? p.h : p.v)))
-            : { ...this.working, points: movePoint(this.working.points, this.dragging, { [h]: p.h, [v]: p.v }) }
+            : this.dragging === 'apex'
+              ? { ...this.working, apex: { [h]: p.h, [v]: p.v } }
+              : { ...this.working, points: movePoint(this.working.points, this.dragging, { [h]: p.h, [v]: p.v }) }
           if (this.valid(this.working)) this.lastValid = this.working
           this.preview()
         }}
@@ -523,6 +547,22 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
               fill=${bad ? 'var(--md-sys-color-error)' : 'var(--md-sys-color-on-surface)'}>${pointLabel(p.id)}</text>
           </g>`
         })}
+        ${w.apex
+          ? svg`${pts.map(p => svg`<line x1=${p[h]} y1=${p[v]} x2=${w.apex![h]} y2=${w.apex![v]} stroke="var(--md-sys-color-primary)" stroke-width=${e / 300} stroke-dasharray=${`${e / 60} ${e / 90}`} />`)}
+            <g apex style="cursor: grab"
+              @pointerdown=${(ev: PointerEvent) => {
+                ev.stopPropagation()
+                ;(ev.target as Element).setPointerCapture?.(ev.pointerId)
+                this.dragFrom = this.working
+                this.selected = null
+                this.dragging = 'apex'
+              }}>
+              <rect x=${w.apex[h]! - e / 34} y=${w.apex[v]! - e / 34} width=${e / 17} height=${e / 17}
+                transform=${`rotate(45 ${w.apex[h]} ${w.apex[v]})`} fill="var(--md-sys-color-tertiary)" stroke="var(--md-sys-color-surface)" stroke-width=${e / 250} />
+              <text x=${w.apex[h]! + e / 22} y=${w.apex[v]! + e / 12} font-size=${e / 16} font-weight="600" fill="var(--md-sys-color-on-surface)">${i18next.t('figure.label.section-editor-apex-mark')}</text>
+              <title>${i18next.t('figure.label.section-editor-apex-mark')}</title>
+            </g>`
+          : nothing}
         ${this.kind === 'polygon'
           ? nothing
           : ([h, v] as const).filter(sized).map(axis => {
@@ -571,6 +611,50 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
     </label>`
   }
 
+  /** A drawn section's end: the section again (a push) or one point (a pyramid), and where that point is. */
+  private apexFields() {
+    const [h, v] = SCREEN[this.axis]
+    const apex = this.working.apex
+    /* The kernel's refusal holds only for turning a push into a pyramid; a pyramid can always be made a push again. */
+    const blocked = !apex && !this.opened?.apex ? this.pointBlocked : ''
+    return html`<label apex>
+        <input
+          type="checkbox"
+          .checked=${live(!!apex)}
+          ?disabled=${!!blocked}
+          @change=${(ev: Event) => {
+            const on = (ev.target as HTMLInputElement).checked
+            this.change({ ...this.working, apex: on ? (this.opened.apex ?? apexOver(this.working.points, this.axis)) : null })
+          }}
+        />
+        <span>${i18next.t('figure.label.section-editor-apex')}</span>
+        ${blocked ? html`<small>${blocked}</small>` : nothing}
+      </label>
+      ${apex
+        ? ([h, v] as const).map(axis =>
+            html`<label mm>
+              <span>${i18next.t('figure.label.section-editor-apex-at', { axis: axis.toUpperCase() })}</span>
+              <input
+                type="number"
+                step="any"
+                inputmode="decimal"
+                aria-label=${i18next.t('figure.label.section-editor-apex-at', { axis: axis.toUpperCase() })}
+                .value=${live(String(apex[axis] ?? ''))}
+                @change=${(ev: Event) => {
+                  const input = ev.target as HTMLInputElement
+                  const value = Number(input.value)
+                  if (input.value === '' || !Number.isFinite(value)) {
+                    input.value = String(apex[axis] ?? '')
+                    return
+                  }
+                  this.change({ ...this.working, apex: { ...apex, [axis]: value } })
+                }}
+              />
+            </label>`
+          )
+        : nothing}`
+  }
+
   private list(issues: ReturnType<typeof workingIssuesOf>['issues'], words: ReturnType<typeof workingIssuesOf>['words']) {
     const [h, v] = SCREEN[this.axis]
     const marked = markedBy(issues)
@@ -578,12 +662,13 @@ export class FigureSectionEditor extends localize(i18next)(LitElement) {
     const linked = i18next.t('figure.text.section-editor-linked')
     return html`<div sizes>
         ${this.field(
-          i18next.t('figure.label.section-editor-length'),
+          i18next.t(this.working.apex ? 'figure.label.section-editor-height' : 'figure.label.section-editor-length'),
           this.working.length,
           value => this.change({ ...this.working, length: value }),
           m?.[this.axis] !== 'editable',
           m?.[this.axis] === 'linked' ? linked : this.keptWords()
         )}
+        ${this.kind === 'polygon' ? this.apexFields() : nothing}
         ${this.kind === 'polygon'
           ? nothing
           : this.measures?.round

package/client/modeller/figure-section-panel.ts

@@ -5,6 +5,7 @@ import { live } from 'lit/directives/live.js'
 import { i18next, localize } from '@operato/i18n'
 import type { FigureAuthoringAction, FigureCavityRequest, FigureEvaluatedShape } from '@hatiolab/figure-model'
 import { SidePanelStyles } from './side-panel-styles.js'
+import { drawnOf } from './section-drawing.js'
 import {
   END_FACE,
   SIDE_FACE,
@@ -94,7 +95,8 @@ export class FigureSectionPanel extends localize(i18next)(LitElement) {
 
   render() {
     const body = this.body
-    const e = body?.shape?.provider === 'extrude' ? body.shape.extrusion : undefined
+    /* A push, or a pyramid: a drawn section drawn to one point, which has no corners and no inside. */
+    const e = body?.shape ? drawnOf(body.shape) : undefined
     if (!body || !e) return nothing
     const kind = e.section.kind
     return html`<section>

package/client/modeller/maturity.ts

@@ -173,7 +173,14 @@ export function shapeKeyOf(body: FigureAssetGeometry | FigureGeometry): string {
   const e = shape.extrusion,
     c = shape.cavity,
     r = shape.revolution
-  const meaning = e ? `${e.axis}:${e.section.kind}:${c ? `${c.start === 'open' ? 'o' : 'c'}${c.end === 'open' ? 'o' : 'c'}` : '-'}` : r ? `${r.axis}:${r.profile.kind}` : ''
+  const l = shape.loft
+  const meaning = e
+    ? `${e.axis}:${e.section.kind}:${c ? `${c.start === 'open' ? 'o' : 'c'}${c.end === 'open' ? 'o' : 'c'}` : '-'}`
+    : r
+      ? `${r.axis}:${r.profile.kind}`
+      : l
+        ? `${l.axis}:point`
+        : ''
   const segments = (body as { segments?: number }).segments ?? 12
   return `${shape.provider}|${meaning}|${dims}|s${segments}`
 }

package/client/modeller/palette.ts

@@ -30,6 +30,19 @@ export function paletteRecipe(kind: FigurePaletteKind, id: string): FigurePrimit
           { x: 0, z: 43 }
         ]
       }
+    case 'pyramid':
+      /* A tetrahedron: the drawn triangle's, drawn up to one point over its middle. */
+      return {
+        ...standing(100),
+        kind,
+        dimensions: { height: 100 },
+        points: [
+          { x: -50, z: -43 },
+          { x: 50, z: -43 },
+          { x: 0, z: 43 }
+        ],
+        apex: { x: 0, z: 0 }
+      }
     case 'plate':
       return { ...standing(10), kind: 'box', dimensions: { width: 600, height: 10, depth: 400 } }
     case 'wall':

package/client/modeller/section-drawing.ts

@@ -104,11 +104,29 @@ export interface SectionWorking {
   /** Along each plane axis: a rectangle's size, an ellipse's diameter. Empty for a drawn section. */
   across: Partial<Record<Axis, number>>
   length: number
+  /** A drawn section's end drawn to one point (a pyramid), across the plane axes; null for a push. */
+  apex: Partial<Record<Axis, number>> | null
+}
+
+/** A pushed part's section, axis and ends -- or a pyramid's, whose end is its apex (figure-model `loft@1`). */
+export function drawnOf(shape: FigureEvaluatedShape):
+  | { axis: Axis; section: FigureSection; start: number; end: number; apex: Partial<Record<Axis, number>> | null }
+  | undefined {
+  if (shape.extrusion) return { ...shape.extrusion, apex: null }
+  if (shape.loft) return { ...shape.loft, apex: shape.loft.apex }
+  return undefined
+}
+
+/** Where a new apex goes: over the middle of the points' span, whole millimetres. */
+export function apexOver(points: Points, axis: Axis): Partial<Record<Axis, number>> {
+  const [u, v] = FIGURE_SECTION_PLANE[axis]
+  const mid = (x: Axis) => Math.round((Math.min(...points.map(p => p[x]!)) + Math.max(...points.map(p => p[x]!))) / 2)
+  return { [u]: mid(u), [v]: mid(v) }
 }
 
 /** The working state of a pushed part as it stands. */
 export function workingOf(shape: FigureEvaluatedShape): SectionWorking {
-  const e = shape.extrusion!
+  const e = drawnOf(shape)!
   const s = e.section
   const [u, v] = FIGURE_SECTION_PLANE[e.axis]
   const across =
@@ -117,13 +135,14 @@ export function workingOf(shape: FigureEvaluatedShape): SectionWorking {
       : s.kind === 'ellipse'
         ? { [u]: 2 * s.radius[u]!, [v]: 2 * s.radius[v]! }
         : {}
-  return { points: s.kind === 'polygon' ? s.points.map(p => ({ ...p })) : [], across, length: e.end - e.start }
+  return { points: s.kind === 'polygon' ? s.points.map(p => ({ ...p })) : [], across, length: e.end - e.start, apex: e.apex ? { ...e.apex } : null }
 }
 
 /** The section the working state makes, of the part's own kind: its corners kept, its points or widths the working ones. */
 export function sectionOf(shape: FigureEvaluatedShape, w: SectionWorking): FigureSection {
-  const s = shape.extrusion!.section
-  const [u, v] = FIGURE_SECTION_PLANE[shape.extrusion!.axis]
+  const e = drawnOf(shape)!
+  const s = e.section
+  const [u, v] = FIGURE_SECTION_PLANE[e.axis]
   if (s.kind === 'polygon') return { kind: 'polygon', points: w.points }
   if (s.kind === 'ellipse') return { kind: 'ellipse', radius: { [u]: w.across[u]! / 2, [v]: w.across[v]! / 2 } }
   return { kind: 'rectangle', size: { [u]: w.across[u]!, [v]: w.across[v]! }, ...(s.corner ? { corner: s.corner } : {}) }
@@ -134,11 +153,12 @@ export function workingIssuesOf(
   shape: FigureEvaluatedShape,
   w: SectionWorking
 ): { issues: FigureSectionIssue[]; words: Array<{ key: string; params: Record<string, string> }> } {
-  const e = shape.extrusion!
+  const e = drawnOf(shape)!
   const section = sectionOf(shape, w)
   const issues = checkFigureSection(section, e.axis)
   const words = issues.map(i => issueWords(i, w.points, e.axis))
   if (!(Number.isFinite(w.length) && w.length > 0)) words.push({ key: 'figure.text.section-issue-length', params: {} })
+  if (w.apex && !Object.values(w.apex).every(n => Number.isFinite(n))) words.push({ key: 'figure.text.section-issue-number', params: {} })
   if (!issues.length && words.length === 0 && shape.cavity) {
     const made = figureExtrusionFeaturesOf({ axis: e.axis, section, start: e.start, end: e.start + w.length }, [shape.cavity])
     if ('refused' in made) {

package/client/modeller/starting-shape.ts

@@ -1,13 +1,14 @@
 /**
  * What a person calls a part's shape (ADR-0100 §2.1): the starting shape it reads as -- 상자, 둥근 상자, 위가 열린 상자,
- * 원기둥, 문틀, 구, 원뿔, 그린 단면. A word for the screen, read from the shape node's own params; it is not a kind of
+ * 원기둥, 문틀, 구, 원뿔, 그린 단면, 뿔. A word for the screen, read from the shape node's own params; it is not a kind of
  * stored shape, and nothing is decided by it.
  */
-export type StartingShapeKind = 'cube' | 'rounded-box' | 'hollow-box' | 'cylinder' | 'portal' | 'sphere' | 'frustum' | 'polygon'
+export type StartingShapeKind = 'cube' | 'rounded-box' | 'hollow-box' | 'cylinder' | 'portal' | 'sphere' | 'frustum' | 'polygon' | 'pyramid'
 
 export function startingShapeKindOf(shape: { op: string; params?: Record<string, unknown> } | undefined): StartingShapeKind | undefined {
   const p = shape?.params ?? {}
   if (shape?.op === 'revolve@1') return p.profile === 'taper' ? 'frustum' : 'sphere'
+  if (shape?.op === 'loft@1') return 'pyramid'
   if (shape?.op !== 'extrude@1') return undefined
   if (p.section === 'ellipse') return 'cylinder'
   if (p.section === 'polygon') return 'polygon'
@@ -20,7 +21,8 @@ export function startingShapeKindOf(shape: { op: string; params?: Record<string,
  * The same word for an evaluated body, when only the shape the kernel evaluated is in hand (a row of the parts list):
  * a door frame is the section with jambs, a drawn section the rest of the drawn ones.
  */
-export function startingShapeKindOfBody(shape: { provider?: string; dimensions?: Record<string, number>; extrusion?: { section: { kind: string; corner?: unknown } }; cavity?: unknown; revolution?: { profile: { kind: string } } } | undefined): StartingShapeKind | undefined {
+export function startingShapeKindOfBody(shape: { provider?: string; dimensions?: Record<string, number>; extrusion?: { section: { kind: string; corner?: unknown } }; cavity?: unknown; revolution?: { profile: { kind: string } }; loft?: unknown } | undefined): StartingShapeKind | undefined {
+  if (shape?.loft) return 'pyramid'
   if (shape?.revolution) return shape.revolution.profile.kind === 'taper' ? 'frustum' : 'sphere'
   const s = shape?.extrusion?.section
   if (!s) return undefined

package/dist-client/modeller/clips.d.ts

@@ -34,6 +34,6 @@ export declare const trackEdit: (clip: Clip, track: ClipTrack, patch?: Partial<P
     state: string;
     clip: string;
     keys: ClipKey[];
-    loop: "hold" | "wrap";
+    loop: "wrap" | "hold";
     interpolation: "linear" | "step";
 };

package/dist-client/modeller/editor.d.ts

@@ -295,6 +295,12 @@ export declare class FigureEditor extends LitElement {
      */
     /** The section editor over the canvas, the figure behind it drawing what the working points make. */
     private renderSectionEditor;
+    /**
+     * Why a drawn push's end cannot be drawn to one point now: the kernel's own refusal of that command on a copy (what is
+     * fastened to the end face), said as the face. Asked once per figure revision and part.
+     */
+    private pointBlocked?;
+    private pointBlockedOf;
     private renderStart;
     /**
      * Where the panel is, held at its top: the model by its name -- the way back to its settings -- and the part chosen,

package/dist-client/modeller/editor.js

@@ -32,6 +32,8 @@ import { SidePanelStyles } from './side-panel-styles.js';
 import { ScrollbarStyles } from '@operato/styles';
 import { alignChanges, boxOf, canMirror, mirrorChanges } from './align.js';
 import { paletteRecipe } from './palette.js';
+import { apexOver, drawnOf } from './section-drawing.js';
+import { END_FACE } from './section-controls.js';
 import { nudgeOf, placementOf } from './stage-model.js';
 import { roomRefitRowsOf } from './occupancy.js';
 import { editRefusalOf, inDeclaredRoom, inputRangeRefusalOf, narrowingRetryOf, partRefusalOf, placementRefusalOf, recipeRefusalOf, removalNoticeOf, sizeRangeRefusalOf } from './refusals.js';
@@ -1824,21 +1826,40 @@ let FigureEditor = class FigureEditor extends LitElement {
     renderSectionEditor(geometry) {
         const part = geometry.find(g => ownerOf(g.id) === this.selected);
         /* A door frame's section is its own width, height, jamb and head: its fields edit it, not an outline. */
-        if (!part?.shape?.extrusion || part.shape.dimensions.jamb !== undefined)
+        const drawn = part?.shape && drawnOf(part.shape);
+        if (!part || !drawn || part.shape.dimensions.jamb !== undefined)
             return nothing;
         const asset = this.asset();
         const measures = figureSectionMeasuresOf(asset, this.selected);
-        const kept = figureScaleAnchorOf(asset, this.selected)?.[part.shape.extrusion.axis];
+        const kept = figureScaleAnchorOf(asset, this.selected)?.[drawn.axis];
         return html `<figure-section-editor
       .body=${{ ...part, id: this.selected }}
       .measures=${measures}
       .kept=${kept}
+      .pointBlocked=${this.pointBlockedOf(drawn)}
       .revision=${this.session?.read().revision ?? 0}
       @command=${(e) => this.linkCommand(e.detail.action)}
       @command-live=${(e) => this.holdAction(e.detail.action)}
       @section-editor-close=${() => this.closeSectionEditor()}
     ></figure-section-editor>`;
     }
+    pointBlockedOf(drawn) {
+        if (drawn.apex || drawn.section.kind !== 'polygon' || !this.session)
+            return '';
+        const key = `${this.session.read().revision}|${this.selected}`;
+        if (this.pointBlocked?.key === key)
+            return this.pointBlocked.words;
+        let words = '';
+        try {
+            this.session.previewCommand({ kind: 'set-section', part: this.selected, apex: apexOver(drawn.section.points, drawn.axis) });
+        }
+        catch (error) {
+            if (error.code === 'FEATURE_MAPPING_REQUIRED')
+                words = i18next.t('figure.text.section-editor-apex-blocked', { face: i18next.t('figure.label.face-' + END_FACE(drawn.axis, 'end')) });
+        }
+        this.pointBlocked = { key, words };
+        return words;
+    }
     renderStart() {
         const shapes = ['box', 'cylinder', 'plate'];
         /* Where it is authored from, chosen before any part (ADR-0097): the figure's own setting, no room made up for it. */
@@ -2263,9 +2284,12 @@ let FigureEditor = class FigureEditor extends LitElement {
     renderSingle(name, field, unavailable) {
         /* A drawn section's point is called by its number and axis, as the section editor calls it (ADR-0100 §2.1, Q9). */
         const point = /^point\.p(\d+)\.([xyz])$/.exec(name);
+        const apex = /^apex\.([xyz])$/.exec(name);
         const words = point
             ? [i18next.t('figure.label.section-editor-coordinate', { point: point[1], axis: point[2].toUpperCase() })]
-            : name.split('.').map(part => i18next.t('figure.label.field-' + part, { defaultValue: part }));
+            : apex
+                ? [`${i18next.t('figure.label.section-editor-apex-mark')} ${apex[1].toUpperCase()}`]
+                : name.split('.').map(part => i18next.t('figure.label.field-' + part, { defaultValue: part }));
         return html `<span ?scrub=${!unavailable} @pointerdown=${(e) => this.scrub(field, e, unavailable)}>${words.join(' · ')} (${field.unit})</span
       ><input
         aria-label=${field.id}