音量編集機能の追加 #2263
Draft
音量編集機能の追加 #2263
+893
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| | { type: "draw"; data: number[]; startFrame: number } | ||
| | { type: "erase"; startFrame: number; frameLength: number } | ||
| | undefined | ||
| >(undefined); | ||
| const prevCursorPos = { frame: 0, frequency: 0 }; // 前のカーソル位置 |
There was a problem hiding this comment.
ピッチ編集用のprevCursorPosになっちゃっているので、
prevCursorPos: { frame: number; frequency: number; }を無くして、
prevCursorFrame: numberと
prevCursorFrequency: numberと
prevCursorVolume: numberにするのが一旦良いかもと思いました！
| @@ -667,6 +686,79 @@ const previewDrawPitch = () => { | |||
| prevCursorPos.frequency = cursorFrequency; | |||
| }; | |||
|
|
|||
| // ピッチを描く処理を行う | |||
| const previewDrawVolume = () => { | |||
There was a problem hiding this comment.
細かいですが、関数の順番は
- previewDrawPitch
- previewErasePitch
- previewDrawVolume
- previewEraseVolume
が良いかなと思いました！
（処理は似ていますが、一旦共通化はせずに個々の機能として分けておくのが良いかなと）
Comment on lines
+702
to
+704
| const cursorFrame = Math.round(cursorSeconds * frameRate); | ||
| const cursorNoteNumber = baseYToNoteNumber(cursorBaseY, false); | ||
| const cursorFrequency = noteNumberToFrequency(cursorNoteNumber); |
There was a problem hiding this comment.
ここは、cursorFrequencyを無くして、cursorVolumeを算出する処理を追加になるかなと思います。
以下のような感じでsing/viewHelper.tsに変換処理を実装して、それを使用するのが良いと思います。（decibelToLinearとlinearToDecibelはsing/domain.tsにあります）
// viewHelper.ts
const PIXELS_PER_DECIBEL = 6;
const DECIBEL_VIEW_OFFSET = 100;
export function viewYToDecibel(viewY: number) {
return -((viewY - DECIBEL_VIEW_OFFSET) / PIXELS_PER_DECIBEL);
}
export function decibelToViewY(decibel: number) {
return -decibel * PIXELS_PER_DECIBEL + DECIBEL_VIEW_OFFSET;
}// ScoreSequencer.vue
const cursorDecibel = viewYToDecibel(cursorY.value);
const cursorVolume = decibelToLinear(cursorDecibel);| }; | ||
| } else { | ||
| throw new Error("Unknown preview mode."); | ||
| } |
There was a problem hiding this comment.
ここはeditTarget.value === "PITCH"のときと同様に、最後に
prevCursorFrame = cursorFrame;
prevCursorVolume = cursorVolume;する必要があるかも。
Comment on lines
+1083
to
+1087
| // 平滑化を行う | ||
| let data = previewVolumeEdit.value.data; | ||
| data = data.map((value) => Math.log(value)); | ||
| applyGaussianFilter(data, 0.7); | ||
| data = data.map((value) => Math.exp(value)); |
There was a problem hiding this comment.
一旦平滑化はなしで、配列のコピーのみで良いかも…！
Comment on lines
+109
to
+112
| const zoomX = store.state.sequencerZoomX; | ||
| const zoomY = store.state.sequencerZoomY; | ||
| const offsetX = props.offsetX; | ||
| const offsetY = props.offsetY; |
There was a problem hiding this comment.
音量の線はシーケンサーを垂直方向にスクロールしたときに動かない方が良いかもです。なので、ここのzoomYとoffsetYは無くて良いかも。
Comment on lines
+555
to
+558
| const voiced = !unvoicedPhonemes.includes(phoneme); | ||
| if (voiced && volumeEditData[i] !== VALUE_INDICATING_NO_DATA) { | ||
| volume[i - singingGuideStartFrame] = volumeEditData[i]; | ||
| } |
There was a problem hiding this comment.
ピッチではなく音量なので、voicedの判定はしなくても良いかも。
Comment on lines
+751
to
+767
| SET_VOLUME_EDIT_DATA: { | ||
| // ピッチ編集データをセットする。 | ||
| // track.pitchEditDataの長さが足りない場合は、伸長も行う。 | ||
| mutation(state, { volumeArray, startFrame, trackId }) { | ||
| const track = getOrThrow(state.tracks, trackId); | ||
| const pitchEditData = track.volumeEditData; | ||
| const tempData = [...pitchEditData]; | ||
| const endFrame = startFrame + volumeArray.length; | ||
| if (tempData.length < endFrame) { | ||
| const valuesToPush = new Array(endFrame - tempData.length).fill( | ||
| VALUE_INDICATING_NO_DATA, | ||
| ); | ||
| tempData.push(...valuesToPush); | ||
| } | ||
| tempData.splice(startFrame, volumeArray.length, ...volumeArray); | ||
| track.volumeEditData = tempData; | ||
| }, |
There was a problem hiding this comment.
処理がSET_PITCH_EDIT_DATAと同じになってるかも。
Comment on lines
+781
to
+790
| ERASE_VOLUME_EDIT_DATA: { | ||
| mutation(state, { startFrame, frameLength, trackId }) { | ||
| const track = getOrThrow(state.tracks, trackId); | ||
| const pitchEditData = track.pitchEditData; | ||
| const tempData = [...pitchEditData]; | ||
| const endFrame = Math.min(startFrame + frameLength, tempData.length); | ||
| tempData.fill(VALUE_INDICATING_NO_DATA, startFrame, endFrame); | ||
| track.pitchEditData = tempData; | ||
| }, | ||
| }, |
| @@ -1632,6 +1687,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({ | |||
| // 歌い方をコピーして、ピッチ編集を適用する | |||
| singingGuide = structuredClone(toRaw(singingGuide)); | |||
| applyPitchEdit(singingGuide, track.pitchEditData, editFrameRate); | |||
| applyVolumeEdit(singingGuide, track.pitchEditData, editFrameRate); | |||
There was a problem hiding this comment.
ここはtrack.volumeEditDataを渡す必要がありそう。
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
内容
音量をピッチと同様にカーブを描いて編集できるようにする。
ラインの色やアイコンは暫定
問題点
volumeData.dataにundefinedが含まれているため？
関連 Issue
#2003
スクリーンショット・動画など
ツールバー
全体