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.
- package/dist/agent-failures.d.ts +8 -0
- package/dist/agent-failures.js +19 -2
- package/dist/agent-prompts.d.ts +1 -1
- package/dist/agent-prompts.js +10 -3
- package/dist/agent.d.ts +64 -3
- package/dist/agent.js +170 -81
- package/dist/castle-host/host.d.ts +1 -0
- package/dist/castle-host/host.js +51 -3
- package/dist/castleJson.d.ts +4 -2
- package/dist/castleJson.js +2 -0
- package/dist/check.d.ts +3 -1
- package/dist/check.js +11 -1
- package/dist/devSessionStorage.js +47 -1
- package/dist/importPinMismatch.d.ts +22 -0
- package/dist/importPinMismatch.js +77 -0
- package/dist/importRegression.js +3 -15
- package/dist/imports.d.ts +10 -3
- package/dist/imports.js +88 -20
- package/dist/index.js +5 -4
- package/dist/init.js +1 -1
- package/dist/platformDoc.js +22 -0
- package/dist/routerFences.d.ts +5 -0
- package/dist/routerFences.js +12 -2
- package/dist/save-deck.d.ts +5 -0
- package/dist/save-deck.js +37 -4
- package/dist/serve.js +3 -0
- package/dist/shell/assets/{index-D2tWM896.js → index-BjOxR-lW.js} +4 -4
- package/dist/shell/assets/index-MVLfNYd9.css +1 -0
- package/dist/shell/index.html +2 -2
- package/dist/taskSteer.d.ts +13 -0
- package/dist/taskSteer.js +22 -2
- package/kits/base/castle.json +1 -1
- package/kits/base/package-lock.json +1 -1
- package/kits/base/sdk/README.md +79 -2
- package/kits/base/sdk/avatar.d.ts +6 -2
- package/kits/base/sdk/avatar.js +12 -4
- package/kits/base/sdk/castle.d.ts +1 -1
- package/kits/base/sdk/commands.d.ts +14 -0
- package/kits/base/sdk/hub.d.ts +6 -2
- package/kits/base/sdk/hub.js +13 -0
- package/kits/base/sdk/multiplayer.js +17 -1
- package/kits/base/sdk/save.js +2 -1
- package/kits/base/sdk/server/hub.d.ts +87 -0
- package/kits/base/sdk/server/hub.js +70 -0
- package/kits/base/sdk/server/platformHandle.d.ts +31 -1
- package/kits/base/sdk/server/storage.d.ts +13 -0
- package/kits/base/sdk/server/storage.js +46 -0
- package/kits/base/sdk/server/wrapper.d.ts +36 -5
- package/kits/base/sdk/server/wrapper.js +83 -8
- package/kits/hub-game/CLAUDE.md +329 -11
- package/kits/hub-game/blueprints/avatar-10.scene +28 -0
- package/kits/hub-game/blueprints/avatar-11.scene +28 -0
- package/kits/hub-game/blueprints/avatar-12.scene +28 -0
- package/kits/hub-game/blueprints/avatar-13.scene +28 -0
- package/kits/hub-game/blueprints/avatar-14.scene +28 -0
- package/kits/hub-game/blueprints/avatar-15.scene +28 -0
- package/kits/hub-game/blueprints/avatar-4.scene +28 -0
- package/kits/hub-game/blueprints/avatar-5.scene +28 -0
- package/kits/hub-game/blueprints/avatar-6.scene +28 -0
- package/kits/hub-game/blueprints/avatar-7.scene +28 -0
- package/kits/hub-game/blueprints/avatar-8.scene +28 -0
- package/kits/hub-game/blueprints/avatar-9.scene +28 -0
- package/kits/hub-game/code/client/actorBudget.js +47 -0
- package/kits/hub-game/code/client/attention.js +11 -2
- package/kits/hub-game/code/client/avatar.js +309 -35
- package/kits/hub-game/code/client/avatarCap.js +228 -0
- package/kits/hub-game/code/client/avatarColors.js +70 -0
- package/kits/hub-game/code/client/avatarFaces.js +21 -0
- package/kits/hub-game/code/client/avatarShare.js +251 -0
- package/kits/hub-game/code/client/ballot.js +467 -0
- package/kits/hub-game/code/client/build.js +22 -0
- package/kits/hub-game/code/client/chrome.js +1144 -50
- package/kits/hub-game/code/client/companion.js +716 -0
- package/kits/hub-game/code/client/companionDress.js +99 -0
- package/kits/hub-game/code/client/decor.js +509 -0
- package/kits/hub-game/code/client/earned.js +131 -0
- package/kits/hub-game/code/client/emoteBubble.js +75 -0
- package/kits/hub-game/code/client/grab.js +339 -20
- package/kits/hub-game/code/client/hookLayer.js +299 -13
- package/kits/hub-game/code/client/idle.js +163 -22
- package/kits/hub-game/code/client/interestCap.js +81 -0
- package/kits/hub-game/code/client/keys.js +36 -0
- package/kits/hub-game/code/client/labelsNear.js +205 -0
- package/kits/hub-game/code/client/menuIcons.js +34 -0
- package/kits/hub-game/code/client/pack.js +6 -2
- package/kits/hub-game/code/client/packFormat.js +3 -3
- package/kits/hub-game/code/client/rehello.js +167 -0
- package/kits/hub-game/code/client/shot.js +92 -0
- package/kits/hub-game/code/client/sound.js +63 -8
- package/kits/hub-game/code/client/soundscape.js +1151 -0
- package/kits/hub-game/code/client/soundscapeActions.js +99 -0
- package/kits/hub-game/code/client/soundscapeAmbience.js +453 -0
- package/kits/hub-game/code/client/soundscapeBaked.js +143 -0
- package/kits/hub-game/code/client/soundscapeBusker.js +217 -0
- package/kits/hub-game/code/client/soundscapeCourt.js +200 -0
- package/kits/hub-game/code/client/soundscapeCrowd.js +331 -0
- package/kits/hub-game/code/client/soundscapeCues.js +362 -0
- package/kits/hub-game/code/client/soundscapeMap.js +181 -0
- package/kits/hub-game/code/client/soundscapeMarket.js +176 -0
- package/kits/hub-game/code/client/soundscapeMusic.js +126 -0
- package/kits/hub-game/code/client/soundscapeMusicEngine.js +460 -0
- package/kits/hub-game/code/client/soundscapeSimlish.js +737 -0
- package/kits/hub-game/code/client/soundscapeSongs.js +127 -0
- package/kits/hub-game/code/client/soundscapeSongsRound3.js +63 -0
- package/kits/hub-game/code/client/soundscapeSynthesis.js +168 -0
- package/kits/hub-game/code/client/soundscapeUi.js +211 -0
- package/kits/hub-game/code/client/soundscapeVoice.js +1209 -0
- package/kits/hub-game/code/client/soundscapeWaves.js +206 -0
- package/kits/hub-game/code/client/spin.js +101 -0
- package/kits/hub-game/code/client/state.js +109 -1
- package/kits/hub-game/code/client/stuck.js +259 -0
- package/kits/hub-game/code/client/talk.js +538 -47
- package/kits/hub-game/code/client/tiers.js +516 -27
- package/kits/hub-game/code/client/toastBand.js +37 -0
- package/kits/hub-game/code/client/together.js +32 -0
- package/kits/hub-game/code/client/visibility.js +43 -0
- package/kits/hub-game/code/client/wear.js +461 -170
- package/kits/hub-game/code/client/yours.js +199 -0
- package/kits/hub-game/code/companionSpec.js +45 -0
- package/kits/hub-game/code/privateText.js +7 -0
- package/kits/hub-game/code/server/actions.js +133 -0
- package/kits/hub-game/code/server/actors.js +9 -1
- package/kits/hub-game/code/server/ask.js +155 -0
- package/kits/hub-game/code/server/ballot.js +539 -0
- package/kits/hub-game/code/server/cells.js +100 -0
- package/kits/hub-game/code/server/companion.js +82 -0
- package/kits/hub-game/code/server/cues.js +70 -0
- package/kits/hub-game/code/server/decor.js +269 -0
- package/kits/hub-game/code/server/earned.js +461 -0
- package/kits/hub-game/code/server/friendBests.js +166 -0
- package/kits/hub-game/code/server/friendsAmong.js +232 -0
- package/kits/hub-game/code/server/history.js +5 -0
- package/kits/hub-game/code/server/hub.js +1254 -50
- package/kits/hub-game/code/server/idle.js +30 -11
- package/kits/hub-game/code/server/index.js +2 -2
- package/kits/hub-game/code/server/labels.js +28 -2
- package/kits/hub-game/code/server/manifest.js +378 -7
- package/kits/hub-game/code/server/menu.js +133 -0
- package/kits/hub-game/code/server/npcs.js +830 -80
- package/kits/hub-game/code/server/party.js +2 -2
- package/kits/hub-game/code/server/players.js +22 -0
- package/kits/hub-game/code/server/shot.js +110 -0
- package/kits/hub-game/code/server/standing.js +124 -0
- package/kits/hub-game/code/server/vis.js +113 -0
- package/kits/hub-game/code/server/wear.js +12 -0
- package/kits/hub-game/code/server/yours.js +59 -0
- package/kits/hub-game/code/shared/cues.js +9 -0
- package/kits/hub-game/code/shared/decor.js +41 -0
- package/kits/hub-game/code/shared/shot.js +19 -0
- package/kits/hub-game/code/shared/spin.js +57 -0
- package/kits/hub-game/code/systems/hub.js +845 -95
- package/kits/hub-game/docs/content-pack.md +1 -1
- package/kits/hub-game/docs/contract.md +2244 -61
- package/kits/hub-game/docs/home-pieces.md +64 -0
- package/kits/hub-game/models/avatar-10.pxmodel +28 -0
- package/kits/hub-game/models/avatar-11.pxmodel +28 -0
- package/kits/hub-game/models/avatar-12.pxmodel +27 -0
- package/kits/hub-game/models/avatar-13.pxmodel +24 -0
- package/kits/hub-game/models/avatar-14.pxmodel +29 -0
- package/kits/hub-game/models/avatar-15.pxmodel +24 -0
- package/kits/hub-game/models/avatar-4.pxmodel +29 -0
- package/kits/hub-game/models/avatar-5.pxmodel +27 -0
- package/kits/hub-game/models/avatar-6.pxmodel +26 -0
- package/kits/hub-game/models/avatar-7.pxmodel +25 -0
- package/kits/hub-game/models/avatar-8.pxmodel +24 -0
- package/kits/hub-game/models/avatar-9.pxmodel +30 -0
- package/kits/hub-game/models/earned/badge-round.pxmodel +100 -0
- package/kits/hub-game/models/earned/badge-shield.pxmodel +117 -0
- package/kits/hub-game/models/earned/badge-star.pxmodel +87 -0
- package/kits/hub-game/models/earned/belt-plain.pxmodel +72 -0
- package/kits/hub-game/models/earned/held-ball.pxmodel +43 -0
- package/kits/hub-game/models/earned/held-lantern.pxmodel +85 -0
- package/kits/hub-game/models/earned/held-net.pxmodel +57 -0
- package/kits/hub-game/models/earned/held-trophy.pxmodel +109 -0
- package/kits/hub-game/models/earned/pin-round.pxmodel +62 -0
- package/kits/hub-game/models/earned/sash-plain.pxmodel +66 -0
- package/kits/hub-game/models/earned/square/belt-plain.pxmodel +104 -0
- package/kits/hub-game/models/earned/square/sash-plain.pxmodel +98 -0
- package/kits/hub-game/models/hats/bat-clip.pxmodel +206 -0
- package/kits/hub-game/models/hats/beekeeper.pxmodel +149 -0
- package/kits/hub-game/models/hats/cap.pxmodel +162 -0
- package/kits/hub-game/models/hats/captain.pxmodel +178 -0
- package/kits/hub-game/models/hats/crooked-top.pxmodel +172 -0
- package/kits/hub-game/models/hats/flower-crown.pxmodel +451 -0
- package/kits/hub-game/models/hats/foam-crown.pxmodel +179 -0
- package/kits/hub-game/models/hats/lantern.pxmodel +230 -0
- package/kits/hub-game/models/hats/laurel.pxmodel +533 -0
- package/kits/hub-game/models/hats/lighthouse.pxmodel +96 -0
- package/kits/hub-game/models/hats/sailor.pxmodel +141 -0
- package/kits/hub-game/models/hats/souwester.pxmodel +131 -0
- package/kits/hub-game/models/hats/straw.pxmodel +139 -0
- package/kits/hub-game/models/hats/sunflower.pxmodel +406 -0
- package/kits/hub-game/models/hats/sweatband.pxmodel +112 -0
- package/kits/hub-game/models/hats/witch.pxmodel +147 -0
- package/kits/hub-game/package-lock.json +2 -0
- package/kits/hub-game/package.json +2 -1
- package/kits/hub-game/scripts/check.mjs +78 -11
- package/kits/hub-game/scripts/companion-follower-wire.json +1 -0
- package/kits/hub-game/scripts/fixtures/decor-keyless-draw.json +121 -0
- package/kits/hub-game/scripts/fixtures/decor-keyless.json +293 -0
- package/kits/hub-game/scripts/fixtures/engine-models-stub.mjs +23 -0
- package/kits/hub-game/scripts/fixtures/fake-dom.mjs +107 -0
- package/kits/hub-game/scripts/fixtures/interest-legacy.json +385 -0
- package/kits/hub-game/scripts/fixtures/npc-notes-v1.77.jsonl +4 -0
- package/kits/hub-game/scripts/fixtures/vis-shared-wire.json +1 -0
- package/kits/hub-game/scripts/gen-avatars.mjs +933 -16
- package/kits/hub-game/scripts/gen-earned.mjs +285 -0
- package/kits/hub-game/scripts/gen-hats.mjs +827 -0
- package/kits/hub-game/scripts/grab.before-orbit.mjs +400 -0
- package/kits/hub-game/scripts/soundscape-wave-analysis.mjs +125 -0
- package/kits/hub-game/scripts/test-actions-client.mjs +488 -0
- package/kits/hub-game/scripts/test-actions.mjs +298 -0
- package/kits/hub-game/scripts/test-actor-budget.mjs +44 -0
- package/kits/hub-game/scripts/test-actors.mjs +19 -17
- package/kits/hub-game/scripts/test-ask-client.mjs +358 -0
- package/kits/hub-game/scripts/test-ask.mjs +269 -0
- package/kits/hub-game/scripts/test-attention.mjs +10 -1
- package/kits/hub-game/scripts/test-avatar-cap.mjs +379 -0
- package/kits/hub-game/scripts/test-avatar-colors.mjs +72 -0
- package/kits/hub-game/scripts/test-avatar-models.mjs +181 -0
- package/kits/hub-game/scripts/test-avatar-share.mjs +318 -0
- package/kits/hub-game/scripts/test-avatar-wire.mjs +753 -0
- package/kits/hub-game/scripts/test-avatar.mjs +540 -7
- package/kits/hub-game/scripts/test-ballot.mjs +1001 -0
- package/kits/hub-game/scripts/test-build.mjs +31 -0
- package/kits/hub-game/scripts/test-cells.mjs +71 -0
- package/kits/hub-game/scripts/test-chat.mjs +662 -0
- package/kits/hub-game/scripts/test-classic.mjs +2 -0
- package/kits/hub-game/scripts/test-companion-chat.mjs +198 -0
- package/kits/hub-game/scripts/test-companion-client.mjs +1167 -0
- package/kits/hub-game/scripts/test-companion.mjs +259 -0
- package/kits/hub-game/scripts/test-decor-client.mjs +303 -0
- package/kits/hub-game/scripts/test-decor.mjs +457 -0
- package/kits/hub-game/scripts/test-earned-client.mjs +459 -0
- package/kits/hub-game/scripts/test-earned.mjs +1194 -0
- package/kits/hub-game/scripts/test-emote-bubble.mjs +110 -0
- package/kits/hub-game/scripts/test-friend-bests.mjs +435 -0
- package/kits/hub-game/scripts/test-grab-orbit.mjs +918 -0
- package/kits/hub-game/scripts/test-grab.mjs +7 -0
- package/kits/hub-game/scripts/test-hats.mjs +422 -168
- package/kits/hub-game/scripts/test-hub-leaving.mjs +203 -0
- package/kits/hub-game/scripts/test-hub-ops.mjs +439 -2
- package/kits/hub-game/scripts/test-hub-trip.mjs +716 -2
- package/kits/hub-game/scripts/test-hud-clear.mjs +328 -4
- package/kits/hub-game/scripts/test-idle.mjs +361 -1
- package/kits/hub-game/scripts/test-interest-cap.mjs +36 -0
- package/kits/hub-game/scripts/test-interest-cells.mjs +493 -0
- package/kits/hub-game/scripts/test-interest-client.mjs +118 -0
- package/kits/hub-game/scripts/test-keys.mjs +46 -1
- package/kits/hub-game/scripts/test-labels.mjs +596 -0
- package/kits/hub-game/scripts/test-manifest.mjs +207 -0
- package/kits/hub-game/scripts/test-menu-client.mjs +480 -0
- package/kits/hub-game/scripts/test-menu.mjs +296 -0
- package/kits/hub-game/scripts/test-npcs.mjs +1718 -12
- package/kits/hub-game/scripts/test-object-entry.mjs +76 -0
- package/kits/hub-game/scripts/test-pack.mjs +7 -0
- package/kits/hub-game/scripts/test-picker.mjs +314 -0
- package/kits/hub-game/scripts/test-rehello.mjs +1039 -0
- package/kits/hub-game/scripts/test-relations-among.mjs +222 -0
- package/kits/hub-game/scripts/test-relations-refresh.mjs +188 -0
- package/kits/hub-game/scripts/test-shot.mjs +756 -0
- package/kits/hub-game/scripts/test-soundscape.mjs +5432 -0
- package/kits/hub-game/scripts/test-spin.mjs +314 -0
- package/kits/hub-game/scripts/test-standing.mjs +416 -0
- package/kits/hub-game/scripts/test-stuck.mjs +1903 -0
- package/kits/hub-game/scripts/test-tier-cells.mjs +706 -0
- package/kits/hub-game/scripts/test-tiers-render.mjs +339 -0
- package/kits/hub-game/scripts/test-tiers.mjs +477 -2
- package/kits/hub-game/scripts/test-toast-band.mjs +61 -0
- package/kits/hub-game/scripts/test-try-on.mjs +22 -22
- package/kits/hub-game/scripts/test-vis.mjs +343 -0
- package/kits/hub-game/scripts/test-visibility.mjs +134 -0
- package/kits/hub-game/scripts/test-yours-chrome.mjs +166 -0
- package/kits/hub-game/scripts/test-yours.mjs +372 -0
- package/kits/multiplayer-3d/CLAUDE.md +50 -0
- package/kits/multiplayer-3d/castle.json +5 -5
- package/kits/multiplayer-3d/code/client/avatars.js +7 -0
- package/kits/multiplayer-3d/code/client/gait.js +65 -0
- package/kits/multiplayer-3d/code/client/nameTags.js +59 -4
- package/kits/multiplayer-3d/code/options.js +5 -0
- package/kits/multiplayer-3d/code/server/ownership.js +10 -2
- package/kits/multiplayer-3d/code/server/sceneBodies.js +12 -0
- package/kits/multiplayer-3d/code/server/world.js +7 -0
- package/kits/multiplayer-3d/code/systems/multiplayer.js +74 -4
- package/kits/multiplayer-3d/package.json +2 -1
- package/kits/multiplayer-3d/scripts/fixtures/README.md +11 -0
- package/kits/multiplayer-3d/scripts/fixtures/ownership-legacy.json +2 -0
- package/kits/multiplayer-3d/scripts/ownership-harness.mjs +102 -0
- package/kits/multiplayer-3d/scripts/ownership-loader.mjs +46 -0
- package/kits/multiplayer-3d/scripts/ownership-worker.mjs +15 -0
- package/kits/multiplayer-3d/scripts/record-ownership-session.mjs +98 -0
- package/kits/multiplayer-3d/scripts/test-eligible-claims.mjs +167 -0
- package/kits/multiplayer-3d/scripts/test-own-name-tag.mjs +247 -0
- package/kits/physics-2d/CLAUDE.md +9 -0
- package/kits/physics-2d/castle.json +2 -2
- package/kits/physics-2d/engine/scene.js +253 -1
- package/kits/physics-2d/engine/skyKey.js +129 -0
- package/kits/physics-2d/engine/stillClock.js +106 -0
- package/kits/physics-2d/engine/updateBudget.js +21 -0
- package/kits/physics-2d/scripts/test-skip-unchanged.mjs +326 -1
- package/kits/physics-3d/CLAUDE.md +1169 -30
- package/kits/physics-3d/behaviors/Player.jsx +629 -72
- package/kits/physics-3d/castle.json +3 -3
- package/kits/physics-3d/docs/pxmodel-format.md +8 -0
- package/kits/physics-3d/engine3d/Scene3DPlayer.jsx +69 -13
- package/kits/physics-3d/engine3d/actornode.js +86 -0
- package/kits/physics-3d/engine3d/animationBudget.js +23 -0
- package/kits/physics-3d/engine3d/editorWorld.js +6 -0
- package/kits/physics-3d/engine3d/emptynodes.js +232 -0
- package/kits/physics-3d/engine3d/framecap.js +96 -0
- package/kits/physics-3d/engine3d/gait.js +118 -0
- package/kits/physics-3d/engine3d/kithooks.js +47 -0
- package/kits/physics-3d/engine3d/look.js +507 -48
- package/kits/physics-3d/engine3d/lookbake.js +208 -0
- package/kits/physics-3d/engine3d/materialpresets.js +2 -0
- package/kits/physics-3d/engine3d/motion.js +39 -10
- package/kits/physics-3d/engine3d/nearshadows.js +37 -19
- package/kits/physics-3d/engine3d/optimize.js +9 -5
- package/kits/physics-3d/engine3d/orbitinput.js +487 -9
- package/kits/physics-3d/engine3d/orbitlens.js +48 -0
- package/kits/physics-3d/engine3d/ownmodel.js +213 -0
- package/kits/physics-3d/engine3d/pxmodel.js +42 -11
- package/kits/physics-3d/engine3d/shadowfade.js +882 -0
- package/kits/physics-3d/engine3d/sky.js +547 -0
- package/kits/physics-3d/engine3d/skylife.js +306 -0
- package/kits/physics-3d/engine3d/unchanged.js +11 -0
- package/kits/physics-3d/engine3d/viewrange.js +52 -0
- package/kits/physics-3d/engine3d/world3d.js +796 -69
- package/kits/physics-3d/main.jsx +5 -0
- package/kits/physics-3d/package.json +1 -1
- package/kits/physics-3d/scripts/look-baseline.mjs +155 -0
- package/kits/physics-3d/scripts/test-camera-orbit.mjs +2563 -80
- package/kits/physics-3d/scripts/test-drop-empty-parts.mjs +1 -1
- package/kits/physics-3d/scripts/test-frame-cap-bob.mjs +435 -0
- package/kits/physics-3d/scripts/test-frame-cap.mjs +452 -0
- package/kits/physics-3d/scripts/test-gait.mjs +387 -0
- package/kits/physics-3d/scripts/test-look-bake.mjs +1056 -0
- package/kits/physics-3d/scripts/test-model-parse-cache.mjs +92 -0
- package/kits/physics-3d/scripts/test-near-shadows.mjs +3 -0
- package/kits/physics-3d/scripts/test-orbit-shadow-fade.mjs +1920 -0
- package/kits/physics-3d/scripts/test-orbit-shift-lock.mjs +545 -0
- package/kits/physics-3d/scripts/test-orbit-shot.mjs +583 -0
- package/kits/physics-3d/scripts/test-orbit-view.mjs +230 -0
- package/kits/physics-3d/scripts/test-skip-empty-nodes.mjs +845 -0
- package/kits/physics-3d/scripts/test-sky.mjs +2470 -0
- package/kits/physics-3d/scripts/test-static-actors.mjs +8 -1
- package/kits/physics-3d/scripts/test-static-scenery.mjs +2171 -0
- package/kits/physics-3d/scripts/test-steady-hover.mjs +2 -0
- package/kits/physics-3d/scripts/test-view-range.mjs +260 -0
- package/kits/physics-3d/systems/physics3d.js +383 -6
- package/kits/real-time/castle.json +2 -2
- package/kits/real-time/code/server/gameHooks.js +7 -0
- package/kits/real-time/code/server/session.js +97 -19
- package/package.json +2 -2
- package/dist/shell/assets/index-Cf61cNfT.css +0 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// "camera": { "follow": "rigid", "control": "orbit" } }` (the kit's CLAUDE.md
|
|
3
3
|
// has the terms): the player turns, tilts and zooms the Player's camera.
|
|
4
4
|
// Scene3DPlayer's `attachInput` makes this the first time a pointer goes down
|
|
5
|
-
// under the key or a Player runs under it (`runtime.orbitInput()`), hands
|
|
5
|
+
// under the key, Shift is pressed there, or a Player runs under it (`runtime.orbitInput()`), hands
|
|
6
6
|
// each pointer that goes down under the key to it, and leaves every other one
|
|
7
7
|
// to the handlers it always had. A runtime that never meets the key never
|
|
8
8
|
// makes it.
|
|
@@ -12,7 +12,18 @@
|
|
|
12
12
|
// in the right half turns and tilts the camera; two fingers that both
|
|
13
13
|
// landed in the right half are a pinch, which zooms. The left half is the
|
|
14
14
|
// stick's: a finger that lands there is never part of a pinch.
|
|
15
|
-
// - mouse: a drag with any button turns and tilts; the wheel zooms.
|
|
15
|
+
// - mouse: a drag with any button turns and tilts; the wheel zooms. On a
|
|
16
|
+
// desktop the drag holds the pointer lock (Roblox's right-drag): a right
|
|
17
|
+
// press asks for it at once, any other button once the drag passes the
|
|
18
|
+
// tap slop, so a click is never locked. While locked the turn comes from
|
|
19
|
+
// movementX/Y; the lock ends with the drag (the last button up, a blur,
|
|
20
|
+
// the page hidden, a scene load, detach), and when the browser ends it
|
|
21
|
+
// (Escape, the host taking focus) the drag ends with no tap. Where the
|
|
22
|
+
// lock is missing or refused the drag goes on as before, on the pointer
|
|
23
|
+
// capture taken at the press (see `attachOrbitInput`).
|
|
24
|
+
// Shift or the desktop lock button keeps the lock until toggled off,
|
|
25
|
+
// Escape, blur, page hidden or a scene load. Then every mouse move turns,
|
|
26
|
+
// with no button needed; a quick left click still jumps.
|
|
16
27
|
// - a short tap that did not move is a jump, as without the key (a mouse's
|
|
17
28
|
// left button only).
|
|
18
29
|
//
|
|
@@ -117,6 +128,12 @@ export function makeLookGestures(stick, onTap, tuning) {
|
|
|
117
128
|
look,
|
|
118
129
|
roleOf: (id) => pointers.get(id)?.role ?? null,
|
|
119
130
|
|
|
131
|
+
// A mouse move under shift lock needs no held pointer or tap slop.
|
|
132
|
+
turn(dx, dy) {
|
|
133
|
+
asked.yaw += (Number.isFinite(dx) ? dx : 0) * LOOK_RAD_PER_PX;
|
|
134
|
+
asked.pitch += (Number.isFinite(dy) ? dy : 0) * LOOK_RAD_PER_PX;
|
|
135
|
+
},
|
|
136
|
+
|
|
120
137
|
// `at` is { x, y, time, mouse, button, left }: where (CSS px), when (ms),
|
|
121
138
|
// whether it is a mouse and which button, and whether it is in the left
|
|
122
139
|
// half of the canvas.
|
|
@@ -196,6 +213,15 @@ export function makeLookGestures(stick, onTap, tuning) {
|
|
|
196
213
|
drop();
|
|
197
214
|
},
|
|
198
215
|
|
|
216
|
+
// A mouse drag made a look at once (a second button pressed while it
|
|
217
|
+
// was still a tap): it will not jump.
|
|
218
|
+
drag(id) {
|
|
219
|
+
const p = pointers.get(id);
|
|
220
|
+
if (!p || !p.mouse || p.role !== 'tap') return;
|
|
221
|
+
p.moved = true;
|
|
222
|
+
p.role = 'look';
|
|
223
|
+
},
|
|
224
|
+
|
|
199
225
|
// A wheel event's deltaY and deltaMode: away from the player is nearer.
|
|
200
226
|
wheel(deltaY, deltaMode) {
|
|
201
227
|
const px = deltaY * (deltaMode === 1 ? WHEEL_LINE_PX : deltaMode === 2 ? WHEEL_NOTCH_PX : 1);
|
|
@@ -222,8 +248,23 @@ export const isOrbitLook = (look) => ours.has(look);
|
|
|
222
248
|
// pointer, listener or pending look here, and a pointer held across any load
|
|
223
249
|
// does nothing more until it lifts: the handlers attachInput always had do
|
|
224
250
|
// not know it either.
|
|
225
|
-
|
|
251
|
+
//
|
|
252
|
+
// `onLost`, when given, is the canvas's own pointerup handler, for a
|
|
253
|
+
// pointer whose capture a lock of ours took (Scene3DPlayer passes its own,
|
|
254
|
+
// so a keyless pointer goes through the keyless path). It is handed the
|
|
255
|
+
// pointer's real pointerup or pointercancel when that lands beyond the
|
|
256
|
+
// canvas while the lock (or our request, or our exit) is on, and a made-up
|
|
257
|
+
// pointercancel for one whose lift was never seen at all. Without it these
|
|
258
|
+
// go to this input's own `up`.
|
|
259
|
+
export function attachOrbitInput(canvas, runtime, stick, onTap, tuning, onLost) {
|
|
226
260
|
const gestures = makeLookGestures(stick, onTap, tuning);
|
|
261
|
+
const lift = (event) => {
|
|
262
|
+
if (onLost) onLost(event);
|
|
263
|
+
else input.up(event);
|
|
264
|
+
};
|
|
265
|
+
let control;
|
|
266
|
+
const lock = makeMouseLock(canvas, gestures, lift, () => control.update());
|
|
267
|
+
control = makeShiftLockControl(canvas, runtime, lock, () => input.shiftLock.toggle());
|
|
227
268
|
let listening = false;
|
|
228
269
|
const onWheel = (event) => {
|
|
229
270
|
event.preventDefault();
|
|
@@ -237,20 +278,38 @@ export function attachOrbitInput(canvas, runtime, stick, onTap, tuning) {
|
|
|
237
278
|
canvas.removeEventListener('contextmenu', onContextMenu);
|
|
238
279
|
};
|
|
239
280
|
gestures.look.listen = () => {
|
|
240
|
-
if (
|
|
281
|
+
if (runtime.cameraControl !== 'orbit') return;
|
|
282
|
+
control.show();
|
|
283
|
+
if (listening) return;
|
|
241
284
|
listening = true;
|
|
242
285
|
canvas.addEventListener('wheel', onWheel, { passive: false });
|
|
243
286
|
canvas.addEventListener('contextmenu', onContextMenu);
|
|
244
287
|
};
|
|
245
288
|
gestures.look.reset = () => {
|
|
246
289
|
gestures.cancel();
|
|
290
|
+
lock.drop();
|
|
247
291
|
unlisten();
|
|
292
|
+
control.hide();
|
|
248
293
|
};
|
|
249
294
|
ours.add(gestures.look);
|
|
250
295
|
runtime.lookInput = gestures.look;
|
|
251
|
-
|
|
296
|
+
const input = {
|
|
297
|
+
shiftLock: {
|
|
298
|
+
get active() {
|
|
299
|
+
return lock.shiftLock.active;
|
|
300
|
+
},
|
|
301
|
+
toggle() {
|
|
302
|
+
if (runtime.cameraControl !== 'orbit') return;
|
|
303
|
+
control.show();
|
|
304
|
+
lock.shiftLock.toggle(control.available());
|
|
305
|
+
},
|
|
306
|
+
},
|
|
307
|
+
// Moves also belong here with no held pointer while shift lock is on.
|
|
308
|
+
get active() {
|
|
309
|
+
return gestures.busy || lock.shiftLock.active;
|
|
310
|
+
},
|
|
252
311
|
// Whether a pointer that went down under the key is still down: its
|
|
253
|
-
//
|
|
312
|
+
// lift is this file's.
|
|
254
313
|
get busy() {
|
|
255
314
|
return gestures.busy;
|
|
256
315
|
},
|
|
@@ -265,13 +324,432 @@ export function attachOrbitInput(canvas, runtime, stick, onTap, tuning) {
|
|
|
265
324
|
button: event.button,
|
|
266
325
|
left: event.clientX - rect.left < rect.width / 2,
|
|
267
326
|
});
|
|
268
|
-
|
|
327
|
+
// Under a lock a capture cannot be taken (InvalidStateError); the
|
|
328
|
+
// lock's end gives it (`lock.held`).
|
|
329
|
+
lock.held(event.pointerId, true);
|
|
330
|
+
lock.capture(event.pointerId);
|
|
331
|
+
lock.down(event);
|
|
269
332
|
},
|
|
270
|
-
move: (event) => gestures.move(event.pointerId, event.clientX, event.clientY),
|
|
271
|
-
up: (event) =>
|
|
333
|
+
move: (event) => lock.move(event) ?? gestures.move(event.pointerId, event.clientX, event.clientY),
|
|
334
|
+
up: (event) => {
|
|
335
|
+
const ours = gestures.up(event.pointerId, performance.now(), event.type === 'pointercancel');
|
|
336
|
+
lock.held(event.pointerId, false);
|
|
337
|
+
lock.up(event);
|
|
338
|
+
return ours;
|
|
339
|
+
},
|
|
340
|
+
// A pointer that went down or up on the canvas without the key
|
|
341
|
+
// (Scene3DPlayer's own handlers, in a runtime that has met the key): it
|
|
342
|
+
// is held, and gets its capture back when a lock of ours ends.
|
|
343
|
+
pointer: (event) => lock.held(event.pointerId, event.type === 'pointerdown'),
|
|
272
344
|
detach: () => {
|
|
273
345
|
gestures.cancel();
|
|
346
|
+
lock.drop();
|
|
274
347
|
unlisten();
|
|
348
|
+
control.detach();
|
|
349
|
+
},
|
|
350
|
+
};
|
|
351
|
+
return input;
|
|
352
|
+
}
|
|
353
|
+
|
|
354
|
+
// Made only by an orbit input, and its DOM only on a keyed desktop frame or toggle.
|
|
355
|
+
// It lives beside the canvas so it never enters the canvas's pointer path.
|
|
356
|
+
function makeShiftLockControl(canvas, runtime, lock, toggle) {
|
|
357
|
+
const doc = canvas.ownerDocument;
|
|
358
|
+
let media;
|
|
359
|
+
let button = null;
|
|
360
|
+
const available = () => {
|
|
361
|
+
if (typeof canvas.requestPointerLock !== 'function' || typeof doc?.exitPointerLock !== 'function') return false;
|
|
362
|
+
media ??= doc.defaultView?.matchMedia?.('(hover: hover) and (pointer: fine)');
|
|
363
|
+
return media?.matches === true;
|
|
364
|
+
};
|
|
365
|
+
const update = () => {
|
|
366
|
+
if (button === null) return;
|
|
367
|
+
button.setAttribute('aria-pressed', String(lock.shiftLock.active));
|
|
368
|
+
button.style.color = lock.shiftLock.active ? '#7bd9ed' : '#e6e6e2';
|
|
369
|
+
button.style.background = lock.shiftLock.active ? 'rgba(32, 66, 74, 0.8)' : 'rgba(0, 0, 0, 0.45)';
|
|
370
|
+
};
|
|
371
|
+
const onDown = (event) => {
|
|
372
|
+
event.stopPropagation();
|
|
373
|
+
event.preventDefault();
|
|
374
|
+
};
|
|
375
|
+
const onClick = (event) => {
|
|
376
|
+
event.stopPropagation();
|
|
377
|
+
canvas.focus();
|
|
378
|
+
toggle();
|
|
379
|
+
};
|
|
380
|
+
return {
|
|
381
|
+
available,
|
|
382
|
+
update,
|
|
383
|
+
show() {
|
|
384
|
+
const visible = runtime.cameraControl === 'orbit' && available();
|
|
385
|
+
if (visible && button === null && canvas.parentElement) {
|
|
386
|
+
button = doc.createElement('button');
|
|
387
|
+
button.type = 'button';
|
|
388
|
+
button.title = 'Shift lock (Shift)';
|
|
389
|
+
button.setAttribute('aria-label', button.title);
|
|
390
|
+
button.innerHTML = '<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" aria-hidden="true"><rect x="5" y="10" width="14" height="11" rx="3"/><path d="M8 10V7a4 4 0 0 1 8 0v3"/><path d="M12 14v3"/></svg>';
|
|
391
|
+
Object.assign(button.style, {
|
|
392
|
+
position: 'absolute', right: '16px', bottom: '16px', width: '44px', height: '44px',
|
|
393
|
+
border: '1px solid rgba(230, 230, 226, 0.3)', borderRadius: '10px', padding: '0',
|
|
394
|
+
alignItems: 'center', justifyContent: 'center', cursor: 'pointer', zIndex: '1',
|
|
395
|
+
touchAction: 'none',
|
|
396
|
+
});
|
|
397
|
+
button.addEventListener('pointerdown', onDown);
|
|
398
|
+
button.addEventListener('click', onClick);
|
|
399
|
+
canvas.parentElement.appendChild(button);
|
|
400
|
+
update();
|
|
401
|
+
}
|
|
402
|
+
// Called every keyed frame: the style is written only when it changes.
|
|
403
|
+
const display = visible ? 'flex' : 'none';
|
|
404
|
+
if (button !== null && button.style.display !== display) button.style.display = display;
|
|
405
|
+
},
|
|
406
|
+
hide() {
|
|
407
|
+
if (button !== null && button.style.display !== 'none') button.style.display = 'none';
|
|
408
|
+
},
|
|
409
|
+
detach() {
|
|
410
|
+
if (button === null) return;
|
|
411
|
+
button.removeEventListener('pointerdown', onDown);
|
|
412
|
+
button.removeEventListener('click', onClick);
|
|
413
|
+
button.remove();
|
|
414
|
+
button = null;
|
|
415
|
+
},
|
|
416
|
+
};
|
|
417
|
+
}
|
|
418
|
+
|
|
419
|
+
// The pointer lock a desktop mouse look-drag or shift lock holds under the key (only
|
|
420
|
+
// `pointerType === 'mouse'`; touch and pen never come here).
|
|
421
|
+
// Shift lock owns it from its toggle gesture until turned off or cancelled;
|
|
422
|
+
// the drag path never asks for it or releases it while that owner is on.
|
|
423
|
+
//
|
|
424
|
+
// - asked for: on a right-button press at once; for any other button once
|
|
425
|
+
// the drag passes the tap slop (it is a look then), or when a second
|
|
426
|
+
// button is pressed while it is still a tap. So a left tap still jumps
|
|
427
|
+
// and a click is never locked. At most once per drag.
|
|
428
|
+
// - while locked, the turn comes from movementX/Y at LOOK_RAD_PER_PX (the
|
|
429
|
+
// pointer's client position stands still under a lock); before it lands,
|
|
430
|
+
// and without it, from clientX/Y as always.
|
|
431
|
+
// - let go of (exitPointerLock): on the drag's pointerup (pointer events
|
|
432
|
+
// send it when the last button is up), a pointermove with no button
|
|
433
|
+
// down (a lost pointerup), the window's blur, the page hidden, a scene
|
|
434
|
+
// load (`reset`) and detach. The browser puts the cursor back where the
|
|
435
|
+
// lock began.
|
|
436
|
+
// - ended by the browser (Escape, the host page taking focus): the drag is
|
|
437
|
+
// let go of, no tap, so no look or stick is left held.
|
|
438
|
+
// - a lock of ours that lands when no drag wants it (the button came up
|
|
439
|
+
// first, the next press is still a tap, a scene load came between) is
|
|
440
|
+
// let go of as soon as it is known.
|
|
441
|
+
// - a lock that lands takes the capture of every pointer down on the
|
|
442
|
+
// canvas (the spec's implicit release), touch and keyless ones too, and
|
|
443
|
+
// a capture cannot be taken while it is on. So every pointer that went
|
|
444
|
+
// down on the canvas and has not come up (`held`; Scene3DPlayer reports
|
|
445
|
+
// the ones its keyless handlers take through `pointer`) gets its capture
|
|
446
|
+
// back when a lock of ours ends, however it ends: when its
|
|
447
|
+
// pointerlockchange comes, not when pointerLockElement clears (Chromium
|
|
448
|
+
// clears it inside exitPointerLock and sends the event later). One that
|
|
449
|
+
// lifts beyond the canvas meanwhile is caught by the document (capture
|
|
450
|
+
// phase) and its own pointerup handed to its own handler, so a tap
|
|
451
|
+
// still jumps; one whose lift was never seen and cannot be captured
|
|
452
|
+
// again is let go of as a pointercancel would be. Both through `onLost`.
|
|
453
|
+
// - missing (no requestPointerLock: iOS, old browsers), throwing, its
|
|
454
|
+
// promise rejecting (a sandbox without allow-pointer-lock, Chrome's
|
|
455
|
+
// refusal of a re-lock just after Escape) or pointerlockerror: that drag
|
|
456
|
+
// goes on unlocked, on the pointer capture `down` took, so a drag that
|
|
457
|
+
// leaves the frame keeps turning and its release outside still ends it.
|
|
458
|
+
// The next drag asks again.
|
|
459
|
+
//
|
|
460
|
+
// Listeners, each only while it is needed: the window's blur and the
|
|
461
|
+
// document's visibilitychange while a mouse button or shift lock is held under the key;
|
|
462
|
+
// pointerlockchange while a drag has asked or shift lock wants it, and while our exit's event has
|
|
463
|
+
// not come (so the captures can be given back, a scene load between or
|
|
464
|
+
// not); the document's pointerup and pointercancel (capture phase) while a
|
|
465
|
+
// request of ours is on its way, the lock is ours, or our exit's event has
|
|
466
|
+
// not come; and, where requestPointerLock returns no promise (old Safari), while a request is on its way, with pointerlockerror
|
|
467
|
+
// too. A request that returns a promise is followed by the promise alone,
|
|
468
|
+
// so a scene load with one on its way leaves no listener behind, and a
|
|
469
|
+
// pointerlockerror (which does not say whose it is) is not taken for ours
|
|
470
|
+
// then. Without a promise an error may be another element's, so ours is
|
|
471
|
+
// still watched for SETTLE_MS after one.
|
|
472
|
+
const SETTLE_MS = 1000;
|
|
473
|
+
|
|
474
|
+
function makeMouseLock(canvas, gestures, lift, onShiftChange) {
|
|
475
|
+
const doc = canvas.ownerDocument ?? null;
|
|
476
|
+
const win = doc?.defaultView ?? null;
|
|
477
|
+
const supported = () => doc !== null && typeof canvas.requestPointerLock === 'function' && typeof doc.exitPointerLock === 'function';
|
|
478
|
+
// The mouse pointer down under the key: { id, x, y, asked, failed, had }.
|
|
479
|
+
// x, y is where the gestures last saw it (moved by movementX/Y while
|
|
480
|
+
// locked); `had` is whether it held the lock.
|
|
481
|
+
let drag = null;
|
|
482
|
+
// Intent while asking, and mode on only once the lock actually lands.
|
|
483
|
+
let shiftWanted = false;
|
|
484
|
+
let shiftOn = false;
|
|
485
|
+
// Our request on its way: { promise, timer }, or null.
|
|
486
|
+
let request = null;
|
|
487
|
+
// exitPointerLock called and its pointerlockchange not yet come. Not read
|
|
488
|
+
// off pointerLockElement: Chromium clears that inside the call and sends
|
|
489
|
+
// the event after. (If the event never came, `exitTimer` stands in.)
|
|
490
|
+
let exiting = false;
|
|
491
|
+
let exitTimer = null;
|
|
492
|
+
const on = { change: false, error: false, away: false, 'away-window': false, stray: false };
|
|
493
|
+
const locked = () => doc !== null && doc.pointerLockElement === canvas;
|
|
494
|
+
const wanted = () => shiftWanted || (drag !== null && drag.asked && !drag.failed);
|
|
495
|
+
const ours = () => locked() && !exiting;
|
|
496
|
+
// Every pointer down on the canvas, with the key or without: a lock that
|
|
497
|
+
// lands takes their captures (the Pointer Events spec's implicit release),
|
|
498
|
+
// and when a lock of ours ends each gets it back.
|
|
499
|
+
const down = new Set();
|
|
500
|
+
// Whether the lock now on (or just let go of) is ours.
|
|
501
|
+
let had = false;
|
|
502
|
+
// Whether the pointer is captured (or the capture could not be checked).
|
|
503
|
+
const capture = (id) => {
|
|
504
|
+
try {
|
|
505
|
+
canvas.setPointerCapture(id);
|
|
506
|
+
} catch {
|
|
507
|
+
// Not down any more (NotFoundError), or the lock still on.
|
|
508
|
+
return false;
|
|
509
|
+
}
|
|
510
|
+
return typeof canvas.hasPointerCapture !== 'function' || canvas.hasPointerCapture(id) !== false;
|
|
511
|
+
};
|
|
512
|
+
const release = () => {
|
|
513
|
+
if (!locked() || exiting) return;
|
|
514
|
+
exiting = true;
|
|
515
|
+
had = true;
|
|
516
|
+
try {
|
|
517
|
+
doc.exitPointerLock();
|
|
518
|
+
} catch {
|
|
519
|
+
exiting = false;
|
|
520
|
+
return;
|
|
521
|
+
}
|
|
522
|
+
clearTimeout(exitTimer);
|
|
523
|
+
exitTimer = setTimeout(() => {
|
|
524
|
+
exitTimer = null;
|
|
525
|
+
if (exiting && !locked()) onChange();
|
|
526
|
+
}, SETTLE_MS);
|
|
527
|
+
};
|
|
528
|
+
const toggle = (name, want, target, type, fn, options) => {
|
|
529
|
+
if (on[name] === want) return;
|
|
530
|
+
on[name] = want;
|
|
531
|
+
for (const t of type) (want ? target.addEventListener : target.removeEventListener).call(target, t, fn, options);
|
|
532
|
+
};
|
|
533
|
+
const sync = () => {
|
|
534
|
+
if (doc === null) return;
|
|
535
|
+
const eventOnly = request !== null && !request.promise;
|
|
536
|
+
// shiftWanted stays true for the whole time shiftOn is true too.
|
|
537
|
+
const away = drag !== null || shiftWanted;
|
|
538
|
+
toggle('change', eventOnly || exiting || shiftWanted || (drag !== null && drag.asked), doc, ['pointerlockchange'], onChange);
|
|
539
|
+
toggle('stray', request !== null || had || exiting, doc, ['pointerup', 'pointercancel'], onStray, true);
|
|
540
|
+
toggle('error', eventOnly, doc, ['pointerlockerror'], onError);
|
|
541
|
+
toggle('away', away, doc, ['visibilitychange'], onAway);
|
|
542
|
+
if (win !== null) toggle('away-window', away, win, ['blur'], onAway);
|
|
543
|
+
};
|
|
544
|
+
const endShift = () => {
|
|
545
|
+
if (!shiftWanted && !shiftOn) return;
|
|
546
|
+
shiftWanted = false;
|
|
547
|
+
shiftOn = false;
|
|
548
|
+
drag = null;
|
|
549
|
+
gestures.cancel();
|
|
550
|
+
onShiftChange();
|
|
551
|
+
};
|
|
552
|
+
// The drag ends with no tap: what it asked of the camera stays, the
|
|
553
|
+
// pointer is this file's no more.
|
|
554
|
+
const letGo = () => {
|
|
555
|
+
const id = drag.id;
|
|
556
|
+
drag = null;
|
|
557
|
+
gestures.up(id, performance.now(), true);
|
|
558
|
+
};
|
|
559
|
+
const done = (r) => {
|
|
560
|
+
if (request !== r) return false;
|
|
561
|
+
clearTimeout(r.timer);
|
|
562
|
+
request = null;
|
|
563
|
+
return true;
|
|
564
|
+
};
|
|
565
|
+
const failed = () => {
|
|
566
|
+
if (!locked() && shiftWanted) endShift();
|
|
567
|
+
if (drag !== null && drag.asked && !locked()) drag.failed = true;
|
|
568
|
+
sync();
|
|
569
|
+
};
|
|
570
|
+
// One owner: shift lock keeps it across mouse presses and releases.
|
|
571
|
+
const landed = () => {
|
|
572
|
+
if (locked()) {
|
|
573
|
+
had = true;
|
|
574
|
+
if (shiftWanted) {
|
|
575
|
+
shiftOn = true;
|
|
576
|
+
onShiftChange();
|
|
577
|
+
} else if (wanted()) drag.had = true;
|
|
578
|
+
else release();
|
|
579
|
+
}
|
|
580
|
+
sync();
|
|
581
|
+
};
|
|
582
|
+
const ask = () => {
|
|
583
|
+
if (!wanted() || shiftOn || drag?.had) return;
|
|
584
|
+
if (ours()) {
|
|
585
|
+
landed();
|
|
586
|
+
return;
|
|
587
|
+
}
|
|
588
|
+
// A request on its way, or our own exit not yet done: what settles it
|
|
589
|
+
// asks again if this drag still wants the lock.
|
|
590
|
+
if (request !== null || exiting) return;
|
|
591
|
+
let result;
|
|
592
|
+
try {
|
|
593
|
+
result = canvas.requestPointerLock();
|
|
594
|
+
} catch {
|
|
595
|
+
failed();
|
|
596
|
+
return;
|
|
597
|
+
}
|
|
598
|
+
const r = { promise: typeof result?.then === 'function', timer: null };
|
|
599
|
+
request = r;
|
|
600
|
+
if (r.promise) {
|
|
601
|
+
result.then(
|
|
602
|
+
() => {
|
|
603
|
+
if (done(r)) {
|
|
604
|
+
if (locked()) landed();
|
|
605
|
+
else failed();
|
|
606
|
+
}
|
|
607
|
+
},
|
|
608
|
+
() => {
|
|
609
|
+
if (done(r)) failed();
|
|
610
|
+
}
|
|
611
|
+
);
|
|
612
|
+
}
|
|
613
|
+
};
|
|
614
|
+
function onChange() {
|
|
615
|
+
if (locked()) {
|
|
616
|
+
if (request !== null && !request.promise) done(request);
|
|
617
|
+
landed();
|
|
618
|
+
return;
|
|
619
|
+
}
|
|
620
|
+
exiting = false;
|
|
621
|
+
clearTimeout(exitTimer);
|
|
622
|
+
exitTimer = null;
|
|
623
|
+
if (shiftOn) endShift();
|
|
624
|
+
if (had) {
|
|
625
|
+
had = false;
|
|
626
|
+
// One that cannot have it back came up while the lock had its
|
|
627
|
+
// capture, and its lift was not seen even by the document: it is let
|
|
628
|
+
// go of as a pointercancel would (the stick idles, no tap).
|
|
629
|
+
for (const id of [...down]) {
|
|
630
|
+
if (down.has(id) && !capture(id)) {
|
|
631
|
+
down.delete(id);
|
|
632
|
+
lift({ type: 'pointercancel', pointerId: id });
|
|
633
|
+
}
|
|
634
|
+
}
|
|
635
|
+
}
|
|
636
|
+
if (drag !== null && drag.had) letGo();
|
|
637
|
+
else ask();
|
|
638
|
+
sync();
|
|
639
|
+
}
|
|
640
|
+
function onError() {
|
|
641
|
+
const r = request;
|
|
642
|
+
if (r === null || r.promise) return;
|
|
643
|
+
// Maybe another element's: this drag goes on unlocked, and ours is
|
|
644
|
+
// still watched for a while in case it lands after all.
|
|
645
|
+
failed();
|
|
646
|
+
r.timer ??= setTimeout(() => {
|
|
647
|
+
if (!done(r)) return;
|
|
648
|
+
// A shift lock asked for meanwhile waited on this request, which never
|
|
649
|
+
// landed: it is off, so the next toggle asks again.
|
|
650
|
+
if (shiftWanted && !locked()) endShift();
|
|
651
|
+
sync();
|
|
652
|
+
}, SETTLE_MS);
|
|
653
|
+
}
|
|
654
|
+
// A held pointer lifted beyond the canvas while a lock of ours could have
|
|
655
|
+
// its capture: its own handler gets its own event, as the capture would
|
|
656
|
+
// have given it.
|
|
657
|
+
function onStray(event) {
|
|
658
|
+
if (event.target === canvas || !down.has(event.pointerId)) return;
|
|
659
|
+
lift(event);
|
|
660
|
+
}
|
|
661
|
+
function onAway(event) {
|
|
662
|
+
if (event.type === 'visibilitychange' && doc.visibilityState !== 'hidden') return;
|
|
663
|
+
endShift();
|
|
664
|
+
if (drag !== null) letGo();
|
|
665
|
+
release();
|
|
666
|
+
sync();
|
|
667
|
+
}
|
|
668
|
+
const want = () => {
|
|
669
|
+
if (drag.asked) return;
|
|
670
|
+
drag.asked = true;
|
|
671
|
+
ask();
|
|
672
|
+
sync();
|
|
673
|
+
};
|
|
674
|
+
return {
|
|
675
|
+
shiftLock: {
|
|
676
|
+
get active() {
|
|
677
|
+
return shiftOn;
|
|
678
|
+
},
|
|
679
|
+
toggle(available) {
|
|
680
|
+
if (shiftWanted || shiftOn) {
|
|
681
|
+
endShift();
|
|
682
|
+
release();
|
|
683
|
+
} else if (available && supported() && !exiting) {
|
|
684
|
+
// Never defer a shift-lock request until an unlock event: the
|
|
685
|
+
// request must run here, in the user's keydown or click gesture.
|
|
686
|
+
shiftWanted = true;
|
|
687
|
+
if (drag !== null) letGo();
|
|
688
|
+
ask();
|
|
689
|
+
}
|
|
690
|
+
sync();
|
|
691
|
+
},
|
|
692
|
+
},
|
|
693
|
+
capture,
|
|
694
|
+
held(id, isDown) {
|
|
695
|
+
if (isDown) down.add(id);
|
|
696
|
+
else down.delete(id);
|
|
697
|
+
},
|
|
698
|
+
down(event) {
|
|
699
|
+
if (event.pointerType !== 'mouse' || doc === null) return;
|
|
700
|
+
if (shiftWanted || shiftOn) return;
|
|
701
|
+
// One mouse: a press while another is held lost its pointerup.
|
|
702
|
+
if (drag !== null && drag.id !== event.pointerId) gestures.up(drag.id, performance.now(), true);
|
|
703
|
+
drag = { id: event.pointerId, x: event.clientX, y: event.clientY, asked: false, failed: false, had: false };
|
|
704
|
+
if (event.button === 2 && supported()) want();
|
|
705
|
+
else release();
|
|
706
|
+
sync();
|
|
707
|
+
},
|
|
708
|
+
// Undefined for a pointer that is not the drag: the caller hands it to
|
|
709
|
+
// the gestures as always.
|
|
710
|
+
move(event) {
|
|
711
|
+
if (shiftOn && event.pointerType === 'mouse') {
|
|
712
|
+
if (ours()) gestures.turn(event.movementX, event.movementY);
|
|
713
|
+
// A missing pointerup still lets go of a press, without ending
|
|
714
|
+
// shift lock or making that press a look-drag.
|
|
715
|
+
if (event.buttons === 0) gestures.up(event.pointerId, performance.now(), true);
|
|
716
|
+
return true;
|
|
717
|
+
}
|
|
718
|
+
if (drag === null || event.pointerId !== drag.id) return undefined;
|
|
719
|
+
if (event.buttons === 0) {
|
|
720
|
+
// Every button is up and no pointerup came.
|
|
721
|
+
letGo();
|
|
722
|
+
release();
|
|
723
|
+
sync();
|
|
724
|
+
return true;
|
|
725
|
+
}
|
|
726
|
+
if (ours()) {
|
|
727
|
+
drag.x += Number.isFinite(event.movementX) ? event.movementX : 0;
|
|
728
|
+
drag.y += Number.isFinite(event.movementY) ? event.movementY : 0;
|
|
729
|
+
} else {
|
|
730
|
+
drag.x = event.clientX;
|
|
731
|
+
drag.y = event.clientY;
|
|
732
|
+
}
|
|
733
|
+
const result = gestures.move(drag.id, drag.x, drag.y);
|
|
734
|
+
// A second button pressed while the drag is held (a chord comes as a
|
|
735
|
+
// pointermove): a tap no more, and the lock is asked for.
|
|
736
|
+
if (event.button >= 0 && (event.buttons & (event.buttons - 1)) !== 0) gestures.drag(drag.id);
|
|
737
|
+
if (gestures.roleOf(drag.id) === 'look' && supported()) want();
|
|
738
|
+
else if (!wanted()) release();
|
|
739
|
+
return result;
|
|
740
|
+
},
|
|
741
|
+
up(event) {
|
|
742
|
+
if (drag === null || event.pointerId !== drag.id) return;
|
|
743
|
+
drag = null;
|
|
744
|
+
release();
|
|
745
|
+
sync();
|
|
746
|
+
},
|
|
747
|
+
// Every pointer was let go of (a scene load, detach): so is the lock.
|
|
748
|
+
drop() {
|
|
749
|
+
endShift();
|
|
750
|
+
drag = null;
|
|
751
|
+
release();
|
|
752
|
+
sync();
|
|
275
753
|
},
|
|
276
754
|
};
|
|
277
755
|
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
// The orbit camera's lens (`"engine": { "camera": { "follow": "rigid",
|
|
2
|
+
// "control": "orbit" } }`): a vertical field of view of `engine.camera.fov`
|
|
3
|
+
// degrees (10 to 120; anything else, or none, is ORBIT_FOV, Roblox's 70)
|
|
4
|
+
// while a scene with the key plays.
|
|
5
|
+
//
|
|
6
|
+
// `fitOrbitLens` sets it on each frame of a keyed scene (world3d.js
|
|
7
|
+
// `renderWorld`), keeping the lens the camera had when the key first met it
|
|
8
|
+
// (`world.orbitLens`). `giveBackOrbitLens` gives that lens back, exactly, and
|
|
9
|
+
// keeps nothing after; it runs when the keyed scene goes, before any code of
|
|
10
|
+
// what follows can run: on every scene load (the physics system's `reset`,
|
|
11
|
+
// at the start of `load`, before the new scene's data is in), on an editor's
|
|
12
|
+
// frame (`renderWorld` with no runtime) and on `disposeWorld`. So a keyless
|
|
13
|
+
// scene's own code always starts from the lens the camera had before the
|
|
14
|
+
// key, and whatever field of view it sets stands: no keyless frame looks at
|
|
15
|
+
// the camera. A keyed scene after a keyed scene takes the lens again on its
|
|
16
|
+
// first frame. A world that never played the key has no `orbitLens` and none
|
|
17
|
+
// of this touches its camera.
|
|
18
|
+
//
|
|
19
|
+
// No imports: systems/physics3d.js and the tests load it alone.
|
|
20
|
+
export const ORBIT_FOV = 70;
|
|
21
|
+
|
|
22
|
+
export function orbitFov(data) {
|
|
23
|
+
const fov = data?.engine?.camera?.fov;
|
|
24
|
+
return typeof fov === 'number' && fov >= 10 && fov <= 120 ? fov : ORBIT_FOV;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
// One frame of a keyed scene: the lens it asks for, on the world's camera.
|
|
28
|
+
export function fitOrbitLens(world, runtime) {
|
|
29
|
+
const camera = world.camera;
|
|
30
|
+
world.orbitLens ??= { fov: camera.fov };
|
|
31
|
+
const fov = orbitFov(runtime.data);
|
|
32
|
+
if (camera.fov !== fov) {
|
|
33
|
+
camera.fov = fov;
|
|
34
|
+
camera.updateProjectionMatrix();
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
// The keyed scene has gone: the lens the camera had before it, back.
|
|
39
|
+
export function giveBackOrbitLens(world) {
|
|
40
|
+
const lens = world?.orbitLens;
|
|
41
|
+
if (!lens) return;
|
|
42
|
+
world.orbitLens = null;
|
|
43
|
+
const camera = world.camera;
|
|
44
|
+
if (camera && camera.fov !== lens.fov) {
|
|
45
|
+
camera.fov = lens.fov;
|
|
46
|
+
camera.updateProjectionMatrix();
|
|
47
|
+
}
|
|
48
|
+
}
|