@onjmin/dtm 1.0.4 → 1.0.6

package/dist/index.js

@@ -2810,7 +2810,7 @@ var KOE_VOICEBANKS = {
   mgroid: "MGRoid_\u539F\u97F3\u8A2D\u5B9A\u6E08\u307F.koe",
   motroid: "MOTRoid\u5B8C\u5168\u7248V2.koe",
   nynroid: "NYNRoidver1.4.koe",
-  uc: "\u84C4\u97F3\u30AD\u30EA\u30B3 \uFF08beta1.0\uFF09.koe"
+  uc: "\u84C4\u97F3\u30AD\u30EA\u30B3 \uFF08beta1.1\uFF09.koe"
 };
 var KOE_VOICEBANK_LABELS = {
   tsukuyomi: "\u3064\u304F\u3088\u307F\u3061\u3083\u3093",
@@ -4024,6 +4024,7 @@ var reverbAmountToGain = (amount) => Math.max(0, Math.min(100, amount)) / 100;
 var STEPS_PER_BEAT = 48;
 var PLAN_TIME = 0.5;
 var TICK_INTERVAL_MS = 20;
+var STEP_EPSILON = 1e-4;
 var resolveLoopPoint = (point, _bpm, stepsPerBar, sps) => {
   if ("step" in point) {
     return point.step;
@@ -4055,6 +4056,8 @@ var createSequencer = (options) => {
   let loopDurationSec = 0;
   let loopStartIndex = 0;
   let loopBase = 0;
+  let drumCursor = 0;
+  let lastDrumStep = Number.NEGATIVE_INFINITY;
   let lastPlayStep = 0;
   const secondsPerStep = () => 60 / options.getBpm() / STEPS_PER_BEAT;
   const getWrappedPlayStep = (time, sps) => {
@@ -4164,24 +4167,32 @@ var createSequencer = (options) => {
     }
     const { stepsPerBar } = options;
     const currentStep = getWrappedPlayStep(time, sps);
-    const currentBar = Math.floor(currentStep / stepsPerBar) + 1;
-    const pattern = options.getDrumPattern(currentBar);
-    if (pattern && pattern.length > 0) {
-      const currentStepInBar = currentStep % stepsPerBar;
-      const nextStep = currentStepInBar + 4;
-      const crossedBar = currentStepInBar < 4;
-      for (const drum of pattern) {
-        const shouldPlay = crossedBar && drum.step === 0 || drum.step >= currentStepInBar && drum.step < nextStep;
-        if (!shouldPlay) continue;
-        const whenSeconds = (drum.step - currentStepInBar) * sps;
-        if (whenSeconds < -0.1 || whenSeconds > PLAN_TIME) continue;
-        options.onPlayDrum({
-          pitch: drum.pitch,
-          velocity: drum.velocity ?? 1,
-          when: Math.max(0, whenSeconds),
-          duration: 0.1
-        });
+    if (isLooping && loopDurationSec > 0 && currentStep + STEP_EPSILON < lastDrumStep) {
+      drumCursor = loopStartStep - STEP_EPSILON;
+    }
+    lastDrumStep = currentStep;
+    let drumScanTo = currentStep + PLAN_TIME / sps;
+    if (isLooping && loopDurationSec > 0) {
+      drumScanTo = Math.min(drumScanTo, loopEndStep - STEP_EPSILON);
+    }
+    if (drumScanTo > drumCursor) {
+      const firstBar = Math.floor(Math.max(0, drumCursor) / stepsPerBar);
+      const lastBar = Math.floor(Math.max(0, drumScanTo) / stepsPerBar);
+      for (let bar = firstBar; bar <= lastBar; bar++) {
+        const pattern = options.getDrumPattern(bar + 1);
+        if (!pattern || pattern.length === 0) continue;
+        for (const drum of pattern) {
+          const absStep = bar * stepsPerBar + drum.step;
+          if (absStep <= drumCursor || absStep > drumScanTo) continue;
+          options.onPlayDrum({
+            pitch: drum.pitch,
+            velocity: drum.velocity ?? 1,
+            when: Math.max(0, (absStep - currentStep) * sps),
+            duration: 0.1
+          });
+        }
       }
+      drumCursor = drumScanTo;
     }
     if (time >= 0) {
       const currentStep2 = getWrappedPlayStep(time, sps);
@@ -4252,6 +4263,8 @@ var createSequencer = (options) => {
       nowIndex++;
     }
     loopBase = 0;
+    drumCursor = fromStepValue - STEP_EPSILON;
+    lastDrumStep = Number.NEGATIVE_INFINITY;
     lastPlayStep = fromStepValue - 1e-4;
     lastRealTime = -1;
     lastAudioTime = -1;
@@ -8891,14 +8904,20 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   }
   const seqTracks = trackIndices.map((index) => {
     let id = 0;
-    const notes = placements.filter((p) => p.trackIndex === index).map((p) => ({
+    const trackPlacements = placements.filter((p) => p.trackIndex === index);
+    const headerVelocity = trackPlacements[0]?.velocity ?? DEFAULT_VELOCITY;
+    const notes = trackPlacements.map((p) => ({
       id: id++,
       startStep: p.startStep,
       durationSteps: p.durationSteps,
       pitch: p.pitch,
-      velocity: p.velocity
+      velocity: DEFAULT_VELOCITY
     }));
-    return { id: String(index), volume: trackVolume, notes };
+    return {
+      id: String(index),
+      volume: trackVolume * headerVelocity / DEFAULT_VELOCITY,
+      notes
+    };
   });
   const colorOf = (index) => colors[index % colors.length] ?? DEFAULT_TRACK_COLORS[0];
   let audioCtx = null;
@@ -12226,6 +12245,7 @@ var shiftNotes = (cores, shiftSteps) => {
       if (newStart < 0) core.deleteNoteById(note.id);
       else core.moveNote(note.id, newStart, note.pitch);
     }
+    core.saveHistory();
   }
 };
 var transposeNotes = (cores, semitones) => {
@@ -12238,6 +12258,7 @@ var transposeNotes = (cores, semitones) => {
         core.moveNote(note.id, note.startStep, newPitch);
       }
     }
+    core.saveHistory();
   }
 };
 
@@ -12846,7 +12867,8 @@ var LinkedList = class {
    * Undo可能かチェック（カーソル移動なし）
    */
   canUndo() {
-    return this.#cursor.prev?.value !== null;
+    const { prev } = this.#cursor;
+    return prev !== null && prev.value !== null;
   }
   /**
    * Redo可能かチェック（カーソル移動なし）
@@ -13064,7 +13086,7 @@ var drawGrid = (noteLengthSteps = 1) => {
   for (let y = startY; y < endY; y += keyHeight) {
     const pitchIndex = keyCount - 1 - y / keyHeight;
     const totalPitch = pitchIndex + pitchRangeStart;
-    const pitchMod12 = pitchIndex % 12;
+    const pitchMod12 = totalPitch % 12;
     const isBlackKey = blackKeyPitches.has(pitchMod12);
     const isC = pitchMod12 === 0;
     const octave = Math.floor(totalPitch / 12) - 1;
@@ -18653,6 +18675,10 @@ var createPianoRoll = (options, handlers) => {
       selectionStart = null;
     }
     if (dragState) {
+      if (hasDragged) {
+        if (dragState.mode === "move") core.moveNoteEnd(dragState.noteId);
+        else core.resizeNoteEnd(dragState.noteId);
+      }
       dragState = null;
       if (hasDragged) {
         suppressClick = true;

package/dist/index.mjs

@@ -2677,7 +2677,7 @@ var KOE_VOICEBANKS = {
   mgroid: "MGRoid_\u539F\u97F3\u8A2D\u5B9A\u6E08\u307F.koe",
   motroid: "MOTRoid\u5B8C\u5168\u7248V2.koe",
   nynroid: "NYNRoidver1.4.koe",
-  uc: "\u84C4\u97F3\u30AD\u30EA\u30B3 \uFF08beta1.0\uFF09.koe"
+  uc: "\u84C4\u97F3\u30AD\u30EA\u30B3 \uFF08beta1.1\uFF09.koe"
 };
 var KOE_VOICEBANK_LABELS = {
   tsukuyomi: "\u3064\u304F\u3088\u307F\u3061\u3083\u3093",
@@ -3891,6 +3891,7 @@ var reverbAmountToGain = (amount) => Math.max(0, Math.min(100, amount)) / 100;
 var STEPS_PER_BEAT = 48;
 var PLAN_TIME = 0.5;
 var TICK_INTERVAL_MS = 20;
+var STEP_EPSILON = 1e-4;
 var resolveLoopPoint = (point, _bpm, stepsPerBar, sps) => {
   if ("step" in point) {
     return point.step;
@@ -3922,6 +3923,8 @@ var createSequencer = (options) => {
   let loopDurationSec = 0;
   let loopStartIndex = 0;
   let loopBase = 0;
+  let drumCursor = 0;
+  let lastDrumStep = Number.NEGATIVE_INFINITY;
   let lastPlayStep = 0;
   const secondsPerStep = () => 60 / options.getBpm() / STEPS_PER_BEAT;
   const getWrappedPlayStep = (time, sps) => {
@@ -4031,24 +4034,32 @@ var createSequencer = (options) => {
     }
     const { stepsPerBar } = options;
     const currentStep = getWrappedPlayStep(time, sps);
-    const currentBar = Math.floor(currentStep / stepsPerBar) + 1;
-    const pattern = options.getDrumPattern(currentBar);
-    if (pattern && pattern.length > 0) {
-      const currentStepInBar = currentStep % stepsPerBar;
-      const nextStep = currentStepInBar + 4;
-      const crossedBar = currentStepInBar < 4;
-      for (const drum of pattern) {
-        const shouldPlay = crossedBar && drum.step === 0 || drum.step >= currentStepInBar && drum.step < nextStep;
-        if (!shouldPlay) continue;
-        const whenSeconds = (drum.step - currentStepInBar) * sps;
-        if (whenSeconds < -0.1 || whenSeconds > PLAN_TIME) continue;
-        options.onPlayDrum({
-          pitch: drum.pitch,
-          velocity: drum.velocity ?? 1,
-          when: Math.max(0, whenSeconds),
-          duration: 0.1
-        });
+    if (isLooping && loopDurationSec > 0 && currentStep + STEP_EPSILON < lastDrumStep) {
+      drumCursor = loopStartStep - STEP_EPSILON;
+    }
+    lastDrumStep = currentStep;
+    let drumScanTo = currentStep + PLAN_TIME / sps;
+    if (isLooping && loopDurationSec > 0) {
+      drumScanTo = Math.min(drumScanTo, loopEndStep - STEP_EPSILON);
+    }
+    if (drumScanTo > drumCursor) {
+      const firstBar = Math.floor(Math.max(0, drumCursor) / stepsPerBar);
+      const lastBar = Math.floor(Math.max(0, drumScanTo) / stepsPerBar);
+      for (let bar = firstBar; bar <= lastBar; bar++) {
+        const pattern = options.getDrumPattern(bar + 1);
+        if (!pattern || pattern.length === 0) continue;
+        for (const drum of pattern) {
+          const absStep = bar * stepsPerBar + drum.step;
+          if (absStep <= drumCursor || absStep > drumScanTo) continue;
+          options.onPlayDrum({
+            pitch: drum.pitch,
+            velocity: drum.velocity ?? 1,
+            when: Math.max(0, (absStep - currentStep) * sps),
+            duration: 0.1
+          });
+        }
       }
+      drumCursor = drumScanTo;
     }
     if (time >= 0) {
       const currentStep2 = getWrappedPlayStep(time, sps);
@@ -4119,6 +4130,8 @@ var createSequencer = (options) => {
       nowIndex++;
     }
     loopBase = 0;
+    drumCursor = fromStepValue - STEP_EPSILON;
+    lastDrumStep = Number.NEGATIVE_INFINITY;
     lastPlayStep = fromStepValue - 1e-4;
     lastRealTime = -1;
     lastAudioTime = -1;
@@ -8758,14 +8771,20 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   }
   const seqTracks = trackIndices.map((index) => {
     let id = 0;
-    const notes = placements.filter((p) => p.trackIndex === index).map((p) => ({
+    const trackPlacements = placements.filter((p) => p.trackIndex === index);
+    const headerVelocity = trackPlacements[0]?.velocity ?? DEFAULT_VELOCITY;
+    const notes = trackPlacements.map((p) => ({
       id: id++,
       startStep: p.startStep,
       durationSteps: p.durationSteps,
       pitch: p.pitch,
-      velocity: p.velocity
+      velocity: DEFAULT_VELOCITY
     }));
-    return { id: String(index), volume: trackVolume, notes };
+    return {
+      id: String(index),
+      volume: trackVolume * headerVelocity / DEFAULT_VELOCITY,
+      notes
+    };
   });
   const colorOf = (index) => colors[index % colors.length] ?? DEFAULT_TRACK_COLORS[0];
   let audioCtx = null;
@@ -12093,6 +12112,7 @@ var shiftNotes = (cores, shiftSteps) => {
       if (newStart < 0) core.deleteNoteById(note.id);
       else core.moveNote(note.id, newStart, note.pitch);
     }
+    core.saveHistory();
   }
 };
 var transposeNotes = (cores, semitones) => {
@@ -12105,6 +12125,7 @@ var transposeNotes = (cores, semitones) => {
         core.moveNote(note.id, note.startStep, newPitch);
       }
     }
+    core.saveHistory();
   }
 };
 
@@ -12713,7 +12734,8 @@ var LinkedList = class {
    * Undo可能かチェック（カーソル移動なし）
    */
   canUndo() {
-    return this.#cursor.prev?.value !== null;
+    const { prev } = this.#cursor;
+    return prev !== null && prev.value !== null;
   }
   /**
    * Redo可能かチェック（カーソル移動なし）
@@ -12931,7 +12953,7 @@ var drawGrid = (noteLengthSteps = 1) => {
   for (let y = startY; y < endY; y += keyHeight) {
     const pitchIndex = keyCount - 1 - y / keyHeight;
     const totalPitch = pitchIndex + pitchRangeStart;
-    const pitchMod12 = pitchIndex % 12;
+    const pitchMod12 = totalPitch % 12;
     const isBlackKey = blackKeyPitches.has(pitchMod12);
     const isC = pitchMod12 === 0;
     const octave = Math.floor(totalPitch / 12) - 1;
@@ -18520,6 +18542,10 @@ var createPianoRoll = (options, handlers) => {
       selectionStart = null;
     }
     if (dragState) {
+      if (hasDragged) {
+        if (dragState.mode === "move") core.moveNoteEnd(dragState.noteId);
+        else core.resizeNoteEnd(dragState.noteId);
+      }
       dragState = null;
       if (hasDragged) {
         suppressClick = true;

package/package.json

@@ -2,7 +2,7 @@
   "author": "onjmin",
   "license": "MIT",
   "name": "@onjmin/dtm",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "MMLを中間言語に用いた、モバイルファーストなDAW / ピアノロール打ち込みコンポーネント",
   "homepage": "https://onjmin.github.io/dtm",
   "repository": {