From df2629af163164f3999fe976797182165cdd8479 Mon Sep 17 00:00:00 2001 From: Jeremy Kashkett Date: Thu, 16 Jul 2026 14:48:52 -0700 Subject: [PATCH] feat(naming): adopt war_dance_01, fertility_dance_01, taming_dance_01 hakadance1->war_dance_01, aloha1->fertility_dance_01, dance1->taming_dance_01, each with a _pp loop variant (all SMOOTH per loop_qc). Loop rule: every adopted dance ships base + _pp pair. GLM trim+blend loop variants archived (ping-pong is the loop standard). Co-Authored-By: Claude Fable 5 --- .claude/skills/animation/SKILL.md | 2 ++ {exchange => archive}/looped-glb/aloha1.glb | 0 {exchange => archive}/looped-glb/dance1.glb | 0 {exchange => archive}/looped-glb/hakadance1.glb | 0 docs/dances/REGISTRY.md | 16 +++++++++------- exchange/converted-glb/aloha1.glb | 3 --- exchange/converted-glb/dance1.glb | 3 --- exchange/converted-glb/fertility_dance_01.glb | 3 +++ exchange/converted-glb/hakadance1.glb | 3 --- exchange/converted-glb/taming_dance_01.glb | 3 +++ exchange/converted-glb/war_dance_01.glb | 3 +++ exchange/pingpong-glb/aloha1_pp.glb | 3 --- exchange/pingpong-glb/dance1_pp.glb | 3 --- exchange/pingpong-glb/fertility_dance_01_pp.glb | 3 +++ exchange/pingpong-glb/taming_dance_01_pp.glb | 3 +++ exchange/pingpong-glb/war_dance_01_pp.glb | 3 +++ 16 files changed, 29 insertions(+), 22 deletions(-) rename {exchange => archive}/looped-glb/aloha1.glb (100%) rename {exchange => archive}/looped-glb/dance1.glb (100%) rename {exchange => archive}/looped-glb/hakadance1.glb (100%) delete mode 100644 exchange/converted-glb/aloha1.glb delete mode 100644 exchange/converted-glb/dance1.glb create mode 100644 exchange/converted-glb/fertility_dance_01.glb delete mode 100644 exchange/converted-glb/hakadance1.glb create mode 100644 exchange/converted-glb/taming_dance_01.glb create mode 100644 exchange/converted-glb/war_dance_01.glb delete mode 100644 exchange/pingpong-glb/aloha1_pp.glb delete mode 100644 exchange/pingpong-glb/dance1_pp.glb create mode 100644 exchange/pingpong-glb/fertility_dance_01_pp.glb create mode 100644 exchange/pingpong-glb/taming_dance_01_pp.glb create mode 100644 exchange/pingpong-glb/war_dance_01_pp.glb diff --git a/.claude/skills/animation/SKILL.md b/.claude/skills/animation/SKILL.md index 8411318..decbf74 100644 --- a/.claude/skills/animation/SKILL.md +++ b/.claude/skills/animation/SKILL.md @@ -14,6 +14,8 @@ This skill is the accumulated **do-it-this-way** knowledge from real runs. 1. **Pull first.** `git pull` (or `tinqs pull`) — incoming FBX + textures + JSON land in `exchange/incoming-fbx/`. 2. **Retarget each FBX** with the exact command below → GLB in `exchange/converted-glb/`. + **Every dance ships as a pair**: also bake its loop variant with + `tools/pingpong_bake.py` → `exchange/pingpong-glb/_pp.glb` (clip `PP`). 3. **Commit + push the GLBs** in *this* repo (use `tinqs push`, not raw `git push` — it self-heals auth and uploads LFS direct-to-S3). 4. **Copy GLBs into ariki-game** `assets/quaternius/dancegen/`, write a dance JSON per clip. 5. **Loop QC gate** — run `loop_qc.py` on each converted GLB (see below). Flag anything that isn't smooth *before* it ships. diff --git a/exchange/looped-glb/aloha1.glb b/archive/looped-glb/aloha1.glb similarity index 100% rename from exchange/looped-glb/aloha1.glb rename to archive/looped-glb/aloha1.glb diff --git a/exchange/looped-glb/dance1.glb b/archive/looped-glb/dance1.glb similarity index 100% rename from exchange/looped-glb/dance1.glb rename to archive/looped-glb/dance1.glb diff --git a/exchange/looped-glb/hakadance1.glb b/archive/looped-glb/hakadance1.glb similarity index 100% rename from exchange/looped-glb/hakadance1.glb rename to archive/looped-glb/hakadance1.glb diff --git a/docs/dances/REGISTRY.md b/docs/dances/REGISTRY.md index f41f383..0574dd8 100644 --- a/docs/dances/REGISTRY.md +++ b/docs/dances/REGISTRY.md @@ -28,6 +28,8 @@ renamed once Jeremy says which ceremony it corresponds to. Rename with: …then rename the dance JSON (+ its `name` and `clip` fields) in ariki-game, re-run `game.sh import`, and `git mv` the old files out. Update the row below. +**Loop rule.** Every adopted dance ships as a PAIR: the base clip (`war_dance_01`) plus its ping-pong loop variant (`war_dance_01_pp` / `WarDance01PP`, baked with `tools/pingpong_bake.py`, must pass `loop_qc.py`). No adoption is complete without the loop. + **Archive.** Rejected/superseded takes move to `archive/` (this repo) and `archive/dances/` (ariki-game, `.gdignore`d) — never deleted, never renamed. @@ -38,11 +40,11 @@ renamed once Jeremy says which ceremony it corresponds to. Rename with: | `water_dance_01` | 1 | awaiting take | — | | `fire_dance_01` | 1 | awaiting take | — (the old "firedance1" was mislabeled dance1 choreography) | | `tide_dance_01` | 1 | awaiting take | — | -| `fertility_dance_01` | 1 | awaiting take | candidate: aloha1 (hula) | -| `food_dance_01` | 1 | awaiting take | candidate: aloha1 / dance1 | -| `taming_dance_01` | 1 | awaiting take | — | +| `fertility_dance_01` | 1 | **adopted** 2026-07-16 | aloha1 (hula) — shipped with `_pp` loop | +| `food_dance_01` | 1 | awaiting take | — | +| `taming_dance_01` | 1 | **adopted** 2026-07-16 | dance1 — shipped with `_pp` loop | | `sailing_dance_01` | 2 | awaiting take | — | -| `war_dance_01` | 2 | awaiting take | candidate: hakadance1 (haka) | +| `war_dance_01` | 2 | **adopted** 2026-07-16 | hakadance1 (haka) — shipped with `_pp` loop | | `building_dance_01` | 2 | awaiting take | — | | `colony_shield_dance_01` | 2 | awaiting take | — | | `age_progression_dance_01` | 3 | awaiting take | — (gates Age advancement) | @@ -53,9 +55,9 @@ renamed once Jeremy says which ceremony it corresponds to. Rename with: | id | status | pack(s) | clip | origin take | notes | |---|---|---|---|---|---| -| — | **candidate** (legacy name) | `aloha1`, `aloha1_pp` | `Aloha1`, `Aloha1PP` | aloha1 (iClone, 2026-07-15) | hula; rename to `hula##` on adoption | -| — | **candidate** (legacy name) | `dance1`, `dance1_pp` | `Dance1`, `Dance1PP` | dance1 (iClone, 2026-07-15) | rename on adoption | -| — | **candidate** (legacy name) | `hakadance1` | `HakaDance1` | hakadance1 (iClone, 2026-07-15) | haka; rename to `haka##` on adoption | +| fertility_dance_01 | **adopted** | `fertility_dance_01`, `fertility_dance_01_pp` | `FertilityDance01`, `FertilityDance01PP` | aloha1 (iClone, 2026-07-15) | hula | +| taming_dance_01 | **adopted** | `taming_dance_01`, `taming_dance_01_pp` | `TamingDance01`, `TamingDance01PP` | dance1 (iClone, 2026-07-15) | | +| war_dance_01 | **adopted** | `war_dance_01`, `war_dance_01_pp` | `WarDance01`, `WarDance01PP` | hakadance1 (iClone, 2026-07-15) | haka | | — | archived | `hakadance2` | `HakaDance2` | hakadance2 | near-duplicate of hakadance1 take family | | — | archived | `alohaOG` | `AlohaOG` | alohaOG | superseded by aloha1 | | — | archived | `firedance1` | `FireDance1` | firedance1 | **same choreography as dance1** — mislabeled export | diff --git a/exchange/converted-glb/aloha1.glb b/exchange/converted-glb/aloha1.glb deleted file mode 100644 index 0967a60..0000000 --- a/exchange/converted-glb/aloha1.glb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13b6cfeb07b0726f22e4b1c28fecee6eb3fc85c94f5b3f895134d0fdb4e183b0 -size 4751244 diff --git a/exchange/converted-glb/dance1.glb b/exchange/converted-glb/dance1.glb deleted file mode 100644 index 1e998e9..0000000 --- a/exchange/converted-glb/dance1.glb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fa962e73069b363018444523d88006389902a5438166cfacc4c0b2a6ad09ab8 -size 4751244 diff --git a/exchange/converted-glb/fertility_dance_01.glb b/exchange/converted-glb/fertility_dance_01.glb new file mode 100644 index 0000000..38f5a12 --- /dev/null +++ b/exchange/converted-glb/fertility_dance_01.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:494b587126edcf10dde4c99c1b46db85b054dda4f70fa884c877b70fb4f56f44 +size 1938680 diff --git a/exchange/converted-glb/hakadance1.glb b/exchange/converted-glb/hakadance1.glb deleted file mode 100644 index 18d580d..0000000 --- a/exchange/converted-glb/hakadance1.glb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:701ba6ef5424055e2a1a6cfe38c0db9c657593ff13a1d6e73f29ee283f94cca9 -size 4751248 diff --git a/exchange/converted-glb/taming_dance_01.glb b/exchange/converted-glb/taming_dance_01.glb new file mode 100644 index 0000000..34eb7a6 --- /dev/null +++ b/exchange/converted-glb/taming_dance_01.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a6a80e682913a6b3432ca47670a73459e99f98a6a33a2f7f9f5da9a495407e2 +size 1938676 diff --git a/exchange/converted-glb/war_dance_01.glb b/exchange/converted-glb/war_dance_01.glb new file mode 100644 index 0000000..d3ab1aa --- /dev/null +++ b/exchange/converted-glb/war_dance_01.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f97282089387a611e04bd68ac5984229281f4b622f6d4b4f33a9ee2f22a7c62 +size 1938672 diff --git a/exchange/pingpong-glb/aloha1_pp.glb b/exchange/pingpong-glb/aloha1_pp.glb deleted file mode 100644 index 0c87762..0000000 --- a/exchange/pingpong-glb/aloha1_pp.glb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16572122cfc1ade5f4f94108001f0e1b518bb82d2cc0cc000262ffa1025fabe8 -size 3816524 diff --git a/exchange/pingpong-glb/dance1_pp.glb b/exchange/pingpong-glb/dance1_pp.glb deleted file mode 100644 index 6dc4824..0000000 --- a/exchange/pingpong-glb/dance1_pp.glb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:137e45aacf167c02904ed41277b5d22047eedc673ec0c6a068bf8747d8a6bb1e -size 3816524 diff --git a/exchange/pingpong-glb/fertility_dance_01_pp.glb b/exchange/pingpong-glb/fertility_dance_01_pp.glb new file mode 100644 index 0000000..6b7d47a --- /dev/null +++ b/exchange/pingpong-glb/fertility_dance_01_pp.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fcc54fa73294457f934286cb675d25a2496bcd688905f1930a6d1636db02442 +size 3816464 diff --git a/exchange/pingpong-glb/taming_dance_01_pp.glb b/exchange/pingpong-glb/taming_dance_01_pp.glb new file mode 100644 index 0000000..99c9198 --- /dev/null +++ b/exchange/pingpong-glb/taming_dance_01_pp.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fb5c5f87f333c9dd1cf8d5f95950d6a62c8c92d5c4e2518ab9be4329ab04888 +size 3816460 diff --git a/exchange/pingpong-glb/war_dance_01_pp.glb b/exchange/pingpong-glb/war_dance_01_pp.glb new file mode 100644 index 0000000..3c8cb14 --- /dev/null +++ b/exchange/pingpong-glb/war_dance_01_pp.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b279e71e072bda919b1aa3b2943b6beb652c5ffef3a7d0d380bd9acee6d0309 +size 3811264