@onjmin/dtm 2.0.3 → 2.1.0

package/dist/voice-worker.js

@@ -517,12 +517,60 @@
   var VIBRATO_RATE_HZ = 5.5;
   var VIBRATO_DEPTH_CENTS = 35;
   var VIBRATO_FADE_MS = 150;
-  var vibratoPitchCurve = (baseHz, preMs) => (tMs) => {
-    const sinceOnset = tMs - preMs;
-    if (sinceOnset <= 0) return baseHz;
-    const depth = VIBRATO_DEPTH_CENTS * Math.min(1, sinceOnset / VIBRATO_FADE_MS);
-    const cents = depth * Math.sin(2 * Math.PI * VIBRATO_RATE_HZ * sinceOnset / 1e3);
-    return baseHz * 2 ** (cents / 1200);
+  var vibratoRatio = (sinceOnsetMs) => {
+    if (sinceOnsetMs <= 0) return 1;
+    const depth = VIBRATO_DEPTH_CENTS * Math.min(1, sinceOnsetMs / VIBRATO_FADE_MS);
+    const cents = depth * Math.sin(2 * Math.PI * VIBRATO_RATE_HZ * sinceOnsetMs / 1e3);
+    return 2 ** (cents / 1200);
+  };
+
+  // src/pitch-curve.ts
+  var STEP_GLIDE_MS = 15;
+  var PORTAMENTO_MS = 70;
+  var MIN_GLIDE_MS = 4;
+  var unitsToHz = (units) => 440 * 2 ** ((units - 2139) / 372);
+  var smoothstep = (u) => u * u * (3 - 2 * u);
+  var toKeyframes = (segments) => {
+    const kf = [];
+    let prevAtMs = 0;
+    for (const seg of segments) {
+      const atMs = seg.atSec * 1e3;
+      const glideMs = Math.max(
+        MIN_GLIDE_MS,
+        Math.min(
+          seg.portamento ? PORTAMENTO_MS : STEP_GLIDE_MS,
+          (atMs - prevAtMs) * 0.5
+        )
+      );
+      kf.push({
+        hz: unitsToHz(seg.pitch),
+        startMs: Math.max(0, atMs - glideMs / 2),
+        glideMs
+      });
+      prevAtMs = atMs;
+    }
+    return kf;
+  };
+  var pitchCurveFor = (baseHz, segments, preMs, vibrato) => {
+    const kf = segments?.length ? toKeyframes(segments) : null;
+    if (!kf && !vibrato) return baseHz;
+    return (tMs) => {
+      const sinceOnset = tMs - preMs;
+      let hz = baseHz;
+      if (kf && sinceOnset > 0) {
+        for (const k of kf) {
+          if (sinceOnset >= k.startMs + k.glideMs) {
+            hz = k.hz;
+            continue;
+          }
+          if (sinceOnset <= k.startMs) break;
+          const u = smoothstep((sinceOnset - k.startMs) / k.glideMs);
+          hz = hz * (k.hz / hz) ** u;
+          break;
+        }
+      }
+      return vibrato ? hz * vibratoRatio(sinceOnset) : hz;
+    };
   };
 
   // src/voice-worker-types.ts
@@ -567,7 +615,7 @@
     const consonantMs = (consonantPcm.length - xfade / 2) / sampleRate * 1e3;
     return { pcm, preMs: consonantMs, consonantMs };
   };
-  var renderComposite = async (consonantAlias, vowelAlias, pitch, durationMs, vibrato, gender, breathiness, tension) => {
+  var renderComposite = async (consonantAlias, vowelAlias, pitch, durationMs, vibrato, gender, breathiness, tension, pitchSegments) => {
     if (!worldline) return null;
     const [consonantPcm, vowelPcm] = await Promise.all([
       getPcm(consonantAlias),
@@ -579,7 +627,7 @@
     const targetHz = unitsToFreq(pitch);
     const audio = worldline.renderNote({
       pcm: spliced.pcm,
-      pitch: vibrato ? vibratoPitchCurve(targetHz, spliced.preMs) : targetHz,
+      pitch: pitchCurveFor(targetHz, pitchSegments, spliced.preMs, !!vibrato),
       durationMs,
       preMs: spliced.preMs,
       consonantMs: spliced.consonantMs,
@@ -589,7 +637,7 @@
     });
     return audio ? { pcm: audio, preSec: spliced.preMs / 1e3, rate: 1 } : null;
   };
-  var renderAlias = async (alias, pitch, durationMs, vibrato, gender, breathiness, tension) => {
+  var renderAlias = async (alias, pitch, durationMs, vibrato, gender, breathiness, tension, pitchSegments) => {
     if (!bank) return null;
     const composite = unpackCompositeAlias(alias);
     if (composite) {
@@ -601,7 +649,8 @@
         vibrato,
         gender,
         breathiness,
-        tension
+        tension,
+        pitchSegments
       );
     }
     const pcm = await getPcm(alias);
@@ -612,7 +661,7 @@
     if (worldline) {
       const audio = worldline.renderNote({
         pcm,
-        pitch: vibrato ? vibratoPitchCurve(targetHz, lead.preMs) : targetHz,
+        pitch: pitchCurveFor(targetHz, pitchSegments, lead.preMs, !!vibrato),
         durationMs,
         ...lead,
         gender,
@@ -657,7 +706,8 @@
         vibrato,
         gender,
         breathiness,
-        tension
+        tension,
+        pitchSegments
       } = msg;
       try {
         const out = await renderAlias(
@@ -667,7 +717,8 @@
           vibrato,
           gender,
           breathiness,
-          tension
+          tension,
+          pitchSegments
         );
         if (out) {
           wself.postMessage(

package/package.json

@@ -2,7 +2,7 @@
   "author": "onjmin",
   "license": "MIT",
   "name": "@onjmin/dtm",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "MMLを中間言語に用いた、モバイルファーストなDAW / ピアノロール打ち込みコンポーネント",
   "homepage": "https://onjmin.github.io/dtm",
   "repository": {
@@ -62,6 +62,7 @@
     "dev": "rimraf dist && tsup && biome format src --write && tsx demo/server.ts",
     "build": "rimraf dist && tsup && biome format src --write",
     "check": "biome check src --write",
+    "test": "tsx scripts/check-compose.ts",
     "patch": "pnpm version patch",
     "minor": "pnpm version minor",
     "major": "pnpm version major",