WIP:音量編集機能の追加 #2263
Closed
WIP:音量編集機能の追加 #2263
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
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は無くて良いかも。
There was a problem hiding this comment.
props.offsetYが残ってるかも…？
|
#2263 (comment) 指摘箇所の確認漏れで複数回に分けてコミットしてしまったので見づらいと思います。 |
Comment on lines
433
to
439
| // const prevCursorPos = ref< | ||
| // | { prevCursorFrame: number, prevCursorFrequency: number,prevCursorVolume: number } | ||
| // | undefined | ||
| // >(undefined); | ||
| let prevCursorFrame: number = 0; | ||
| let prevCursorFrequency: number = 0; | ||
| let prevCursorVolume: number = 0; |
There was a problem hiding this comment.
前のコードは消してしまって大丈夫です！
また、= 0で型は推論されるはずなので、型注釈は無くても大丈夫だと思います！
Comment on lines
1096
to
1097
| // 平滑化を行う | ||
| let data = previewVolumeEdit.value.data; |
There was a problem hiding this comment.
ここはこうかも。（配列のコピーは必要ないかもですが念のため…）
Suggested change
| // 平滑化を行う | |
| let data = previewVolumeEdit.value.data; | |
| const data = [...previewVolumeEdit.value.data]; |
Comment on lines
178
to
180
| if(Number.isNaN(linear)||linear === undefined){ | ||
| continue; | ||
| } |
There was a problem hiding this comment.
linearはNaNやundefinedにはならないはずなので、この処理は必要ないと思います！
| const db = linearToDecibel(linear); | ||
| const y = db * -120 * zoomY - offsetY;//- ; | ||
| const y = decibelToViewY(db);//- ; |
There was a problem hiding this comment.
コメントが残っていたので。
Suggested change
| const y = decibelToViewY(db);//- ; | |
| const y = decibelToViewY(db); |
| @@ -257,7 +258,7 @@ const setVolumeDataToVolumeLine = async ( | |||
| }; | |||
|
|
|||
| const generateOriginalVolumeData = () => { | |||
| const unvoicedPhonemes = UNVOICED_PHONEMES; | |||
| //const unvoicedPhonemes = UNVOICED_PHONEMES; | |||
There was a problem hiding this comment.
何のためにコメントアウトされているかが後で分からなくなるので、
コメントアウトの意図を書くか、必要なければ消して良いと思います！
|
|
||
| const removedLineStrips: LineStrip[] = []; | ||
|
|
||
| // 無くなったピッチデータを調べて、そのピッチデータに対応するLineStripを削除する |
There was a problem hiding this comment.
ピッチやpitchになっている箇所が何か所かあるかも。
src/store/singing.ts
Outdated
Comment on lines
792
to
797
| CLEAR_VOLUME_EDIT_DATA: { | ||
| // ピッチ編集データを失くす。 | ||
| mutation(state, { trackId }) { | ||
| const track = getOrThrow(state.tracks, trackId); | ||
| track.pitchEditData = []; | ||
| }, |
There was a problem hiding this comment.
ここもピッチ、pitchEditDataになってますね。
Suggested change
| CLEAR_VOLUME_EDIT_DATA: { | |
| // ピッチ編集データを失くす。 | |
| mutation(state, { trackId }) { | |
| const track = getOrThrow(state.tracks, trackId); | |
| track.pitchEditData = []; | |
| }, | |
| CLEAR_VOLUME_EDIT_DATA: { | |
| // ボリューム編集データを失くす。 | |
| mutation(state, { trackId }) { | |
| const track = getOrThrow(state.tracks, trackId); | |
| track.volumeEditData = []; | |
| }, |
src/store/singing.ts
Outdated
Comment on lines
772
to
774
| if (!isValidVolumeEditData(volumeArray)) { | ||
| throw new Error("The pitch edit data is invalid."); | ||
| } |
There was a problem hiding this comment.
ここも。
Suggested change
| if (!isValidVolumeEditData(volumeArray)) { | |
| throw new Error("The pitch edit data is invalid."); | |
| } | |
| if (!isValidVolumeEditData(volumeArray)) { | |
| throw new Error("The volume edit data is invalid."); | |
| } |
src/sing/domain.ts
Outdated
Comment on lines
550
to
551
| // ピッチ編集をf0に適用する | ||
| const startFrame = Math.max(0, singingGuideStartFrame); |
There was a problem hiding this comment.
ここもピッチになってますね。
Suggested change
| // ピッチ編集をf0に適用する | |
| const startFrame = Math.max(0, singingGuideStartFrame); | |
| // ボリューム編集をvolumeに適用する | |
| const startFrame = Math.max(0, singingGuideStartFrame); |
src/domain/project/schema.ts
Outdated
| @@ -91,6 +91,7 @@ export const trackSchema = z.object({ | |||
| volumeRangeAdjustment: z.number(), // 声量調整量 | |||
| notes: z.array(noteSchema), | |||
| pitchEditData: z.array(z.number()), // 値の単位はHzで、データが無いところはVALUE_INDICATING_NO_DATAの値 | |||
| volumeEditData: z.array(z.number()), // 値の単位はdbで、データが無いところはVALUE_INDICATING_NO_DATAの値 | |||
There was a problem hiding this comment.
細かいですが…
Suggested change
| volumeEditData: z.array(z.number()), // 値の単位はdbで、データが無いところはVALUE_INDICATING_NO_DATAの値 | |
| volumeEditData: z.array(z.number()), // 値の単位はdBで、データが無いところはVALUE_INDICATING_NO_DATAの値 |
rokujyushi
force-pushed
the
Add_Volume
branch
from
48e3da6 to
301f792
Compare
Open
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
スクリーンショット・動画など
ツールバー
全体