spine-parts 2.14.2 → 2.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/docs/AUTHORING.md +5 -4
- package/docs/STABILITY.md +1 -1
- package/package.json +1 -1
- package/src/assemble.ts +119 -8
- package/src/build.ts +1 -0
- package/src/config.ts +15 -1
package/docs/AUTHORING.md
CHANGED
|
@@ -152,7 +152,7 @@ read by no CPU stage).
|
|
|
152
152
|
| `assemble.ground` | assemble, build | **authored**, optional `"plain"` or `"busy"` (issue #996): what lies behind the figure in the painting. `plain` (the default) is a ground of one colour; `busy` is an opaque ground of many colours (a wall, a banner). Read by `--project visible` only: a busy, opaque ground needs `assemble.ground: busy`; without it, visible takes backdrop pixels. An invalid value is `CONFIG_FIELD_TYPE` at `config.assemble.ground`. Absent or `plain`, existing build bytes are unchanged. `assemble` warns (`ASSEMBLE_GROUND_PLAIN`, §5), under project: visible, where paintingEdges reads the ground, when a plain ground's border ring is not one colour. |
|
|
153
153
|
| `assemble.rig_scale` | assemble — the rig is `trunc(w × rig_scale)` x `trunc(h × rig_scale)`, and every rig-px value after it (`bones`, `meshes`, `motion`, `patches`, `cuts`) is in that rig's pixels; `check --source` (`CHECK_SOURCE_SIZE`) and `compose` (`SCENE_RIG_SCALE_AGREES`) read it back off `parts.json` | authored; rig pixels per source pixel. 0.5 in both examples (a 1664x2432 painting makes an 832x1216 rig). **Keep the figure about 1,100 to 1,200 rig px tall** — the `H` of `propose`'s `mesh spacing:` note, the height of the parts' boxes together — so for another painting, about 1,150 over the figure's height in painting px: that is the size the proposer's spacing divisor was calibrated at (H 1106–1185, the `mesh spacing` note says so) and the size of the two examples `check`'s bars are derived from, and the proposer and `check` also hold fixed rig-px values that do not scale with it (the fringe's 10 px step, the trunk segments' 18, 20, 30 and 100 px, the 15 px wrist tolerance, the 10-row pendant floor, the seam bar's 50 rig px over 40). What else it trades, measured on `demo` with the README loop from a fresh config at 0.25, 0.5 and 1 (issue #345, rig-c 2.47.1): the same plan and the same ten chains; every bar but the one the uncorrected `demo` always fails (`bottomwear` `TIP_OVER_ROOT`, the README loop's `RL01`) passing at all three; the atlas page 418x606, 832x1205 and 1825x2047; the figure's mesh spacing 16, 32 and 64, so 830, 868 and 932 triangles; the breath 2.5 % of a torso that scales with it; and the proposed bones, scaled to 0.5, off the 0.5 proposal's by up to 38 px at 0.25 and 22.5 px at 1 (the hairpin's origin; the skirt roots 20 and 10.5) — the fixed-px values above. `propose` records it on the proposal as `proposed_rig_scale` (issue #354), and changing `assemble.rig_scale` after the rig sections are written is refused (`CONFIG_PROPOSED_RIG_SCALE`): without that refusal `demo`'s tracked config built at 0.25 gated green and `check` failed only `TIP_OVER_ROOT` on both sleeves (`propose --from-config` named 54 `LINT` lines, links off the art) — re-run `assemble` and `propose` at the new scale. Absent: `CONFIG_FIELD_PRESENT`; 0, negative or not a number: `CONFIG_FIELD_TYPE`; a rig under 1x1: `ASSEMBLE_RIG_SIZE` |
|
|
154
154
|
| `assemble.plan` | assemble; also the list every `meshes`/`regions` key must come from | **proposed** by `assemble --propose-plan`. `[part name, "full" \| "head", See-through tag]`, in draw order back to front. Names are free; roles come from the tag. A layer the author made and added to a run takes `author:<label>` in the tag's place, and has no role (§5, *A layer the author made*). When `generation.control.skeleton` is present and a full-run `handwear-r` or `handwear-l` layer merges sleeve, bare hand and overgarment drape into one layer — a skin-coloured hand cluster (`>= 40` run px, `GHOST_MIN_AREA`, measured `516..4,787` run px across the 9-standee corpus) lies within `0.35` forearm lengths of `<s>_wrist` and non-skin pixels reach more than `1.0x` the forearm length (`<s>_elbow -> <s>_wrist`) below `<s>_wrist` (issue #490; measured `-0.15x..0.45x` on the 6 clean standees vs `1.25x..2.02x` on the 3 merged standees, placing `1.0x` inside the `0.45x..1.25x` gap) — the layer is split into `drape-<s>`, `handwear-<s>` and `hand-<s>` (back to front) when the Euclidean RGB distance between the sleeve median colour above `<s>_wrist` and the drape median colour below `<s>_wrist` is at least `80` (`ARM_DRAPE_COLOR_DISTANCE`, measured `103.6..236.0` on the two distinct-colour merged standees vs `20.8..28.2` on the same-colour merged standee, placing `80` between `28.2` and `103.6`), or refused with `SEETHROUGH_ARM_RUN_MERGED` when the distance is under `80` |
|
|
155
|
-
| `assemble.extend_below_crop` | assemble | **proposed** with the plan: `{part, run, tag}` — a head-run part that reaches the bottom of the head crop is continued from a full-run layer, whole connected components |
|
|
155
|
+
| `assemble.extend_below_crop` | assemble | **proposed** with the plan: `{part, run, tag}` — a head-run part that reaches the bottom of the head crop is continued from a full-run layer, whole connected components. With optional `edges: ["left", "right", "top", "bottom"]`, copies full-run pixels at alpha >= 128 beyond only those actual crop edges; no rim is grown and no pixel whose centre lies inside the half-open crop is written. The entry must name a head-run part and full-run layer of the same tag. Omit `edges` to retain the original inset bottom, component seeding and rim behavior. |
|
|
156
156
|
| `assemble.extend_painting` | assemble, base painting only — assigns unheld opaque painting samples to declared final layer-derived parts | **authored**, optional array of `{part, band: [x0,y0,x1,y1], max_distance, min_held_alpha?, order?}`; part, band and max_distance required, integer rig pixels, half-open band and positive maximum four-neighbour path length. Off when absent or empty. See [Bounded painting extension](#bounded-painting-extension-issue-848) |
|
|
157
157
|
| `assemble.patches` | assemble; `meshes`/`regions` keys may name them too | **authored**, optional: `[{name, box, alpha, draw}]` — an extra part cut from the **painting** itself, for figure no See-through layer holds (a hem both runs dropped). `box` is `[x0, y0, x1, y1]` in **rig** pixels, `x1`/`y1` exclusive — the space of `parts.json` and `recomposite_rig.png`, where the hole is found; `alpha` is `"silhouette"` (the painting's figure silhouette inside the box, the one `--seam silhouette` uses) or `"box"` (the whole box); `draw` is `"back"`, `"front"` or `{"before": "<plan part>"}`. A patch is always a region: its bone is `regions.<name>`, in the one place every region's bone lives, and a `meshes` entry for it is refused. `draw` sets assembled part order; an exclusively bound limb rider's final rig slot joins that limb's block (see the limbs subsection). Use [Source before scissors](#source-before-scissors) before a patch; §5 describes structural placement |
|
|
158
158
|
| `assemble.cuts` | assemble; `meshes`/`regions` keys may name the new parts too, and must (each is a part like any other) | **authored**, optional (issue #170): `[{from, into, polygon, draw, overlap, under, under_fill}]`, `under` and `under_fill` optional — a structural separation under [Source before scissors](#source-before-scissors), cut from a plan part's layer by the author's polygon: the pixels of plan part `from` whose **centre** lies inside `polygon` (even-odd; a centre exactly on an edge is outside) leave `from` and make the new part `into`, colour and alpha, so every pixel of the layer ends in exactly one of the two. `polygon` is `[[x, y], …]`, at least three points, non-negative integer **rig** pixels — the space of `parts.json` and of the patches' boxes. The file that shows the layer in those coordinates is `assemble`'s own `rig/parts/<from>.png`, placed at its `parts.json` `x`, `y` (the PNG's pixel `(i, j)` is rig pixel `(x + i, y + j)`), or `render/recomposite_rig.png`, the whole rig 1:1; the contact sheets (`sheet`) are scaled and carry no coordinates. `draw` is `"back"`, `"front"` or `{"before": "<plan part>"}`, as for a patch (to keep the setup pose, draw the piece immediately in front of `from` — `{"before": "<the plan part after from>"}`, or `"front"` when `from` is the last plan part; `{"before": "<from>"}` draws it behind `from`, which `under` refuses as `ASSEMBLE_UNDER_DRAW` because the fill would hide it). `from` must be a plan part (`CONFIG_NAME_RESOLVES`; a patch or another cut's piece is refused; a part a limb takes may be cut where no segment of the limb holds it, issue #564, §5 *Limbs*), `into` a new name (`CONFIG_PART_UNIQUE`), the polygon three or more integer points (`CONFIG_FIELD_TYPE`). The piece's `parts.json` record carries `from`'s `<run>:<tag>` and its own counts, each split from the layer's by where the pixel lies; it is a mesh or a region under its own name, and the coverage rule holds it like a plan part. What the config cannot know the stage refuses: a polygon point past the rig (`ASSEMBLE_CUT_INSIDE`), two cuts of one part sharing a pixel (`ASSEMBLE_CUT_OVERLAP`), a cut that takes none of the layer's opaque pixels or leaves `from` none (`ASSEMBLE_CUT_PIXELS`), a cut of a part a limb takes that takes a pixel a segment of the limb holds (`ASSEMBLE_CUT_CROSSES_LIMB`). `overlap` is required, a non-negative integer of rig pixels with no default (`CONFIG_FIELD_TYPE`): the **band** — the polygon's pixels within `overlap` px of its edge by Chebyshev distance (the polygon's mask less its erosion by a `2 * overlap + 1` square) — stays in `from` as well as going to the piece, so the piece's resampled edge has art under it; the counts stay a strict partition and the band is the base's extra copy, printed on the `cut:` line. At `0` the two abut and `check`'s seam bar judges the edge between them (`CHECK_SEAM_WITHIN_BAR`, §5). A band only covers the edge at rest: a piece that swings well clear of where it was painted shows the hole it leaves, and a thin piece's band shows a ghost of the piece. `under` (issue #193), optional, is the author's image of what lies under the piece: a PNG path relative to the config's directory (`CONFIG_FIELD_TYPE` unless a non-empty string), in rig pixels over the polygon's **bounding box** — the least and greatest polygon x and y, so the image is `max x − min x` by `max y − min y` and its pixel `(i, j)` is rig pixel `(min x + i, min y + j)`. Where the cut removed pixels from `from` — the piece's pixels (alpha above 0) less the band — `from` takes the image's pixel, colour and alpha wherever the image's alpha is at least the alpha the cut removed there (**filled**); elsewhere `from` stays empty there (**left empty**): a transparent pixel is the author's statement that nothing lies under it (the background, or a part drawn behind), and a less opaque one is not half-filled. The image is read nowhere else, so its pixels over the band, over the box outside the polygon or where the layer had no art never change `from`. The `cut:` line then ends `; under <n> px filled, <m> px left empty` (`n + m` is every removed pixel), so an unintended hole is a number in the log, not a guess; the filled pixels count in `from`'s `opaque_px` and `occluded_px` (the piece is drawn over them), never as visible or projected. The stage refuses: a file that is not there (`ASSEMBLE_UNDER_PRESENT`) or not a PNG (`ASSEMBLE_UNDER_DECODES`), an image not exactly the box's size (`ASSEMBLE_UNDER_SIZE`, both sizes given), an image that fills none of the removed pixels — all transparent there, or another file (`ASSEMBLE_UNDER_EMPTY`; to leave the whole hole, drop `under`), and a piece drawn behind `from` (`ASSEMBLE_UNDER_DRAW`: the fill would hide it; draw it `"front"` or `{"before": "<the plan part after from>"}`). Producing the image is the author's, by whatever means; absent, `from` keeps only its band. `under_fill` (issue #360), optional, is the one value `"colour"` (`CONFIG_FIELD_TYPE` on any other): the same pixels are filled and left empty, and a filled pixel takes the image's **colour** at the alpha the cut removed there instead of the image's alpha, so `from`'s alpha is the uncut layer's wherever the image fills and its silhouette does not grow — an opaque image over a soft edge leaves the edge soft. It applies to the part's hidden-art layer as well as to a file; a cut with neither is refused (`ASSEMBLE_UNDER_FILL_SOURCE`). The `cut:` line's filled count then says how many took the colour only: `; under 190 px filled (190 colour only, at the alpha the cut removed), 0 px left empty`. Absent, a filled pixel takes the image's colour and alpha, as above |
|
|
@@ -990,7 +990,7 @@ receipt covers, and nothing else:
|
|
|
990
990
|
What stays: a limb's segments are cut at the joint the bones place, not along a
|
|
991
991
|
drawn line, and a limb `split` with `"edge": "painting"` follows the painting's
|
|
992
992
|
stroke; a `take` entry's layer is another run's, held by its identity receipt;
|
|
993
|
-
`extend_below_crop` continues a part from a full-run layer; projection, the seam
|
|
993
|
+
`extend_below_crop` continues a part from a full-run layer (optional `edges` selects actual crop edges; omitted, the original bottom-only rule); projection, the seam
|
|
994
994
|
override and the fringe push-back write inside a layer's own footprint. The
|
|
995
995
|
remedy for a refused part is an author layer (`author:<label>`) painted in an
|
|
996
996
|
image editor, with its receipt, or the part taken whole from a layer of the
|
|
@@ -4075,7 +4075,7 @@ valued destination path with two destination rules — **in place on an existing
|
|
|
4075
4075
|
| proposal mode | destination | fields written |
|
|
4076
4076
|
| --- | --- | --- |
|
|
4077
4077
|
| `propose --head-box` | existing regular config | `seethrough.head_box` |
|
|
4078
|
-
| `assemble --propose-plan` | existing regular config; must name `--config` itself | `assemble.plan`, `assemble.extend_below_crop` |
|
|
4078
|
+
| `assemble --propose-plan` | existing regular config; must name `--config` itself | `assemble.plan`, `assemble.extend_below_crop`. Front/back hair reaching more than 8 rig pixels beyond a side or top edge receives explicit `edges`; each explicit edge has the same strict reach bar. The legacy bottom entry is retained unchanged; qualifying side/top edges receive a separate entry without bottom. With no qualifying side/top edge, the proposal remains unchanged. |
|
|
4079
4079
|
| ordinary `propose --parts` without `--cloth` | existing regular config | each present `PROPOSAL_CONFIG_SECTIONS` value: `bones`, `meshes`, `regions`, `limbs`, `motion`, `constraints`, `turn`, `motion_seams`, `proposed_rig_scale` |
|
|
4080
4080
|
| ordinary `propose --parts … --only-missing` (issues #671, #679) | existing regular config | only resolvable `meshes.<part>` or `regions.<part>` for an unattached part: attached covers existing `meshes` and `regions`, source parts consumed by the config's own `limbs.<name>.segments[].from`, and `assemble.patches` (always regions), with or without `--keypoints`. Entries are checked against the config's bones and chains, including mesh and `auto` bone/region references; an unresolved entry is never written. Each skipped part gets a note naming its attachment or the unresolved reference and why. An accepted split part from `full:drape-<s>` / `full:hand-<s>` also gains its missing `assemble.plan` row (drape before the full run's `handwear-<s>` row, hand after it); added row by row and entry by entry, every existing byte as read |
|
|
4081
4081
|
| `propose --cloth <input.json>` | new file | the recipe's edits spliced into the cloth config; §3, *The config written*, gives entry ownership, hand-edit conflicts and `--from <previous.json>` |
|
|
@@ -4121,7 +4121,7 @@ existing hardlinks are refused before artifact output; the ordinary mode names
|
|
|
4121
4121
|
| `comfy seethrough --image --out [--host]` | optional: run the ComfyUI See-through wrapper on one image and write the form `layers` reads |
|
|
4122
4122
|
| `layers <dir \| layers.json \| file.psd>` | keep the existing columns (`opaque_px` still means alpha >8) and append source-alpha boxes `drawn(a>8)` / `opaque(a>=250)` with exclusive right/bottom; name absent boxes, report the existing body-group union height at **CORE_ALPHA (>=250)** in **input-canvas px**, and show its >8 union separately; no anatomical height, ownership/erosion or painting registration is inferred ([units and rig-scale guidance](AUTHORING.md#4-the-command-order)) |
|
|
4123
4123
|
| `sheet --source <png> --layers <path>… --out <png>` | a labelled contact sheet of the painting and every layer or part |
|
|
4124
|
-
| `assemble --propose-plan … [--write-config <config>]` | propose `assemble.plan` and `extend_below_crop` from the two runs, leaving out an implausible layer with a note naming the rule, naming in a note any full-run body no planned part covers, and naming every layer no row takes with why (empty, taken from the other run only, a plausibility rule; `nose`, never planned, with the row that lets `propose` read the head's pitch) |
|
|
4124
|
+
| `assemble --propose-plan … [--write-config <config>]` | propose `assemble.plan` and `extend_below_crop` from the two runs, leaving out an implausible layer with a note naming the rule, naming in a note any full-run body no planned part covers, and naming every layer no row takes with why (empty, taken from the other run only, a plausibility rule; `nose`, never planned, with the row that lets `propose` read the head's pitch). Front/back hair reaching more than 8 rig pixels beyond a side or top edge receives explicit `edges`; each explicit edge has the same strict reach bar. The legacy bottom entry is retained unchanged; qualifying side/top edges receive a separate entry without bottom. With no qualifying side/top edge, the proposal remains unchanged. |
|
|
4125
4125
|
| `assemble --source --full --head --config --out [--seam] [--project]` | merge the two runs into rig-space parts, `parts.json`, the recomposite and its error map, and list the uncovered holes |
|
|
4126
4126
|
| `propose --head-box --full <run> --canvas WxH [--no-back-hair] [--write-config <config>]` | propose `seethrough.head_box` from the full run, held inside the painting; `--no-back-hair` leaves the back-hair layer out of that proposal |
|
|
4127
4127
|
| `propose --parts --source --out [--compare <config>] [--write-config <config> [--only-missing]]` | propose bones, meshes, regions and an idle; draw the overlay; print, per bone, which check read it or that none did and why (its role, its kind of segment), and write `basis.json` beside the proposal — what each bone rests on (a joint, a part's mask, a ratio, other bones) and, with `--compare`, whether the config's bone differs |
|
|
@@ -5228,6 +5228,7 @@ those settings. Changing a config seed alone cannot change a no-config run.
|
|
|
5228
5228
|
| <a id="ASSEMBLE_RUN_CANVAS"></a>`ASSEMBLE_RUN_CANVAS` | a run's canvas is not `resolution` square; with one run (issue #366), a side of the file is above `resolution` — a smaller one is padded, a larger one would have to be shrunk | `seethrough.resolution`, or the run |
|
|
5229
5229
|
| <a id="ASSEMBLE_SINGLE_RUN_SOURCE"></a>`ASSEMBLE_SINGLE_RUN_SOURCE` | with no `--head` (issue #366), the painting `--source` names is not the one run's file's size: the painting is the file flattened, and every part's box maps back to the file through it | the painting — the file flattened, at the file's size |
|
|
5230
5230
|
| <a id="ASSEMBLE_SINGLE_RUN_FACE"></a>`ASSEMBLE_SINGLE_RUN_FACE` | with no `--head` (issue #359), the one run holds no painted layer for one of `face`, `eyewhite-r`, `eyewhite-l` — the parts the head run exists to separate (one problem per tag) | paint the layer, or give the head run with `--head` |
|
|
5231
|
+
| <a id="ASSEMBLE_CROP_CLIPPED"></a>`ASSEMBLE_CROP_CLIPPED` | informational: a head-run part has full-run pixels at alpha >= 128 outside its crop that the plan does not cover; gives a union count, per-edge counts (corners count on both edges), and the subset the legacy bottom rule could select | declare `assemble.extend_below_crop` with explicit `edges` for side/top continuation; inside-crop label disagreements are not measured by this line |
|
|
5231
5232
|
| <a id="ASSEMBLE_SINGLE_RUN_PLAN"></a>`ASSEMBLE_SINGLE_RUN_PLAN` | with no `--head`, a plan row takes `"head"`, or an `extend_below_crop` entry continues a part below a crop there is not | `"full"` in the row; remove the entry |
|
|
5232
5233
|
| <a id="ASSEMBLE_SINGLE_RUN_HEAD_BOX"></a>`ASSEMBLE_SINGLE_RUN_HEAD_BOX` | with no `--head`, the config sets `seethrough.head_box`, which places a head run there is not | remove `head_box`, or give the head run with `--head` |
|
|
5233
5234
|
| <a id="ASSEMBLE_ARM_SPLIT_CUTS_ARM"></a>`ASSEMBLE_ARM_SPLIT_CUTS_ARM` | `seethrough.arm_split` cuts a horizontal opaque run of the arm layer into more than two segments (issue #439; the detail gives the row, the run and the split x) | `seethrough.arm_split`: move `x` or `line` so each horizontal opaque run of the arm layer is split at most once |
|
package/docs/STABILITY.md
CHANGED
|
@@ -154,7 +154,7 @@ part name, `[i]` an entry of a list):
|
|
|
154
154
|
- **seethrough.arm_split** — required: `order`, and one of `x` or `line` (issue #439)
|
|
155
155
|
- **assemble** — required: `rig_scale`, `plan` (from plain `assemble` on); optional: `seam`, `project`, `ground`, `extend_below_crop`, `patches`, `cuts`, `alternates`, `head_face_underfill`, `yield_refused`, `keep_under_occluders`, `extend_painting`, `take`, `editor_receipts`
|
|
156
156
|
- **assemble.alternates[i]** — required: `name`; optional: `source`, `full`, `head`, `parts`, `hides`, `head_box`, `cuts`, `skeleton`, `anchor`, `base_anchor`, `drawn`, `tips`, `front`, `layers`, `focus` (issues #454, #465, #543, #652, #664, #666, #719, #780). `focus` is an authored finite `[x, y]` in painting pixels, within its canvas (edges included), refused as CONFIG_SET_FOCUS before assemble output when invalid; only when present, `parts.json` records it with focus_source_size and `sets.json` emits it in setup-world coordinates through the actual rig resize and `src/coords.ts`. Absent focus emits no field or inferred value; changing/removing it requires reassembly
|
|
157
|
-
- **assemble.extend_below_crop[i]** — required: `part`, `run`, `tag`
|
|
157
|
+
- **assemble.extend_below_crop[i]** — required: `part`, `run`, `tag`; optional: `edges` (left, right, top, bottom; explicit edges require a head-run part and the full-run layer of the same tag)
|
|
158
158
|
- **assemble.extend_painting[i]** — required: `part`, `band`, `max_distance`; optional: `min_held_alpha`, `order` (issues #848, #854, #855; explicit final layer-derived part, half-open rig band and positive four-neighbour path bound; base painting only). The optional integer floor 1–255 admits exact original alpha-over coverage strictly below it; absent or 1 blocks every nonzero holder. Only selected target samples below the floor may take painting RGBA; target samples at/above the floor and every non-target holder remain exact. By default overlapping reachable claims refuse. With `order` on every entry (unique nonnegative safe integers), lower values claim first and their gains block later candidates and paths; array order never breaks ties or supplies missing precedence
|
|
159
159
|
- **assemble.take[i]** — required: `run`, `run_dir`, `st_input`; optional: `tags`, `part`, `seed`, `reference`, `crop` (issues #866, #973, #1000, #1031). Whole-layer entries require `tags`; region entries require `part` and `seed`. An absent `reference` preserves the shipped `source: true` predicate and emits one named implicit-reference warning; only an explicitly declared painting reference makes the mask invariant to changes in `--source`
|
|
160
160
|
- **assemble.take[i].crop** — required when present: `box`, `resample` (issue #973, additive, whole-layer entries only). `box` is an inside nonempty integer source-painting `[left, top, right, bottom]` with exclusive right/bottom. `resample: "bilinear"` is required explicitly. Donor input must match the square-padded crop under taken support plus its margin. Unit scale and integer translation copy RGBA exactly; other maps use the declared premultiplied float32 affine filter. Absent, the shipped geometry predicate and refusal message remain unchanged. Region entries reject this field
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "spine-parts",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.15.0",
|
|
4
4
|
"description": "AI-authored 2D character parts from one anime painting and its See-through layer decomposition: measured parts, weighted-mesh rig specs, verified through rig-c before anything is written. A CLI for agents that cannot see the image.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
package/src/assemble.ts
CHANGED
|
@@ -112,7 +112,7 @@ import { bindDepthRun, copyDepthMaterial, registerDepthRun, transportPartDepth,
|
|
|
112
112
|
* Pure: no clock, no randomness, no file access. The CLI reads and writes.
|
|
113
113
|
*/
|
|
114
114
|
import { sourceLimbTarget, nearestTargetPart } from './limbownership.ts';
|
|
115
|
-
import { type ArmSplit, type BoneEntry, type CharacterConfig, type ConfigConstraint, type ControlSkeleton, controlSkeletonOf, type Cut, type EarlyConfig, type Extend, type Limb, type MeshSpec, type Patch, type PlanEntry, type RegionSpec, type Run, type SeeThrough, turnMovingPartPair, type TurnSpec } from './config.ts';
|
|
115
|
+
import { type ArmSplit, type BoneEntry, type CharacterConfig, type ConfigConstraint, type ControlSkeleton, controlSkeletonOf, type CropEdge, type Cut, type EarlyConfig, type Extend, type Limb, type MeshSpec, type Patch, type PlanEntry, type RegionSpec, type Run, type SeeThrough, turnMovingPartPair, type TurnSpec } from './config.ts';
|
|
116
116
|
import { PartsError, type Problem, refuseIfAny } from './errors.ts';
|
|
117
117
|
import { CORE_ALPHA, figuresPhrase, implausibleRules, type Layer, type LayerFigures, layerFigures, type LayerSet, NEAR_WHITE_MIN, OPAQUE_ALPHA_ABOVE, ruleSummary } from './layers.ts';
|
|
118
118
|
import { padToSquare, squarePad } from './inputs.ts';
|
|
@@ -2415,6 +2415,86 @@ export function belowCrop(part: Raster, extra: Raster, headBottom: number): Mask
|
|
|
2415
2415
|
return sel;
|
|
2416
2416
|
}
|
|
2417
2417
|
|
|
2418
|
+
/** The declared crop rectangle, in rig pixels; the legacy inset bottom is separate. */
|
|
2419
|
+
export function cropBounds(frame: Pick<Frame, 'headBox' | 'S'>): [number, number, number, number] {
|
|
2420
|
+
return frame.headBox.map(v => v * frame.S) as [number, number, number, number];
|
|
2421
|
+
}
|
|
2422
|
+
|
|
2423
|
+
/** Copy full-run alpha >= 128 only where pixel centres lie outside the half-open crop. */
|
|
2424
|
+
export function beyondCrop(extra: Raster, box: readonly number[], edges: readonly CropEdge[]): Mask {
|
|
2425
|
+
const sel = newMask(extra.width, extra.height);
|
|
2426
|
+
const [left, top, right, bottom] = box;
|
|
2427
|
+
for (let y = 0; y < extra.height; y++) for (let x = 0; x < extra.width; x++) {
|
|
2428
|
+
const p = y * extra.width + x;
|
|
2429
|
+
if (extra.data[p * 4 + 3] < 128) continue;
|
|
2430
|
+
const cx = x + 0.5, cy = y + 0.5;
|
|
2431
|
+
if (edges.some(edge => edge === 'left' ? cx < left : edge === 'right' ? cx >= right : edge === 'top' ? cy < top : cy >= bottom)) sel.data[p] = 1;
|
|
2432
|
+
}
|
|
2433
|
+
return sel;
|
|
2434
|
+
}
|
|
2435
|
+
|
|
2436
|
+
/** Keep the original merge byte-for-byte when no explicit edge is declared. */
|
|
2437
|
+
function mergeCropEntries(part: Raster, extras: Raster[], front: Mask, srcr: Raster, frame: Frame, entries: Extend[], trace: MergeTrace, changed: (rigPixel: number, stage: 'extend' | 'growRim') => void): number {
|
|
2438
|
+
if (entries.every(e => e.edges === undefined)) return mergeBelowCrop(part, extras, front, srcr, frame.headBottom, trace, changed);
|
|
2439
|
+
let merged = 0;
|
|
2440
|
+
entries.forEach((entry, e) => {
|
|
2441
|
+
if (entry.edges === undefined) {
|
|
2442
|
+
const local: MergeTrace = { from: new Int32Array(part.width * part.height).fill(-1), ring: newMask(part.width, part.height) };
|
|
2443
|
+
merged = mergeBelowCrop(part, [extras[e]], front, srcr, frame.headBottom, local, changed);
|
|
2444
|
+
for (let p = 0; p < local.from.length; p++) if (local.from[p] >= 0) { trace.from[p] = e; trace.ring.data[p] = local.ring.data[p]; }
|
|
2445
|
+
trace.lastSel = local.lastSel;
|
|
2446
|
+
trace.lastRing = local.lastRing;
|
|
2447
|
+
return;
|
|
2448
|
+
}
|
|
2449
|
+
const sel = beyondCrop(extras[e], cropBounds(frame), entry.edges);
|
|
2450
|
+
merged = 0;
|
|
2451
|
+
for (let p = 0; p < sel.data.length; p++) {
|
|
2452
|
+
if (sel.data[p] === 0) continue;
|
|
2453
|
+
if (!rgbaEqual(part.data, p * 4, extras[e].data, p * 4)) changed(p, 'extend');
|
|
2454
|
+
part.data.set(extras[e].data.subarray(p * 4, p * 4 + 4), p * 4);
|
|
2455
|
+
trace.from[p] = e;
|
|
2456
|
+
trace.ring.data[p] = 0;
|
|
2457
|
+
merged++;
|
|
2458
|
+
}
|
|
2459
|
+
trace.lastSel = sel;
|
|
2460
|
+
trace.lastRing = newMask(part.width, part.height);
|
|
2461
|
+
});
|
|
2462
|
+
return merged;
|
|
2463
|
+
}
|
|
2464
|
+
|
|
2465
|
+
/** Informational line registered by the authoring rule ledger. */
|
|
2466
|
+
export const CROP_CLIPPED_LINE = 'ASSEMBLE_CROP_CLIPPED';
|
|
2467
|
+
|
|
2468
|
+
/** Name uncovered full-run support outside each head part's crop; no raster writes. */
|
|
2469
|
+
export function cropClippedLines(plan: readonly PlanEntry[], extend: readonly Extend[], rigOf: (run: Run, tag: string) => Raster | null, frame: Frame): string[] {
|
|
2470
|
+
const lines: string[] = [];
|
|
2471
|
+
const box = cropBounds(frame);
|
|
2472
|
+
const covered = planCoverage(plan, extend, (run, tag) => rigOf(run, tag)!, frame.headBottom, box);
|
|
2473
|
+
for (const [name, run, tag] of plan) {
|
|
2474
|
+
if (run !== 'head') continue;
|
|
2475
|
+
const extra = rigOf('full', tag), part = rigOf('head', tag);
|
|
2476
|
+
if (extra === null || part === null) continue;
|
|
2477
|
+
const legacy = belowCrop(part, extra, frame.headBottom);
|
|
2478
|
+
const counts: Record<CropEdge, number> = { left: 0, right: 0, top: 0, bottom: 0 };
|
|
2479
|
+
let total = 0, legacyPx = 0;
|
|
2480
|
+
for (let y = 0; y < extra.height; y++) for (let x = 0; x < extra.width; x++) {
|
|
2481
|
+
const p = y * extra.width + x;
|
|
2482
|
+
if (extra.data[p * 4 + 3] < 128 || covered[p] === 1) continue;
|
|
2483
|
+
const edges: CropEdge[] = [];
|
|
2484
|
+
if (x + 0.5 < box[0]) edges.push('left');
|
|
2485
|
+
if (x + 0.5 >= box[2]) edges.push('right');
|
|
2486
|
+
if (y + 0.5 < box[1]) edges.push('top');
|
|
2487
|
+
if (y + 0.5 >= box[3]) edges.push('bottom');
|
|
2488
|
+
if (edges.length === 0) continue;
|
|
2489
|
+
total++;
|
|
2490
|
+
for (const edge of edges) counts[edge]++;
|
|
2491
|
+
if (legacy.data[p] === 1) legacyPx++;
|
|
2492
|
+
}
|
|
2493
|
+
if (total > 0) lines.push(` ${CROP_CLIPPED_LINE}: part "${name}" (full:${tag}) has ${total} uncovered px at alpha >= 128 outside the head crop; edges ${Object.entries(counts).filter(([, n]) => n > 0).map(([e, n]) => `${e} ${n}`).join(', ')}; legacy extend_below_crop selects ${legacyPx}/${total} (bottom seeded components only; side/top require explicit edges)`);
|
|
2494
|
+
}
|
|
2495
|
+
return lines;
|
|
2496
|
+
}
|
|
2497
|
+
|
|
2418
2498
|
/**
|
|
2419
2499
|
* Close the half-pixel seam round a merged-in piece: the full run's silhouette
|
|
2420
2500
|
* is a few pixels narrower than the painting, and a renderer's sub-pixel
|
|
@@ -4628,6 +4708,8 @@ export interface AssembleResult {
|
|
|
4628
4708
|
edgeResiduals?: EdgeResidualReport;
|
|
4629
4709
|
/** Report-only source re-take under actual soft front support (#825). */
|
|
4630
4710
|
softOcclusion?: SoftOcclusionReading[];
|
|
4711
|
+
/** Informational only; never serialized into parts.json. */
|
|
4712
|
+
cropClipped?: string[];
|
|
4631
4713
|
parts: PartsFile;
|
|
4632
4714
|
/** In plan order, each cropped to its record's box. */
|
|
4633
4715
|
images: PlacedPart[];
|
|
@@ -5185,7 +5267,7 @@ function assembleParts(input: AssembleInput, targets?: ReadonlySet<string>, befo
|
|
|
5185
5267
|
const f = rig.get(`${run2}:${tag2}`) as Raster;
|
|
5186
5268
|
for (let p = 0; p < W * H; p++) if (f.data[p * 4 + 3] >= FRONT_ALPHA) front.data[p] = 1;
|
|
5187
5269
|
}
|
|
5188
|
-
merged =
|
|
5270
|
+
merged = mergeCropEntries(r, extras, front, srcr, frame, extend.filter(e => e.part === name), trace, (p, stage) => { writers[p] = AW[stage]; });
|
|
5189
5271
|
}
|
|
5190
5272
|
const { x1, opaque } = measureBox(r);
|
|
5191
5273
|
if (opaque === 0 && !emptyTargets?.has(name)) {
|
|
@@ -5924,6 +6006,7 @@ function assembleParts(input: AssembleInput, targets?: ReadonlySet<string>, befo
|
|
|
5924
6006
|
if (supportFigure !== undefined && supportSilhouette !== null) for (let p = 0; p < supportPainted.length; p++) supportFigure.data[p] = supportSilhouette.data[p] & supportPainted[p];
|
|
5925
6007
|
return {
|
|
5926
6008
|
...(softOcclusion.length === 0 ? {} : { softOcclusion }),
|
|
6009
|
+
...(!single ? { cropClipped: cropClippedLines(plan, extend, (run, tag) => rig.get(`${run}:${tag}`) ?? null, frame) } : {}),
|
|
5927
6010
|
parts: {
|
|
5928
6011
|
rig_size: [W, H],
|
|
5929
6012
|
scale_rig_per_source: frame.S,
|
|
@@ -6163,13 +6246,14 @@ export function bodyBox(b: UncoveredBody): string {
|
|
|
6163
6246
|
* plan takes `tag` from the head run; `why` is the proposer's reason for not
|
|
6164
6247
|
* proposing an extend entry, when the caller is the proposer.
|
|
6165
6248
|
*
|
|
6166
|
-
* ⚖️ Invariant:
|
|
6167
|
-
* takes no part from `tag`; it takes one from the head run and no
|
|
6249
|
+
* ⚖️ Invariant: the legacy path has four cases, decided in this order — the
|
|
6250
|
+
* plan takes no part from `tag`; it takes one from the head run and no
|
|
6168
6251
|
* `extend_below_crop` entry continues that part from the full run's `tag`;
|
|
6169
6252
|
* an entry does, and the head-run part has no pixel of alpha above
|
|
6170
6253
|
* `CROP_PROBE_ALPHA` on the probe row (`headBottom - CROP_PROBE_ROWS`), so
|
|
6171
6254
|
* `belowCrop` seeds nothing; or it reaches the line and the body is not one
|
|
6172
|
-
* of the components `belowCrop` seeds.
|
|
6255
|
+
* of the components `belowCrop` seeds. Explicit-edge entries instead name
|
|
6256
|
+
* their declared edges and alpha threshold; they do not use bottom seeding.
|
|
6173
6257
|
*/
|
|
6174
6258
|
export function skippedBy(tag: string, plan: readonly PlanEntry[], extend: readonly Extend[], headPart: Raster | null, headBottom: number, why: string | null): string {
|
|
6175
6259
|
const entry = plan.find((e) => e[2] === tag);
|
|
@@ -6179,6 +6263,11 @@ export function skippedBy(tag: string, plan: readonly PlanEntry[], extend: reado
|
|
|
6179
6263
|
if (!extend.some((e) => e.part === part && e.run === 'full' && e.tag === tag)) {
|
|
6180
6264
|
return `${taken}, and no extend_below_crop entry continues it from the full run${why === null ? '' : ` (${why})`}`;
|
|
6181
6265
|
}
|
|
6266
|
+
const explicit = extend.filter(e => e.part === part && e.run === 'full' && e.tag === tag && e.edges !== undefined);
|
|
6267
|
+
if (explicit.length > 0) {
|
|
6268
|
+
const edges = [...new Set(explicit.flatMap(e => e.edges ?? []))];
|
|
6269
|
+
return `${taken}; extend_below_crop edges [${edges.join(', ')}] copy full-run pixels at alpha >= 128 beyond the declared crop edges only; this body remains outside their coverage`;
|
|
6270
|
+
}
|
|
6182
6271
|
const probe = headBottom - CROP_PROBE_ROWS;
|
|
6183
6272
|
let reaches = false;
|
|
6184
6273
|
if (headPart !== null && probe >= 0 && probe < headPart.height) {
|
|
@@ -6243,7 +6332,7 @@ export function uncoveredLayers(
|
|
|
6243
6332
|
* push-back and the seam override add or clear along an outline — a pixel
|
|
6244
6333
|
* wide, below any body (`BODY_KERNEL`).
|
|
6245
6334
|
*/
|
|
6246
|
-
export function planCoverage(plan: readonly PlanEntry[], extend: readonly Extend[], rigOf: (run: Run, tag: string) => Raster, headBottom: number): Uint8Array {
|
|
6335
|
+
export function planCoverage(plan: readonly PlanEntry[], extend: readonly Extend[], rigOf: (run: Run, tag: string) => Raster, headBottom: number, box?: readonly number[]): Uint8Array {
|
|
6247
6336
|
let covered: Uint8Array | null = null;
|
|
6248
6337
|
const mark = (r: Raster, sel: Mask | null): void => {
|
|
6249
6338
|
if (covered === null) covered = new Uint8Array(r.width * r.height);
|
|
@@ -6255,7 +6344,7 @@ export function planCoverage(plan: readonly PlanEntry[], extend: readonly Extend
|
|
|
6255
6344
|
for (const e of extend) {
|
|
6256
6345
|
if (e.part !== name) continue;
|
|
6257
6346
|
const extra = rigOf(e.run, e.tag);
|
|
6258
|
-
mark(extra, belowCrop(part, extra, headBottom));
|
|
6347
|
+
mark(extra, e.edges === undefined ? belowCrop(part, extra, headBottom) : beyondCrop(extra, box!, e.edges));
|
|
6259
6348
|
}
|
|
6260
6349
|
}
|
|
6261
6350
|
return covered ?? new Uint8Array(0);
|
|
@@ -6669,9 +6758,31 @@ export function proposePlan(full0: LayerSet, head0: LayerSet, g: Geometry, minPx
|
|
|
6669
6758
|
}
|
|
6670
6759
|
return r;
|
|
6671
6760
|
};
|
|
6672
|
-
|
|
6761
|
+
// Explicit edges use the actual crop rectangle, never the legacy inset line.
|
|
6762
|
+
const box = cropBounds(frame);
|
|
6763
|
+
const edgeReaches = new Map<string, Record<CropEdge, number>>();
|
|
6764
|
+
for (const [name, run, tag] of plan) {
|
|
6765
|
+
if (run !== 'head' || !['front hair', 'back hair'].includes(tag) || find('full', tag) === undefined || noted.has(`full:${tag}`)) continue;
|
|
6766
|
+
const extra = rigOf('full', tag);
|
|
6767
|
+
const reach: Record<CropEdge, number> = { left: 0, right: 0, top: 0, bottom: 0 };
|
|
6768
|
+
for (let y = 0; y < extra.height; y++) for (let x = 0; x < extra.width; x++) {
|
|
6769
|
+
if (extra.data[(y * extra.width + x) * 4 + 3] < 128) continue;
|
|
6770
|
+
reach.left = Math.max(reach.left, box[0] - (x + 0.5));
|
|
6771
|
+
reach.right = Math.max(reach.right, x + 0.5 - box[2]);
|
|
6772
|
+
reach.top = Math.max(reach.top, box[1] - (y + 0.5));
|
|
6773
|
+
reach.bottom = Math.max(reach.bottom, y + 0.5 - box[3]);
|
|
6774
|
+
}
|
|
6775
|
+
edgeReaches.set(tag, reach);
|
|
6776
|
+
const edges = (['left', 'right', 'top'] as const).filter(edge => reach[edge] > 8);
|
|
6777
|
+
// Legacy bottom entries retain their inset line, seeding, rim and order.
|
|
6778
|
+
// Side/top continuation is additive; it never replaces that entry.
|
|
6779
|
+
if (edges.length > 0) extend.push({ part: name, run: 'full', tag, edges });
|
|
6780
|
+
}
|
|
6781
|
+
const covered = planCoverage(plan, extend, rigOf, frame.headBottom, box);
|
|
6673
6782
|
const minBody = bodyMinPx(frame, minPx);
|
|
6674
6783
|
const why = (tag: string): string => {
|
|
6784
|
+
const edge = edgeReaches.get(tag);
|
|
6785
|
+
if (edge !== undefined && (edge.left > 8 || edge.right > 8 || edge.top > 8)) return `the proposer continues ${tag} beyond each crop edge only when its full-run alpha >= 128 reaches more than 8 rig px beyond it; reaches ${Object.entries(edge).map(([name, px]) => `${name} ${px} rig px`).join(', ')}`;
|
|
6675
6786
|
if (!reaches.has(tag)) return 'the proposer continues only front hair and back hair below the head crop';
|
|
6676
6787
|
const r = reaches.get(tag);
|
|
6677
6788
|
return `the proposer continues ${tag} only when its full-run layer reaches more than 8 rig px below the crop line, rig row ${frame.headBottom}; it reaches ${r === null || r === undefined ? 'no row' : `rig row ${fmt0(r)}`}`;
|
package/src/build.ts
CHANGED
|
@@ -895,6 +895,7 @@ export function assembleStage(input: AssembleStageInput, outs: AssembleOutputs,
|
|
|
895
895
|
log(pinholesLine(pinholes, altBuilt.map((b) => b.record.name)));
|
|
896
896
|
for (const d of result.drift) log(driftLine(d));
|
|
897
897
|
for (const d of result.softOcclusion ?? []) log(softOcclusionLine(d));
|
|
898
|
+
for (const line of result.cropClipped ?? []) log(line);
|
|
898
899
|
// Issue #588: per subset set, one line per limb part cut from a layer of more than one island, then (issue #587) one
|
|
899
900
|
// per limb part and base part over it that took a pixel. None otherwise.
|
|
900
901
|
// Issue #609: then one per limb part cut from a layer of one island that also holds a limb the set does not carry.
|
package/src/config.ts
CHANGED
|
@@ -198,10 +198,15 @@ export type Run = 'full' | 'head';
|
|
|
198
198
|
/** One part: its name, which run it comes from, and the See-through tag it is. Order = draw order, back to front. */
|
|
199
199
|
export type PlanEntry = [string, Run, string];
|
|
200
200
|
|
|
201
|
+
export const CROP_EDGES = ['left', 'right', 'top', 'bottom'] as const;
|
|
202
|
+
export type CropEdge = typeof CROP_EDGES[number];
|
|
203
|
+
|
|
201
204
|
export interface Extend {
|
|
202
205
|
part: string;
|
|
203
206
|
run: Run;
|
|
204
207
|
tag: string;
|
|
208
|
+
/** Explicit crop edges; absent, retain the original below-crop component and rim rule. */
|
|
209
|
+
edges?: CropEdge[];
|
|
205
210
|
}
|
|
206
211
|
|
|
207
212
|
/** Which pixels of a patch's box it takes: the painting's figure silhouette inside the box, or the whole box. */
|
|
@@ -2645,9 +2650,18 @@ function checkAssemble(c: Check, v: Json, door: 'assemble' | 'full'): { parts: s
|
|
|
2645
2650
|
if ('extend_below_crop' in a && c.array(`${p}.extend_below_crop`, a.extend_below_crop, false)) {
|
|
2646
2651
|
(a.extend_below_crop as Json[]).forEach((entry, i) => {
|
|
2647
2652
|
const at = `${p}.extend_below_crop[${i}]`;
|
|
2648
|
-
const e = c.object(at, entry, ['part', 'run', 'tag'], []);
|
|
2653
|
+
const e = c.object(at, entry, ['part', 'run', 'tag'], ['edges']);
|
|
2649
2654
|
if (e === null) return;
|
|
2650
2655
|
checkRunTag(c, at, e.run, e.tag);
|
|
2656
|
+
if ('edges' in e && c.array(`${at}.edges`, e.edges, true)) {
|
|
2657
|
+
const edges = e.edges as Json[];
|
|
2658
|
+
edges.forEach((edge, j) => {
|
|
2659
|
+
if (typeof edge !== 'string' || !CROP_EDGES.includes(edge as CropEdge)) c.fail('CONFIG_FIELD_TYPE', `${at}.edges[${j}]`, `is ${show(edge)}; left, right, top or bottom is required`);
|
|
2660
|
+
else if (edges.indexOf(edge) !== j) c.fail('CONFIG_FIELD_TYPE', `${at}.edges[${j}]`, `repeats ${show(edge)}; each crop edge is declared once`);
|
|
2661
|
+
});
|
|
2662
|
+
const row = Array.isArray(a.plan) ? a.plan.find(row => Array.isArray(row) && row[0] === e.part) as Json[] | undefined : undefined;
|
|
2663
|
+
if (e.run !== 'full' || row?.[1] !== 'head' || row?.[2] !== e.tag) c.fail('CONFIG_NAME_RESOLVES', at, 'explicit crop edges require a head-run plan part and the full-run layer of the same tag');
|
|
2664
|
+
}
|
|
2651
2665
|
if (typeof e.part !== 'string' || !parts.includes(e.part)) {
|
|
2652
2666
|
c.fail('CONFIG_NAME_RESOLVES', `${at}.part`, `is ${show(e.part)}; a part named in assemble.plan is required`);
|
|
2653
2667
|
}
|