castle-web-cli 0.4.239 → 0.4.241
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/dist/agent.js +5 -1
- package/dist/api.d.ts +20 -0
- package/dist/api.js +57 -0
- package/dist/bundle.d.ts +38 -1
- package/dist/bundle.js +309 -13
- package/dist/castle-host/host.js +163 -11
- package/dist/castleJson.d.ts +10 -0
- package/dist/castleJson.js +46 -2
- package/dist/check.js +5 -2
- package/dist/devSessionServer.js +4 -1
- package/dist/devSessionStorage.d.ts +1 -0
- package/dist/devSessionStorage.js +32 -7
- package/dist/importOrder.d.ts +2 -0
- package/dist/importOrder.js +29 -0
- package/dist/index.js +6 -3
- package/dist/init.js +24 -2
- package/dist/multiplayerDoc.d.ts +1 -1
- package/dist/multiplayerDoc.js +2 -0
- package/dist/platformDoc.js +3 -2
- package/dist/playPagePolicy.js +5 -1
- package/dist/resetLeaderboards.d.ts +8 -1
- package/dist/resetLeaderboards.js +43 -8
- package/dist/roomLogs.d.ts +1 -0
- package/dist/roomLogs.js +30 -6
- package/dist/save-deck.d.ts +32 -2
- package/dist/save-deck.js +240 -39
- package/kits/base/CLAUDE.md +1 -1
- package/kits/base/castle.json +1 -1
- package/kits/base/sdk/README.md +174 -6
- package/kits/base/sdk/analytics.d.ts +8 -0
- package/kits/base/sdk/analytics.js +92 -0
- package/kits/base/sdk/castle.d.ts +5 -1
- package/kits/base/sdk/castle.js +2 -0
- package/kits/base/sdk/commands.d.ts +48 -0
- package/kits/base/sdk/commands.js +1 -0
- package/kits/base/sdk/debugConsole.d.ts +17 -0
- package/kits/base/sdk/debugConsole.js +154 -0
- package/kits/base/sdk/experiments.js +24 -1
- package/kits/base/sdk/hostRetry.d.ts +7 -0
- package/kits/base/sdk/hostRetry.js +57 -0
- package/kits/base/sdk/hub.d.ts +20 -2
- package/kits/base/sdk/hub.js +99 -13
- package/kits/base/sdk/multiplayer.d.ts +2 -0
- package/kits/base/sdk/multiplayer.js +168 -26
- package/kits/base/sdk/reconnectBudget.d.ts +6 -0
- package/kits/base/sdk/reconnectBudget.js +41 -1
- package/kits/base/sdk/runtime.js +36 -19
- package/kits/base/sdk/server/hub.d.ts +19 -0
- package/kits/base/sdk/server/hub.js +12 -0
- package/kits/base/sdk/server/platformHandle.d.ts +1 -0
- package/kits/base/sdk/server/wrapper.d.ts +1 -1
- package/kits/base/sdk/server/wrapper.js +26 -1
- package/kits/base/sdk/transport.d.ts +2 -1
- package/kits/base/sdk/transport.js +35 -0
- package/kits/hub-game/CLAUDE.md +66 -19
- package/kits/hub-game/code/client/act.js +9 -6
- package/kits/hub-game/code/client/actCore.js +26 -6
- package/kits/hub-game/code/client/actGateLog.js +36 -0
- package/kits/hub-game/code/client/actionOverflow.js +29 -8
- package/kits/hub-game/code/client/actionRailSurface.js +186 -0
- package/kits/hub-game/code/client/actionRailTree.js +173 -0
- package/kits/hub-game/code/client/askSurface.js +85 -0
- package/kits/hub-game/code/client/askTree.js +51 -0
- package/kits/hub-game/code/client/attention.js +31 -6
- package/kits/hub-game/code/client/ballot.js +42 -5
- package/kits/hub-game/code/client/ballotSurface.js +115 -0
- package/kits/hub-game/code/client/ballotTree.js +180 -0
- package/kits/hub-game/code/client/catchingUp.js +19 -0
- package/kits/hub-game/code/client/celebrate.js +66 -0
- package/kits/hub-game/code/client/chrome.js +481 -57
- package/kits/hub-game/code/client/companion.js +93 -23
- package/kits/hub-game/code/client/companionDress.js +1 -1
- package/kits/hub-game/code/client/cornerSurface.js +106 -0
- package/kits/hub-game/code/client/cornerTree.js +83 -0
- package/kits/hub-game/code/client/decor.js +20 -11
- package/kits/hub-game/code/client/deviceStorage.js +121 -0
- package/kits/hub-game/code/client/disguise.js +23 -0
- package/kits/hub-game/code/client/disguiseDraw.js +87 -0
- package/kits/hub-game/code/client/dockSurface.js +206 -0
- package/kits/hub-game/code/client/dockTree.js +232 -0
- package/kits/hub-game/code/client/earned.js +29 -0
- package/kits/hub-game/code/client/emoteSurface.js +188 -0
- package/kits/hub-game/code/client/emoteTree.js +264 -0
- package/kits/hub-game/code/client/farAvatars.js +4 -3
- package/kits/hub-game/code/client/fpsTelemetry.js +3 -1
- package/kits/hub-game/code/client/grab.js +121 -50
- package/kits/hub-game/code/client/holdShow.js +19 -0
- package/kits/hub-game/code/client/hookLayer.js +96 -12
- package/kits/hub-game/code/client/hubControls.js +7 -1
- package/kits/hub-game/code/client/hudSurface.js +11 -3
- package/kits/hub-game/code/client/hudTree.js +7 -4
- package/kits/hub-game/code/client/idle.js +21 -3
- package/kits/hub-game/code/client/invites.js +24 -3
- package/kits/hub-game/code/client/keys.js +15 -0
- package/kits/hub-game/code/client/labelsNear.js +8 -1
- package/kits/hub-game/code/client/layoutCache.js +57 -8
- package/kits/hub-game/code/client/loadingCover.js +53 -4
- package/kits/hub-game/code/client/menuIcons.js +15 -0
- package/kits/hub-game/code/client/menuSurface.js +102 -0
- package/kits/hub-game/code/client/menuTree.js +135 -0
- package/kits/hub-game/code/client/modelLook.js +41 -0
- package/kits/hub-game/code/client/padCues.js +11 -7
- package/kits/hub-game/code/client/padReadability.js +3 -3
- package/kits/hub-game/code/client/pickerSurface.js +152 -0
- package/kits/hub-game/code/client/pickerTree.js +163 -0
- package/kits/hub-game/code/client/pushVisit.js +4 -2
- package/kits/hub-game/code/client/quality.js +188 -29
- package/kits/hub-game/code/client/qualityEntry.js +10 -1
- package/kits/hub-game/code/client/quickChatSurface.js +222 -0
- package/kits/hub-game/code/client/quickChatTree.js +201 -0
- package/kits/hub-game/code/client/rehello.js +75 -0
- package/kits/hub-game/code/client/renderVisibility.js +17 -0
- package/kits/hub-game/code/client/replay.js +118 -0
- package/kits/hub-game/code/client/role.js +3 -0
- package/kits/hub-game/code/client/safeLayout.js +441 -56
- package/kits/hub-game/code/client/safeStyle.js +13 -10
- package/kits/hub-game/code/client/say.js +2 -0
- package/kits/hub-game/code/client/soundSurface.js +77 -0
- package/kits/hub-game/code/client/soundTree.js +74 -0
- package/kits/hub-game/code/client/soundscape.js +12 -9
- package/kits/hub-game/code/client/soundscapeCues.js +1 -1
- package/kits/hub-game/code/client/state.js +67 -1
- package/kits/hub-game/code/client/stuckSurface.js +76 -0
- package/kits/hub-game/code/client/stuckTree.js +67 -0
- package/kits/hub-game/code/client/talk.js +42 -12
- package/kits/hub-game/code/client/talkTree.js +4 -2
- package/kits/hub-game/code/client/textAskSurface.js +147 -0
- package/kits/hub-game/code/client/textAskTree.js +67 -0
- package/kits/hub-game/code/client/tiers.js +252 -27
- package/kits/hub-game/code/client/together.js +4 -1
- package/kits/hub-game/code/client/uiDom.js +86 -8
- package/kits/hub-game/code/client/uiTree.js +33 -4
- package/kits/hub-game/code/client/vehicle.js +72 -51
- package/kits/hub-game/code/client/weakestTier.js +75 -31
- package/kits/hub-game/code/client/wear.js +159 -5
- package/kits/hub-game/code/client/worldLabels.js +205 -25
- package/kits/hub-game/code/companionSpec.js +4 -2
- package/kits/hub-game/code/server/act.js +3 -0
- package/kits/hub-game/code/server/actGate.js +83 -0
- package/kits/hub-game/code/server/actions.js +71 -15
- package/kits/hub-game/code/server/actors.js +20 -5
- package/kits/hub-game/code/server/analytics.js +35 -3
- package/kits/hub-game/code/server/ask.js +39 -3
- package/kits/hub-game/code/server/ballot.js +167 -4
- package/kits/hub-game/code/server/celebrate.js +64 -0
- package/kits/hub-game/code/server/companion.js +17 -2
- package/kits/hub-game/code/server/decor.js +11 -2
- package/kits/hub-game/code/server/disguise.js +63 -0
- package/kits/hub-game/code/server/earned.js +6 -2
- package/kits/hub-game/code/server/friendBests.js +13 -4
- package/kits/hub-game/code/server/friendsAmong.js +67 -8
- package/kits/hub-game/code/server/grab.js +12 -2
- package/kits/hub-game/code/server/heldOffers.js +142 -0
- package/kits/hub-game/code/server/holdShow.js +98 -0
- package/kits/hub-game/code/server/hub.js +991 -72
- package/kits/hub-game/code/server/idle.js +110 -9
- package/kits/hub-game/code/server/index.js +9 -0
- package/kits/hub-game/code/server/labels.js +13 -3
- package/kits/hub-game/code/server/manifest.js +94 -6
- package/kits/hub-game/code/server/menu.js +26 -3
- package/kits/hub-game/code/server/npcs.js +55 -9
- package/kits/hub-game/code/server/observe.js +67 -6
- package/kits/hub-game/code/server/players.js +14 -2
- package/kits/hub-game/code/server/replay.js +135 -0
- package/kits/hub-game/code/server/standing.js +7 -3
- package/kits/hub-game/code/server/storageLimit.js +4 -1
- package/kits/hub-game/code/server/townDay.js +74 -0
- package/kits/hub-game/code/server/vehicle.js +3 -0
- package/kits/hub-game/code/server/vis.js +26 -4
- package/kits/hub-game/code/server/wallet.js +677 -0
- package/kits/hub-game/code/server/wear.js +13 -3
- package/kits/hub-game/code/server/writerLease.js +191 -0
- package/kits/hub-game/code/shared/act.js +1 -1
- package/kits/hub-game/code/shared/expression.js +6 -0
- package/kits/hub-game/code/shared/replay.js +37 -0
- package/kits/hub-game/code/systems/hub.js +429 -55
- package/kits/hub-game/docs/analytics.md +16 -2
- package/kits/hub-game/docs/contract.md +956 -101
- package/kits/hub-game/docs/home-pieces.md +5 -6
- package/kits/hub-game/docs/observed-progress.md +49 -1
- package/kits/hub-game/docs/vehicle-preset.md +23 -0
- package/kits/hub-game/index.html +1 -0
- package/kits/hub-game/models/hats/baker-cap.pxmodel +3 -3
- package/kits/hub-game/models/hats/bat-clip.pxmodel +3 -3
- package/kits/hub-game/models/hats/beekeeper.pxmodel +3 -3
- package/kits/hub-game/models/hats/cap.pxmodel +3 -3
- package/kits/hub-game/models/hats/captain.pxmodel +3 -3
- package/kits/hub-game/models/hats/chef-toque.pxmodel +3 -3
- package/kits/hub-game/models/hats/crooked-top.pxmodel +3 -3
- package/kits/hub-game/models/hats/delivery-cap.pxmodel +3 -3
- package/kits/hub-game/models/hats/fire-helmet.pxmodel +3 -3
- package/kits/hub-game/models/hats/flower-crown.pxmodel +3 -3
- package/kits/hub-game/models/hats/foam-crown.pxmodel +3 -3
- package/kits/hub-game/models/hats/hard-hat.pxmodel +3 -3
- package/kits/hub-game/models/hats/lantern.pxmodel +3 -3
- package/kits/hub-game/models/hats/laurel.pxmodel +3 -3
- package/kits/hub-game/models/hats/lighthouse.pxmodel +3 -3
- package/kits/hub-game/models/hats/nurse-cap.pxmodel +3 -3
- package/kits/hub-game/models/hats/police-cap.pxmodel +3 -3
- package/kits/hub-game/models/hats/sailor.pxmodel +3 -3
- package/kits/hub-game/models/hats/souwester.pxmodel +3 -3
- package/kits/hub-game/models/hats/straw.pxmodel +3 -3
- package/kits/hub-game/models/hats/sunflower.pxmodel +3 -3
- package/kits/hub-game/models/hats/sweatband.pxmodel +3 -3
- package/kits/hub-game/models/hats/teacher-beret.pxmodel +3 -3
- package/kits/hub-game/models/hats/witch.pxmodel +3 -3
- package/kits/hub-game/models/hold-show/daisy.pxmodel +231 -0
- package/kits/hub-game/models/hold-show/moonflower.pxmodel +171 -0
- package/kits/hub-game/models/hold-show/rose.pxmodel +191 -0
- package/kits/hub-game/models/hold-show/square/daisy.pxmodel +233 -0
- package/kits/hub-game/models/hold-show/square/moonflower.pxmodel +173 -0
- package/kits/hub-game/models/hold-show/square/rose.pxmodel +193 -0
- package/kits/hub-game/models/hold-show/square/sunflower.pxmodel +313 -0
- package/kits/hub-game/models/hold-show/square/tulip.pxmodel +133 -0
- package/kits/hub-game/models/hold-show/sunflower.pxmodel +311 -0
- package/kits/hub-game/models/hold-show/tulip.pxmodel +131 -0
- package/kits/hub-game/package-lock.json +3 -3
- package/kits/hub-game/package.json +4 -3
- package/kits/hub-game/scripts/fixtures/engine-models-stub.mjs +1 -0
- package/kits/hub-game/scripts/fixtures/hud-surface.json +12 -12
- package/kits/hub-game/scripts/fixtures/talk-surface.json +8 -8
- package/kits/hub-game/scripts/gen-hats.mjs +1 -1
- package/kits/hub-game/scripts/gen-hold-show.mjs +27 -0
- package/kits/hub-game/scripts/pack.mjs +89 -23
- package/kits/hub-game/scripts/test-act-client.mjs +5 -0
- package/kits/hub-game/scripts/test-act-core.mjs +32 -0
- package/kits/hub-game/scripts/test-act-gate.mjs +186 -0
- package/kits/hub-game/scripts/test-action-rail-crowded-dom.mjs +7 -1
- package/kits/hub-game/scripts/test-action-rail-default-dom.mjs +102 -0
- package/kits/hub-game/scripts/test-action-rail-never-silent-dom.mjs +50 -0
- package/kits/hub-game/scripts/test-action-rail-surface.mjs +368 -0
- package/kits/hub-game/scripts/test-action-rail-town-jobs-dom.mjs +118 -0
- package/kits/hub-game/scripts/test-actions-client.mjs +5 -3
- package/kits/hub-game/scripts/test-actions.mjs +24 -0
- package/kits/hub-game/scripts/test-actors.mjs +19 -0
- package/kits/hub-game/scripts/test-again-corner-dom.mjs +59 -0
- package/kits/hub-game/scripts/test-analytics.mjs +79 -0
- package/kits/hub-game/scripts/test-arrival-pose-server.mjs +25 -8
- package/kits/hub-game/scripts/test-ask-client.mjs +9 -0
- package/kits/hub-game/scripts/test-ask-surface.mjs +188 -0
- package/kits/hub-game/scripts/test-attention.mjs +43 -1
- package/kits/hub-game/scripts/test-ballot-sheet-dom.mjs +71 -0
- package/kits/hub-game/scripts/test-ballot-surface.mjs +276 -0
- package/kits/hub-game/scripts/test-ballot.mjs +421 -4
- package/kits/hub-game/scripts/test-ban-join.mjs +1 -1
- package/kits/hub-game/scripts/test-celebrate-client.mjs +62 -0
- package/kits/hub-game/scripts/test-celebrate.mjs +116 -0
- package/kits/hub-game/scripts/test-chat.mjs +73 -0
- package/kits/hub-game/scripts/test-companion-client.mjs +203 -21
- package/kits/hub-game/scripts/test-companion.mjs +110 -3
- package/kits/hub-game/scripts/test-control-layout-dom.mjs +57 -10
- package/kits/hub-game/scripts/test-corner-surface.mjs +268 -0
- package/kits/hub-game/scripts/test-decor-client.mjs +59 -3
- package/kits/hub-game/scripts/test-decor.mjs +27 -0
- package/kits/hub-game/scripts/test-device-class.mjs +4 -1
- package/kits/hub-game/scripts/test-disguise-client.mjs +281 -0
- package/kits/hub-game/scripts/test-disguise.mjs +176 -0
- package/kits/hub-game/scripts/test-dock-surface.mjs +404 -0
- package/kits/hub-game/scripts/test-door-stay-client.mjs +602 -0
- package/kits/hub-game/scripts/test-door-stay.mjs +613 -0
- package/kits/hub-game/scripts/test-earned-client.mjs +119 -0
- package/kits/hub-game/scripts/test-emote-surface.mjs +616 -0
- package/kits/hub-game/scripts/test-fps-telemetry.mjs +39 -4
- package/kits/hub-game/scripts/test-friend-bests.mjs +38 -12
- package/kits/hub-game/scripts/test-ghost-click-dom.mjs +75 -0
- package/kits/hub-game/scripts/test-grab-client.mjs +29 -2
- package/kits/hub-game/scripts/test-grab-orbit.mjs +260 -11
- package/kits/hub-game/scripts/test-grab.mjs +10 -1
- package/kits/hub-game/scripts/test-hats.mjs +28 -0
- package/kits/hub-game/scripts/test-held-offers.mjs +394 -0
- package/kits/hub-game/scripts/test-high-only.mjs +3 -3
- package/kits/hub-game/scripts/test-hold-show-client.mjs +175 -0
- package/kits/hub-game/scripts/test-hold-show.mjs +355 -0
- package/kits/hub-game/scripts/test-hub-controls.mjs +3 -1
- package/kits/hub-game/scripts/test-hub-idle.mjs +348 -0
- package/kits/hub-game/scripts/test-hub-leaving.mjs +21 -0
- package/kits/hub-game/scripts/test-hub-ops.mjs +119 -0
- package/kits/hub-game/scripts/test-hub-trip.mjs +240 -4
- package/kits/hub-game/scripts/test-hud-clear.mjs +83 -0
- package/kits/hub-game/scripts/test-hud-rate.mjs +2 -1
- package/kits/hub-game/scripts/test-idle.mjs +160 -0
- package/kits/hub-game/scripts/test-invites-client.mjs +53 -0
- package/kits/hub-game/scripts/test-labels.mjs +11 -0
- package/kits/hub-game/scripts/test-landscape-layout.mjs +20 -0
- package/kits/hub-game/scripts/test-loading-cover.mjs +67 -1
- package/kits/hub-game/scripts/test-manifest.mjs +27 -0
- package/kits/hub-game/scripts/test-menu-client.mjs +54 -5
- package/kits/hub-game/scripts/test-menu-surface.mjs +236 -0
- package/kits/hub-game/scripts/test-npcs.mjs +128 -0
- package/kits/hub-game/scripts/test-observed.mjs +171 -3
- package/kits/hub-game/scripts/test-pack.mjs +166 -0
- package/kits/hub-game/scripts/test-pad-cues.mjs +39 -0
- package/kits/hub-game/scripts/test-picker-surface.mjs +321 -0
- package/kits/hub-game/scripts/test-placeat-server.mjs +648 -0
- package/kits/hub-game/scripts/test-placement-cache.mjs +1 -1
- package/kits/hub-game/scripts/test-pointer-clear-dom.mjs +82 -0
- package/kits/hub-game/scripts/test-progress-reset.mjs +184 -6
- package/kits/hub-game/scripts/test-push-visit.mjs +9 -0
- package/kits/hub-game/scripts/test-quality.mjs +312 -9
- package/kits/hub-game/scripts/test-quick-chat-surface.mjs +511 -0
- package/kits/hub-game/scripts/test-rehello.mjs +242 -3
- package/kits/hub-game/scripts/test-rejoin-yaw.mjs +138 -0
- package/kits/hub-game/scripts/test-relations-among.mjs +13 -7
- package/kits/hub-game/scripts/test-relations-refresh.mjs +90 -2
- package/kits/hub-game/scripts/test-replay-client.mjs +110 -0
- package/kits/hub-game/scripts/test-replay.mjs +178 -0
- package/kits/hub-game/scripts/test-resume-held.mjs +13 -0
- package/kits/hub-game/scripts/test-resume-pose-server.mjs +43 -5
- package/kits/hub-game/scripts/test-role-client.mjs +2 -1
- package/kits/hub-game/scripts/test-safe-act.mjs +233 -0
- package/kits/hub-game/scripts/test-safe-caption.mjs +364 -0
- package/kits/hub-game/scripts/test-safe-layout.mjs +79 -0
- package/kits/hub-game/scripts/test-safe-prompt.mjs +163 -0
- package/kits/hub-game/scripts/test-sound-surface.mjs +256 -0
- package/kits/hub-game/scripts/test-soundscape.mjs +85 -2
- package/kits/hub-game/scripts/test-standing.mjs +135 -2
- package/kits/hub-game/scripts/test-stuck-surface.mjs +174 -0
- package/kits/hub-game/scripts/test-stuck.mjs +36 -1
- package/kits/hub-game/scripts/test-talk-surface.mjs +23 -6
- package/kits/hub-game/scripts/test-talk-walk-dom.mjs +123 -0
- package/kits/hub-game/scripts/test-text-ask-surface.mjs +273 -0
- package/kits/hub-game/scripts/test-tiers.mjs +453 -3
- package/kits/hub-game/scripts/test-toast-no-row-dom.mjs +71 -0
- package/kits/hub-game/scripts/test-together.mjs +11 -0
- package/kits/hub-game/scripts/test-town-day.mjs +90 -0
- package/kits/hub-game/scripts/test-try-on.mjs +39 -0
- package/kits/hub-game/scripts/test-ui-dom-dom.mjs +49 -2
- package/kits/hub-game/scripts/test-ui-tree.mjs +28 -0
- package/kits/hub-game/scripts/test-vehicle-client.mjs +68 -1
- package/kits/hub-game/scripts/test-vis.mjs +145 -0
- package/kits/hub-game/scripts/test-wallet.mjs +650 -0
- package/kits/hub-game/scripts/test-weakest-tier.mjs +135 -1
- package/kits/hub-game/scripts/test-world-labels.mjs +340 -0
- package/kits/hub-game/scripts/test-writer-lease-server.mjs +234 -0
- package/kits/hub-game/scripts/test-writer-lease.mjs +281 -0
- package/kits/hub-game/scripts/writer-storage-fixture.mjs +37 -0
- package/kits/hub-game/tools/hubScene/export.mjs +6 -5
- package/kits/hub-game/tools/hubScene/hubdata.mjs +10 -0
- package/kits/hub-game/tools/hubScene/test/export-fixture.mjs +36 -2
- package/kits/hub-game/tools/hubScene/validate-manifest.mjs +10 -2
- package/kits/multiplayer-3d/castle.json +5 -5
- package/kits/multiplayer-3d/code/client/resumeGate.js +66 -2
- package/kits/multiplayer-3d/code/server/ownership.js +25 -6
- package/kits/multiplayer-3d/code/server/world.js +19 -4
- package/kits/multiplayer-3d/code/systems/multiplayer.js +108 -18
- package/kits/multiplayer-3d/package-lock.json +1 -1
- package/kits/multiplayer-3d/package.json +2 -1
- package/kits/multiplayer-3d/scripts/test-ground-half.mjs +56 -0
- package/kits/multiplayer-3d/scripts/test-join-watchdog.mjs +54 -3
- package/kits/multiplayer-3d/scripts/test-owned-moves.mjs +190 -0
- package/kits/multiplayer-3d/scripts/test-resume-gate.mjs +417 -5
- package/kits/multiplayer-3d/scripts/test-resync-reconnect.mjs +68 -0
- package/kits/physics-2d/castle.json +2 -2
- package/kits/physics-2d/engine/scene.js +10 -2
- package/kits/physics-3d/CLAUDE.md +14 -0
- package/kits/physics-3d/behaviors/Player.jsx +39 -3
- package/kits/physics-3d/castle.json +3 -3
- package/kits/physics-3d/docs/engine-model-cache.md +109 -0
- package/kits/physics-3d/docs/engine-player.md +76 -0
- package/kits/physics-3d/docs/engine-skip-work.md +16 -0
- package/kits/physics-3d/docs/pxmodel-format.md +5 -1
- package/kits/physics-3d/engine3d/gait.js +16 -8
- package/kits/physics-3d/engine3d/groundsize.js +23 -0
- package/kits/physics-3d/engine3d/kithooks.js +50 -0
- package/kits/physics-3d/engine3d/look.js +110 -17
- package/kits/physics-3d/engine3d/lookbake.js +19 -1
- package/kits/physics-3d/engine3d/materialpresets.js +3 -2
- package/kits/physics-3d/engine3d/modelcache.js +280 -0
- package/kits/physics-3d/engine3d/modelcachedigest.js +37 -0
- package/kits/physics-3d/engine3d/modelcachegate.js +69 -0
- package/kits/physics-3d/engine3d/modelrefs.js +13 -0
- package/kits/physics-3d/engine3d/optimize.js +20 -9
- package/kits/physics-3d/engine3d/playerRun.js +26 -1
- package/kits/physics-3d/engine3d/pxmodel.js +7 -3
- package/kits/physics-3d/engine3d/templatecache.js +722 -0
- package/kits/physics-3d/engine3d/world3d.js +211 -17
- package/kits/physics-3d/package-lock.json +1 -1
- package/kits/physics-3d/package.json +2 -1
- package/kits/physics-3d/play/behaviors/Player.js +43 -3
- package/kits/physics-3d/scripts/render.mjs +56 -8
- package/kits/physics-3d/scripts/template-cache-fixtures.mjs +37 -0
- package/kits/physics-3d/scripts/template-cache-v1-bytes.json +49 -0
- package/kits/physics-3d/scripts/test-coaxial-escape.mjs +176 -0
- package/kits/physics-3d/scripts/test-gait.mjs +53 -9
- package/kits/physics-3d/scripts/test-ground-half.mjs +120 -0
- package/kits/physics-3d/scripts/test-model-cache.mjs +600 -0
- package/kits/physics-3d/scripts/test-orbit-shadow-fade.mjs +1 -0
- package/kits/physics-3d/scripts/test-sleeping-models.mjs +384 -0
- package/kits/physics-3d/scripts/test-template-cache-minified.mjs +106 -0
- package/kits/physics-3d/scripts/test-template-cache.mjs +519 -0
- package/kits/physics-3d/scripts/test-wall-slide.mjs +272 -0
- package/kits/physics-3d/systems/physics3d.js +59 -2
- package/kits/real-time/castle.json +2 -2
- package/kits/real-time/code/client/connection.js +3 -0
- package/package.json +2 -2
- package/vendor/three/examples/jsm/libs/fflate.module.js +2672 -0
|
@@ -85,7 +85,7 @@ export function makeLookBake() {
|
|
|
85
85
|
// `geometries`, and `copied(copy, geometry, source)` is told: `source` is
|
|
86
86
|
// what it was cloned from and `geometry` the one of the task's own that
|
|
87
87
|
// `source` is, or is a copy of.
|
|
88
|
-
export function queueLookBake(queue, owner, geometries, steps, copied = null) {
|
|
88
|
+
export function queueLookBake(queue, owner, geometries, steps, copied = null, restored = null) {
|
|
89
89
|
const gone = new Set();
|
|
90
90
|
const task = { owner, geometries, gone, copyOf: new Map(), copied, steps: steps(gone), started: false, distance: 0, onDispose: null };
|
|
91
91
|
task.onDispose = (event) => {
|
|
@@ -98,15 +98,33 @@ export function queueLookBake(queue, owner, geometries, steps, copied = null) {
|
|
|
98
98
|
for (const geometry of [...geometries]) {
|
|
99
99
|
waitIn(task, geometry);
|
|
100
100
|
}
|
|
101
|
+
if (restored) {
|
|
102
|
+
for (const [copy, geometry] of restored.copies) {
|
|
103
|
+
task.copyOf.set(copy, geometry);
|
|
104
|
+
geometries.push(copy);
|
|
105
|
+
waitIn(task, copy);
|
|
106
|
+
copied?.(copy, geometry, geometry);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
101
109
|
queue.tasks.push(task);
|
|
102
110
|
queue.unsorted = true;
|
|
103
111
|
queue.shown = false;
|
|
112
|
+
if (restored) for (const geometry of restored.gone) task.onDispose({ target: geometry });
|
|
113
|
+
return task;
|
|
104
114
|
}
|
|
105
115
|
|
|
106
116
|
// The tasks each geometry waits in. While it is in any, its `clone` is
|
|
107
117
|
// `cloneWaiting`, a property of its own that goes when the last task does.
|
|
108
118
|
const waitingIn = new WeakMap();
|
|
109
119
|
|
|
120
|
+
// Only the cache's pristine bake recipes can stand in for these callbacks.
|
|
121
|
+
export function templateBakeGeometry(geometry, tasks) {
|
|
122
|
+
const waiting = waitingIn.get(geometry);
|
|
123
|
+
if (Object.hasOwn(geometry, 'clone') && (geometry.clone !== cloneWaiting || !waiting?.length || waiting.some((task) => !tasks.has(task)))) return false;
|
|
124
|
+
return Object.entries(geometry._listeners ?? {}).every(([name, listeners]) => listeners.every((listener) =>
|
|
125
|
+
name === 'dispose' && waiting?.some((task) => tasks.has(task) && task.onDispose === listener)));
|
|
126
|
+
}
|
|
127
|
+
|
|
110
128
|
function waitIn(task, geometry) {
|
|
111
129
|
geometry.addEventListener('dispose', task.onDispose);
|
|
112
130
|
const tasks = waitingIn.get(geometry);
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
|
|
11
11
|
import * as THREE from 'three';
|
|
12
12
|
import { PART_DEFAULTS } from './pxmodel';
|
|
13
|
-
import { markKitHooks } from './kithooks';
|
|
13
|
+
import { markKitHooks, recordTemplateHook, templateCaptureActive } from './kithooks';
|
|
14
14
|
|
|
15
15
|
const FINISH_KEYS = ['roughness', 'metalness', 'clearcoat', 'emissive', 'emissiveIntensity'];
|
|
16
16
|
|
|
@@ -76,7 +76,7 @@ function setFinish(material, part, preset) {
|
|
|
76
76
|
|
|
77
77
|
// Emissive light is one color for the whole material. Here it is multiplied
|
|
78
78
|
// by the vertex color, so bright paint glows and dark paint barely does.
|
|
79
|
-
function glowByColor(material) {
|
|
79
|
+
export function glowByColor(material) {
|
|
80
80
|
material.onBeforeCompile = (shader) => {
|
|
81
81
|
shader.fragmentShader = shader.fragmentShader.replace(
|
|
82
82
|
'#include <emissivemap_fragment>',
|
|
@@ -85,6 +85,7 @@ function glowByColor(material) {
|
|
|
85
85
|
};
|
|
86
86
|
material.customProgramCacheKey = () => 'glow-by-color';
|
|
87
87
|
markKitHooks(material);
|
|
88
|
+
if (templateCaptureActive) recordTemplateHook(material, { kind: 'glow' });
|
|
88
89
|
}
|
|
89
90
|
|
|
90
91
|
//
|
|
@@ -0,0 +1,280 @@
|
|
|
1
|
+
// Play-only, opt-in scene template cache. Storage and digest modules load only
|
|
2
|
+
// after the key is accepted; editor worlds never create a visit or a report.
|
|
3
|
+
import { templateCacheKey, serializeTemplate, deserializeTemplate, TEMPLATE_CACHE_VERSION } from './templatecache';
|
|
4
|
+
import { beginTemplateCapture, endTemplateCapture } from './kithooks';
|
|
5
|
+
import { disposeNode } from './materials';
|
|
6
|
+
import { bakingLater, forgetTemplateLook, bindTemplateLookModels } from './look';
|
|
7
|
+
import { makeLookBake, stepLookBake, clearLookBake } from './lookbake';
|
|
8
|
+
import { parseModelCached } from './pxmodel';
|
|
9
|
+
|
|
10
|
+
import { MODEL_CACHE_MAX_BYTES } from './modelcachegate';
|
|
11
|
+
export { preloadModelCache, modelCacheVisitReady, readModelCacheKey, MODEL_CACHE_DEFAULT_BYTES, MODEL_CACHE_MAX_BYTES } from './modelcachegate';
|
|
12
|
+
const PREFIX = 'physics-3d:model-cache:';
|
|
13
|
+
const encoder = new TextEncoder();
|
|
14
|
+
const decoder = new TextDecoder('utf-8', { fatal: true });
|
|
15
|
+
const storageWork = new Map();
|
|
16
|
+
|
|
17
|
+
// Old visits cannot publish an index or resurrect a blob after a newer
|
|
18
|
+
// digest's cleanup. Bridge operations are async and never hold a frame.
|
|
19
|
+
function storageTurn(index, action) {
|
|
20
|
+
const previous = storageWork.get(index) ?? Promise.resolve();
|
|
21
|
+
const next = previous.catch(() => {}).then(action);
|
|
22
|
+
storageWork.set(index, next);
|
|
23
|
+
void next.finally(() => { if (storageWork.get(index) === next) storageWork.delete(index); }).catch(() => {});
|
|
24
|
+
return next;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function capture(build) {
|
|
28
|
+
beginTemplateCapture();
|
|
29
|
+
try { return build(); } finally { endTemplateCapture(); }
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function sameBytes(a, b) {
|
|
33
|
+
if (!(a instanceof ArrayBuffer) || !(b instanceof ArrayBuffer) || a.byteLength !== b.byteLength) return false;
|
|
34
|
+
const left = new Uint8Array(a), right = new Uint8Array(b);
|
|
35
|
+
return left.every((value, index) => value === right[index]);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export function readModelCacheBlob(bytes, scene, digest) {
|
|
39
|
+
if (!(bytes instanceof ArrayBuffer) || bytes.byteLength < 4 || bytes.byteLength > MODEL_CACHE_MAX_BYTES) return null;
|
|
40
|
+
try {
|
|
41
|
+
const size = new DataView(bytes).getUint32(0, true);
|
|
42
|
+
const header = JSON.parse(decoder.decode(new Uint8Array(bytes, 4, size)));
|
|
43
|
+
if (header.version !== TEMPLATE_CACHE_VERSION || header.scene !== scene || header.digest !== digest || !Array.isArray(header.entries)) return null;
|
|
44
|
+
const entries = new Map();
|
|
45
|
+
let at = 4 + size;
|
|
46
|
+
for (const [key, length] of header.entries) {
|
|
47
|
+
if (typeof key !== 'string' || !key.startsWith(`template:${TEMPLATE_CACHE_VERSION}:`) || entries.has(key) ||
|
|
48
|
+
!Number.isSafeInteger(length) || length <= 0 || at + length > bytes.byteLength) return null;
|
|
49
|
+
entries.set(key, bytes.slice(at, at + length));
|
|
50
|
+
at += length;
|
|
51
|
+
}
|
|
52
|
+
return at === bytes.byteLength ? entries : null;
|
|
53
|
+
} catch { return null; }
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
// The Map is oldest first. Charge the complete blob, including its header.
|
|
57
|
+
export function boundModelCache(entries, scene, digest, maxBytes) {
|
|
58
|
+
const header = () => encoder.encode(JSON.stringify({ version: TEMPLATE_CACHE_VERSION, scene, digest,
|
|
59
|
+
entries: [...entries].map(([key, bytes]) => [key, bytes.byteLength]) }));
|
|
60
|
+
let payload = [...entries.values()].reduce((sum, bytes) => sum + bytes.byteLength, 0);
|
|
61
|
+
let json = header();
|
|
62
|
+
while (entries.size && 4 + json.length + payload > maxBytes) {
|
|
63
|
+
const key = entries.keys().next().value;
|
|
64
|
+
payload -= entries.get(key).byteLength;
|
|
65
|
+
entries.delete(key);
|
|
66
|
+
json = header();
|
|
67
|
+
}
|
|
68
|
+
return entries.size ? { json, size: 4 + json.length + payload } : null;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
async function blobBytes(entries, bounded, pause, cancelled) {
|
|
72
|
+
const bytes = new ArrayBuffer(bounded.size);
|
|
73
|
+
new DataView(bytes).setUint32(0, bounded.json.length, true);
|
|
74
|
+
new Uint8Array(bytes, 4, bounded.json.length).set(bounded.json);
|
|
75
|
+
let offset = 4 + bounded.json.length;
|
|
76
|
+
for (const template of entries.values()) {
|
|
77
|
+
const source = new Uint8Array(template);
|
|
78
|
+
for (let at = 0; at < source.length; at += 65536) {
|
|
79
|
+
if (cancelled()) return null;
|
|
80
|
+
new Uint8Array(bytes, offset + at, Math.min(65536, source.length - at)).set(source.subarray(at, at + 65536));
|
|
81
|
+
if (at % (512 * 1024) === 0) await pause();
|
|
82
|
+
}
|
|
83
|
+
offset += source.length;
|
|
84
|
+
}
|
|
85
|
+
return bytes;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
const pause = () => new Promise((resolve) => setTimeout(resolve, 0));
|
|
89
|
+
const defaultStorage = () => import('castle-web-sdk').then((module) => module.LocalCache);
|
|
90
|
+
|
|
91
|
+
export function createModelCacheVisit(world, runtime, scene, maxBytes, options) {
|
|
92
|
+
return new ModelCacheVisit(world, runtime, scene, maxBytes, options);
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
class ModelCacheVisit {
|
|
96
|
+
constructor(world, runtime, scene, maxBytes, options = {}) {
|
|
97
|
+
this.world = world;
|
|
98
|
+
this.runtime = runtime;
|
|
99
|
+
this.data = runtime.data;
|
|
100
|
+
this.files = runtime.files;
|
|
101
|
+
this.scene = scene;
|
|
102
|
+
this.maxBytes = maxBytes;
|
|
103
|
+
this.options = options;
|
|
104
|
+
this.entries = new Map();
|
|
105
|
+
this.pending = new Map();
|
|
106
|
+
this.closed = false;
|
|
107
|
+
this.ready = false;
|
|
108
|
+
this.dirty = false;
|
|
109
|
+
this.revision = 0;
|
|
110
|
+
this.firstFrame = false;
|
|
111
|
+
this.timer = null;
|
|
112
|
+
this.running = null;
|
|
113
|
+
this.report = options.report ?? { hits: 0, misses: 0, stored: 0, bytes: 0, readMs: 0, decodeMs: 0 };
|
|
114
|
+
if (globalThis.__castleModelCacheVerify === true) Object.assign(this.report, { verified: 0, mismatches: [] });
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
async preload() {
|
|
118
|
+
const started = performance.now();
|
|
119
|
+
let timer;
|
|
120
|
+
// Include lazy module/digest work in the 1500 ms allowance. The task
|
|
121
|
+
// returns data only: a timed-out or abandoned read cannot adopt anything.
|
|
122
|
+
const task = (async () => {
|
|
123
|
+
const digest = this.options.digest;
|
|
124
|
+
if (typeof digest !== 'string' || !digest || this.closed || this.readExpired) return null;
|
|
125
|
+
const storage = await (this.options.localCache ?? defaultStorage());
|
|
126
|
+
if (this.closed || this.readExpired) return null;
|
|
127
|
+
this.storage = storage;
|
|
128
|
+
this.digest = digest;
|
|
129
|
+
this.indexKey = `${PREFIX}${encodeURIComponent(this.scene)}:index`;
|
|
130
|
+
this.blobKey = `${PREFIX}${encodeURIComponent(this.scene)}:${digest}`;
|
|
131
|
+
const [blob, old] = await Promise.all([storage.getBinary(this.blobKey), storage.getText(this.indexKey)]);
|
|
132
|
+
return { blob, old };
|
|
133
|
+
})().catch(() => null);
|
|
134
|
+
const timeout = new Promise((resolve) => { timer = setTimeout(() => resolve(null), this.options.timeoutMs ?? 1500); });
|
|
135
|
+
const result = await Promise.race([task, timeout]);
|
|
136
|
+
clearTimeout(timer);
|
|
137
|
+
if (this.readExpired) return;
|
|
138
|
+
this.readExpired = true;
|
|
139
|
+
if (this.closed) return;
|
|
140
|
+
this.report.readMs = performance.now() - started;
|
|
141
|
+
if (result) {
|
|
142
|
+
const entries = readModelCacheBlob(result.blob, this.scene, this.digest);
|
|
143
|
+
if (entries) { this.entries = entries; this.report.bytes = result.blob.byteLength; this.report.stored = entries.size; }
|
|
144
|
+
else if (result.blob) this.dirty = true;
|
|
145
|
+
if (result.blob?.byteLength > this.maxBytes) this.dirty = true;
|
|
146
|
+
if (typeof result.old === 'string' && result.old.startsWith(`${PREFIX}${encodeURIComponent(this.scene)}:`) && result.old !== this.blobKey) {
|
|
147
|
+
this.dirty = true;
|
|
148
|
+
void storageTurn(this.indexKey, () => this.storage.remove(result.old)).catch(() => {});
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
this.ready = true;
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
template(_sharedKey, file, model, sprites, files, drops, build, buildAsScene, later = this.world.bakesLookLater) {
|
|
155
|
+
this.revision++;
|
|
156
|
+
const key = templateCacheKey(files[file], file, { models: files, sprites, optimize: true,
|
|
157
|
+
dropEmptyParts: drops === true, bakesLookLater: later === true,
|
|
158
|
+
skipSurfaceBakes: this.world.lookBake?.skipSurfaceBakes === true });
|
|
159
|
+
const bytes = this.entries.get(key);
|
|
160
|
+
if (bytes) {
|
|
161
|
+
const started = performance.now();
|
|
162
|
+
const decode = () => {
|
|
163
|
+
const root = deserializeTemplate(bytes);
|
|
164
|
+
if (root && !bindTemplateLookModels(root, (path) => path === file ? model : parseModelCached(files[path]))) {
|
|
165
|
+
disposeNode(root);
|
|
166
|
+
return null;
|
|
167
|
+
}
|
|
168
|
+
return root;
|
|
169
|
+
};
|
|
170
|
+
const root = decode();
|
|
171
|
+
this.report.decodeMs += performance.now() - started;
|
|
172
|
+
let verified = true;
|
|
173
|
+
let fresh;
|
|
174
|
+
if (root && this.report.mismatches) {
|
|
175
|
+
const queue = makeLookBake();
|
|
176
|
+
queue.now = () => 0;
|
|
177
|
+
queue.skipSurfaceBakes = this.world.lookBake?.skipSurfaceBakes === true;
|
|
178
|
+
// QA may finish isolated copies, while the actual hit remains exactly
|
|
179
|
+
// the unbaked build result that the playing world's queue will receive.
|
|
180
|
+
const proof = later ? bakingLater(queue, key, decode, true) : root;
|
|
181
|
+
try {
|
|
182
|
+
fresh = capture(() => later ? bakingLater(queue, key, build) : build());
|
|
183
|
+
while (queue.pending > 0) stepLookBake(queue);
|
|
184
|
+
this.report.verified++;
|
|
185
|
+
verified = sameBytes(serializeTemplate(proof).bytes, serializeTemplate(fresh).bytes);
|
|
186
|
+
if (!verified) this.report.mismatches.push(key);
|
|
187
|
+
} finally {
|
|
188
|
+
clearLookBake(queue);
|
|
189
|
+
if (proof !== root) disposeNode(proof);
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
if (root && verified) {
|
|
193
|
+
if (fresh) disposeNode(fresh);
|
|
194
|
+
this.entries.delete(key);
|
|
195
|
+
this.entries.set(key, bytes);
|
|
196
|
+
this.report.hits++;
|
|
197
|
+
this.dirty = true;
|
|
198
|
+
const template = buildAsScene ? buildAsScene(() => root, true) : root;
|
|
199
|
+
forgetTemplateLook(template);
|
|
200
|
+
return template;
|
|
201
|
+
}
|
|
202
|
+
if (root) disposeNode(root);
|
|
203
|
+
if (fresh) disposeNode(fresh);
|
|
204
|
+
this.entries.delete(key);
|
|
205
|
+
this.dirty = true;
|
|
206
|
+
}
|
|
207
|
+
this.report.misses++;
|
|
208
|
+
return capture(() => {
|
|
209
|
+
const root = buildAsScene ? buildAsScene(build) : build();
|
|
210
|
+
// Freeze bytes synchronously, inside capture and before takeModel can
|
|
211
|
+
// hand any copy to play. No material, geometry or node is read at flush.
|
|
212
|
+
const { bytes } = serializeTemplate(root);
|
|
213
|
+
forgetTemplateLook(root);
|
|
214
|
+
if (bytes) this.pending.set(key, bytes);
|
|
215
|
+
this.dirty = true;
|
|
216
|
+
return root;
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
afterFrame() {
|
|
221
|
+
if (!this.firstFrame) {
|
|
222
|
+
this.firstFrame = true;
|
|
223
|
+
this.noLoadDue = performance.now() + (this.options.settleMs ?? 3000);
|
|
224
|
+
}
|
|
225
|
+
if (this.closed || !this.ready || !this.dirty || this.timer !== null || this.running) return;
|
|
226
|
+
const load = this.world.modelLoad;
|
|
227
|
+
if (load && !load.restMarked) return;
|
|
228
|
+
// No load queue: wait three seconds after the first drawn frame.
|
|
229
|
+
const delay = load?.restMarked ? 0 : Math.max(0, this.noLoadDue - performance.now());
|
|
230
|
+
this.timer = setTimeout(() => { this.timer = null; void this.flush(); }, delay);
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
async flush() {
|
|
234
|
+
if (this.running) return this.running;
|
|
235
|
+
if (!this.firstFrame || !this.ready || this.closed || this.world.modelLoad && !this.world.modelLoad.restMarked) return;
|
|
236
|
+
if (this.timer !== null) { clearTimeout(this.timer); this.timer = null; }
|
|
237
|
+
this.running = this.write().catch(() => {}).finally(() => { this.running = null; });
|
|
238
|
+
return this.running;
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
async write() {
|
|
242
|
+
const cancelled = () => this.closed || this.world.disposed || this.world.modelCache !== this;
|
|
243
|
+
const yieldTurn = this.options.pause ?? pause;
|
|
244
|
+
const revision = this.revision;
|
|
245
|
+
if (!this.storage || !this.blobKey) { this.pending.clear(); this.dirty = false; return; }
|
|
246
|
+
const batch = [...this.pending];
|
|
247
|
+
for (const [key, bytes] of batch) {
|
|
248
|
+
if (cancelled()) return;
|
|
249
|
+
if (this.pending.get(key) === bytes) this.pending.delete(key);
|
|
250
|
+
this.entries.delete(key);
|
|
251
|
+
this.entries.set(key, bytes);
|
|
252
|
+
await yieldTurn();
|
|
253
|
+
}
|
|
254
|
+
if (cancelled() || !this.storage || !this.blobKey) return;
|
|
255
|
+
const writing = new Map(this.entries);
|
|
256
|
+
const bounded = boundModelCache(writing, this.scene, this.digest, this.maxBytes);
|
|
257
|
+
for (const [key, bytes] of this.entries) if (!writing.has(key) && this.entries.get(key) === bytes) this.entries.delete(key);
|
|
258
|
+
const blob = bounded ? await blobBytes(writing, bounded, yieldTurn, cancelled) : null;
|
|
259
|
+
if (cancelled()) return;
|
|
260
|
+
this.dirty = this.pending.size > 0 || this.revision !== revision;
|
|
261
|
+
this.report.stored = writing.size;
|
|
262
|
+
this.report.bytes = blob?.byteLength ?? 0;
|
|
263
|
+
// set transfers its buffer. The blob is a separate allocation; the
|
|
264
|
+
// per-template byte arrays remain owned by this visit for future hits.
|
|
265
|
+
await storageTurn(this.indexKey, async () => {
|
|
266
|
+
if (cancelled()) return;
|
|
267
|
+
if (blob) await this.storage.set(this.blobKey, blob);
|
|
268
|
+
else await this.storage.remove(this.blobKey);
|
|
269
|
+
if (!cancelled()) await this.storage.set(this.indexKey, this.blobKey);
|
|
270
|
+
else await this.storage.remove(this.blobKey);
|
|
271
|
+
});
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
close() {
|
|
275
|
+
this.closed = true;
|
|
276
|
+
if (this.timer !== null) clearTimeout(this.timer);
|
|
277
|
+
this.pending.clear();
|
|
278
|
+
this.entries.clear();
|
|
279
|
+
}
|
|
280
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
// Loaded only for opted-in play. Inspect the frame's existing code, without
|
|
2
|
+
// bundling a second copy of the kit's source or fetching any script contents.
|
|
3
|
+
import * as THREE from 'three';
|
|
4
|
+
import { TEMPLATE_CACHE_VERSION } from './templatecache';
|
|
5
|
+
|
|
6
|
+
export async function digestModelCacheScripts(environment = globalThis) {
|
|
7
|
+
try {
|
|
8
|
+
const { document, TextEncoder, crypto } = environment;
|
|
9
|
+
if (!document?.scripts || typeof TextEncoder !== 'function' || typeof crypto?.subtle?.digest !== 'function') return null;
|
|
10
|
+
const scripts = [];
|
|
11
|
+
for (const script of document.scripts) {
|
|
12
|
+
if (script.src) {
|
|
13
|
+
let path;
|
|
14
|
+
try {
|
|
15
|
+
const url = new URL(script.src, document.baseURI);
|
|
16
|
+
if (['http:', 'https:'].includes(url.protocol)) path = url.pathname;
|
|
17
|
+
} catch { path = null; /* An unparseable URL is not content-addressed. */ }
|
|
18
|
+
if (!path || !/(?:^|\/)[a-f0-9]{64}(?:\.m?js)?(?:\/|$)/i.test(path)) {
|
|
19
|
+
return { digest: null, reason: 'unhashed script' };
|
|
20
|
+
}
|
|
21
|
+
scripts.push(`src:${script.src}`);
|
|
22
|
+
} else scripts.push(`inline:${script.textContent}`);
|
|
23
|
+
}
|
|
24
|
+
const input = new TextEncoder().encode(JSON.stringify([TEMPLATE_CACHE_VERSION, THREE.REVISION, scripts]));
|
|
25
|
+
const digest = await crypto.subtle.digest('SHA-256', input);
|
|
26
|
+
return [...new Uint8Array(digest)].map((byte) => byte.toString(16).padStart(2, '0')).join('').slice(0, 16);
|
|
27
|
+
} catch { return null; }
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
// One snapshot per page, including an unavailable result. Native hashing starts
|
|
31
|
+
// during preload and shares its deadline; a late result cannot enable a visit.
|
|
32
|
+
export function makeModelCacheBuildDigest(environment = globalThis) {
|
|
33
|
+
let digest;
|
|
34
|
+
return () => digest ??= digestModelCacheScripts(environment);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export const modelCacheBuildDigest = makeModelCacheBuildDigest();
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
// Keyless play imports only this gate: no codec, script digest or SDK module.
|
|
2
|
+
export const MODEL_CACHE_DEFAULT_BYTES = 8 * 1024 * 1024;
|
|
3
|
+
export const MODEL_CACHE_MAX_BYTES = 16 * 1024 * 1024;
|
|
4
|
+
|
|
5
|
+
export function readModelCacheKey(data) {
|
|
6
|
+
const key = data?.engine?.modelCache;
|
|
7
|
+
if (!key || typeof key !== 'object' || Array.isArray(key)) return null;
|
|
8
|
+
for (const name in key) if (Object.hasOwn(key, name) && name !== 'maxBytes') return null;
|
|
9
|
+
const maxBytes = key.maxBytes === undefined ? MODEL_CACHE_DEFAULT_BYTES : key.maxBytes;
|
|
10
|
+
return Number.isSafeInteger(maxBytes) && maxBytes > 0 && maxBytes <= MODEL_CACHE_MAX_BYTES ? maxBytes : null;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
// Returns null without a valid key, otherwise the same promise for this visit.
|
|
14
|
+
// The timeout includes loading the optional cache/SDK/digest modules themselves.
|
|
15
|
+
export function preloadModelCache(world, runtime, options) {
|
|
16
|
+
const maxBytes = world.staticActorsOff === true || world.disposed ? null : readModelCacheKey(runtime.data);
|
|
17
|
+
const scene = runtime.scenePath ?? runtime.currentScenePath ?? 'scenes/main.scene';
|
|
18
|
+
const previous = world.modelCache;
|
|
19
|
+
if (previous && previous.data === runtime.data && previous.scene === scene && previous.files === runtime.files && previous.maxBytes === maxBytes && !previous.closed) return previous.readyPromise;
|
|
20
|
+
if (previous) { previous.close(); delete world.modelCache; delete world.modelCacheReport; }
|
|
21
|
+
if (!maxBytes) return null;
|
|
22
|
+
const started = performance.now();
|
|
23
|
+
const timeoutMs = options?.timeoutMs ?? 1500;
|
|
24
|
+
const report = { hits: 0, misses: 0, stored: 0, bytes: 0, readMs: 0, decodeMs: 0 };
|
|
25
|
+
if (globalThis.__castleModelCacheVerify === true) Object.assign(report, { verified: 0, mismatches: [] });
|
|
26
|
+
// If an optional module itself times out, ordinary builds remain available.
|
|
27
|
+
const waiting = { data: runtime.data, scene, files: runtime.files, maxBytes, report, ready: false, closed: false,
|
|
28
|
+
template(_shared, _file, _model, _sprites, _files, _drops, build, buildAsScene) { report.misses++; return buildAsScene ? buildAsScene(build) : build(); },
|
|
29
|
+
afterFrame() {}, close() { this.closed = true; } };
|
|
30
|
+
let current = waiting;
|
|
31
|
+
let timer;
|
|
32
|
+
world.modelCache = waiting;
|
|
33
|
+
world.modelCacheReport = report;
|
|
34
|
+
// Start hashing alongside optional module loading. The blob key needs the
|
|
35
|
+
// result; failed hashing must not issue even an index read to LocalCache.
|
|
36
|
+
const digest = options?.digest === undefined
|
|
37
|
+
? import('./modelcachedigest').then((module) => module.modelCacheBuildDigest())
|
|
38
|
+
: Promise.resolve(options.digest);
|
|
39
|
+
const moduleReady = import('./modelcache').catch(() => null);
|
|
40
|
+
const loaded = digest.catch(() => null).then(async (digest) => {
|
|
41
|
+
if (waiting.closed || performance.now() - started >= timeoutMs) return;
|
|
42
|
+
if (typeof digest !== 'string' || !digest) {
|
|
43
|
+
report.digest = 'unavailable';
|
|
44
|
+
if (digest?.reason) report.reason = digest.reason;
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const module = await moduleReady;
|
|
48
|
+
if (!module || waiting.closed || performance.now() - started >= timeoutMs) return;
|
|
49
|
+
current = module.createModelCacheVisit(world, runtime, scene, maxBytes,
|
|
50
|
+
{ ...options, digest, report, timeoutMs: Math.max(0, timeoutMs - (performance.now() - started)) });
|
|
51
|
+
current.readyPromise = waiting.readyPromise;
|
|
52
|
+
world.modelCache = current;
|
|
53
|
+
await current.preload();
|
|
54
|
+
}).catch(() => {});
|
|
55
|
+
const deadline = new Promise((resolve) => { timer = setTimeout(resolve, timeoutMs); });
|
|
56
|
+
waiting.readyPromise = Promise.race([loaded, deadline]).then(() => {
|
|
57
|
+
clearTimeout(timer);
|
|
58
|
+
if (world.modelCache !== current || current.closed) return;
|
|
59
|
+
current.readExpired = true;
|
|
60
|
+
current.ready = true;
|
|
61
|
+
report.readMs = performance.now() - started;
|
|
62
|
+
});
|
|
63
|
+
return waiting.readyPromise;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
export function modelCacheVisitReady(world, runtime) {
|
|
67
|
+
preloadModelCache(world, runtime);
|
|
68
|
+
return !world.modelCache || world.modelCache.ready;
|
|
69
|
+
}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
|
|
10
10
|
import * as THREE from 'three';
|
|
11
11
|
import { parseModelCached, buildModelNode, modelArtSignature } from './pxmodel';
|
|
12
|
+
import { partArtRefs } from './artobjects';
|
|
12
13
|
|
|
13
14
|
// References nest at most this deep: a model, a part of it, a part of that.
|
|
14
15
|
export const MAX_MODEL_DEPTH = 4;
|
|
@@ -118,3 +119,15 @@ export function modelRefSignature(model, sprites, models, path = '') {
|
|
|
118
119
|
}
|
|
119
120
|
return out.join('|');
|
|
120
121
|
}
|
|
122
|
+
|
|
123
|
+
// Capture-only: even unresolved art makes a template unsuitable for the byte
|
|
124
|
+
// cache. Use the builder's same path, cycle and depth rules for references.
|
|
125
|
+
export function modelRequestsArt(model, models, chain) {
|
|
126
|
+
if (model.parts.some((part) => partArtRefs(part).length > 0)) return true;
|
|
127
|
+
for (const part of model.parts) {
|
|
128
|
+
if (part.kind !== 'model') continue;
|
|
129
|
+
const found = referencedModel(part, models, chain);
|
|
130
|
+
if (found && modelRequestsArt(found.model, models, [...chain, found.path])) return true;
|
|
131
|
+
}
|
|
132
|
+
return false;
|
|
133
|
+
}
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
|
|
17
17
|
import * as THREE from 'three';
|
|
18
18
|
import { mergeGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
|
|
19
|
-
import { outlinePartByPart, outlineMergedLater } from './look';
|
|
20
|
-
import { markKitHooks } from './kithooks';
|
|
19
|
+
import { outlinePartByPart, outlineMergedLater, OutlineMesh } from './look';
|
|
20
|
+
import { markKitHooks, recordTemplateHook, templateCaptureActive } from './kithooks';
|
|
21
21
|
|
|
22
22
|
// Meters per screen pixel under the third-person camera, and under the far
|
|
23
23
|
// overhead camera of the space decks.
|
|
@@ -610,7 +610,7 @@ function instancedCopy(anchor, copies) {
|
|
|
610
610
|
instanced.userData = { ...first.userData };
|
|
611
611
|
instanced.computeBoundingSphere();
|
|
612
612
|
if (first.userData.lookOutline) {
|
|
613
|
-
instanced.raycast =
|
|
613
|
+
instanced.raycast = OutlineMesh.prototype.raycast;
|
|
614
614
|
}
|
|
615
615
|
return instanced;
|
|
616
616
|
}
|
|
@@ -676,7 +676,7 @@ varying vec2 vPartFinish;
|
|
|
676
676
|
|
|
677
677
|
// The material reads roughness and metalness from each vertex, so parts
|
|
678
678
|
// that differ only in those draw in one call.
|
|
679
|
-
function finishFromVertices(material) {
|
|
679
|
+
export function finishFromVertices(material) {
|
|
680
680
|
const previous = material.onBeforeCompile;
|
|
681
681
|
const previousKey = material.customProgramCacheKey;
|
|
682
682
|
material.onBeforeCompile = (shader, renderer) => {
|
|
@@ -693,6 +693,7 @@ function finishFromVertices(material) {
|
|
|
693
693
|
};
|
|
694
694
|
material.customProgramCacheKey = () => `part-finish|${previousKey.call(material)}`;
|
|
695
695
|
markKitHooks(material, previous, previousKey);
|
|
696
|
+
if (templateCaptureActive) recordTemplateHook(material, { kind: 'finish' }, previous, previousKey);
|
|
696
697
|
}
|
|
697
698
|
|
|
698
699
|
//
|
|
@@ -896,16 +897,26 @@ export function takeModel(cache, key, build) {
|
|
|
896
897
|
return entry.template;
|
|
897
898
|
}
|
|
898
899
|
|
|
899
|
-
// Gives back one actor's use
|
|
900
|
-
|
|
900
|
+
// Gives back one actor's use. Sleeping actors park the last user's build at
|
|
901
|
+
// zero users; takeModel reuses it on wake. Other releases still dispose it.
|
|
902
|
+
export function releaseModel(cache, key, dispose, park = false) {
|
|
901
903
|
const entry = cache.get(key);
|
|
902
904
|
if (!entry) {
|
|
903
905
|
return;
|
|
904
906
|
}
|
|
905
|
-
entry.users
|
|
906
|
-
if (entry.users
|
|
907
|
+
entry.users = Math.max(0, entry.users - 1);
|
|
908
|
+
if (entry.users === 0 && !park) {
|
|
909
|
+
cache.delete(key);
|
|
907
910
|
dispose(entry.template);
|
|
911
|
+
}
|
|
912
|
+
}
|
|
913
|
+
|
|
914
|
+
// Clear only unowned templates: live and resident-scene users retain theirs.
|
|
915
|
+
export function disposeParkedModels(cache, dispose) {
|
|
916
|
+
for (const [key, entry] of cache) {
|
|
917
|
+
if (entry.users !== 0) continue;
|
|
908
918
|
cache.delete(key);
|
|
919
|
+
dispose(entry.template);
|
|
909
920
|
}
|
|
910
921
|
}
|
|
911
922
|
|
|
@@ -1086,7 +1097,7 @@ function replaceInstancedMesh(scene, part) {
|
|
|
1086
1097
|
mesh.receiveShadow = source.receiveShadow;
|
|
1087
1098
|
mesh.frustumCulled = false;
|
|
1088
1099
|
mesh.userData.lookOutline = source.userData.lookOutline;
|
|
1089
|
-
mesh.raycast =
|
|
1100
|
+
mesh.raycast = OutlineMesh.prototype.raycast;
|
|
1090
1101
|
part.mesh = mesh;
|
|
1091
1102
|
scene.add(mesh);
|
|
1092
1103
|
}
|
|
@@ -14,6 +14,7 @@ import { renderHidingOwnModel } from './ownmodel';
|
|
|
14
14
|
import { makeFrameClock, makeInputLatch, nextFrame, updateLending } from './framecap';
|
|
15
15
|
import { prepareModelConsumers } from './modelready.js';
|
|
16
16
|
import { lowMemoryDevice } from './memoryprofile.js';
|
|
17
|
+
import { readModelCacheKey, preloadModelCache, modelCacheVisitReady } from './modelcachegate';
|
|
17
18
|
|
|
18
19
|
export function mountScene3D({
|
|
19
20
|
canvas,
|
|
@@ -55,7 +56,7 @@ export function mountScene3D({
|
|
|
55
56
|
const latch = makeInputLatch();
|
|
56
57
|
const detachInput = attachInput(canvas, runtime, world, latch);
|
|
57
58
|
const stopResize = attachResize(canvas, world);
|
|
58
|
-
const stopLoop = startLoop(
|
|
59
|
+
const stopLoop = (readModelCacheKey(runtime.data) ? startLoopAfterModelCache : startLoop)(
|
|
59
60
|
runtime,
|
|
60
61
|
world,
|
|
61
62
|
sprites,
|
|
@@ -74,6 +75,19 @@ export function mountScene3D({
|
|
|
74
75
|
};
|
|
75
76
|
}
|
|
76
77
|
|
|
78
|
+
// The mount cleanup stays synchronous, but opted-in play cannot update or
|
|
79
|
+
// synchronize a model until the one scene blob has read (or timed out).
|
|
80
|
+
function startLoopAfterModelCache(runtime, world, ...args) {
|
|
81
|
+
let alive = true;
|
|
82
|
+
let stop;
|
|
83
|
+
const ready = preloadModelCache(world, runtime);
|
|
84
|
+
if (!ready) return startLoop(runtime, world, ...args);
|
|
85
|
+
ready.then(() => {
|
|
86
|
+
if (alive) stop = startLoop(runtime, world, ...args);
|
|
87
|
+
});
|
|
88
|
+
return () => { alive = false; stop?.(); };
|
|
89
|
+
}
|
|
90
|
+
|
|
77
91
|
function attachInput(canvas, runtime, world, latch) {
|
|
78
92
|
const onKeyDown = (event) => {
|
|
79
93
|
// Space is gameplay (jump); keep it from scrolling the page.
|
|
@@ -245,6 +259,10 @@ function startLoop(runtime, world, sprites, hudRefs, onFirstFrame, onError, latc
|
|
|
245
259
|
const clock = makeFrameClock(performance.now());
|
|
246
260
|
let firstFrameSignaled = false;
|
|
247
261
|
const tick = (now) => {
|
|
262
|
+
if ((world.modelCache || runtime.data?.engine?.modelCache) && !modelCacheVisitReady(world, runtime)) {
|
|
263
|
+
raf = requestAnimationFrame(tick);
|
|
264
|
+
return;
|
|
265
|
+
}
|
|
248
266
|
// A scene that set `engine.maxFps` skips an animation frame that comes
|
|
249
267
|
// too soon after the last frame that ran (`framecap.js`); without it
|
|
250
268
|
// every animation frame runs, handed what it always was.
|
|
@@ -281,6 +299,12 @@ function startLoop(runtime, world, sprites, hudRefs, onFirstFrame, onError, latc
|
|
|
281
299
|
runtime.currentScenePath = next;
|
|
282
300
|
runtime.persistent.sceneChangeGraceUntil = runtime.time + 1;
|
|
283
301
|
}
|
|
302
|
+
// A behavior can switch scenes during update, including a direct
|
|
303
|
+
// loadFromFile. Preload that visit before its first model sync as well.
|
|
304
|
+
if ((world.modelCache || runtime.data?.engine?.modelCache) && !modelCacheVisitReady(world, runtime)) {
|
|
305
|
+
raf = requestAnimationFrame(tick);
|
|
306
|
+
return;
|
|
307
|
+
}
|
|
284
308
|
stage?.('scene-build:start');
|
|
285
309
|
syncActors(world, runtime, runtime.sprites ?? sprites, dt);
|
|
286
310
|
stage?.('scene-build:end');
|
|
@@ -293,6 +317,7 @@ function startLoop(runtime, world, sprites, hudRefs, onFirstFrame, onError, latc
|
|
|
293
317
|
if (runtime.orbitOwnModel !== undefined) renderHidingOwnModel(world, runtime, renderWorld);
|
|
294
318
|
else renderWorld(world, runtime);
|
|
295
319
|
stage?.('first-render:end');
|
|
320
|
+
if (world.modelCache) world.modelCache.afterFrame();
|
|
296
321
|
updateHud(runtime, hudRefs);
|
|
297
322
|
} catch (err) {
|
|
298
323
|
onError?.(err);
|
|
@@ -12,7 +12,8 @@ import { repeatAlong } from './paths';
|
|
|
12
12
|
import { applySurfaceDetail, hasSurfaceDetail } from './surfacedetail';
|
|
13
13
|
import { applyPaint, hasPaint } from './paint';
|
|
14
14
|
import { applyMaterialPreset } from './materialpresets';
|
|
15
|
-
import { buildModelRef } from './modelrefs';
|
|
15
|
+
import { buildModelRef, modelRequestsArt } from './modelrefs';
|
|
16
|
+
import { templateCaptureActive, recordTemplateArt } from './kithooks';
|
|
16
17
|
import { applyLook, lookIsEnabled } from './look';
|
|
17
18
|
import { applyArtObjects, applyMaterialExtras, partArtRefs } from './artobjects';
|
|
18
19
|
import { coarsenParts, detailFor, optimizeModel, referenceBudget } from './optimize';
|
|
@@ -553,6 +554,7 @@ export function buildModelNode(
|
|
|
553
554
|
options = {}
|
|
554
555
|
) {
|
|
555
556
|
const root = new THREE.Group();
|
|
557
|
+
if (templateCaptureActive && modelRequestsArt(model, models, chain)) recordTemplateArt(root);
|
|
556
558
|
const groups = new Map();
|
|
557
559
|
const built = [];
|
|
558
560
|
const references = [];
|
|
@@ -602,7 +604,7 @@ export function buildModelNode(
|
|
|
602
604
|
if (options.optimize) {
|
|
603
605
|
optimizeModel(root, model, detail);
|
|
604
606
|
}
|
|
605
|
-
applyLook(root, model);
|
|
607
|
+
applyLook(root, model, path);
|
|
606
608
|
fitHeight(root, model);
|
|
607
609
|
root.userData.modelParts = groups;
|
|
608
610
|
return root;
|
|
@@ -675,6 +677,8 @@ export function animateModelParts(entry, dt, world, skipEmptyHints = false) {
|
|
|
675
677
|
anim.air += ((Math.abs(verticalSpeed) > 1.2 ? 1 : 0) - anim.air) * Math.min(1, dt * 8);
|
|
676
678
|
anim.amplitudeScale ??= 1;
|
|
677
679
|
anim.amplitudeScale += (gait.amplitudeScale - anim.amplitudeScale) * Math.min(1, gait.dt * 10);
|
|
680
|
+
anim.bobScale ??= 1;
|
|
681
|
+
anim.bobScale += (gait.bobScale - anim.bobScale) * Math.min(1, gait.dt * 10);
|
|
678
682
|
anim.phase += 2 * Math.PI * gait.cadence * gait.phaseDt;
|
|
679
683
|
} else {
|
|
680
684
|
const speed = Math.hypot(p.x - anim.last.x, p.z - anim.last.z) / dt;
|
|
@@ -704,7 +708,7 @@ export function animateModelParts(entry, dt, world, skipEmptyHints = false) {
|
|
|
704
708
|
parts.torso.userData.basePosition ??
|
|
705
709
|
(parts.torso.userData.basePosition = parts.torso.position.y);
|
|
706
710
|
parts.torso.position.y =
|
|
707
|
-
base + Math.abs(Math.sin(anim.phase)) * 0.05 * anim.swing * (1 - anim.air);
|
|
711
|
+
base + Math.abs(Math.sin(anim.phase)) * 0.05 * anim.swing * (1 - anim.air) * (gait?.model ? anim.bobScale ?? 1 : 1);
|
|
708
712
|
parts.torso.rotation.z = -anim.lean;
|
|
709
713
|
parts.torso.rotation.y = anim.lean * 0.4;
|
|
710
714
|
}
|