castle-web-cli 0.4.232 → 0.4.233

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.
Files changed (355) hide show
  1. package/dist/agent-failures.d.ts +8 -0
  2. package/dist/agent-failures.js +19 -2
  3. package/dist/agent-prompts.d.ts +1 -1
  4. package/dist/agent-prompts.js +10 -3
  5. package/dist/agent.d.ts +64 -3
  6. package/dist/agent.js +170 -81
  7. package/dist/castle-host/host.d.ts +1 -0
  8. package/dist/castle-host/host.js +51 -3
  9. package/dist/castleJson.d.ts +4 -2
  10. package/dist/castleJson.js +2 -0
  11. package/dist/check.d.ts +3 -1
  12. package/dist/check.js +11 -1
  13. package/dist/devSessionStorage.js +47 -1
  14. package/dist/importPinMismatch.d.ts +22 -0
  15. package/dist/importPinMismatch.js +77 -0
  16. package/dist/importRegression.js +3 -15
  17. package/dist/imports.d.ts +10 -3
  18. package/dist/imports.js +88 -20
  19. package/dist/index.js +5 -4
  20. package/dist/init.js +1 -1
  21. package/dist/platformDoc.js +22 -0
  22. package/dist/routerFences.d.ts +5 -0
  23. package/dist/routerFences.js +12 -2
  24. package/dist/save-deck.d.ts +5 -0
  25. package/dist/save-deck.js +37 -4
  26. package/dist/serve.js +3 -0
  27. package/dist/shell/assets/{index-D2tWM896.js → index-BjOxR-lW.js} +4 -4
  28. package/dist/shell/assets/index-MVLfNYd9.css +1 -0
  29. package/dist/shell/index.html +2 -2
  30. package/dist/taskSteer.d.ts +13 -0
  31. package/dist/taskSteer.js +22 -2
  32. package/kits/base/castle.json +1 -1
  33. package/kits/base/package-lock.json +1 -1
  34. package/kits/base/sdk/README.md +79 -2
  35. package/kits/base/sdk/avatar.d.ts +6 -2
  36. package/kits/base/sdk/avatar.js +12 -4
  37. package/kits/base/sdk/castle.d.ts +1 -1
  38. package/kits/base/sdk/commands.d.ts +14 -0
  39. package/kits/base/sdk/hub.d.ts +6 -2
  40. package/kits/base/sdk/hub.js +13 -0
  41. package/kits/base/sdk/multiplayer.js +17 -1
  42. package/kits/base/sdk/save.js +2 -1
  43. package/kits/base/sdk/server/hub.d.ts +87 -0
  44. package/kits/base/sdk/server/hub.js +70 -0
  45. package/kits/base/sdk/server/platformHandle.d.ts +31 -1
  46. package/kits/base/sdk/server/storage.d.ts +13 -0
  47. package/kits/base/sdk/server/storage.js +46 -0
  48. package/kits/base/sdk/server/wrapper.d.ts +36 -5
  49. package/kits/base/sdk/server/wrapper.js +83 -8
  50. package/kits/hub-game/CLAUDE.md +329 -11
  51. package/kits/hub-game/blueprints/avatar-10.scene +28 -0
  52. package/kits/hub-game/blueprints/avatar-11.scene +28 -0
  53. package/kits/hub-game/blueprints/avatar-12.scene +28 -0
  54. package/kits/hub-game/blueprints/avatar-13.scene +28 -0
  55. package/kits/hub-game/blueprints/avatar-14.scene +28 -0
  56. package/kits/hub-game/blueprints/avatar-15.scene +28 -0
  57. package/kits/hub-game/blueprints/avatar-4.scene +28 -0
  58. package/kits/hub-game/blueprints/avatar-5.scene +28 -0
  59. package/kits/hub-game/blueprints/avatar-6.scene +28 -0
  60. package/kits/hub-game/blueprints/avatar-7.scene +28 -0
  61. package/kits/hub-game/blueprints/avatar-8.scene +28 -0
  62. package/kits/hub-game/blueprints/avatar-9.scene +28 -0
  63. package/kits/hub-game/code/client/actorBudget.js +47 -0
  64. package/kits/hub-game/code/client/attention.js +11 -2
  65. package/kits/hub-game/code/client/avatar.js +309 -35
  66. package/kits/hub-game/code/client/avatarCap.js +228 -0
  67. package/kits/hub-game/code/client/avatarColors.js +70 -0
  68. package/kits/hub-game/code/client/avatarFaces.js +21 -0
  69. package/kits/hub-game/code/client/avatarShare.js +251 -0
  70. package/kits/hub-game/code/client/ballot.js +467 -0
  71. package/kits/hub-game/code/client/build.js +22 -0
  72. package/kits/hub-game/code/client/chrome.js +1144 -50
  73. package/kits/hub-game/code/client/companion.js +716 -0
  74. package/kits/hub-game/code/client/companionDress.js +99 -0
  75. package/kits/hub-game/code/client/decor.js +509 -0
  76. package/kits/hub-game/code/client/earned.js +131 -0
  77. package/kits/hub-game/code/client/emoteBubble.js +75 -0
  78. package/kits/hub-game/code/client/grab.js +339 -20
  79. package/kits/hub-game/code/client/hookLayer.js +299 -13
  80. package/kits/hub-game/code/client/idle.js +163 -22
  81. package/kits/hub-game/code/client/interestCap.js +81 -0
  82. package/kits/hub-game/code/client/keys.js +36 -0
  83. package/kits/hub-game/code/client/labelsNear.js +205 -0
  84. package/kits/hub-game/code/client/menuIcons.js +34 -0
  85. package/kits/hub-game/code/client/pack.js +6 -2
  86. package/kits/hub-game/code/client/packFormat.js +3 -3
  87. package/kits/hub-game/code/client/rehello.js +167 -0
  88. package/kits/hub-game/code/client/shot.js +92 -0
  89. package/kits/hub-game/code/client/sound.js +63 -8
  90. package/kits/hub-game/code/client/soundscape.js +1151 -0
  91. package/kits/hub-game/code/client/soundscapeActions.js +99 -0
  92. package/kits/hub-game/code/client/soundscapeAmbience.js +453 -0
  93. package/kits/hub-game/code/client/soundscapeBaked.js +143 -0
  94. package/kits/hub-game/code/client/soundscapeBusker.js +217 -0
  95. package/kits/hub-game/code/client/soundscapeCourt.js +200 -0
  96. package/kits/hub-game/code/client/soundscapeCrowd.js +331 -0
  97. package/kits/hub-game/code/client/soundscapeCues.js +362 -0
  98. package/kits/hub-game/code/client/soundscapeMap.js +181 -0
  99. package/kits/hub-game/code/client/soundscapeMarket.js +176 -0
  100. package/kits/hub-game/code/client/soundscapeMusic.js +126 -0
  101. package/kits/hub-game/code/client/soundscapeMusicEngine.js +460 -0
  102. package/kits/hub-game/code/client/soundscapeSimlish.js +737 -0
  103. package/kits/hub-game/code/client/soundscapeSongs.js +127 -0
  104. package/kits/hub-game/code/client/soundscapeSongsRound3.js +63 -0
  105. package/kits/hub-game/code/client/soundscapeSynthesis.js +168 -0
  106. package/kits/hub-game/code/client/soundscapeUi.js +211 -0
  107. package/kits/hub-game/code/client/soundscapeVoice.js +1209 -0
  108. package/kits/hub-game/code/client/soundscapeWaves.js +206 -0
  109. package/kits/hub-game/code/client/spin.js +101 -0
  110. package/kits/hub-game/code/client/state.js +109 -1
  111. package/kits/hub-game/code/client/stuck.js +259 -0
  112. package/kits/hub-game/code/client/talk.js +538 -47
  113. package/kits/hub-game/code/client/tiers.js +516 -27
  114. package/kits/hub-game/code/client/toastBand.js +37 -0
  115. package/kits/hub-game/code/client/together.js +32 -0
  116. package/kits/hub-game/code/client/visibility.js +43 -0
  117. package/kits/hub-game/code/client/wear.js +461 -170
  118. package/kits/hub-game/code/client/yours.js +199 -0
  119. package/kits/hub-game/code/companionSpec.js +45 -0
  120. package/kits/hub-game/code/privateText.js +7 -0
  121. package/kits/hub-game/code/server/actions.js +133 -0
  122. package/kits/hub-game/code/server/actors.js +9 -1
  123. package/kits/hub-game/code/server/ask.js +155 -0
  124. package/kits/hub-game/code/server/ballot.js +539 -0
  125. package/kits/hub-game/code/server/cells.js +100 -0
  126. package/kits/hub-game/code/server/companion.js +82 -0
  127. package/kits/hub-game/code/server/cues.js +70 -0
  128. package/kits/hub-game/code/server/decor.js +269 -0
  129. package/kits/hub-game/code/server/earned.js +461 -0
  130. package/kits/hub-game/code/server/friendBests.js +166 -0
  131. package/kits/hub-game/code/server/friendsAmong.js +232 -0
  132. package/kits/hub-game/code/server/history.js +5 -0
  133. package/kits/hub-game/code/server/hub.js +1254 -50
  134. package/kits/hub-game/code/server/idle.js +30 -11
  135. package/kits/hub-game/code/server/index.js +2 -2
  136. package/kits/hub-game/code/server/labels.js +28 -2
  137. package/kits/hub-game/code/server/manifest.js +378 -7
  138. package/kits/hub-game/code/server/menu.js +133 -0
  139. package/kits/hub-game/code/server/npcs.js +830 -80
  140. package/kits/hub-game/code/server/party.js +2 -2
  141. package/kits/hub-game/code/server/players.js +22 -0
  142. package/kits/hub-game/code/server/shot.js +110 -0
  143. package/kits/hub-game/code/server/standing.js +124 -0
  144. package/kits/hub-game/code/server/vis.js +113 -0
  145. package/kits/hub-game/code/server/wear.js +12 -0
  146. package/kits/hub-game/code/server/yours.js +59 -0
  147. package/kits/hub-game/code/shared/cues.js +9 -0
  148. package/kits/hub-game/code/shared/decor.js +41 -0
  149. package/kits/hub-game/code/shared/shot.js +19 -0
  150. package/kits/hub-game/code/shared/spin.js +57 -0
  151. package/kits/hub-game/code/systems/hub.js +845 -95
  152. package/kits/hub-game/docs/content-pack.md +1 -1
  153. package/kits/hub-game/docs/contract.md +2244 -61
  154. package/kits/hub-game/docs/home-pieces.md +64 -0
  155. package/kits/hub-game/models/avatar-10.pxmodel +28 -0
  156. package/kits/hub-game/models/avatar-11.pxmodel +28 -0
  157. package/kits/hub-game/models/avatar-12.pxmodel +27 -0
  158. package/kits/hub-game/models/avatar-13.pxmodel +24 -0
  159. package/kits/hub-game/models/avatar-14.pxmodel +29 -0
  160. package/kits/hub-game/models/avatar-15.pxmodel +24 -0
  161. package/kits/hub-game/models/avatar-4.pxmodel +29 -0
  162. package/kits/hub-game/models/avatar-5.pxmodel +27 -0
  163. package/kits/hub-game/models/avatar-6.pxmodel +26 -0
  164. package/kits/hub-game/models/avatar-7.pxmodel +25 -0
  165. package/kits/hub-game/models/avatar-8.pxmodel +24 -0
  166. package/kits/hub-game/models/avatar-9.pxmodel +30 -0
  167. package/kits/hub-game/models/earned/badge-round.pxmodel +100 -0
  168. package/kits/hub-game/models/earned/badge-shield.pxmodel +117 -0
  169. package/kits/hub-game/models/earned/badge-star.pxmodel +87 -0
  170. package/kits/hub-game/models/earned/belt-plain.pxmodel +72 -0
  171. package/kits/hub-game/models/earned/held-ball.pxmodel +43 -0
  172. package/kits/hub-game/models/earned/held-lantern.pxmodel +85 -0
  173. package/kits/hub-game/models/earned/held-net.pxmodel +57 -0
  174. package/kits/hub-game/models/earned/held-trophy.pxmodel +109 -0
  175. package/kits/hub-game/models/earned/pin-round.pxmodel +62 -0
  176. package/kits/hub-game/models/earned/sash-plain.pxmodel +66 -0
  177. package/kits/hub-game/models/earned/square/belt-plain.pxmodel +104 -0
  178. package/kits/hub-game/models/earned/square/sash-plain.pxmodel +98 -0
  179. package/kits/hub-game/models/hats/bat-clip.pxmodel +206 -0
  180. package/kits/hub-game/models/hats/beekeeper.pxmodel +149 -0
  181. package/kits/hub-game/models/hats/cap.pxmodel +162 -0
  182. package/kits/hub-game/models/hats/captain.pxmodel +178 -0
  183. package/kits/hub-game/models/hats/crooked-top.pxmodel +172 -0
  184. package/kits/hub-game/models/hats/flower-crown.pxmodel +451 -0
  185. package/kits/hub-game/models/hats/foam-crown.pxmodel +179 -0
  186. package/kits/hub-game/models/hats/lantern.pxmodel +230 -0
  187. package/kits/hub-game/models/hats/laurel.pxmodel +533 -0
  188. package/kits/hub-game/models/hats/lighthouse.pxmodel +96 -0
  189. package/kits/hub-game/models/hats/sailor.pxmodel +141 -0
  190. package/kits/hub-game/models/hats/souwester.pxmodel +131 -0
  191. package/kits/hub-game/models/hats/straw.pxmodel +139 -0
  192. package/kits/hub-game/models/hats/sunflower.pxmodel +406 -0
  193. package/kits/hub-game/models/hats/sweatband.pxmodel +112 -0
  194. package/kits/hub-game/models/hats/witch.pxmodel +147 -0
  195. package/kits/hub-game/package-lock.json +2 -0
  196. package/kits/hub-game/package.json +2 -1
  197. package/kits/hub-game/scripts/check.mjs +78 -11
  198. package/kits/hub-game/scripts/companion-follower-wire.json +1 -0
  199. package/kits/hub-game/scripts/fixtures/decor-keyless-draw.json +121 -0
  200. package/kits/hub-game/scripts/fixtures/decor-keyless.json +293 -0
  201. package/kits/hub-game/scripts/fixtures/engine-models-stub.mjs +23 -0
  202. package/kits/hub-game/scripts/fixtures/fake-dom.mjs +107 -0
  203. package/kits/hub-game/scripts/fixtures/interest-legacy.json +385 -0
  204. package/kits/hub-game/scripts/fixtures/npc-notes-v1.77.jsonl +4 -0
  205. package/kits/hub-game/scripts/fixtures/vis-shared-wire.json +1 -0
  206. package/kits/hub-game/scripts/gen-avatars.mjs +933 -16
  207. package/kits/hub-game/scripts/gen-earned.mjs +285 -0
  208. package/kits/hub-game/scripts/gen-hats.mjs +827 -0
  209. package/kits/hub-game/scripts/grab.before-orbit.mjs +400 -0
  210. package/kits/hub-game/scripts/soundscape-wave-analysis.mjs +125 -0
  211. package/kits/hub-game/scripts/test-actions-client.mjs +488 -0
  212. package/kits/hub-game/scripts/test-actions.mjs +298 -0
  213. package/kits/hub-game/scripts/test-actor-budget.mjs +44 -0
  214. package/kits/hub-game/scripts/test-actors.mjs +19 -17
  215. package/kits/hub-game/scripts/test-ask-client.mjs +358 -0
  216. package/kits/hub-game/scripts/test-ask.mjs +269 -0
  217. package/kits/hub-game/scripts/test-attention.mjs +10 -1
  218. package/kits/hub-game/scripts/test-avatar-cap.mjs +379 -0
  219. package/kits/hub-game/scripts/test-avatar-colors.mjs +72 -0
  220. package/kits/hub-game/scripts/test-avatar-models.mjs +181 -0
  221. package/kits/hub-game/scripts/test-avatar-share.mjs +318 -0
  222. package/kits/hub-game/scripts/test-avatar-wire.mjs +753 -0
  223. package/kits/hub-game/scripts/test-avatar.mjs +540 -7
  224. package/kits/hub-game/scripts/test-ballot.mjs +1001 -0
  225. package/kits/hub-game/scripts/test-build.mjs +31 -0
  226. package/kits/hub-game/scripts/test-cells.mjs +71 -0
  227. package/kits/hub-game/scripts/test-chat.mjs +662 -0
  228. package/kits/hub-game/scripts/test-classic.mjs +2 -0
  229. package/kits/hub-game/scripts/test-companion-chat.mjs +198 -0
  230. package/kits/hub-game/scripts/test-companion-client.mjs +1167 -0
  231. package/kits/hub-game/scripts/test-companion.mjs +259 -0
  232. package/kits/hub-game/scripts/test-decor-client.mjs +303 -0
  233. package/kits/hub-game/scripts/test-decor.mjs +457 -0
  234. package/kits/hub-game/scripts/test-earned-client.mjs +459 -0
  235. package/kits/hub-game/scripts/test-earned.mjs +1194 -0
  236. package/kits/hub-game/scripts/test-emote-bubble.mjs +110 -0
  237. package/kits/hub-game/scripts/test-friend-bests.mjs +435 -0
  238. package/kits/hub-game/scripts/test-grab-orbit.mjs +918 -0
  239. package/kits/hub-game/scripts/test-grab.mjs +7 -0
  240. package/kits/hub-game/scripts/test-hats.mjs +422 -168
  241. package/kits/hub-game/scripts/test-hub-leaving.mjs +203 -0
  242. package/kits/hub-game/scripts/test-hub-ops.mjs +439 -2
  243. package/kits/hub-game/scripts/test-hub-trip.mjs +716 -2
  244. package/kits/hub-game/scripts/test-hud-clear.mjs +328 -4
  245. package/kits/hub-game/scripts/test-idle.mjs +361 -1
  246. package/kits/hub-game/scripts/test-interest-cap.mjs +36 -0
  247. package/kits/hub-game/scripts/test-interest-cells.mjs +493 -0
  248. package/kits/hub-game/scripts/test-interest-client.mjs +118 -0
  249. package/kits/hub-game/scripts/test-keys.mjs +46 -1
  250. package/kits/hub-game/scripts/test-labels.mjs +596 -0
  251. package/kits/hub-game/scripts/test-manifest.mjs +207 -0
  252. package/kits/hub-game/scripts/test-menu-client.mjs +480 -0
  253. package/kits/hub-game/scripts/test-menu.mjs +296 -0
  254. package/kits/hub-game/scripts/test-npcs.mjs +1718 -12
  255. package/kits/hub-game/scripts/test-object-entry.mjs +76 -0
  256. package/kits/hub-game/scripts/test-pack.mjs +7 -0
  257. package/kits/hub-game/scripts/test-picker.mjs +314 -0
  258. package/kits/hub-game/scripts/test-rehello.mjs +1039 -0
  259. package/kits/hub-game/scripts/test-relations-among.mjs +222 -0
  260. package/kits/hub-game/scripts/test-relations-refresh.mjs +188 -0
  261. package/kits/hub-game/scripts/test-shot.mjs +756 -0
  262. package/kits/hub-game/scripts/test-soundscape.mjs +5432 -0
  263. package/kits/hub-game/scripts/test-spin.mjs +314 -0
  264. package/kits/hub-game/scripts/test-standing.mjs +416 -0
  265. package/kits/hub-game/scripts/test-stuck.mjs +1903 -0
  266. package/kits/hub-game/scripts/test-tier-cells.mjs +706 -0
  267. package/kits/hub-game/scripts/test-tiers-render.mjs +339 -0
  268. package/kits/hub-game/scripts/test-tiers.mjs +477 -2
  269. package/kits/hub-game/scripts/test-toast-band.mjs +61 -0
  270. package/kits/hub-game/scripts/test-try-on.mjs +22 -22
  271. package/kits/hub-game/scripts/test-vis.mjs +343 -0
  272. package/kits/hub-game/scripts/test-visibility.mjs +134 -0
  273. package/kits/hub-game/scripts/test-yours-chrome.mjs +166 -0
  274. package/kits/hub-game/scripts/test-yours.mjs +372 -0
  275. package/kits/multiplayer-3d/CLAUDE.md +50 -0
  276. package/kits/multiplayer-3d/castle.json +5 -5
  277. package/kits/multiplayer-3d/code/client/avatars.js +7 -0
  278. package/kits/multiplayer-3d/code/client/gait.js +65 -0
  279. package/kits/multiplayer-3d/code/client/nameTags.js +59 -4
  280. package/kits/multiplayer-3d/code/options.js +5 -0
  281. package/kits/multiplayer-3d/code/server/ownership.js +10 -2
  282. package/kits/multiplayer-3d/code/server/sceneBodies.js +12 -0
  283. package/kits/multiplayer-3d/code/server/world.js +7 -0
  284. package/kits/multiplayer-3d/code/systems/multiplayer.js +74 -4
  285. package/kits/multiplayer-3d/package.json +2 -1
  286. package/kits/multiplayer-3d/scripts/fixtures/README.md +11 -0
  287. package/kits/multiplayer-3d/scripts/fixtures/ownership-legacy.json +2 -0
  288. package/kits/multiplayer-3d/scripts/ownership-harness.mjs +102 -0
  289. package/kits/multiplayer-3d/scripts/ownership-loader.mjs +46 -0
  290. package/kits/multiplayer-3d/scripts/ownership-worker.mjs +15 -0
  291. package/kits/multiplayer-3d/scripts/record-ownership-session.mjs +98 -0
  292. package/kits/multiplayer-3d/scripts/test-eligible-claims.mjs +167 -0
  293. package/kits/multiplayer-3d/scripts/test-own-name-tag.mjs +247 -0
  294. package/kits/physics-2d/CLAUDE.md +9 -0
  295. package/kits/physics-2d/castle.json +2 -2
  296. package/kits/physics-2d/engine/scene.js +253 -1
  297. package/kits/physics-2d/engine/skyKey.js +129 -0
  298. package/kits/physics-2d/engine/stillClock.js +106 -0
  299. package/kits/physics-2d/engine/updateBudget.js +21 -0
  300. package/kits/physics-2d/scripts/test-skip-unchanged.mjs +326 -1
  301. package/kits/physics-3d/CLAUDE.md +1169 -30
  302. package/kits/physics-3d/behaviors/Player.jsx +629 -72
  303. package/kits/physics-3d/castle.json +3 -3
  304. package/kits/physics-3d/docs/pxmodel-format.md +8 -0
  305. package/kits/physics-3d/engine3d/Scene3DPlayer.jsx +69 -13
  306. package/kits/physics-3d/engine3d/actornode.js +86 -0
  307. package/kits/physics-3d/engine3d/animationBudget.js +23 -0
  308. package/kits/physics-3d/engine3d/editorWorld.js +6 -0
  309. package/kits/physics-3d/engine3d/emptynodes.js +232 -0
  310. package/kits/physics-3d/engine3d/framecap.js +96 -0
  311. package/kits/physics-3d/engine3d/gait.js +118 -0
  312. package/kits/physics-3d/engine3d/kithooks.js +47 -0
  313. package/kits/physics-3d/engine3d/look.js +507 -48
  314. package/kits/physics-3d/engine3d/lookbake.js +208 -0
  315. package/kits/physics-3d/engine3d/materialpresets.js +2 -0
  316. package/kits/physics-3d/engine3d/motion.js +39 -10
  317. package/kits/physics-3d/engine3d/nearshadows.js +37 -19
  318. package/kits/physics-3d/engine3d/optimize.js +9 -5
  319. package/kits/physics-3d/engine3d/orbitinput.js +487 -9
  320. package/kits/physics-3d/engine3d/orbitlens.js +48 -0
  321. package/kits/physics-3d/engine3d/ownmodel.js +213 -0
  322. package/kits/physics-3d/engine3d/pxmodel.js +42 -11
  323. package/kits/physics-3d/engine3d/shadowfade.js +882 -0
  324. package/kits/physics-3d/engine3d/sky.js +547 -0
  325. package/kits/physics-3d/engine3d/skylife.js +306 -0
  326. package/kits/physics-3d/engine3d/unchanged.js +11 -0
  327. package/kits/physics-3d/engine3d/viewrange.js +52 -0
  328. package/kits/physics-3d/engine3d/world3d.js +796 -69
  329. package/kits/physics-3d/main.jsx +5 -0
  330. package/kits/physics-3d/package.json +1 -1
  331. package/kits/physics-3d/scripts/look-baseline.mjs +155 -0
  332. package/kits/physics-3d/scripts/test-camera-orbit.mjs +2563 -80
  333. package/kits/physics-3d/scripts/test-drop-empty-parts.mjs +1 -1
  334. package/kits/physics-3d/scripts/test-frame-cap-bob.mjs +435 -0
  335. package/kits/physics-3d/scripts/test-frame-cap.mjs +452 -0
  336. package/kits/physics-3d/scripts/test-gait.mjs +387 -0
  337. package/kits/physics-3d/scripts/test-look-bake.mjs +1056 -0
  338. package/kits/physics-3d/scripts/test-model-parse-cache.mjs +92 -0
  339. package/kits/physics-3d/scripts/test-near-shadows.mjs +3 -0
  340. package/kits/physics-3d/scripts/test-orbit-shadow-fade.mjs +1920 -0
  341. package/kits/physics-3d/scripts/test-orbit-shift-lock.mjs +545 -0
  342. package/kits/physics-3d/scripts/test-orbit-shot.mjs +583 -0
  343. package/kits/physics-3d/scripts/test-orbit-view.mjs +230 -0
  344. package/kits/physics-3d/scripts/test-skip-empty-nodes.mjs +845 -0
  345. package/kits/physics-3d/scripts/test-sky.mjs +2470 -0
  346. package/kits/physics-3d/scripts/test-static-actors.mjs +8 -1
  347. package/kits/physics-3d/scripts/test-static-scenery.mjs +2171 -0
  348. package/kits/physics-3d/scripts/test-steady-hover.mjs +2 -0
  349. package/kits/physics-3d/scripts/test-view-range.mjs +260 -0
  350. package/kits/physics-3d/systems/physics3d.js +383 -6
  351. package/kits/real-time/castle.json +2 -2
  352. package/kits/real-time/code/server/gameHooks.js +7 -0
  353. package/kits/real-time/code/server/session.js +97 -19
  354. package/package.json +2 -2
  355. package/dist/shell/assets/index-Cf61cNfT.css +0 -1
@@ -0,0 +1,208 @@
1
+ // Scenes that set `"engine": { "look": { "bake": "deferred" } }`
2
+ //
3
+ // The look (look.js) bakes two things into a model when it is built: the
4
+ // occlusion, by marching rays through a grid of the model's surfaces, and the
5
+ // attributes its outline hulls are pushed out by. On a slow phone that is
6
+ // several seconds of a town's load, all of it before the first frame. For a
7
+ // scene that asks, a model is built without them and drawn at once, and the
8
+ // baking is queued here: a little of it is done after each frame is drawn,
9
+ // until none is left.
10
+ //
11
+ // A task is one model's baking, cut into steps (look.js `bakeLater`). A step
12
+ // is never interrupted, so one that takes longer than the budget runs to its
13
+ // end and nothing else starts that frame.
14
+ //
15
+ // A task writes into the geometries of a model the world may release before
16
+ // the task has run. It listens for each one's `dispose`: a geometry that has
17
+ // been disposed is not written to, and a task none of whose geometries is
18
+ // left is dropped.
19
+ //
20
+ // A copy made of a geometry while it waits (`geometry.clone()`, as motion.js
21
+ // makes for a part that glows and a deck may for its own ends) waits with it,
22
+ // so a mesh whose geometry was replaced by a copy, the first one disposed, is
23
+ // still baked. For the length of a task each of its geometries has a `clone`
24
+ // of its own (`cloneWaiting`) that adds the copy to the task. What that keeps
25
+ // true, between here and look.js:
26
+ //
27
+ // When a task ends as `baked`, every geometry in it that has not been
28
+ // disposed, the ones it was queued with and every copy alike, holds the
29
+ // whole of the baking: whenever the copy was made (before the task began,
30
+ // between two of its stages, between two steps of one), and whatever it was
31
+ // made from (a geometry already written, one not yet, or one disposed and
32
+ // never written). Otherwise the task ends as `dropped`.
33
+ //
34
+ // It holds because nothing is read back from a geometry: the task keeps each
35
+ // stage's result for each geometry it was queued with, and keeps which stages
36
+ // each geometry holds; a copy starts with what its source held and is given
37
+ // the rest when it is made, and each stage that finishes later is given to
38
+ // every copy there is (look.js `settle`). The one geometry that cannot be
39
+ // given a result is one whose vertices were replaced by another number of
40
+ // them, and a task that ends with such a one not disposed is `dropped`.
41
+ //
42
+ // Once the task has ended, however it ended, the `clone` of its own is gone
43
+ // and a geometry is cloned as any other; so is one whose `clone` was taken
44
+ // hold of while it waited and called afterwards.
45
+
46
+ // How long the baking may take out of a frame, in milliseconds, unless the
47
+ // step that passes it is still running.
48
+ const BUDGET_MS = 6;
49
+
50
+ // The queue a world keeps (`world.lookBake`). `pending` is how many models
51
+ // are still to bake, `ms` the time spent baking so far, `baked` how many
52
+ // tasks ran to the end and left the whole of the baking in every geometry
53
+ // not disposed, and `dropped` how many did not: dropped unfinished, or ended
54
+ // with a geometry they could not write to.
55
+ // `budgetMs` and `now` can be set.
56
+ //
57
+ // `shown` is what a harness or a capture waits for: true once a frame has
58
+ // been drawn with nothing pending, so the picture on screen is the complete
59
+ // one, and false again from the moment a model is queued. `pending` reaching
60
+ // 0 is not that: the baking is done after the frame is drawn, so the frame
61
+ // that finishes the queue was drawn without the last of it.
62
+ export function makeLookBake() {
63
+ return {
64
+ tasks: [],
65
+ budgetMs: BUDGET_MS,
66
+ now: () => performance.now(),
67
+ drawn: false,
68
+ shown: false,
69
+ unsorted: false,
70
+ ms: 0,
71
+ baked: 0,
72
+ dropped: 0,
73
+ get pending() {
74
+ return this.tasks.length;
75
+ },
76
+ };
77
+ }
78
+
79
+ // Adds a task. `owner` says whose it is, for `orderLookBake`; `geometries` is
80
+ // every geometry it writes to, each once; and `steps(gone)` returns the
81
+ // iterator that does the work, one step each time it is advanced, and that
82
+ // ends with false when it left a geometry that is not disposed without the
83
+ // whole of the baking. `gone` is the set of the task's geometries disposed
84
+ // since. A copy made of one of them, or of a copy of one, is added to
85
+ // `geometries`, and `copied(copy, geometry, source)` is told: `source` is
86
+ // what it was cloned from and `geometry` the one of the task's own that
87
+ // `source` is, or is a copy of.
88
+ export function queueLookBake(queue, owner, geometries, steps, copied = null) {
89
+ const gone = new Set();
90
+ const task = { owner, geometries, gone, copyOf: new Map(), copied, steps: steps(gone), started: false, distance: 0, onDispose: null };
91
+ task.onDispose = (event) => {
92
+ gone.add(event.target);
93
+ if (gone.size >= geometries.length) {
94
+ removeTask(queue, task);
95
+ queue.dropped += 1;
96
+ }
97
+ };
98
+ for (const geometry of [...geometries]) {
99
+ waitIn(task, geometry);
100
+ }
101
+ queue.tasks.push(task);
102
+ queue.unsorted = true;
103
+ queue.shown = false;
104
+ }
105
+
106
+ // The tasks each geometry waits in. While it is in any, its `clone` is
107
+ // `cloneWaiting`, a property of its own that goes when the last task does.
108
+ const waitingIn = new WeakMap();
109
+
110
+ function waitIn(task, geometry) {
111
+ geometry.addEventListener('dispose', task.onDispose);
112
+ const tasks = waitingIn.get(geometry);
113
+ if (tasks) {
114
+ tasks.push(task);
115
+ return;
116
+ }
117
+ waitingIn.set(geometry, [task]);
118
+ geometry.clone = cloneWaiting;
119
+ }
120
+
121
+ // `clone` of a waiting geometry: the copy waits in the same tasks, as a copy
122
+ // of the geometry the task was given. Called once its tasks have ended, by
123
+ // someone who kept hold of it, it is the plain `clone`.
124
+ function cloneWaiting() {
125
+ const copy = Object.getPrototypeOf(this).clone.call(this);
126
+ for (const task of waitingIn.get(this) ?? []) {
127
+ const geometry = task.copyOf.get(this) ?? this;
128
+ task.copyOf.set(copy, geometry);
129
+ task.geometries.push(copy);
130
+ waitIn(task, copy);
131
+ task.copied?.(copy, geometry, this);
132
+ }
133
+ return copy;
134
+ }
135
+
136
+ function removeTask(queue, task) {
137
+ for (const geometry of task.geometries) {
138
+ geometry.removeEventListener('dispose', task.onDispose);
139
+ const tasks = (waitingIn.get(geometry) ?? []).filter((other) => other !== task);
140
+ if (tasks.length > 0) {
141
+ waitingIn.set(geometry, tasks);
142
+ } else {
143
+ waitingIn.delete(geometry);
144
+ delete geometry.clone;
145
+ }
146
+ }
147
+ task.copyOf.clear();
148
+ const at = queue.tasks.indexOf(task);
149
+ if (at >= 0) {
150
+ queue.tasks.splice(at, 1);
151
+ }
152
+ }
153
+
154
+ // Called once after each frame is drawn. The first call bakes nothing, so the
155
+ // first frame is on screen before any baking starts; and a call that finds
156
+ // nothing pending sets `shown`, the frame just drawn being the complete
157
+ // picture. A step that throws takes its task with it.
158
+ export function stepLookBake(queue) {
159
+ const { tasks } = queue;
160
+ const first = !queue.drawn;
161
+ queue.drawn = true;
162
+ if (tasks.length === 0) {
163
+ queue.shown = true;
164
+ return;
165
+ }
166
+ if (first) {
167
+ return;
168
+ }
169
+ const started = queue.now();
170
+ let now = started;
171
+ while (tasks.length > 0 && now - started < queue.budgetMs) {
172
+ const task = tasks[0];
173
+ task.started = true;
174
+ let step = null;
175
+ try {
176
+ step = task.steps.next();
177
+ } finally {
178
+ const then = now;
179
+ now = queue.now();
180
+ queue.ms += now - then;
181
+ if ((!step || step.done) && tasks.includes(task)) {
182
+ removeTask(queue, task);
183
+ queue[step && step.value !== false ? 'baked' : 'dropped'] += 1;
184
+ }
185
+ }
186
+ }
187
+ }
188
+
189
+ // Puts the tasks in the order of `distanceOf(owner)`, nearest first, and those
190
+ // as near as each other in the order they were added. A task already begun
191
+ // stays at the front. Asked for when `queue.unsorted` says tasks were added.
192
+ export function orderLookBake(queue, distanceOf) {
193
+ queue.unsorted = false;
194
+ for (const task of queue.tasks) {
195
+ task.distance = task.started ? -1 : distanceOf(task.owner);
196
+ }
197
+ queue.tasks.sort((a, b) => a.distance - b.distance);
198
+ }
199
+
200
+ // Drops every task, when the world is disposed. A task under way, were
201
+ // anything to advance it again, finds all its geometries gone.
202
+ export function clearLookBake(queue) {
203
+ queue.dropped += queue.tasks.length;
204
+ for (const task of [...queue.tasks]) {
205
+ task.geometries.forEach((geometry) => task.gone.add(geometry));
206
+ removeTask(queue, task);
207
+ }
208
+ }
@@ -10,6 +10,7 @@
10
10
 
11
11
  import * as THREE from 'three';
12
12
  import { PART_DEFAULTS } from './pxmodel';
13
+ import { markKitHooks } from './kithooks';
13
14
 
14
15
  const FINISH_KEYS = ['roughness', 'metalness', 'clearcoat', 'emissive', 'emissiveIntensity'];
15
16
 
@@ -83,6 +84,7 @@ function glowByColor(material) {
83
84
  );
84
85
  };
85
86
  material.customProgramCacheKey = () => 'glow-by-color';
87
+ markKitHooks(material);
86
88
  }
87
89
 
88
90
  //
@@ -6,6 +6,9 @@
6
6
  // The biped walk is animateModelParts in pxmodel.js. It runs first each frame
7
7
  // and sets its channels outright; motion here adds to what it leaves.
8
8
 
9
+ import { checkEmptyPass } from './emptynodes.js';
10
+ import { modelWalk, takeWalkSpeedHint, walkGait } from './gait.js';
11
+
9
12
  const DEG = Math.PI / 180;
10
13
  const TAU = Math.PI * 2;
11
14
 
@@ -29,13 +32,15 @@ const WALK_SPEED = 5;
29
32
  // How fast a node rises or falls over the ground. A scene whose
30
33
  // `userData.groundHeight(x, z)` is set (a deck's terrain) has slopes, and
31
34
  // walking up one is not a fall; without it this is plain vertical speed.
32
- export function airSpeed(node, position, last, dt) {
35
+ export function airSpeed(node, position, last, dt, world) {
33
36
  const groundHeight = node.parent?.userData?.groundHeight;
34
37
  if (typeof groundHeight !== 'function') {
35
38
  return (position.y - last.y) / dt;
36
39
  }
37
40
  const over = position.y - groundHeight(position.x, position.z);
41
+ if (world) checkEmptyPass(world);
38
42
  const lastOver = last.y - groundHeight(last.x, last.z);
43
+ if (world) checkEmptyPass(world);
39
44
  return (over - lastOver) / dt;
40
45
  }
41
46
 
@@ -229,14 +234,27 @@ function applyClip(pose, target, state) {
229
234
 
230
235
  // How much the node walks (0 to 1), how much it is in the air, and a phase
231
236
  // that advances with distance walked, observed from its position.
232
- function observeWalk(walk, node, dt) {
237
+ function observeWalk(walk, node, dt, world, hint) {
233
238
  const p = node.position;
239
+ const gait = walkGait() === 'model'
240
+ ? modelWalk(node, walk, ['legFL', 'legFR', 'legBL', 'legBR'], 0.6,
241
+ dt > 0 && walk.last ? Math.hypot(p.x - walk.last.x, p.z - walk.last.z) / dt : 0,
242
+ dt, hint) : null;
234
243
  if (walk.last) {
235
- const speed = Math.hypot(p.x - walk.last.x, p.z - walk.last.z) / dt;
236
- const rise = airSpeed(node, p, walk.last, dt);
237
- walk.amount += (Math.min(1, speed / WALK_SPEED) - walk.amount) * Math.min(1, dt * 10);
238
- walk.air += ((Math.abs(rise) > 1.2 ? 1 : 0) - walk.air) * Math.min(1, dt * 8);
239
- walk.phase += Math.min(speed, 8) * STRIDE * dt;
244
+ if (gait?.model) {
245
+ const rise = airSpeed(node, p, walk.last, dt, world);
246
+ walk.amount += (Math.min(1, gait.speed / gait.walkSpeed) - walk.amount) * Math.min(1, gait.dt * 10);
247
+ walk.air += ((Math.abs(rise) > 1.2 ? 1 : 0) - walk.air) * Math.min(1, dt * 8);
248
+ walk.amplitudeScale ??= 1;
249
+ walk.amplitudeScale += (gait.amplitudeScale - walk.amplitudeScale) * Math.min(1, gait.dt * 10);
250
+ walk.phase += TAU * gait.cadence * gait.phaseDt;
251
+ } else {
252
+ const speed = Math.hypot(p.x - walk.last.x, p.z - walk.last.z) / dt;
253
+ const rise = airSpeed(node, p, walk.last, dt, world);
254
+ walk.amount += (Math.min(1, speed / WALK_SPEED) - walk.amount) * Math.min(1, dt * 10);
255
+ walk.air += ((Math.abs(rise) > 1.2 ? 1 : 0) - walk.air) * Math.min(1, dt * 8);
256
+ walk.phase += Math.min(speed, 8) * STRIDE * dt;
257
+ }
240
258
  }
241
259
  walk.last = { x: p.x, y: p.y, z: p.z };
242
260
  }
@@ -246,7 +264,9 @@ const LEG_SIDES = { legFL: 1, legBR: 1, legFR: -1, legBL: -1 };
246
264
 
247
265
  function gaitLeg(pose, target, state) {
248
266
  const walk = state.walk;
249
- const swing = Math.sin(walk.phase) * 0.6 * walk.amount * (1 - walk.air);
267
+ const swing = walkGait() === 'model' && walk.gait?.model
268
+ ? Math.sin(walk.phase) * 0.6 * walk.amount * (1 - walk.air) * (walk.amplitudeScale ?? 1)
269
+ : Math.sin(walk.phase) * 0.6 * walk.amount * (1 - walk.air);
250
270
 
251
271
  // In the air the front legs reach forward and the back legs back.
252
272
  const tuck = target.id.startsWith('legF') ? -0.5 : 0.5;
@@ -539,7 +559,12 @@ function setupMotion(entry, actor) {
539
559
  // animateModelParts, with the actor whose clips to play (optional). dt of 0
540
560
  // (editor views) leaves the model in its rest pose. The first call finds the
541
561
  // parts and moves nothing.
542
- export function animateMotion(entry, dt, actor = null) {
562
+ export function animateMotion(entry, dt, actor = null, world) {
563
+ let hint;
564
+ if (walkGait() === 'model') {
565
+ hint = entry.walkFrameHint ?? takeWalkSpeedHint(entry.node);
566
+ delete entry.walkFrameHint;
567
+ }
543
568
  if (!(dt > 0)) {
544
569
  return;
545
570
  }
@@ -551,8 +576,12 @@ export function animateMotion(entry, dt, actor = null) {
551
576
  if (!state) {
552
577
  return;
553
578
  }
579
+ // Reject a non-finite elapsed time only for a measurable model gait; an
580
+ // unreadable model retains the fixed path's exact behavior, too.
581
+ if (walkGait() === 'model' && !Number.isFinite(dt)
582
+ && modelWalk(entry.node, state.walk, ['legFL', 'legFR', 'legBL', 'legBR'], 0.6, 0, dt, hint).model) return;
554
583
  state.clock += dt;
555
- observeWalk(state.walk, entry.node, dt);
584
+ observeWalk(state.walk, entry.node, dt, world, hint);
556
585
  updateClip(state, actor, dt);
557
586
  for (const target of state.targets) {
558
587
  poseTarget(target, state, dt);
@@ -207,15 +207,16 @@ const axisZ = new THREE.Vector3();
207
207
  // class by name; a light's shadow has it.
208
208
  let NearShadowClass = null;
209
209
 
210
- function makeNearShadow() {
210
+ function makeNearShadow(onCallout) {
211
211
  NearShadowClass ??= defineNearShadow(new THREE.DirectionalLight().shadow.constructor);
212
- return new NearShadowClass();
212
+ return new NearShadowClass(onCallout);
213
213
  }
214
214
 
215
215
  function defineNearShadow(DirectionalLightShadow) {
216
216
  return class NearShadow extends DirectionalLightShadow {
217
- constructor() {
217
+ constructor(onCallout) {
218
218
  super();
219
+ this.onCallout = onCallout;
219
220
  this.slice = new SliceFrustum();
220
221
  // What a frame is fitted to (`fit`): the view camera, the distance drawn,
221
222
  // the view's corners one metre ahead, how far along the view the sphere's
@@ -294,11 +295,18 @@ function defineNearShadow(DirectionalLightShadow) {
294
295
  this.mapPass = null;
295
296
  // Both are off the shadow before either is disposed, and a `dispose`
296
297
  // listener that throws does not keep the other from being freed.
297
- try {
298
- if (map) map.dispose();
299
- } finally {
300
- if (mapPass) mapPass.dispose();
301
- }
298
+ // One bracket spans both maps and all their listeners. Empty releases
299
+ // and unchanged frames neither call out nor allocate this operation.
300
+ if (!map && !mapPass) return;
301
+ const dispose = () => {
302
+ try {
303
+ if (map) map.dispose();
304
+ } finally {
305
+ if (mapPass) mapPass.dispose();
306
+ }
307
+ };
308
+ if (this.onCallout) this.onCallout(dispose);
309
+ else dispose();
302
310
  }
303
311
  };
304
312
  }
@@ -328,11 +336,14 @@ function shadowSettings(world) {
328
336
  }
329
337
 
330
338
  // The frame the mode is drawing, if there is one, is over for it and the sun
331
- // has its own shadow back. Assignments only: nothing here calls out.
339
+ // has its own shadow back, and under the orbit key the meshes their own
340
+ // materials and the scene and the shadow pass their own functions
341
+ // (shadowfade.js `end`). Assignments only: nothing here calls out.
332
342
  function giveBack(state) {
333
343
  const frame = state.frame;
334
344
  state.frame = null;
335
345
  if (frame && frame.sun.shadow === frame.near) frame.sun.shadow = frame.own;
346
+ if (frame?.fade) frame.fade.end();
336
347
  }
337
348
 
338
349
  // The one way out of the mode, for every reason and at the moment it happens:
@@ -363,9 +374,12 @@ export function dropNearShadows(world) {
363
374
  // One `renderWorld` of a world that has mode state or whose scene asked for
364
375
  // `distance` (0: it did not). `fitBias` is world3d.js fitting the bias of the
365
376
  // sun's own shadow and `render` its render call; a plain frame is the two, as
366
- // without the key.
367
- export function renderWithNearShadows(world, distance, fitBias, render) {
368
- const state = world.nearShadows ?? newState(world);
377
+ // without the key. `onCallout` is kept with the mode and brackets the entire
378
+ // release operation when a map's disposal can run listeners. `fade` (the
379
+ // scene has the orbit camera key as well, shadowfade.js) fades the far edge
380
+ // of a frame the mode draws; a plain frame is drawn the same either way.
381
+ export function renderWithNearShadows(world, distance, fitBias, render, onCallout, fade) {
382
+ const state = world.nearShadows ?? newState(world, onCallout);
369
383
  if (state.depth > 0) {
370
384
  // Term 2: entered from inside another call. Plain, and nothing is made.
371
385
  state.off = true;
@@ -380,7 +394,7 @@ export function renderWithNearShadows(world, distance, fitBias, render) {
380
394
  let returned = false;
381
395
  try {
382
396
  try {
383
- drawn = guardedFrame(world, state, distance, fitBias, render);
397
+ drawn = guardedFrame(world, state, distance, fitBias, render, fade);
384
398
  returned = true;
385
399
  } finally {
386
400
  // First what must happen whatever follows and cannot call out: the sun
@@ -398,13 +412,13 @@ export function renderWithNearShadows(world, distance, fitBias, render) {
398
412
  }
399
413
  }
400
414
 
401
- function newState(world) {
402
- world.nearShadows = { shadow: null, lastType: undefined, off: false, frame: null, depth: 0 };
415
+ function newState(world, onCallout) {
416
+ world.nearShadows = { shadow: null, lastType: undefined, off: false, frame: null, depth: 0, onCallout };
403
417
  return world.nearShadows;
404
418
  }
405
419
 
406
420
  // The frame, inside the guard. True when the mode drew it.
407
- function guardedFrame(world, state, distance, fitBias, render) {
421
+ function guardedFrame(world, state, distance, fitBias, render, fade) {
408
422
  if (!(distance > 0) || world.disposed === true || state.off) {
409
423
  leaveMode(state);
410
424
  fitBias();
@@ -417,7 +431,7 @@ function guardedFrame(world, state, distance, fitBias, render) {
417
431
  const due = type !== undefined && state.lastType === type;
418
432
  state.lastType = undefined;
419
433
  fitBias();
420
- const drawn = due && nearFrame(world, state, distance, render);
434
+ const drawn = due && nearFrame(world, state, distance, render, fade);
421
435
  if (!drawn) {
422
436
  leaveMode(state);
423
437
  render();
@@ -428,16 +442,20 @@ function guardedFrame(world, state, distance, fitBias, render) {
428
442
 
429
443
  // Draws the frame with the mode's own shadow on the sun, if the terms hold.
430
444
  // False when they do not and nothing has been drawn.
431
- function nearFrame(world, state, distance, render) {
445
+ function nearFrame(world, state, distance, render, fade) {
432
446
  const sun = sunOf(world);
433
447
  if (!sun) return false;
434
- state.shadow ??= makeNearShadow();
448
+ state.shadow ??= makeNearShadow(state.onCallout);
435
449
  const frame = { sun, own: sun.shadow, near: state.shadow };
436
450
  state.frame = frame;
437
451
  // Fitting may free a map of the wrong size, whose `dispose` runs someone
438
452
  // else's code: a call from there has left the mode.
439
453
  if (!fit(frame.near, frame.own, world, distance) || state.frame !== frame) return false;
440
454
  sun.shadow = frame.near;
455
+ if (fade) {
456
+ frame.fade = fade;
457
+ fade.begin(frame.near.reach, sun);
458
+ }
441
459
  render();
442
460
  return true;
443
461
  }
@@ -16,7 +16,8 @@
16
16
 
17
17
  import * as THREE from 'three';
18
18
  import { mergeGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
19
- import { addOutlineAttributes } from './look';
19
+ import { outlinePartByPart, outlineMergedLater } from './look';
20
+ import { markKitHooks } from './kithooks';
20
21
 
21
22
  // Meters per screen pixel under the third-person camera, and under the far
22
23
  // overhead camera of the space decks.
@@ -535,14 +536,16 @@ function mergeBatch({ anchor, meshes, radius, castShadow }) {
535
536
  );
536
537
 
537
538
  // Outline normals are smoothed over vertices at one place, and are found
538
- // part by part, so parts that touch keep an outline between them.
539
- if (radius >= OUTLINE_MIN_RADIUS) {
540
- geometries.forEach(addOutlineAttributes);
541
- }
539
+ // part by part, so parts that touch keep an outline between them. `later`
540
+ // is where the parts lie, when the look bakes after the model is drawn.
541
+ const later = radius >= OUTLINE_MIN_RADIUS ? outlinePartByPart(geometries) : null;
542
542
  const geometry = mergeGeometries(geometries, false);
543
543
  if (!geometry) {
544
544
  return;
545
545
  }
546
+ if (later) {
547
+ outlineMergedLater(geometry, later);
548
+ }
546
549
  const material = meshes[0].material.clone();
547
550
  material.color.set('#ffffff');
548
551
  material.vertexColors = true;
@@ -689,6 +692,7 @@ function finishFromVertices(material) {
689
692
  .replace('#include <metalnessmap_fragment>', 'float metalnessFactor = vPartFinish.y;');
690
693
  };
691
694
  material.customProgramCacheKey = () => `part-finish|${previousKey.call(material)}`;
695
+ markKitHooks(material, previous, previousKey);
692
696
  }
693
697
 
694
698
  //