@edv4h/usketch-plugin-character 0.2.3 → 0.3.1
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/README.md +35 -7
- package/dist/character-input.d.ts +9 -4
- package/dist/character-input.d.ts.map +1 -1
- package/dist/character-input.js +151 -11
- package/dist/character-input.js.map +1 -1
- package/dist/character-layer.d.ts +3 -1
- package/dist/character-layer.d.ts.map +1 -1
- package/dist/character-layer.js +29 -6
- package/dist/character-layer.js.map +1 -1
- package/dist/character-physics.d.ts +55 -2
- package/dist/character-physics.d.ts.map +1 -1
- package/dist/character-physics.js +90 -9
- package/dist/character-physics.js.map +1 -1
- package/dist/character-runtime.d.ts.map +1 -1
- package/dist/character-runtime.js +13 -5
- package/dist/character-runtime.js.map +1 -1
- package/dist/character-service.d.ts +6 -2
- package/dist/character-service.d.ts.map +1 -1
- package/dist/character-service.js +2 -0
- package/dist/character-service.js.map +1 -1
- package/dist/character-store.d.ts +8 -1
- package/dist/character-store.d.ts.map +1 -1
- package/dist/character-store.js +40 -4
- package/dist/character-store.js.map +1 -1
- package/dist/character-sync.d.ts +7 -1
- package/dist/character-sync.d.ts.map +1 -1
- package/dist/character-sync.js +13 -1
- package/dist/character-sync.js.map +1 -1
- package/dist/character-types.d.ts +13 -0
- package/dist/character-types.d.ts.map +1 -1
- package/dist/character-types.js +1 -0
- package/dist/character-types.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/plugin.d.ts +7 -2
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +1 -0
- package/dist/plugin.js.map +1 -1
- package/dist/register-character-hud.d.ts.map +1 -1
- package/dist/register-character-hud.js +12 -0
- package/dist/register-character-hud.js.map +1 -1
- package/package.json +3 -3
|
@@ -2,13 +2,40 @@
|
|
|
2
2
|
// 0 = up (world -y), clockwise-positive — the same convention as CSS `rotate()` and
|
|
3
3
|
// the Core viewport `rotation`, so `screenHeading = heading + viewport.rotation`.
|
|
4
4
|
import { shortestAngleDelta, wrapDeg } from "@edv4h/usketch-shared";
|
|
5
|
-
export const NO_INPUT = {
|
|
5
|
+
export const NO_INPUT = {
|
|
6
|
+
up: false,
|
|
7
|
+
down: false,
|
|
8
|
+
left: false,
|
|
9
|
+
right: false,
|
|
10
|
+
drift: false,
|
|
11
|
+
};
|
|
12
|
+
/** A pose at rest at the origin, facing up. */
|
|
13
|
+
export const ORIGIN_POSE = {
|
|
14
|
+
x: 0,
|
|
15
|
+
y: 0,
|
|
16
|
+
heading: 0,
|
|
17
|
+
speed: 0,
|
|
18
|
+
moving: false,
|
|
19
|
+
steering: 0,
|
|
20
|
+
slip: 0,
|
|
21
|
+
drift: 0,
|
|
22
|
+
};
|
|
6
23
|
export const DEFAULT_MOTION = {
|
|
7
24
|
moveSpeed: 400,
|
|
8
25
|
turnRate: 240,
|
|
9
26
|
acceleration: 900,
|
|
10
27
|
friction: 700,
|
|
11
28
|
reverseRatio: 0.5,
|
|
29
|
+
maxStep: 24,
|
|
30
|
+
};
|
|
31
|
+
export const DEFAULT_DRIFT = {
|
|
32
|
+
startSpeed: 0.27,
|
|
33
|
+
stopSpeed: 0.17,
|
|
34
|
+
turnRate: 1.27,
|
|
35
|
+
steerRate: 0.23,
|
|
36
|
+
slipAngle: 28,
|
|
37
|
+
steerSlipAngle: 8,
|
|
38
|
+
recoveryRate: 8,
|
|
12
39
|
};
|
|
13
40
|
/** Unit vector of a heading in world space (0° → (0, -1), 90° → (1, 0)). */
|
|
14
41
|
export function headingVector(deg) {
|
|
@@ -40,9 +67,10 @@ function approach(v, target, step) {
|
|
|
40
67
|
* rather than snapping keeps a heading-following camera from spinning.)
|
|
41
68
|
* - `vehicle`: up/down are throttle/reverse along the heading, left/right steer.
|
|
42
69
|
* Steering authority scales with speed (a stopped car can't turn) and inverts
|
|
43
|
-
* when reversing, like a car.
|
|
70
|
+
* when reversing, like a car. With `driftParams`, holding the drift key while
|
|
71
|
+
* steering at speed drifts (see `DriftParams`).
|
|
44
72
|
*/
|
|
45
|
-
export function stepCharacter(pose, input, dt, scheme, params, cameraRotation = 0) {
|
|
73
|
+
export function stepCharacter(pose, input, dt, scheme, params, cameraRotation = 0, driftParams = null) {
|
|
46
74
|
if (dt <= 0)
|
|
47
75
|
return pose;
|
|
48
76
|
if (scheme === "directional") {
|
|
@@ -61,6 +89,9 @@ export function stepCharacter(pose, input, dt, scheme, params, cameraRotation =
|
|
|
61
89
|
heading: turnToward(pose.heading, target, params.turnRate * dt),
|
|
62
90
|
speed: params.moveSpeed,
|
|
63
91
|
moving: true,
|
|
92
|
+
steering: 0,
|
|
93
|
+
slip: 0,
|
|
94
|
+
drift: 0,
|
|
64
95
|
};
|
|
65
96
|
}
|
|
66
97
|
const throttle = (input.up ? 1 : 0) - (input.down ? 1 : 0);
|
|
@@ -77,12 +108,24 @@ export function stepCharacter(pose, input, dt, scheme, params, cameraRotation =
|
|
|
77
108
|
else {
|
|
78
109
|
speed = approach(speed, 0, params.friction * dt);
|
|
79
110
|
}
|
|
80
|
-
const
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
111
|
+
const steering = (input.right ? 1 : 0) - (input.left ? 1 : 0);
|
|
112
|
+
const drift = nextDrift(pose.drift, input.drift === true, steering, speed, params, driftParams);
|
|
113
|
+
let turn;
|
|
114
|
+
if (drift !== 0 && driftParams) {
|
|
115
|
+
const into = steering * drift;
|
|
116
|
+
turn = drift * (driftParams.turnRate + into * driftParams.steerRate) * params.turnRate;
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
const authority = Math.min(1, (Math.abs(speed) / Math.max(1, params.moveSpeed)) * 3);
|
|
120
|
+
turn = steering * Math.sign(speed) * authority * params.turnRate;
|
|
121
|
+
}
|
|
122
|
+
const heading = turn === 0 ? pose.heading : wrapDeg(pose.heading + turn * dt);
|
|
123
|
+
const slip = nextSlip(pose.slip, drift, steering, dt, driftParams ?? DEFAULT_DRIFT);
|
|
124
|
+
if (speed === 0 &&
|
|
125
|
+
heading === pose.heading &&
|
|
126
|
+
steering === pose.steering &&
|
|
127
|
+
slip === pose.slip &&
|
|
128
|
+
drift === pose.drift) {
|
|
86
129
|
return pose.moving || pose.speed !== 0 ? { ...pose, speed: 0, moving: false } : pose;
|
|
87
130
|
}
|
|
88
131
|
const dir = headingVector(heading);
|
|
@@ -92,6 +135,44 @@ export function stepCharacter(pose, input, dt, scheme, params, cameraRotation =
|
|
|
92
135
|
heading,
|
|
93
136
|
speed,
|
|
94
137
|
moving: speed !== 0,
|
|
138
|
+
steering,
|
|
139
|
+
slip,
|
|
140
|
+
drift,
|
|
95
141
|
};
|
|
96
142
|
}
|
|
143
|
+
/**
|
|
144
|
+
* Keep a step from `prev` to `next` on climbable ground: moving onto ground more than
|
|
145
|
+
* `maxStep` higher than where the character stands is blocked. A blocked move first
|
|
146
|
+
* tries to slide along the cliff (keep only the x or only the y part), so walking into
|
|
147
|
+
* a wall at an angle glides along it; failing both, the character stays put (a
|
|
148
|
+
* vehicle also loses its speed, as if it bumped the wall). The heading still turns.
|
|
149
|
+
*/
|
|
150
|
+
export function constrainToGround(prev, next, heightAt, maxStep) {
|
|
151
|
+
if (next.x === prev.x && next.y === prev.y)
|
|
152
|
+
return next;
|
|
153
|
+
const limit = heightAt(prev.x, prev.y) + Math.max(0, maxStep);
|
|
154
|
+
const ok = (x, y) => heightAt(x, y) <= limit;
|
|
155
|
+
if (ok(next.x, next.y))
|
|
156
|
+
return next;
|
|
157
|
+
if (next.x !== prev.x && ok(next.x, prev.y))
|
|
158
|
+
return { ...next, y: prev.y };
|
|
159
|
+
if (next.y !== prev.y && ok(prev.x, next.y))
|
|
160
|
+
return { ...next, x: prev.x };
|
|
161
|
+
return { ...next, x: prev.x, y: prev.y, speed: 0, moving: false };
|
|
162
|
+
}
|
|
163
|
+
function nextDrift(current, held, steering, speed, params, driftParams) {
|
|
164
|
+
// Drifts only run forward: a stopped car never spins in place, whatever the tuning.
|
|
165
|
+
if (!driftParams || !held || speed <= 0)
|
|
166
|
+
return 0;
|
|
167
|
+
if (current !== 0)
|
|
168
|
+
return speed < driftParams.stopSpeed * params.moveSpeed ? 0 : current;
|
|
169
|
+
if (steering === 0 || speed < driftParams.startSpeed * params.moveSpeed)
|
|
170
|
+
return 0;
|
|
171
|
+
return steering > 0 ? 1 : -1;
|
|
172
|
+
}
|
|
173
|
+
function nextSlip(slip, drift, steering, dt, driftParams) {
|
|
174
|
+
const target = drift * (driftParams.slipAngle + Math.max(0, steering * drift) * driftParams.steerSlipAngle);
|
|
175
|
+
const next = slip + (target - slip) * (1 - Math.exp(-driftParams.recoveryRate * dt));
|
|
176
|
+
return Math.abs(next - target) < 0.001 ? target : next;
|
|
177
|
+
}
|
|
97
178
|
//# sourceMappingURL=character-physics.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"character-physics.js","sourceRoot":"","sources":["../src/character-physics.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,oFAAoF;AACpF,kFAAkF;AAClF,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"character-physics.js","sourceRoot":"","sources":["../src/character-physics.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"character-runtime.d.ts","sourceRoot":"","sources":["../src/character-runtime.tsx"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"character-runtime.d.ts","sourceRoot":"","sources":["../src/character-runtime.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEN,KAAK,aAAa,EAClB,KAAK,KAAK,EAIV,MAAM,uBAAuB,CAAC;AAa/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACN,KAAK,kBAAkB,EAIvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAmB,MAAM,sBAAsB,CAAC;AAE3E,eAAO,MAAM,kBAAkB,cAAc,CAAC;AAG9C,sFAAsF;AACtF,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAe9C;;;;GAIG;AACH,wBAAgB,UAAU,IAAI;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAkB9D;AAED,MAAM,WAAW,uBAAuB;IACvC,IAAI,EAAE,aAAa,CAAC;IACpB,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAgB;IAChC,qEAAqE;IACrE,aAAa,IAAI,IAAI,CAAC;IACtB,iFAAiF;IACjF,WAAW,IAAI,KAAK,CAAC;IACrB,OAAO,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;IACnC,OAAO,IAAI,IAAI,CAAC;CAChB;AAED,wBAAgB,qBAAqB,CACpC,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,uBAAuB,GAC9B,gBAAgB,CA8KlB"}
|
|
@@ -2,11 +2,11 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
2
2
|
// The runtime loop: held keys → physics step → follow camera → awareness publish,
|
|
3
3
|
// plus smoothing of remote characters. One rAF loop that runs only while the local
|
|
4
4
|
// character is enabled or a remote one is still easing into place.
|
|
5
|
-
import { screenToWorld, viewportRotation, } from "@edv4h/usketch-shared";
|
|
5
|
+
import { groundHeightService, screenToWorld, viewportRotation, } from "@edv4h/usketch-shared";
|
|
6
6
|
import { anchorPx, easeFocus, followViewport, sameViewport, smoothingAlpha, targetRotation, } from "./character-camera.js";
|
|
7
7
|
import { createKeyInput } from "./character-input.js";
|
|
8
8
|
import { CharacterLayer } from "./character-layer.js";
|
|
9
|
-
import { stepCharacter } from "./character-physics.js";
|
|
9
|
+
import { constrainToGround, stepCharacter } from "./character-physics.js";
|
|
10
10
|
import { createCharacterSync, easeRemotes, } from "./character-sync.js";
|
|
11
11
|
export const CHARACTER_LAYER_ID = "character";
|
|
12
12
|
/** Above shapes and most overlays, below the HUD (9999). */
|
|
@@ -55,7 +55,7 @@ export function canvasSize() {
|
|
|
55
55
|
return { width: 0, height: 0 };
|
|
56
56
|
}
|
|
57
57
|
export function setupCharacterRuntime(ctx, store, options) {
|
|
58
|
-
const keys = createKeyInput(options.keys, () => store.getState().enabled);
|
|
58
|
+
const keys = createKeyInput(options.keys, () => store.getState().enabled, () => store.getState().controlScheme === "vehicle" && store.getState().drift !== null);
|
|
59
59
|
let cam = null;
|
|
60
60
|
let display = new Map();
|
|
61
61
|
let rafId = null;
|
|
@@ -63,6 +63,9 @@ export function setupCharacterRuntime(ctx, store, options) {
|
|
|
63
63
|
// Set while WE write the viewport, so our own writes don't read as a user pan.
|
|
64
64
|
let writing = false;
|
|
65
65
|
const anchorPoint = () => anchorPx(store.getState().anchor, canvasSize());
|
|
66
|
+
// Ground height from whichever plugin provides it (e.g. the map's raised terrain), looked up
|
|
67
|
+
// per call so a provider registered later still counts. Absent = flat board.
|
|
68
|
+
const heightAt = (x, y) => groundHeightService.get(ctx.services)?.heightAt(x, y) ?? 0;
|
|
66
69
|
const sync = options.awareness
|
|
67
70
|
? createCharacterSync(options.awareness, store, () => ensureLoop())
|
|
68
71
|
: null;
|
|
@@ -99,7 +102,9 @@ export function setupCharacterRuntime(ctx, store, options) {
|
|
|
99
102
|
if (s.followSuspended && keys.anyHeld())
|
|
100
103
|
store.setFollowSuspended(false);
|
|
101
104
|
const vp = ctx.store.getViewport();
|
|
102
|
-
const
|
|
105
|
+
const stepped = stepCharacter(s.pose, input, dt, s.controlScheme, s.motion, viewportRotation(vp), s.drift);
|
|
106
|
+
// Cliffs taller than the climbable step block the move (slide along them).
|
|
107
|
+
const pose = constrainToGround(s.pose, stepped, heightAt, s.motion.maxStep);
|
|
103
108
|
store.setPose(pose);
|
|
104
109
|
s = store.getState();
|
|
105
110
|
if (s.cameraMode !== "free" && !s.followSuspended) {
|
|
@@ -188,7 +193,7 @@ export function setupCharacterRuntime(ctx, store, options) {
|
|
|
188
193
|
id: CHARACTER_LAYER_ID,
|
|
189
194
|
order: CHARACTER_LAYER_ORDER,
|
|
190
195
|
fixed: true,
|
|
191
|
-
render: (rc) => _jsx(CharacterLayer, { store: store, viewport: rc.viewport }),
|
|
196
|
+
render: (rc) => _jsx(CharacterLayer, { store: store, viewport: rc.viewport, heightAt: heightAt }),
|
|
192
197
|
});
|
|
193
198
|
if (store.getState().enabled || sync)
|
|
194
199
|
ensureLoop();
|
|
@@ -219,6 +224,9 @@ function sameRemotes(a, b) {
|
|
|
219
224
|
o.heading !== r.heading ||
|
|
220
225
|
o.moving !== r.moving ||
|
|
221
226
|
o.speed !== r.speed ||
|
|
227
|
+
o.steering !== r.steering ||
|
|
228
|
+
o.slip !== r.slip ||
|
|
229
|
+
o.drifting !== r.drifting ||
|
|
222
230
|
o.name !== r.name ||
|
|
223
231
|
o.appearance !== r.appearance) {
|
|
224
232
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"character-runtime.js","sourceRoot":"","sources":["../src/character-runtime.tsx"],"names":[],"mappings":";AAAA,kFAAkF;AAClF,mFAAmF;AACnF,mEAAmE;AACnE,OAAO,
|
|
1
|
+
{"version":3,"file":"character-runtime.js","sourceRoot":"","sources":["../src/character-runtime.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Point, type ServiceRegistry } from "@edv4h/usketch-shared";
|
|
2
2
|
import type { CameraMode } from "./character-camera.js";
|
|
3
|
-
import type { CharacterPose, ControlScheme, MotionParams } from "./character-physics.js";
|
|
3
|
+
import type { CharacterPose, ControlScheme, DriftParams, MotionParams } from "./character-physics.js";
|
|
4
4
|
import type { CharacterRuntime } from "./character-runtime.js";
|
|
5
5
|
import type { CharacterStore } from "./character-store.js";
|
|
6
6
|
import type { CharacterAppearance, CharacterKeys, CharacterRenderer, RemoteCharacter } from "./character-types.js";
|
|
@@ -23,13 +23,17 @@ export interface CharacterApi {
|
|
|
23
23
|
setControlScheme(scheme: ControlScheme): void;
|
|
24
24
|
getMotion(): MotionParams;
|
|
25
25
|
setMotion(motion: Partial<MotionParams>): void;
|
|
26
|
+
/** Vehicle drift tuning, or `null` when drifting is off. */
|
|
27
|
+
getDrift(): DriftParams | null;
|
|
28
|
+
/** `true` = on (current or default tuning), `false` = off, an object = tuning overrides. */
|
|
29
|
+
setDrift(drift: boolean | Partial<DriftParams>): void;
|
|
26
30
|
/** Screen anchor as canvas fractions (0..1). */
|
|
27
31
|
getAnchor(): Point;
|
|
28
32
|
setAnchor(anchor: Partial<Point>): void;
|
|
29
33
|
/** Follow smoothing (0 = rigid … 0.99 = heavy lag). */
|
|
30
34
|
getFollowSmoothing(): number;
|
|
31
35
|
setFollowSmoothing(value: number): void;
|
|
32
|
-
/** Replace the movement key bindings (`KeyboardEvent.code` values). */
|
|
36
|
+
/** Replace the movement key bindings (`KeyboardEvent.code` values; omitted `drift` is kept). */
|
|
33
37
|
setKeys(keys: CharacterKeys): void;
|
|
34
38
|
/** Swap the character renderer (`undefined` = draw nothing). */
|
|
35
39
|
setRenderer(renderer: CharacterRenderer | undefined): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"character-service.d.ts","sourceRoot":"","sources":["../src/character-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,KAAK,KAAK,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"character-service.d.ts","sourceRoot":"","sources":["../src/character-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,KAAK,KAAK,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EACX,aAAa,EACb,aAAa,EACb,WAAW,EACX,YAAY,EACZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EACX,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,YAAY;IAC5B,SAAS,IAAI,OAAO,CAAC;IACrB,MAAM,IAAI,IAAI,CAAC;IACf,OAAO,IAAI,IAAI,CAAC;IAChB,MAAM,IAAI,IAAI,CAAC;IACf,6DAA6D;IAC7D,OAAO,IAAI,aAAa,CAAC;IACzB,wDAAwD;IACxD,WAAW,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAC5B,qDAAqD;IACrD,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,qEAAqE;IACrE,aAAa,IAAI,IAAI,CAAC;IACtB,aAAa,IAAI,UAAU,CAAC;IAC5B,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IACtC,gBAAgB,IAAI,aAAa,CAAC;IAClC,gBAAgB,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IAC9C,SAAS,IAAI,YAAY,CAAC;IAC1B,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC/C,4DAA4D;IAC5D,QAAQ,IAAI,WAAW,GAAG,IAAI,CAAC;IAC/B,4FAA4F;IAC5F,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;IACtD,gDAAgD;IAChD,SAAS,IAAI,KAAK,CAAC;IACnB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IACxC,uDAAuD;IACvD,kBAAkB,IAAI,MAAM,CAAC;IAC7B,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,gGAAgG;IAChG,OAAO,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;IACnC,gEAAgE;IAChE,WAAW,CAAC,QAAQ,EAAE,iBAAiB,GAAG,SAAS,GAAG,IAAI,CAAC;IAC3D,6CAA6C;IAC7C,aAAa,CAAC,UAAU,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACrD,sCAAsC;IACtC,UAAU,IAAI,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACnD,wDAAwD;IACxD,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;CAC3C;AAED,eAAO,MAAM,gBAAgB,6DAA0D,CAAC;AAExF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,gBAAgB,GAAG,YAAY,CA4BjG;AAED,yFAAyF;AACzF,wBAAgB,eAAe,CAAC,QAAQ,EAAE,eAAe,GAAG,YAAY,GAAG,SAAS,CAEnF"}
|
|
@@ -18,6 +18,8 @@ export function createCharacterApi(store, runtime) {
|
|
|
18
18
|
setControlScheme: (scheme) => store.setControlScheme(scheme),
|
|
19
19
|
getMotion: () => store.getState().motion,
|
|
20
20
|
setMotion: (motion) => store.setMotion(motion),
|
|
21
|
+
getDrift: () => store.getState().drift,
|
|
22
|
+
setDrift: (drift) => store.setDrift(drift),
|
|
21
23
|
getAnchor: () => store.getState().anchor,
|
|
22
24
|
setAnchor: (anchor) => store.setAnchor(anchor),
|
|
23
25
|
getFollowSmoothing: () => store.getState().followSmoothing,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"character-service.js","sourceRoot":"","sources":["../src/character-service.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,8EAA8E;AAC9E,OAAO,EAAE,aAAa,EAAoC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"character-service.js","sourceRoot":"","sources":["../src/character-service.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,8EAA8E;AAC9E,OAAO,EAAE,aAAa,EAAoC,MAAM,uBAAuB,CAAC;AA0DxF,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAe,0BAA0B,CAAC,CAAC;AAExF,MAAM,UAAU,kBAAkB,CAAC,KAAqB,EAAE,OAAyB;IAClF,OAAO;QACN,SAAS,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,OAAO;QACzC,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;QACpC,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC;QACtC,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC;QACzD,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI;QACpC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACxC,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;QAC1C,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE;QAC5C,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,UAAU;QAChD,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC;QAClD,gBAAgB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,aAAa;QACtD,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC;QAC5D,SAAS,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM;QACxC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC;QAC9C,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK;QACtC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;QAC1C,SAAS,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM;QACxC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC;QAC9C,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,eAAe;QAC1D,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QACxC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACxC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QAC5C,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,OAAO;QAC1C,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC;KACjD,CAAC;AACH,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,eAAe,CAAC,QAAyB;IACxD,OAAO,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACvC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Point } from "@edv4h/usketch-shared";
|
|
2
2
|
import type { CameraMode } from "./character-camera.js";
|
|
3
|
-
import { type CharacterPose, type ControlScheme, type MotionParams } from "./character-physics.js";
|
|
3
|
+
import { type CharacterPose, type ControlScheme, type DriftParams, type MotionParams } from "./character-physics.js";
|
|
4
4
|
import type { CharacterAppearance, CharacterRenderer, RemoteCharacter } from "./character-types.js";
|
|
5
5
|
export interface CharacterState {
|
|
6
6
|
enabled: boolean;
|
|
@@ -10,6 +10,8 @@ export interface CharacterState {
|
|
|
10
10
|
cameraMode: CameraMode;
|
|
11
11
|
controlScheme: ControlScheme;
|
|
12
12
|
motion: MotionParams;
|
|
13
|
+
/** Vehicle drift tuning, or `null` when drifting is off. */
|
|
14
|
+
drift: DriftParams | null;
|
|
13
15
|
/** Screen anchor as fractions of the canvas (0..1). */
|
|
14
16
|
anchor: Point;
|
|
15
17
|
/** 0 = rigid follow … 0.99 = heavy lag. */
|
|
@@ -26,12 +28,15 @@ export interface CharacterStoreInit {
|
|
|
26
28
|
cameraMode?: CameraMode;
|
|
27
29
|
controlScheme?: ControlScheme;
|
|
28
30
|
motion?: Partial<MotionParams>;
|
|
31
|
+
drift?: boolean | Partial<DriftParams>;
|
|
29
32
|
anchor?: Partial<Point>;
|
|
30
33
|
followSmoothing?: number;
|
|
31
34
|
appearance?: CharacterAppearance;
|
|
32
35
|
name?: string;
|
|
33
36
|
renderer?: CharacterRenderer;
|
|
34
37
|
}
|
|
38
|
+
/** `true` = defaults, `false` / omitted = off, an object = defaults overridden. */
|
|
39
|
+
export declare function sanitizeDrift(d: boolean | Partial<DriftParams> | undefined, base?: DriftParams): DriftParams | null;
|
|
35
40
|
export declare function createCharacterStore(init?: CharacterStoreInit): {
|
|
36
41
|
getState: () => CharacterState;
|
|
37
42
|
subscribe(listener: () => void): () => void;
|
|
@@ -44,6 +49,8 @@ export declare function createCharacterStore(init?: CharacterStoreInit): {
|
|
|
44
49
|
setCameraMode(cameraMode: CameraMode): void;
|
|
45
50
|
setControlScheme(controlScheme: ControlScheme): void;
|
|
46
51
|
setMotion(m: Partial<MotionParams>): void;
|
|
52
|
+
/** `true` = on (current or default tuning), `false` = off, an object = tuning overrides. */
|
|
53
|
+
setDrift(d: boolean | Partial<DriftParams>): void;
|
|
47
54
|
setAnchor(a: Partial<Point>): void;
|
|
48
55
|
setFollowSmoothing(v: number): void;
|
|
49
56
|
setFollowSuspended(followSuspended: boolean): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"character-store.d.ts","sourceRoot":"","sources":["../src/character-store.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACN,KAAK,aAAa,EAClB,KAAK,aAAa,
|
|
1
|
+
{"version":3,"file":"character-store.d.ts","sourceRoot":"","sources":["../src/character-store.ts"],"names":[],"mappings":"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"}
|
package/dist/character-store.js
CHANGED
|
@@ -2,9 +2,12 @@
|
|
|
2
2
|
// shared with others only through awareness). A tiny subscribe/notify store so the
|
|
3
3
|
// layer, HUD and service all read the same source of truth.
|
|
4
4
|
import { wrapDeg } from "@edv4h/usketch-shared";
|
|
5
|
-
import { DEFAULT_MOTION, } from "./character-physics.js";
|
|
5
|
+
import { DEFAULT_DRIFT, DEFAULT_MOTION, ORIGIN_POSE, } from "./character-physics.js";
|
|
6
|
+
/** Stopped, wheels straight, no drift (teleports and scheme switches). */
|
|
7
|
+
const AT_REST = { speed: 0, moving: false, steering: 0, slip: 0, drift: 0 };
|
|
6
8
|
const clamp01 = (v) => Math.min(1, Math.max(0, v));
|
|
7
9
|
const positive = (v, fallback) => (Number.isFinite(v) && v > 0 ? v : fallback);
|
|
10
|
+
const nonNegative = (v, fallback) => (Number.isFinite(v) && v >= 0 ? v : fallback);
|
|
8
11
|
function sanitizeMotion(m, base) {
|
|
9
12
|
return {
|
|
10
13
|
moveSpeed: positive(m.moveSpeed ?? base.moveSpeed, base.moveSpeed),
|
|
@@ -12,16 +15,40 @@ function sanitizeMotion(m, base) {
|
|
|
12
15
|
acceleration: positive(m.acceleration ?? base.acceleration, base.acceleration),
|
|
13
16
|
friction: positive(m.friction ?? base.friction, base.friction),
|
|
14
17
|
reverseRatio: clamp01(m.reverseRatio ?? base.reverseRatio),
|
|
18
|
+
maxStep: nonNegative(m.maxStep ?? base.maxStep, base.maxStep),
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
const finite = (v, fallback) => v !== undefined && Number.isFinite(v) ? v : fallback;
|
|
22
|
+
/** `true` = defaults, `false` / omitted = off, an object = defaults overridden. */
|
|
23
|
+
export function sanitizeDrift(d, base = DEFAULT_DRIFT) {
|
|
24
|
+
if (!d)
|
|
25
|
+
return null;
|
|
26
|
+
if (d === true)
|
|
27
|
+
return base;
|
|
28
|
+
const nonNegative = (v, fallback) => Math.max(0, finite(v, fallback));
|
|
29
|
+
const startSpeed = nonNegative(d.startSpeed, base.startSpeed);
|
|
30
|
+
const turnRate = nonNegative(d.turnRate, base.turnRate);
|
|
31
|
+
return {
|
|
32
|
+
startSpeed,
|
|
33
|
+
// A drift must not end above the speed that starts it.
|
|
34
|
+
stopSpeed: Math.min(startSpeed, nonNegative(d.stopSpeed, base.stopSpeed)),
|
|
35
|
+
turnRate,
|
|
36
|
+
// Countersteering may open the curve, never reverse it.
|
|
37
|
+
steerRate: Math.min(turnRate, nonNegative(d.steerRate, base.steerRate)),
|
|
38
|
+
slipAngle: Math.min(90, nonNegative(d.slipAngle, base.slipAngle)),
|
|
39
|
+
steerSlipAngle: Math.min(90, nonNegative(d.steerSlipAngle, base.steerSlipAngle)),
|
|
40
|
+
recoveryRate: positive(finite(d.recoveryRate, base.recoveryRate), base.recoveryRate),
|
|
15
41
|
};
|
|
16
42
|
}
|
|
17
43
|
export function createCharacterStore(init = {}) {
|
|
18
44
|
let state = {
|
|
19
45
|
enabled: init.enabled ?? false,
|
|
20
|
-
pose:
|
|
46
|
+
pose: ORIGIN_POSE,
|
|
21
47
|
spawned: false,
|
|
22
48
|
cameraMode: init.cameraMode ?? "fixed",
|
|
23
49
|
controlScheme: init.controlScheme ?? "directional",
|
|
24
50
|
motion: sanitizeMotion(init.motion ?? {}, DEFAULT_MOTION),
|
|
51
|
+
drift: sanitizeDrift(init.drift),
|
|
25
52
|
anchor: { x: clamp01(init.anchor?.x ?? 0.5), y: clamp01(init.anchor?.y ?? 0.5) },
|
|
26
53
|
followSmoothing: Math.min(0.99, Math.max(0, init.followSmoothing ?? 0)),
|
|
27
54
|
followSuspended: false,
|
|
@@ -30,6 +57,8 @@ export function createCharacterStore(init = {}) {
|
|
|
30
57
|
remotes: new Map(),
|
|
31
58
|
};
|
|
32
59
|
let renderer = init.renderer;
|
|
60
|
+
// The tuning survives turning drift off, so turning it back on keeps it.
|
|
61
|
+
let driftTuning = state.drift ?? DEFAULT_DRIFT;
|
|
33
62
|
const listeners = new Set();
|
|
34
63
|
const set = (patch) => {
|
|
35
64
|
state = { ...state, ...patch };
|
|
@@ -56,7 +85,7 @@ export function createCharacterStore(init = {}) {
|
|
|
56
85
|
set({ pose, spawned: true });
|
|
57
86
|
},
|
|
58
87
|
setPosition(p) {
|
|
59
|
-
set({ pose: { ...state.pose, x: p.x, y: p.y
|
|
88
|
+
set({ pose: { ...state.pose, ...AT_REST, x: p.x, y: p.y }, spawned: true });
|
|
60
89
|
},
|
|
61
90
|
setHeading(deg) {
|
|
62
91
|
set({ pose: { ...state.pose, heading: wrapDeg(deg) } });
|
|
@@ -67,12 +96,19 @@ export function createCharacterStore(init = {}) {
|
|
|
67
96
|
},
|
|
68
97
|
setControlScheme(controlScheme) {
|
|
69
98
|
if (controlScheme !== state.controlScheme) {
|
|
70
|
-
set({ controlScheme, pose: { ...state.pose,
|
|
99
|
+
set({ controlScheme, pose: { ...state.pose, ...AT_REST } });
|
|
71
100
|
}
|
|
72
101
|
},
|
|
73
102
|
setMotion(m) {
|
|
74
103
|
set({ motion: sanitizeMotion(m, state.motion) });
|
|
75
104
|
},
|
|
105
|
+
/** `true` = on (current or default tuning), `false` = off, an object = tuning overrides. */
|
|
106
|
+
setDrift(d) {
|
|
107
|
+
const drift = sanitizeDrift(d, driftTuning);
|
|
108
|
+
if (drift)
|
|
109
|
+
driftTuning = drift;
|
|
110
|
+
set({ drift });
|
|
111
|
+
},
|
|
76
112
|
setAnchor(a) {
|
|
77
113
|
set({
|
|
78
114
|
anchor: { x: clamp01(a.x ?? state.anchor.x), y: clamp01(a.y ?? state.anchor.y) },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"character-store.js","sourceRoot":"","sources":["../src/character-store.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,mFAAmF;AACnF,4DAA4D;AAC5D,OAAO,EAAc,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAGN,cAAc,
|
|
1
|
+
{"version":3,"file":"character-store.js","sourceRoot":"","sources":["../src/character-store.ts"],"names":[],"mappings":"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"}
|
package/dist/character-sync.d.ts
CHANGED
|
@@ -16,11 +16,17 @@ export interface CharacterWireState {
|
|
|
16
16
|
heading: number;
|
|
17
17
|
speed: number;
|
|
18
18
|
moving: boolean;
|
|
19
|
+
/** Vehicle steering, -1 … 1 (absent from older clients → 0). */
|
|
20
|
+
steering?: number;
|
|
21
|
+
/** Vehicle body slip, degrees (absent from older clients → 0). */
|
|
22
|
+
slip?: number;
|
|
23
|
+
/** Vehicle drift running (absent from older clients → false). */
|
|
24
|
+
drifting?: boolean;
|
|
19
25
|
appearance: CharacterAppearance;
|
|
20
26
|
name?: string;
|
|
21
27
|
}
|
|
22
28
|
/** Validate an untrusted awareness payload (other clients can send anything). */
|
|
23
|
-
export declare function parseWireState(v: unknown):
|
|
29
|
+
export declare function parseWireState(v: unknown): Omit<RemoteCharacter, "id"> | null;
|
|
24
30
|
/** Minimum interval between broadcasts (≈20 Hz) — remote views interpolate between. */
|
|
25
31
|
export declare const BROADCAST_INTERVAL_MS = 50;
|
|
26
32
|
export interface CharacterSync {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"character-sync.d.ts","sourceRoot":"","sources":["../src/character-sync.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEjF,+DAA+D;AAC/D,MAAM,WAAW,kBAAkB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IACxD,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC/C,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;CAChD;AAED,eAAO,MAAM,eAAe,cAAc,CAAC;AAE3C,sEAAsE;AACtE,MAAM,WAAW,kBAAkB;IAClC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,mBAAmB,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;
|
|
1
|
+
{"version":3,"file":"character-sync.d.ts","sourceRoot":"","sources":["../src/character-sync.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEjF,+DAA+D;AAC/D,MAAM,WAAW,kBAAkB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IACxD,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC/C,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;CAChD;AAED,eAAO,MAAM,eAAe,cAAc,CAAC;AAE3C,sEAAsE;AACtE,MAAM,WAAW,kBAAkB;IAClC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,gEAAgE;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kEAAkE;IAClE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iEAAiE;IACjE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,mBAAmB,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAMD,iFAAiF;AACjF,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,IAAI,CAyB7E;AAED,uFAAuF;AACvF,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAExC,MAAM,WAAW,aAAa;IAC7B,sEAAsE;IACtE,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,0DAA0D;IAC1D,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAChD,OAAO,IAAI,IAAI,CAAC;CAChB;AAED,wBAAgB,mBAAmB,CAClC,SAAS,EAAE,kBAAkB,EAC7B,KAAK,EAAE,cAAc,EACrB,gBAAgB,EAAE,MAAM,IAAI,EAC5B,GAAG,GAAE,MAAM,MAAyB,GAClC,aAAa,CAwDf;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAC1B,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,EAC7C,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,EAC7C,KAAK,EAAE,MAAM,GACX;IAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CA2B3D"}
|
package/dist/character-sync.js
CHANGED
|
@@ -5,6 +5,9 @@
|
|
|
5
5
|
// Typed structurally so the plugin doesn't depend on @edv4h/usketch-sync.
|
|
6
6
|
import { wrapDeg } from "@edv4h/usketch-shared";
|
|
7
7
|
export const AWARENESS_FIELD = "character";
|
|
8
|
+
/** The largest slip accepted from the wire, degrees. */
|
|
9
|
+
const MAX_WIRE_SLIP = 90;
|
|
10
|
+
const clamp = (v, min, max) => Math.min(max, Math.max(min, v));
|
|
8
11
|
/** Validate an untrusted awareness payload (other clients can send anything). */
|
|
9
12
|
export function parseWireState(v) {
|
|
10
13
|
if (!v || typeof v !== "object")
|
|
@@ -25,6 +28,9 @@ export function parseWireState(v) {
|
|
|
25
28
|
heading: wrapDeg(heading),
|
|
26
29
|
speed: num("speed") ?? 0,
|
|
27
30
|
moving: o.moving === true,
|
|
31
|
+
steering: clamp(num("steering") ?? 0, -1, 1),
|
|
32
|
+
slip: clamp(num("slip") ?? 0, -MAX_WIRE_SLIP, MAX_WIRE_SLIP),
|
|
33
|
+
drifting: o.drifting === true,
|
|
28
34
|
appearance,
|
|
29
35
|
name: typeof o.name === "string" ? o.name : undefined,
|
|
30
36
|
};
|
|
@@ -47,6 +53,10 @@ export function createCharacterSync(awareness, store, onTargetsChanged, now = ()
|
|
|
47
53
|
heading: s.pose.heading,
|
|
48
54
|
speed: s.pose.speed,
|
|
49
55
|
moving: s.pose.moving,
|
|
56
|
+
steering: s.pose.steering,
|
|
57
|
+
// Half-degree steps: a settling slip doesn't publish every frame forever.
|
|
58
|
+
slip: Math.round(s.pose.slip * 2) / 2,
|
|
59
|
+
drifting: s.pose.drift !== 0,
|
|
50
60
|
appearance: s.appearance,
|
|
51
61
|
name: s.name,
|
|
52
62
|
}
|
|
@@ -100,7 +110,8 @@ export function easeRemotes(display, targets, alpha) {
|
|
|
100
110
|
const dx = t.x - d.x;
|
|
101
111
|
const dy = t.y - d.y;
|
|
102
112
|
const dh = wrapDeg(t.heading - d.heading);
|
|
103
|
-
|
|
113
|
+
const ds = t.slip - d.slip;
|
|
114
|
+
if (Math.abs(dx) < 0.05 && Math.abs(dy) < 0.05 && Math.abs(dh) < 0.05 && Math.abs(ds) < 0.05) {
|
|
104
115
|
next.set(id, t);
|
|
105
116
|
continue;
|
|
106
117
|
}
|
|
@@ -110,6 +121,7 @@ export function easeRemotes(display, targets, alpha) {
|
|
|
110
121
|
x: d.x + dx * alpha,
|
|
111
122
|
y: d.y + dy * alpha,
|
|
112
123
|
heading: wrapDeg(d.heading + dh * alpha),
|
|
124
|
+
slip: d.slip + ds * alpha,
|
|
113
125
|
});
|
|
114
126
|
}
|
|
115
127
|
return { next, settling };
|