Keep Jade bun and Indigo crop as the flat Sun Salutation characters

The owner chose Jade bun for women and Indigo crop for men; the other
candidates and the shapes only they used are gone.
This commit is contained in:
waozi committed 2026-10-15 20:13:34 -03:00
1 parent bb01ab867d
commit 0f68c8907d
3 files changed
+16 -90

No files matched your search

+3 -15
View File
@@ -3,23 +3,11 @@
"background": "#eef2ef",
"shadow": "#1e4a40",
"characters": [
{"id": "jade-bun", "name": "Jade bun (new)", "torso": "tunic", "legs": "loose", "sleeves": "bell",
{"id": "jade-bun", "name": "Jade bun", "torso": "tunic", "legs": "loose", "sleeves": "bell",
"face": "female", "hair": "bunLong",
"colors": {"skin": "#f1c7a6", "hair": "#2a2238", "top": "#3f8f7a", "pants": "#2e3d63", "cuff": "#2e3d63", "accent": "#f2a65e"}},
{"id": "sunrise-ponytail", "name": "Sunrise ponytail", "torso": "fitted", "legs": "leggings", "sleeves": "fitted",
"face": "female", "hair": "ponytail",
"colors": {"skin": "#f2c9ab", "hair": "#c98a4b", "top": "#6e98a3", "pants": "#8a9a78", "cuff": "#5d8590", "accent": "#f2a65e"}},
{"id": "sage-bun", "name": "Sage bun", "torso": "fitted", "legs": "leggings", "sleeves": "fitted",
"face": "female", "hair": "bun",
"colors": {"skin": "#dfa47c", "hair": "#7f4329", "top": "#efe2cf", "pants": "#6f8f5e", "cuff": "#ddcdb5", "accent": "#f2a65e"}},
{"id": "rust-short", "name": "Rust short hair (male)", "torso": "male", "legs": "leggings", "sleeves": "fittedMale",
"face": "male", "hair": "short",
"colors": {"skin": "#f3c4a3", "hair": "#b06c3b", "top": "#ad5236", "pants": "#4d4a4f", "cuff": "#94452d", "accent": "#f2a65e"}},
{"id": "indigo-crop", "name": "Indigo crop (male)", "torso": "male", "legs": "trousers", "sleeves": "fittedMale",
{"id": "indigo-crop", "name": "Indigo crop", "torso": "male", "legs": "trousers", "sleeves": "fitted",
"face": "male", "hair": "crop",
"colors": {"skin": "#e6aa7c", "hair": "#7a4a2e", "top": "#4f5c94", "pants": "#c4ab78", "cuff": "#424e80", "accent": "#f2a65e"}},
{"id": "lake-short", "name": "Lake short hair (new, male)", "torso": "tunicMale", "legs": "loose", "sleeves": "bellMale",
"face": "male", "hair": "short",
"colors": {"skin": "#d9a07c", "hair": "#2a2238", "top": "#3f6f8f", "pants": "#6e4c36", "cuff": "#6e4c36", "accent": "#f2a65e"}}
"colors": {"skin": "#e6aa7c", "hair": "#7a4a2e", "top": "#4f5c94", "pants": "#c4ab78", "cuff": "#424e80", "accent": "#f2a65e"}}
]
}
+8 -7
View File
@@ -9,10 +9,10 @@ painted animation; only the drawing differs.
```sh
python3 scripts/render-sun-salutation-flat.py # first character's video
python3 scripts/render-sun-salutation-flat.py --character sage-bun # one character
python3 scripts/render-sun-salutation-flat.py --character indigo-crop # one character
python3 scripts/render-sun-salutation-flat.py --all # every character
python3 scripts/render-sun-salutation-flat.py --grid # all side by side, numbered
python3 scripts/render-sun-salutation-flat.py --character sage-bun --still 25.5
python3 scripts/render-sun-salutation-flat.py --character indigo-crop --still 25.5
```
Videos go straight into `build/sun-salutation-flat/` as `<id>.mp4` and
@@ -23,7 +23,8 @@ libx264, and the girl renderer's NumPy and Pillow for its import.
## Characters
`docs/sun-salutation-flat.json` lists the characters. Each picks a torso,
`docs/sun-salutation-flat.json` lists the characters: Jade bun for women
and Indigo crop for men (owner's choice, 2026-10-15). Each picks a torso,
legs, sleeves, face and hair by name and gives its colours: skin, hair, top,
pants, the sleeve cuff and the small light orange accent (hair ties). Far
limbs, shades and hair highlights are derived from those colours.
@@ -31,13 +32,13 @@ limbs, shades and hair highlights are derived from those colours.
The shapes behind those names are tables in the script:
- `TORSOS`: the top's outline along the spine, its hem band, the seat and
the neck base (`tunic`, `tunicMale`, `fitted`, `male`).
the neck base (`tunic`, `male`).
- `LEGS` and `SLEEVES`: limb radii, where trousers and sleeves end and their
bands (`loose`, `leggings`, `trousers`; `bell`, `fitted` and male widths).
bands (`loose`, `trousers`; `bell`, `fitted`).
- `FACES`: the profile, scale, neck, blush, brow and mouth (`female`, `male`).
- `HAIRS`: the cap, an optional bun and an optional hanging strand that
swings with the hair simulation (`bunLong`, `ponytail`, `bun`, `crop`,
`short`). Men use short styles without swinging hair.
swings with the hair simulation (`bunLong`, `crop`). Men have short hair
that never swings: no ponytails or buns.
Limbs are hulls of circles along their bones, and parts of one colour fill as
one shape, so joints never show seams. Feet solve their own floor contact:
+5 -68
View File
@@ -214,26 +214,6 @@ TORSOS = {
"seat": ((-2, -8), 20),
"neck": (114, 2),
},
"tunicMale": {
"outline": [
(-12, 33, 0), (10, 28), (40, 25), (72, 27), (97, 25.5), (110, 14.5), (116.5, 7),
(118, -7), (114.5, -19), (98, -27), (68, -25), (40, -23.5), (12, -29),
(-14, -36, 0), (-16.5, -2),
],
"hem": [(-9, -50), (-11.5, -2), (-7, 50)],
"seat": ((-2, -8), 20),
"neck": (115, 1.5),
},
"fitted": {
"outline": [
(-7, 24, 0), (12, 21), (40, 17.5), (64, 20), (80, 23.5), (98, 18.5), (111, 10),
(116.5, 4), (117.5, -6), (114, -14.5), (98, -21), (70, -19), (42, -17.5),
(16, -22.5), (-9, -27.5, 0), (-10.5, -2),
],
"hem": [(-4.5, -50), (-6.5, -2), (-3, 50)],
"seat": ((-2, -9), 19),
"neck": (114, 2),
},
"male": {
"outline": [
(-7, 24, 0), (12, 22), (42, 21), (72, 24.5), (98, 24), (111, 14), (116.5, 6),
@@ -252,7 +232,6 @@ TORSOS = {
LEGS = {
"loose": {"thigh": (19.5, 17.5, 14.0), "shin": (14.0, 13.6), "end": (12, 11.5),
"band": (13, 4.5, 9.4, 9.0)},
"leggings": {"thigh": (18.0, 15.8, 11.4), "shin": (11.2, 11.9), "end": (3.5, 7.8), "band": None},
"trousers": {"thigh": (19.0, 17.0, 13.2), "shin": (13.0, 12.6), "end": (4.5, 10.6),
"band": (10, 4.5, 10.6, 10.6)},
}
@@ -262,9 +241,7 @@ LEGS = {
# cuff band (from, to units before the wrist, half widths).
SLEEVES = {
"bell": {"upper": (11.2, 10.6, 8.8), "elbow": 8.6, "end": (6, 10.4), "cuff": (6.5, 0.5, 10.3, 11.4)},
"bellMale": {"upper": (12.2, 11.6, 9.6), "elbow": 9.4, "end": (6, 11.2), "cuff": (6.5, 0.5, 11.1, 12.2)},
"fitted": {"upper": (10.2, 9.6, 7.6), "elbow": 7.4, "end": (1.5, 6.4), "cuff": (5.5, 1.5, 6.5, 6.6)},
"fittedMale": {"upper": (11.4, 10.8, 8.6), "elbow": 8.4, "end": (1.5, 7.2), "cuff": (5.5, 1.5, 7.3, 7.4)},
"fitted": {"upper": (11.4, 10.8, 8.6), "elbow": 8.4, "end": (1.5, 7.2), "cuff": (5.5, 1.5, 7.3, 7.4)},
}
# Heads, in their own frame: the neck base at the origin, facing +x, up is
@@ -310,30 +287,9 @@ HAIRS = {
],
"bun": ((-7.5, -89), 15),
"strand": {"roots": [(-20.5, -40), (-17, -30)], "count": 9,
"width": [(0, 11), (0.5, 7.4), (1, 3.5)], "tie": False},
"width": [(0, 11), (0.5, 7.4), (1, 3.5)]},
"ear": False,
},
"ponytail": {
"cap": [
(26, -63.5), (30.5, -56.5, 0), (22, -58.5), (14, -55.5), (8, -51), (4, -49.5),
(-3, -51.5), (-8, -46), (-12, -35), (-19, -30), (-27, -38), (-30.5, -52),
(-25, -69), (-8, -81), (12, -79.5),
],
"bun": None,
"strand": {"roots": [(-25, -57), (-29.5, -52)], "count": 7,
"width": [(0, 5), (0.08, 5.5), (0.3, 9.5), (0.75, 6), (1, 2.2)], "tie": True},
"ear": True,
},
"bun": {
"cap": [
(26, -63.5), (30.5, -56.5, 0), (22, -58.5), (14, -55.5), (8, -51), (4, -49.5),
(-3, -51.5), (-8, -46), (-12, -35), (-19, -30), (-27, -38), (-30.5, -52),
(-25, -69), (-8, -81), (12, -79.5),
],
"bun": ((-20, -75), 13),
"strand": None,
"ear": True,
},
"crop": {
"cap": [
(25, -67), (31.5, -64.5, 0), (23, -62), (14, -58), (9, -52), (7.5, -44), (8, -38.5, 0),
@@ -344,16 +300,6 @@ HAIRS = {
"strand": None,
"ear": True,
},
"short": {
"cap": [
(25, -66), (28, -62.5, 0), (19, -62), (12, -57), (8.5, -50), (7.5, -44), (8, -39, 0),
(4, -44), (-2, -51), (-9, -46), (-13, -36), (-20, -36.5), (-25.5, -47), (-25.5, -63),
(-12, -80.5), (8, -82), (20, -77),
],
"bun": None,
"strand": None,
"ear": True,
},
}
# The far arm sits only a little behind the near one, so praying hands overlap.
@@ -700,16 +646,6 @@ class Figure:
if hairstyle["ear"]:
fill(ctx, [head(smooth(EAR))], colors["skin"])
stroke(ctx, head(smooth(EAR_FOLD, closed=False, samples=4)), colors["mouth"], 1.0)
strand = hairstyle["strand"]
if strand and strand["tie"]:
# The tie wraps the strand a little below where it leaves the head.
points = self.hair.points
direction = GIRL.normalize(sub(points[2], points[1]))
normal = (direction[1], -direction[0])
center = add(points[1], mul(direction, 1.5))
half = strand["width"][1][1] - 1.2
stroke(ctx, [add(center, mul(normal, half)), sub(center, mul(normal, half))],
colors["accent"], 4.4)
def draw_bun_details(self, ctx, head):
"""Wrapped strands across the bun, and the tie where it meets the head."""
@@ -810,9 +746,10 @@ def render(rig, style, character, output, width, height, fps):
encode(rig, timeline, output / f"{character['id']}.mp4", width, height, fps, frames)
def render_grid(rig, style, characters, output, width, height, fps, columns=3):
"""All characters side by side, numbered, to choose between them."""
def render_grid(rig, style, characters, output, width, height, fps):
"""All characters side by side, numbered, to compare them."""
figures = [Figure(rig, style, character, width, height, fps) for character in characters]
columns = min(3, len(figures))
rows = math.ceil(len(figures) / columns)
grid = cairo.ImageSurface(cairo.FORMAT_ARGB32, width * columns, height * rows)
ctx = cairo.Context(grid)