reze-engine 0.70.1 → 0.70.3
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/camera-animation.d.ts +2 -0
- package/dist/camera-animation.d.ts.map +1 -1
- package/dist/camera-animation.js +30 -1
- package/dist/camera-mount.d.ts +10 -2
- package/dist/camera-mount.d.ts.map +1 -1
- package/dist/camera-mount.js +60 -9
- package/dist/model.d.ts.map +1 -1
- package/dist/model.js +15 -5
- package/package.json +1 -1
- package/src/camera-animation.ts +32 -1
- package/src/camera-mount.ts +63 -11
- package/src/model.ts +17 -5
|
@@ -33,6 +33,8 @@ export declare class CameraAnimation {
|
|
|
33
33
|
keyframes(): CameraKeyframe[];
|
|
34
34
|
/** Sample the camera pose at time `t` (seconds). Clamps to the track ends; null if empty. */
|
|
35
35
|
sample(t: number): CameraPose | null;
|
|
36
|
+
/** Whether the one-frame step from key i to i + 1 is a cut, not a baked sample. */
|
|
37
|
+
private isCut;
|
|
36
38
|
private pose;
|
|
37
39
|
}
|
|
38
40
|
//# sourceMappingURL=camera-animation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"camera-animation.d.ts","sourceRoot":"","sources":["../src/camera-animation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,EAAgC,KAAK,cAAc,EAAE,MAAM,cAAc,CAAA;AAKhF,4EAA4E;AAC5E,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,IAAI,CAAA;IACZ,QAAQ,EAAE,IAAI,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;CACZ;AAaD,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,+CAA+C;IAC/C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;gBAEb,MAAM,EAAE,cAAc,EAAE;IAKpC,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;;;OAMG;IACH,eAAe,IAAI,MAAM,EAAE;IAI3B;;;;;;;;OAQG;IACH,SAAS,IAAI,cAAc,EAAE;IAI7B,6FAA6F;IAC7F,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"camera-animation.d.ts","sourceRoot":"","sources":["../src/camera-animation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,EAAgC,KAAK,cAAc,EAAE,MAAM,cAAc,CAAA;AAKhF,4EAA4E;AAC5E,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,IAAI,CAAA;IACZ,QAAQ,EAAE,IAAI,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;CACZ;AAaD,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,+CAA+C;IAC/C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;gBAEb,MAAM,EAAE,cAAc,EAAE;IAKpC,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;;;;;OAMG;IACH,eAAe,IAAI,MAAM,EAAE;IAI3B;;;;;;;;OAQG;IACH,SAAS,IAAI,cAAc,EAAE;IAI7B,6FAA6F;IAC7F,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAqDpC,mFAAmF;IACnF,OAAO,CAAC,KAAK;IAUb,OAAO,CAAC,IAAI;CAGb"}
|
package/dist/camera-animation.js
CHANGED
|
@@ -71,7 +71,12 @@ export class CameraAnimation {
|
|
|
71
71
|
// Keys one frame apart are a cut: MMD never draws between them, so the
|
|
72
72
|
// earlier key holds until the later one's frame. A time meant as that frame
|
|
73
73
|
// can land a hair under it (11/30 * 30), and still cuts.
|
|
74
|
-
|
|
74
|
+
//
|
|
75
|
+
// Not inside a run of keys on every frame, though: that is a baked camera
|
|
76
|
+
// (a converter's or a capture's), whose keys are samples of one move. Held,
|
|
77
|
+
// it steps at 30 fps, and at 60 fps each pose shows twice, a judder. A
|
|
78
|
+
// baked track's own cut is the one step far bigger than its neighbours.
|
|
79
|
+
if (b.frame - a.frame === 1 && this.isCut(lo))
|
|
75
80
|
return this.pose(frame < b.frame - 1e-4 ? a : b);
|
|
76
81
|
const span = b.frame - a.frame;
|
|
77
82
|
const localT = span > 0 ? (frame - a.frame) / span : 0;
|
|
@@ -88,7 +93,31 @@ export class CameraAnimation {
|
|
|
88
93
|
fov: lerp(a.fov * DEG2RAD, b.fov * DEG2RAD, bez(ip, 5, localT)),
|
|
89
94
|
};
|
|
90
95
|
}
|
|
96
|
+
/** Whether the one-frame step from key i to i + 1 is a cut, not a baked sample. */
|
|
97
|
+
isCut(i) {
|
|
98
|
+
const f = this.frames;
|
|
99
|
+
const before = i > 0 && f[i].frame - f[i - 1].frame === 1;
|
|
100
|
+
const after = i + 2 < f.length && f[i + 2].frame - f[i + 1].frame === 1;
|
|
101
|
+
if (!before && !after)
|
|
102
|
+
return true;
|
|
103
|
+
const step = cameraStep(f[i], f[i + 1]);
|
|
104
|
+
const near = Math.max(before ? cameraStep(f[i - 1], f[i]) : 0, after ? cameraStep(f[i + 1], f[i + 2]) : 0);
|
|
105
|
+
return step > CUT_RATIO * near + CUT_FLOOR;
|
|
106
|
+
}
|
|
91
107
|
pose(f) {
|
|
92
108
|
return { target: f.target, rotation: f.rotation, distance: f.distance, fov: f.fov * DEG2RAD };
|
|
93
109
|
}
|
|
94
110
|
}
|
|
111
|
+
/** A baked step this many times its neighbours' (plus the floor) is a cut. */
|
|
112
|
+
const CUT_RATIO = 6;
|
|
113
|
+
const CUT_FLOOR = 0.05;
|
|
114
|
+
/**
|
|
115
|
+
* How far the camera moves in one step: its eye travel in model units plus the
|
|
116
|
+
* turn in radians and the fov change in degrees scaled to read alike, so a
|
|
117
|
+
* cut on any channel (a jump, a swing, a zoom) stands out from a smooth run.
|
|
118
|
+
*/
|
|
119
|
+
function cameraStep(a, b) {
|
|
120
|
+
const t = Math.hypot(b.target.x - a.target.x, b.target.y - a.target.y, b.target.z - a.target.z);
|
|
121
|
+
const r = Math.hypot(b.rotation.x - a.rotation.x, b.rotation.y - a.rotation.y, b.rotation.z - a.rotation.z);
|
|
122
|
+
return t + Math.abs(b.distance - a.distance) + r * 10 + Math.abs(b.fov - a.fov) * 0.2;
|
|
123
|
+
}
|
package/dist/camera-mount.d.ts
CHANGED
|
@@ -8,8 +8,10 @@ export interface CameraMountOptions {
|
|
|
8
8
|
mode: CameraMountMode;
|
|
9
9
|
/** The bone the camera rides. POV 頭 (the head), selfie 右手首 (a wrist). */
|
|
10
10
|
bone?: string;
|
|
11
|
-
/** Seconds the camera's turn trails the bone, eased (POV 0.
|
|
12
|
-
* a dance's head snaps read as a jolt without it. 0 is rigid.
|
|
11
|
+
/** Seconds the camera's turn trails the bone, eased (POV 0.3, selfie 0.25):
|
|
12
|
+
* a dance's head snaps read as a jolt without it. 0 is rigid. In POV the
|
|
13
|
+
* turn is eased twice over and the nod and the lens's travel take their
|
|
14
|
+
* own share of it — see POV_PITCH_TAU and POV_POS_TAU. */
|
|
13
15
|
smoothing?: number;
|
|
14
16
|
/** POV: keep the horizon level, dropping the head's tilt. Default true. */
|
|
15
17
|
level?: boolean;
|
|
@@ -38,6 +40,12 @@ export declare class CameraMount {
|
|
|
38
40
|
/** Selfie: from her face toward the phone, eased. */
|
|
39
41
|
private readonly arm;
|
|
40
42
|
private reach;
|
|
43
|
+
/** POV: yaw and pitch through two lags each ([first, second]), and the
|
|
44
|
+
* lens point through two. */
|
|
45
|
+
private readonly yaw;
|
|
46
|
+
private readonly pitch;
|
|
47
|
+
private readonly eye1;
|
|
48
|
+
private readonly eye2;
|
|
41
49
|
constructor(model: Model, options: CameraMountOptions);
|
|
42
50
|
setOptions(options: CameraMountOptions): void;
|
|
43
51
|
/** Snap to the rig on the next step: a seek or a cut is no camera move. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"camera-mount.d.ts","sourceRoot":"","sources":["../src/camera-mount.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,QAAQ,CAAA;AAE9C,oCAAoC;AACpC,MAAM,WAAW,kBAAkB;IACjC;wCACoC;IACpC,IAAI,EAAE,eAAe,CAAA;IACrB,yEAAyE;IACzE,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;
|
|
1
|
+
{"version":3,"file":"camera-mount.d.ts","sourceRoot":"","sources":["../src/camera-mount.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,QAAQ,CAAA;AAE9C,oCAAoC;AACpC,MAAM,WAAW,kBAAkB;IACjC;wCACoC;IACpC,IAAI,EAAE,eAAe,CAAA;IACrB,yEAAyE;IACzE,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;+DAG2D;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,2EAA2E;IAC3E,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;kFAC8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,2DAA2D;AAC3D,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,IAAI,CAAA;IACT,OAAO,EAAE,IAAI,CAAA;IACb,EAAE,EAAE,IAAI,CAAA;CACT;AAiCD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CASvF;AAqED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI,CAS/C;AAED,qBAAa,WAAW;IAgBpB,QAAQ,CAAC,KAAK,EAAE,KAAK;IAfvB,OAAO,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAA;IACrC,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAoB;IACvC,qDAAqD;IACrD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAqB;IACzC,OAAO,CAAC,KAAK,CAAI;IACjB;kCAC8B;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;gBAG9B,KAAK,EAAE,KAAK,EACrB,OAAO,EAAE,kBAAkB;IAK7B,UAAU,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAO7C,2EAA2E;IAC3E,MAAM,IAAI,IAAI;IAId,4EAA4E;IAC5E,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAQlC,OAAO,CAAC,GAAG;IA8CX,OAAO,CAAC,MAAM;CAgCf;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,EAAE,CAmChD"}
|
package/dist/camera-mount.js
CHANGED
|
@@ -22,12 +22,31 @@ const EYES_UP_FALLBACK = 1.1;
|
|
|
22
22
|
/** Selfie: the nearest the phone comes to her face, as a share of `distance`. */
|
|
23
23
|
const SELFIE_MIN = 0.55;
|
|
24
24
|
const UP = new Vec3(0, 1, 0);
|
|
25
|
+
/**
|
|
26
|
+
* POV is a STABILISED head cam, the way a gimbal or a game's first-person view
|
|
27
|
+
* is: a dancer's head bobs and nods on every beat, and a lens bolted to it
|
|
28
|
+
* shakes the whole frame with each one. So:
|
|
29
|
+
* - the turn is split into yaw and pitch and each eased twice over (two
|
|
30
|
+
* first-order lags in a row: a soft start and a soft stop, where one lag
|
|
31
|
+
* jerks into motion);
|
|
32
|
+
* - the nod is slower still (POV_PITCH_TAU × smoothing) and only
|
|
33
|
+
* POV_PITCH of it reaches the view — the head looks down and up far more
|
|
34
|
+
* than a person's gaze does;
|
|
35
|
+
* - the lens's travel is eased too (POV_POS_TAU × smoothing), so the bob of
|
|
36
|
+
* her head is smoothed out of the eye point. The head is hidden from this
|
|
37
|
+
* camera, so a lens a frame behind it never shows the inside of her face.
|
|
38
|
+
*/
|
|
39
|
+
const POV_PITCH = 0.6;
|
|
40
|
+
const POV_PITCH_TAU = 1.6;
|
|
41
|
+
const POV_POS_TAU = 0.5;
|
|
42
|
+
/** The shortest signed turn from a to b, radians. */
|
|
43
|
+
const wrapAngle = (a) => Math.atan2(Math.sin(a), Math.cos(a));
|
|
25
44
|
export function resolveMountOptions(o) {
|
|
26
45
|
const pov = o.mode !== "selfie";
|
|
27
46
|
return {
|
|
28
47
|
mode: pov ? "pov" : "selfie",
|
|
29
48
|
bone: o.bone || (pov ? HEAD : "右手首"),
|
|
30
|
-
smoothing: Math.min(2, Math.max(0, o.smoothing ?? (pov ? 0.
|
|
49
|
+
smoothing: Math.min(2, Math.max(0, o.smoothing ?? (pov ? 0.3 : 0.25))),
|
|
31
50
|
level: o.level ?? true,
|
|
32
51
|
distance: Math.min(40, Math.max(2, o.distance ?? 7)),
|
|
33
52
|
};
|
|
@@ -123,6 +142,12 @@ export class CameraMount {
|
|
|
123
142
|
/** Selfie: from her face toward the phone, eased. */
|
|
124
143
|
this.arm = new Vec3(0, 0, -1);
|
|
125
144
|
this.reach = 0;
|
|
145
|
+
/** POV: yaw and pitch through two lags each ([first, second]), and the
|
|
146
|
+
* lens point through two. */
|
|
147
|
+
this.yaw = [0, 0];
|
|
148
|
+
this.pitch = [0, 0];
|
|
149
|
+
this.eye1 = new Vec3(0, 0, 0);
|
|
150
|
+
this.eye2 = new Vec3(0, 0, 0);
|
|
126
151
|
this.options = resolveMountOptions(options);
|
|
127
152
|
}
|
|
128
153
|
setOptions(options) {
|
|
@@ -142,9 +167,9 @@ export class CameraMount {
|
|
|
142
167
|
const k = !this.seeded || o.smoothing <= 0 || dt <= 0 ? 1 : 1 - Math.exp(-dt / o.smoothing);
|
|
143
168
|
// A big jump (a seek, a tab come back) is no move to glide through.
|
|
144
169
|
const snap = !this.seeded || dt > 0.25;
|
|
145
|
-
return o.mode === "pov" ? this.pov(snap ?
|
|
170
|
+
return o.mode === "pov" ? this.pov(snap ? 0 : dt, snap) : this.selfie(snap ? 1 : k);
|
|
146
171
|
}
|
|
147
|
-
pov(
|
|
172
|
+
pov(dt, snap) {
|
|
148
173
|
const m = this.model;
|
|
149
174
|
const h = m.getBoneWorldMatrix(this.options.bone) ?? m.getBoneWorldMatrix(HEAD);
|
|
150
175
|
if (!h)
|
|
@@ -154,15 +179,41 @@ export class CameraMount {
|
|
|
154
179
|
return null;
|
|
155
180
|
// MMD rests facing −Z: forward is the head's negated third column, up its second.
|
|
156
181
|
const fwd = dirToWorld(m, -h[8], -h[9], -h[10]);
|
|
157
|
-
const
|
|
158
|
-
|
|
159
|
-
|
|
182
|
+
const yawT = Math.atan2(fwd.x, fwd.z);
|
|
183
|
+
const pitchT = Math.asin(Math.max(-1, Math.min(1, fwd.y))) * POV_PITCH;
|
|
184
|
+
const tau = this.options.smoothing;
|
|
185
|
+
const lag = (t) => (snap || t <= 0 ? 1 : 1 - Math.exp(-dt / t));
|
|
186
|
+
const kYaw = lag(tau);
|
|
187
|
+
const kPitch = lag(tau * POV_PITCH_TAU);
|
|
188
|
+
const kPos = lag(tau * POV_POS_TAU);
|
|
189
|
+
if (snap) {
|
|
190
|
+
this.yaw[0] = this.yaw[1] = yawT;
|
|
191
|
+
this.pitch[0] = this.pitch[1] = pitchT;
|
|
192
|
+
this.eye1.set(face);
|
|
193
|
+
this.eye2.set(face);
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
this.yaw[0] += wrapAngle(yawT - this.yaw[0]) * kYaw;
|
|
197
|
+
this.yaw[1] += wrapAngle(this.yaw[0] - this.yaw[1]) * kYaw;
|
|
198
|
+
this.pitch[0] += (pitchT - this.pitch[0]) * kPitch;
|
|
199
|
+
this.pitch[1] += (this.pitch[0] - this.pitch[1]) * kPitch;
|
|
200
|
+
const e1 = this.eye1;
|
|
201
|
+
e1.setXYZ(e1.x + (face.x - e1.x) * kPos, e1.y + (face.y - e1.y) * kPos, e1.z + (face.z - e1.z) * kPos);
|
|
202
|
+
const e2 = this.eye2;
|
|
203
|
+
e2.setXYZ(e2.x + (e1.x - e2.x) * kPos, e2.y + (e1.y - e2.y) * kPos, e2.z + (e1.z - e2.z) * kPos);
|
|
204
|
+
}
|
|
205
|
+
const cp = Math.cos(this.pitch[1]);
|
|
206
|
+
const f = new Vec3(Math.sin(this.yaw[1]) * cp, Math.sin(this.pitch[1]), Math.cos(this.yaw[1]) * cp);
|
|
207
|
+
this.forward.set(f);
|
|
208
|
+
// The tilt only when asked for, and then eased like the turn.
|
|
209
|
+
const up = this.options.level || Math.abs(f.y) > 0.97 ? UP : dirToWorld(m, h[4], h[5], h[6]);
|
|
210
|
+
ease(this.up, up, kYaw);
|
|
160
211
|
this.seeded = true;
|
|
161
|
-
const f = this.forward;
|
|
162
212
|
const s = POV_FORWARD * m.scale;
|
|
213
|
+
const e = this.eye2;
|
|
163
214
|
return {
|
|
164
|
-
eye: new Vec3(
|
|
165
|
-
forward:
|
|
215
|
+
eye: new Vec3(e.x + f.x * s, e.y + f.y * s, e.z + f.z * s),
|
|
216
|
+
forward: f,
|
|
166
217
|
up: new Vec3(this.up.x, this.up.y, this.up.z),
|
|
167
218
|
};
|
|
168
219
|
}
|
package/dist/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
|
package/dist/model.js
CHANGED
|
@@ -56,9 +56,15 @@ const BLINK_PAIRS = [
|
|
|
56
56
|
const BLINK_CLOSE = 0.09;
|
|
57
57
|
const BLINK_HOLD = 0.04;
|
|
58
58
|
const BLINK_OPEN = 0.2;
|
|
59
|
-
/** How often a blink is doubled,
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
/** How often a blink is doubled, how soon the second follows (start to start,
|
|
60
|
+
* at speed 1) and how much quicker both blinks of the pair run. A double is a
|
|
61
|
+
* flutter: two quick blinks with a glimpse of open eye between, about half a
|
|
62
|
+
* second in all. Two ordinary blinks 0.6 s apart read as just two blinks, and
|
|
63
|
+
* at 15% one came every half minute, so nobody saw it. At 1.8x a blink takes
|
|
64
|
+
* 0.18 s, which leaves the eyes open about 0.12 s before the second. */
|
|
65
|
+
const BLINK_DOUBLE = 0.3;
|
|
66
|
+
const BLINK_DOUBLE_GAP = 0.3;
|
|
67
|
+
const BLINK_DOUBLE_PACE = 1.8;
|
|
62
68
|
/** A fixed value in 0..1 for an integer — the same sequence every take. */
|
|
63
69
|
const blinkHash = (n) => {
|
|
64
70
|
let h = Math.imul(n ^ 0x9e3779b9, 0x85ebca6b);
|
|
@@ -999,6 +1005,7 @@ export class Model {
|
|
|
999
1005
|
next: blinkGap(0, opts.interval),
|
|
1000
1006
|
count: 0,
|
|
1001
1007
|
double: false,
|
|
1008
|
+
pair: false,
|
|
1002
1009
|
options: opts,
|
|
1003
1010
|
};
|
|
1004
1011
|
return true;
|
|
@@ -1038,6 +1045,7 @@ export class Model {
|
|
|
1038
1045
|
b.start = -1;
|
|
1039
1046
|
b.count = 0;
|
|
1040
1047
|
b.double = false;
|
|
1048
|
+
b.pair = false;
|
|
1041
1049
|
b.next = blinkGap(0, interval);
|
|
1042
1050
|
}
|
|
1043
1051
|
// A loop, so a long jump forward lands on the blink it is in, not on each one passed.
|
|
@@ -1045,10 +1053,12 @@ export class Model {
|
|
|
1045
1053
|
b.start = b.next;
|
|
1046
1054
|
b.count++;
|
|
1047
1055
|
// Now and then a second blink follows straight after the first — never a third.
|
|
1048
|
-
|
|
1056
|
+
const second = b.double;
|
|
1057
|
+
b.double = double && !second && blinkHash(b.count * 7 + 3) < BLINK_DOUBLE;
|
|
1058
|
+
b.pair = b.double || second;
|
|
1049
1059
|
b.next = b.start + (b.double ? BLINK_DOUBLE_GAP / speed : blinkGap(b.count, interval));
|
|
1050
1060
|
}
|
|
1051
|
-
const w = blinkCurve((b.clock - b.start) * speed);
|
|
1061
|
+
const w = blinkCurve((b.clock - b.start) * speed * (b.pair ? BLINK_DOUBLE_PACE : 1));
|
|
1052
1062
|
let changed = false;
|
|
1053
1063
|
for (let i = 0; i < b.morphs.length; i++) {
|
|
1054
1064
|
if (weights[b.morphs[i]] !== w) {
|
package/package.json
CHANGED
package/src/camera-animation.ts
CHANGED
|
@@ -89,7 +89,12 @@ export class CameraAnimation {
|
|
|
89
89
|
// Keys one frame apart are a cut: MMD never draws between them, so the
|
|
90
90
|
// earlier key holds until the later one's frame. A time meant as that frame
|
|
91
91
|
// can land a hair under it (11/30 * 30), and still cuts.
|
|
92
|
-
|
|
92
|
+
//
|
|
93
|
+
// Not inside a run of keys on every frame, though: that is a baked camera
|
|
94
|
+
// (a converter's or a capture's), whose keys are samples of one move. Held,
|
|
95
|
+
// it steps at 30 fps, and at 60 fps each pose shows twice, a judder. A
|
|
96
|
+
// baked track's own cut is the one step far bigger than its neighbours.
|
|
97
|
+
if (b.frame - a.frame === 1 && this.isCut(lo)) return this.pose(frame < b.frame - 1e-4 ? a : b)
|
|
93
98
|
const span = b.frame - a.frame
|
|
94
99
|
const localT = span > 0 ? (frame - a.frame) / span : 0
|
|
95
100
|
// The incoming interpolation curve is stored on the segment's end keyframe (b).
|
|
@@ -115,7 +120,33 @@ export class CameraAnimation {
|
|
|
115
120
|
}
|
|
116
121
|
}
|
|
117
122
|
|
|
123
|
+
/** Whether the one-frame step from key i to i + 1 is a cut, not a baked sample. */
|
|
124
|
+
private isCut(i: number): boolean {
|
|
125
|
+
const f = this.frames
|
|
126
|
+
const before = i > 0 && f[i].frame - f[i - 1].frame === 1
|
|
127
|
+
const after = i + 2 < f.length && f[i + 2].frame - f[i + 1].frame === 1
|
|
128
|
+
if (!before && !after) return true
|
|
129
|
+
const step = cameraStep(f[i], f[i + 1])
|
|
130
|
+
const near = Math.max(before ? cameraStep(f[i - 1], f[i]) : 0, after ? cameraStep(f[i + 1], f[i + 2]) : 0)
|
|
131
|
+
return step > CUT_RATIO * near + CUT_FLOOR
|
|
132
|
+
}
|
|
133
|
+
|
|
118
134
|
private pose(f: CameraKeyframe): CameraPose {
|
|
119
135
|
return { target: f.target, rotation: f.rotation, distance: f.distance, fov: f.fov * DEG2RAD }
|
|
120
136
|
}
|
|
121
137
|
}
|
|
138
|
+
|
|
139
|
+
/** A baked step this many times its neighbours' (plus the floor) is a cut. */
|
|
140
|
+
const CUT_RATIO = 6
|
|
141
|
+
const CUT_FLOOR = 0.05
|
|
142
|
+
|
|
143
|
+
/**
|
|
144
|
+
* How far the camera moves in one step: its eye travel in model units plus the
|
|
145
|
+
* turn in radians and the fov change in degrees scaled to read alike, so a
|
|
146
|
+
* cut on any channel (a jump, a swing, a zoom) stands out from a smooth run.
|
|
147
|
+
*/
|
|
148
|
+
function cameraStep(a: CameraKeyframe, b: CameraKeyframe): number {
|
|
149
|
+
const t = Math.hypot(b.target.x - a.target.x, b.target.y - a.target.y, b.target.z - a.target.z)
|
|
150
|
+
const r = Math.hypot(b.rotation.x - a.rotation.x, b.rotation.y - a.rotation.y, b.rotation.z - a.rotation.z)
|
|
151
|
+
return t + Math.abs(b.distance - a.distance) + r * 10 + Math.abs(b.fov - a.fov) * 0.2
|
|
152
|
+
}
|
package/src/camera-mount.ts
CHANGED
|
@@ -23,8 +23,10 @@ export interface CameraMountOptions {
|
|
|
23
23
|
mode: CameraMountMode
|
|
24
24
|
/** The bone the camera rides. POV 頭 (the head), selfie 右手首 (a wrist). */
|
|
25
25
|
bone?: string
|
|
26
|
-
/** Seconds the camera's turn trails the bone, eased (POV 0.
|
|
27
|
-
* a dance's head snaps read as a jolt without it. 0 is rigid.
|
|
26
|
+
/** Seconds the camera's turn trails the bone, eased (POV 0.3, selfie 0.25):
|
|
27
|
+
* a dance's head snaps read as a jolt without it. 0 is rigid. In POV the
|
|
28
|
+
* turn is eased twice over and the nod and the lens's travel take their
|
|
29
|
+
* own share of it — see POV_PITCH_TAU and POV_POS_TAU. */
|
|
28
30
|
smoothing?: number
|
|
29
31
|
/** POV: keep the horizon level, dropping the head's tilt. Default true. */
|
|
30
32
|
level?: boolean
|
|
@@ -51,13 +53,32 @@ const EYES_UP_FALLBACK = 1.1
|
|
|
51
53
|
/** Selfie: the nearest the phone comes to her face, as a share of `distance`. */
|
|
52
54
|
const SELFIE_MIN = 0.55
|
|
53
55
|
const UP = new Vec3(0, 1, 0)
|
|
56
|
+
/**
|
|
57
|
+
* POV is a STABILISED head cam, the way a gimbal or a game's first-person view
|
|
58
|
+
* is: a dancer's head bobs and nods on every beat, and a lens bolted to it
|
|
59
|
+
* shakes the whole frame with each one. So:
|
|
60
|
+
* - the turn is split into yaw and pitch and each eased twice over (two
|
|
61
|
+
* first-order lags in a row: a soft start and a soft stop, where one lag
|
|
62
|
+
* jerks into motion);
|
|
63
|
+
* - the nod is slower still (POV_PITCH_TAU × smoothing) and only
|
|
64
|
+
* POV_PITCH of it reaches the view — the head looks down and up far more
|
|
65
|
+
* than a person's gaze does;
|
|
66
|
+
* - the lens's travel is eased too (POV_POS_TAU × smoothing), so the bob of
|
|
67
|
+
* her head is smoothed out of the eye point. The head is hidden from this
|
|
68
|
+
* camera, so a lens a frame behind it never shows the inside of her face.
|
|
69
|
+
*/
|
|
70
|
+
const POV_PITCH = 0.6
|
|
71
|
+
const POV_PITCH_TAU = 1.6
|
|
72
|
+
const POV_POS_TAU = 0.5
|
|
73
|
+
/** The shortest signed turn from a to b, radians. */
|
|
74
|
+
const wrapAngle = (a: number): number => Math.atan2(Math.sin(a), Math.cos(a))
|
|
54
75
|
|
|
55
76
|
export function resolveMountOptions(o: CameraMountOptions): Required<CameraMountOptions> {
|
|
56
77
|
const pov = o.mode !== "selfie"
|
|
57
78
|
return {
|
|
58
79
|
mode: pov ? "pov" : "selfie",
|
|
59
80
|
bone: o.bone || (pov ? HEAD : "右手首"),
|
|
60
|
-
smoothing: Math.min(2, Math.max(0, o.smoothing ?? (pov ? 0.
|
|
81
|
+
smoothing: Math.min(2, Math.max(0, o.smoothing ?? (pov ? 0.3 : 0.25))),
|
|
61
82
|
level: o.level ?? true,
|
|
62
83
|
distance: Math.min(40, Math.max(2, o.distance ?? 7)),
|
|
63
84
|
}
|
|
@@ -153,6 +174,12 @@ export class CameraMount {
|
|
|
153
174
|
/** Selfie: from her face toward the phone, eased. */
|
|
154
175
|
private readonly arm = new Vec3(0, 0, -1)
|
|
155
176
|
private reach = 0
|
|
177
|
+
/** POV: yaw and pitch through two lags each ([first, second]), and the
|
|
178
|
+
* lens point through two. */
|
|
179
|
+
private readonly yaw = [0, 0]
|
|
180
|
+
private readonly pitch = [0, 0]
|
|
181
|
+
private readonly eye1 = new Vec3(0, 0, 0)
|
|
182
|
+
private readonly eye2 = new Vec3(0, 0, 0)
|
|
156
183
|
|
|
157
184
|
constructor(
|
|
158
185
|
readonly model: Model,
|
|
@@ -179,10 +206,10 @@ export class CameraMount {
|
|
|
179
206
|
const k = !this.seeded || o.smoothing <= 0 || dt <= 0 ? 1 : 1 - Math.exp(-dt / o.smoothing)
|
|
180
207
|
// A big jump (a seek, a tab come back) is no move to glide through.
|
|
181
208
|
const snap = !this.seeded || dt > 0.25
|
|
182
|
-
return o.mode === "pov" ? this.pov(snap ?
|
|
209
|
+
return o.mode === "pov" ? this.pov(snap ? 0 : dt, snap) : this.selfie(snap ? 1 : k)
|
|
183
210
|
}
|
|
184
211
|
|
|
185
|
-
private pov(
|
|
212
|
+
private pov(dt: number, snap: boolean): MountPose | null {
|
|
186
213
|
const m = this.model
|
|
187
214
|
const h = m.getBoneWorldMatrix(this.options.bone) ?? m.getBoneWorldMatrix(HEAD)
|
|
188
215
|
if (!h) return null
|
|
@@ -190,15 +217,40 @@ export class CameraMount {
|
|
|
190
217
|
if (!face) return null
|
|
191
218
|
// MMD rests facing −Z: forward is the head's negated third column, up its second.
|
|
192
219
|
const fwd = dirToWorld(m, -h[8], -h[9], -h[10])
|
|
193
|
-
const
|
|
194
|
-
|
|
195
|
-
|
|
220
|
+
const yawT = Math.atan2(fwd.x, fwd.z)
|
|
221
|
+
const pitchT = Math.asin(Math.max(-1, Math.min(1, fwd.y))) * POV_PITCH
|
|
222
|
+
const tau = this.options.smoothing
|
|
223
|
+
const lag = (t: number) => (snap || t <= 0 ? 1 : 1 - Math.exp(-dt / t))
|
|
224
|
+
const kYaw = lag(tau)
|
|
225
|
+
const kPitch = lag(tau * POV_PITCH_TAU)
|
|
226
|
+
const kPos = lag(tau * POV_POS_TAU)
|
|
227
|
+
if (snap) {
|
|
228
|
+
this.yaw[0] = this.yaw[1] = yawT
|
|
229
|
+
this.pitch[0] = this.pitch[1] = pitchT
|
|
230
|
+
this.eye1.set(face)
|
|
231
|
+
this.eye2.set(face)
|
|
232
|
+
} else {
|
|
233
|
+
this.yaw[0] += wrapAngle(yawT - this.yaw[0]) * kYaw
|
|
234
|
+
this.yaw[1] += wrapAngle(this.yaw[0] - this.yaw[1]) * kYaw
|
|
235
|
+
this.pitch[0] += (pitchT - this.pitch[0]) * kPitch
|
|
236
|
+
this.pitch[1] += (this.pitch[0] - this.pitch[1]) * kPitch
|
|
237
|
+
const e1 = this.eye1
|
|
238
|
+
e1.setXYZ(e1.x + (face.x - e1.x) * kPos, e1.y + (face.y - e1.y) * kPos, e1.z + (face.z - e1.z) * kPos)
|
|
239
|
+
const e2 = this.eye2
|
|
240
|
+
e2.setXYZ(e2.x + (e1.x - e2.x) * kPos, e2.y + (e1.y - e2.y) * kPos, e2.z + (e1.z - e2.z) * kPos)
|
|
241
|
+
}
|
|
242
|
+
const cp = Math.cos(this.pitch[1])
|
|
243
|
+
const f = new Vec3(Math.sin(this.yaw[1]) * cp, Math.sin(this.pitch[1]), Math.cos(this.yaw[1]) * cp)
|
|
244
|
+
this.forward.set(f)
|
|
245
|
+
// The tilt only when asked for, and then eased like the turn.
|
|
246
|
+
const up = this.options.level || Math.abs(f.y) > 0.97 ? UP : dirToWorld(m, h[4], h[5], h[6])
|
|
247
|
+
ease(this.up, up, kYaw)
|
|
196
248
|
this.seeded = true
|
|
197
|
-
const f = this.forward
|
|
198
249
|
const s = POV_FORWARD * m.scale
|
|
250
|
+
const e = this.eye2
|
|
199
251
|
return {
|
|
200
|
-
eye: new Vec3(
|
|
201
|
-
forward:
|
|
252
|
+
eye: new Vec3(e.x + f.x * s, e.y + f.y * s, e.z + f.z * s),
|
|
253
|
+
forward: f,
|
|
202
254
|
up: new Vec3(this.up.x, this.up.y, this.up.z),
|
|
203
255
|
}
|
|
204
256
|
}
|
package/src/model.ts
CHANGED
|
@@ -75,9 +75,15 @@ const BLINK_PAIRS: [string, string][] = [
|
|
|
75
75
|
const BLINK_CLOSE = 0.09
|
|
76
76
|
const BLINK_HOLD = 0.04
|
|
77
77
|
const BLINK_OPEN = 0.2
|
|
78
|
-
/** How often a blink is doubled,
|
|
79
|
-
|
|
80
|
-
|
|
78
|
+
/** How often a blink is doubled, how soon the second follows (start to start,
|
|
79
|
+
* at speed 1) and how much quicker both blinks of the pair run. A double is a
|
|
80
|
+
* flutter: two quick blinks with a glimpse of open eye between, about half a
|
|
81
|
+
* second in all. Two ordinary blinks 0.6 s apart read as just two blinks, and
|
|
82
|
+
* at 15% one came every half minute, so nobody saw it. At 1.8x a blink takes
|
|
83
|
+
* 0.18 s, which leaves the eyes open about 0.12 s before the second. */
|
|
84
|
+
const BLINK_DOUBLE = 0.3
|
|
85
|
+
const BLINK_DOUBLE_GAP = 0.3
|
|
86
|
+
const BLINK_DOUBLE_PACE = 1.8
|
|
81
87
|
|
|
82
88
|
/** What setAutoBlink asks for. */
|
|
83
89
|
export interface AutoBlinkOptions {
|
|
@@ -1359,6 +1365,8 @@ export class Model {
|
|
|
1359
1365
|
count: number
|
|
1360
1366
|
/** Whether the current blink is the first of a double. */
|
|
1361
1367
|
double: boolean
|
|
1368
|
+
/** Whether it is either blink of a double: those run quicker. */
|
|
1369
|
+
pair: boolean
|
|
1362
1370
|
options: Required<AutoBlinkOptions>
|
|
1363
1371
|
} | null = null
|
|
1364
1372
|
|
|
@@ -1408,6 +1416,7 @@ export class Model {
|
|
|
1408
1416
|
next: blinkGap(0, opts.interval),
|
|
1409
1417
|
count: 0,
|
|
1410
1418
|
double: false,
|
|
1419
|
+
pair: false,
|
|
1411
1420
|
options: opts,
|
|
1412
1421
|
}
|
|
1413
1422
|
return true
|
|
@@ -1444,6 +1453,7 @@ export class Model {
|
|
|
1444
1453
|
b.start = -1
|
|
1445
1454
|
b.count = 0
|
|
1446
1455
|
b.double = false
|
|
1456
|
+
b.pair = false
|
|
1447
1457
|
b.next = blinkGap(0, interval)
|
|
1448
1458
|
}
|
|
1449
1459
|
// A loop, so a long jump forward lands on the blink it is in, not on each one passed.
|
|
@@ -1451,10 +1461,12 @@ export class Model {
|
|
|
1451
1461
|
b.start = b.next
|
|
1452
1462
|
b.count++
|
|
1453
1463
|
// Now and then a second blink follows straight after the first — never a third.
|
|
1454
|
-
|
|
1464
|
+
const second = b.double
|
|
1465
|
+
b.double = double && !second && blinkHash(b.count * 7 + 3) < BLINK_DOUBLE
|
|
1466
|
+
b.pair = b.double || second
|
|
1455
1467
|
b.next = b.start + (b.double ? BLINK_DOUBLE_GAP / speed : blinkGap(b.count, interval))
|
|
1456
1468
|
}
|
|
1457
|
-
const w = blinkCurve((b.clock - b.start) * speed)
|
|
1469
|
+
const w = blinkCurve((b.clock - b.start) * speed * (b.pair ? BLINK_DOUBLE_PACE : 1))
|
|
1458
1470
|
let changed = false
|
|
1459
1471
|
for (let i = 0; i < b.morphs.length; i++) {
|
|
1460
1472
|
if (weights[b.morphs[i]] !== w) {
|