Skip to content

Commit 5eba185

Browse files
committed
check if selby is in range and hovering a layer should use layer's vol/pan for note preview before calculate the vol/pan
1 parent 439c6f8 commit 5eba185

1 file changed

Lines changed: 20 additions & 8 deletions

File tree

scripts/control_draw/control_draw.gml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,11 @@ function control_draw() {
234234
selected_pan = 100
235235
selected_pit = 0
236236

237-
preview_vol = (songs[song].layervol[selby] / 100 ) * selected_vel
238-
preview_pan = (songs[song].layerstereo[selby] + selected_pan) / 2
237+
preview_vol = (selby >= 0 && selby <= current_song.endb && !hoverlayer_scrollnote_preview)
238+
? (songs[song].layervol[selby] / 100 ) * selected_vel : 100
239+
240+
preview_pan = (selby >= 0 && selby <= current_song.endb && !hoverlayer_scrollnote_preview)
241+
? (songs[song].layerstereo[selby] + selected_pan) / 2 : 100
239242

240243
play_sound(current_song.instrument, selected_key, preview_vol, preview_pan, 0)
241244
}
@@ -246,8 +249,11 @@ function control_draw() {
246249
selected_pan = 100
247250
selected_pit = 0
248251

249-
preview_vol = (songs[song].layervol[selby] / 100 ) * selected_vel
250-
preview_pan = (songs[song].layerstereo[selby] + selected_pan) / 2
252+
preview_vol = (selby >= 0 && selby <= current_song.endb && !hoverlayer_scrollnote_preview)
253+
? (songs[song].layervol[selby] / 100 ) * selected_vel : 100
254+
255+
preview_pan = (selby >= 0 && selby <= current_song.endb && !hoverlayer_scrollnote_preview)
256+
? (songs[song].layerstereo[selby] + selected_pan) / 2 : 100
251257

252258
play_sound(current_song.instrument, selected_key, preview_vol, preview_pan, 0)
253259
}
@@ -259,8 +265,11 @@ function control_draw() {
259265
selected_pan = 100
260266
selected_pit = 0
261267

262-
preview_vol = (songs[song].layervol[selby] / 100 ) * selected_vel
263-
preview_pan = (songs[song].layerstereo[selby] + selected_pan) / 2
268+
preview_vol = (selby >= 0 && selby <= current_song.endb && !hoverlayer_scrollnote_preview)
269+
? (songs[song].layervol[selby] / 100 ) * selected_vel : 100
270+
271+
preview_pan = (selby >= 0 && selby <= current_song.endb && !hoverlayer_scrollnote_preview)
272+
? (songs[song].layerstereo[selby] + selected_pan) / 2 : 100
264273

265274
play_sound(current_song.instrument, selected_key, preview_vol, preview_pan, 0)
266275
}
@@ -270,8 +279,11 @@ function control_draw() {
270279
selected_pan = 100
271280
selected_pit = 0
272281

273-
preview_vol = (songs[song].layervol[selby] / 100 ) * selected_vel
274-
preview_pan = (songs[song].layerstereo[selby] + selected_pan) / 2
282+
preview_vol = (selby >= 0 && selby <= current_song.endb && !hoverlayer_scrollnote_preview)
283+
? (songs[song].layervol[selby] / 100 ) * selected_vel : 100
284+
285+
preview_pan = (selby >= 0 && selby <= current_song.endb && !hoverlayer_scrollnote_preview)
286+
? (songs[song].layerstereo[selby] + selected_pan) / 2 : 100
275287

276288
play_sound(current_song.instrument, selected_key, preview_vol, preview_pan, 0)
277289
}

0 commit comments

Comments
 (0)