impl: Further improve the speed of nontrivial macros

IoeCmcomc · IoeCmcomc · commit 32e17e77393c · 2024-04-26T17:44:38.000+07:00
- Move `array_grow_then_set()` to a separate file;
- Utilize `array_grow_then_set()` in `selection_to_array_ext()` function;
- Introduce a new function `selection_load_from_array()` to load the selection directly from a selection code array, which is the opposite of `selection_to_array_ext()`;
- Use `selection_to_array_ext()` in nonsimple macros.
diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp
diff --git a/scripts/array_grow_then_set/array_grow_then_set.gml b/scripts/array_grow_then_set/array_grow_then_set.gml
@@ -0,0 +1,15 @@
+function array_grow_then_set(array, index, value) {
+	// Set a value at the index of the array; also allows custom growth of the array
+	
+	var length = array_length(array)
+	if (index >= length) {
+		var new_size = index + 1
+		var new_length = new_size * 3 / 2; // 1.5x growth factor
+		//var new_length = (new_size + (new_size >> 3) + 6) & ~3; // Python-style growth
+		//show_debug_message(string(length) + " -> " + string(floor(new_length)))
+		for (var i = new_length - 1; i >= length; --i) {
+			array[@ i] = 0
+		}
+	}
+	array[@ index] = value
+}
diff --git a/scripts/array_grow_then_set/array_grow_then_set.yy b/scripts/array_grow_then_set/array_grow_then_set.yy
diff --git a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml
@@ -63,8 +63,7 @@ function draw_window_macro_arpeggio() {
 			}
 		if val >= total_vals break
 		}
-		var new_str = array_to_selection(arr_data, total_vals)
-		selection_load_ext(selection_x, selection_y, new_str)
+		selection_load_from_array(selection_x, selection_y, arr_data)
 		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
diff --git a/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml b/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml
@@ -54,8 +54,7 @@ function draw_window_macro_portamento() {
 			} else decr = decr + inc
 			val ++
 		}
-		var new_str = array_to_selection(arr_data, total_vals)
-		selection_load_ext(selection_x, selection_y, new_str)
+		selection_load_from_array(selection_x, selection_y, arr_data)
 		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
diff --git a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml
@@ -86,11 +86,10 @@ function draw_window_macro_stagger() {
 			}
 		if val >= total_vals break
 		}
-		var new_str = array_to_selection(arr_data, total_vals)
 		var sel_x = selection_x
 		var sel_y = selection_y
 		selection_delete(true)
-		selection_load_ext(sel_x, sel_y, new_str)
+		selection_load_from_array(sel_x, sel_y, arr_data)
 		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
diff --git a/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml b/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml
@@ -67,8 +67,7 @@ function draw_window_macro_stereo() {
 			}
 			val ++
 		}
-		var new_str = array_to_selection(arr_data, total_vals)
-		selection_load_ext(selection_x, selection_y, new_str)
+		selection_load_from_array(selection_x, selection_y, arr_data)
 		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
diff --git a/scripts/load_song/load_song.gml b/scripts/load_song/load_song.gml
@@ -232,19 +232,3 @@ function load_song() {
 	io_clear()
 
 }
-
-function array_grow_then_set(array, index, value) {
-	// Behave like array_set(), except it allows custom growth of the array
-	
-	var length = array_length(array)
-	if (index >= length) {
-		var new_size = index + 1
-		var new_length = new_size * 3 / 2; // 1.5x growth factor
-		//var new_length = (new_size + (new_size >> 3) + 6) & ~3; // Python-style growth
-		show_debug_message(string(length) + " -> " + string(floor(new_length)))
-		for (var i = new_length - 1; i >= length; --i) {
-			array[@ i] = 0
-		}
-	}
-	array[@ index] = value
-}
diff --git a/scripts/macro_chorus/macro_chorus.gml b/scripts/macro_chorus/macro_chorus.gml
@@ -41,8 +41,7 @@ function macro_chorus() {
 			}
 		}
 	}
-	var new_str = array_to_selection(arr_data, total_vals)
-	selection_load_ext(selection_x, selection_y, new_str)
+	selection_load_from_array(selection_x, selection_y, arr_data)
 	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
diff --git a/scripts/macro_fadein/macro_fadein.gml b/scripts/macro_fadein/macro_fadein.gml
@@ -26,8 +26,7 @@ function macro_fadein() {
 		decr = decr + inc
 		val ++
 	}
-	var new_str = array_to_selection(arr_data, total_vals)
-	selection_load_ext(selection_x, selection_y, new_str)
+	selection_load_from_array(selection_x, selection_y, arr_data)
 	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
diff --git a/scripts/macro_fadeout/macro_fadeout.gml b/scripts/macro_fadeout/macro_fadeout.gml
@@ -24,8 +24,7 @@ function macro_fadeout() {
 		decr = decr + inc
 		val ++
 	}
-	var new_str = array_to_selection(arr_data, total_vals)
-	selection_load_ext(selection_x, selection_y, new_str)
+	selection_load_from_array(selection_x, selection_y, arr_data)
 	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
diff --git a/scripts/macro_tremolo/macro_tremolo.gml b/scripts/macro_tremolo/macro_tremolo.gml
@@ -48,11 +48,10 @@ function macro_tremolo() {
 	}
 	arr_data[0] = 0
 	//show_debug_message("Out of loop. arr_data has been changed to " + string(array_to_selection(arr_data, c)))
-	var new_str = array_to_selection(arr_data, array_length(arr_data))
 	var sel_x = selection_x
 	var sel_y = selection_y
 	selection_delete(true)
-	selection_load_ext(sel_x, sel_y, new_str)
+	selection_load_from_array(selection_x, selection_y, arr_data)
 	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
diff --git a/scripts/macro_tremolo_fadein/macro_tremolo_fadein.gml b/scripts/macro_tremolo_fadein/macro_tremolo_fadein.gml
@@ -82,11 +82,11 @@ function macro_tremolo_fadein() {
 	}
 	arr_data[0] = 0
 	//show_debug_message("Out of loop. arr_data has been changed to " + string(array_to_selection(arr_data, c)))
-	var new_str = array_to_selection(arr_data, c)
+	array_resize(arr_data, c)
 	var sel_x = selection_x
 	var sel_y = selection_y
 	selection_delete(true)
-	selection_load_ext(sel_x, sel_y, new_str)
+	selection_load_from_array(sel_x, sel_y, arr_data)
 	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
diff --git a/scripts/macro_tremolo_fadeout/macro_tremolo_fadeout.gml b/scripts/macro_tremolo_fadeout/macro_tremolo_fadeout.gml
@@ -79,11 +79,11 @@ function macro_tremolo_fadeout() {
 	}
 	arr_data[0] = 0
 	//show_debug_message("Out of loop. arr_data has been changed to " + string(array_to_selection(arr_data, c)))
-	var new_str = array_to_selection(arr_data, c)
+	array_resize(arr_data, c)
 	var sel_x = selection_x
 	var sel_y = selection_y
 	selection_delete(true)
-	selection_load_ext(sel_x, sel_y, new_str)
+	selection_load_from_array(sel_x, sel_y, arr_data)
 	history_set(h_selectchange, selection_x, selection_y, try_compress_selection(selection_code), selection_x, selection_y, try_compress_selection(str))
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
diff --git a/scripts/macro_velocitylfo/macro_velocitylfo.gml b/scripts/macro_velocitylfo/macro_velocitylfo.gml
@@ -58,8 +58,7 @@ function macro_velocitylfo() {
 		}
 		val ++
 	}
-	var new_str = array_to_selection(arr_data, total_vals)
-	selection_load_ext(selection_x, selection_y, new_str)
+	selection_load_from_array(selection_x, selection_y, arr_data)
 	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
diff --git a/scripts/macro_vibrato/macro_vibrato.gml b/scripts/macro_vibrato/macro_vibrato.gml
@@ -49,8 +49,7 @@ function macro_vibrato() {
 		}
 		val ++
 	}
-	var new_str = array_to_selection(arr_data, total_vals)
-	selection_load_ext(selection_x, selection_y, new_str)
+	selection_load_from_array(selection_x, selection_y, arr_data)
 	history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	if(!keyboard_check(vk_alt)) selection_place(false)
 
diff --git a/scripts/selection_load_from_array/selection_load_from_array.gml b/scripts/selection_load_from_array/selection_load_from_array.gml
@@ -0,0 +1,38 @@
+function selection_load_from_array(xx, yy, array){
+	// Load a selection code array to the selection data arrays
+	
+	var ca, cb, h;
+	var length = array_length(array)
+	if (length == 0) return 0
+	ca = 0
+	h = 0
+	
+	var at = 0
+	
+	while(at < length) {
+	    ca += array[at++]
+	    cb = 0
+	    while (1) {
+			var val = array[at++]
+	        if (val == -1) break
+	        cb += val
+			remove_block_select(xx + ca, yy + cb)
+	        selection_exists[ca, cb] = 1
+			selection_ins[ca, cb] = instrument_list[| array[at++] ]
+			selection_key[ca, cb] = array[at++]
+			selection_vel[ca, cb] = array[at++]
+			selection_pan[ca, cb] = array[at++]
+			selection_pit[ca, cb] = array[at++]
+			selected += 1
+			if (selection_colfirst[ca] = -1) selection_colfirst[ca] = cb
+			selection_collast[ca] = cb
+			h = max(h, cb)
+	    }
+	}
+
+	selection_x = xx
+	selection_y = yy
+	selection_l = ca + 1
+	selection_h = h + 1
+	selection_code_update()
+}
diff --git a/scripts/selection_load_from_array/selection_load_from_array.yy b/scripts/selection_load_from_array/selection_load_from_array.yy
diff --git a/scripts/selection_to_array/selection_to_array.gml b/scripts/selection_to_array/selection_to_array.gml
@@ -1,6 +1,6 @@
 function selection_to_array(str) {
 	// selection_to_array(str)
-	var array = undefined
+	var array = []
 	var at = 0
 	var sel_str = try_decompress_selection(str)
 	var main_str = string_delete(sel_str, string_length(sel_str), 1)
@@ -15,14 +15,15 @@ function selection_to_array(str) {
 		pipe_pos = buffer_pos_char(main_str_buffer, main_str_len, pipe_ord, pipe_pos)
 		var element_size = pipe_pos - prev_pipe_pos - 1
 		if (element_size > 0) {
-			array[at++] = real(buffer_substr_copy(main_str_buffer, prev_pipe_pos+1, element_size, element_buffer))
+			array_grow_then_set(array, at++, real(buffer_substr_copy(main_str_buffer, prev_pipe_pos+1, element_size, element_buffer)))
 		}
 		if (pipe_pos >= main_str_len) {
 			break
 		}
 		prev_pipe_pos = pipe_pos
 		pipe_pos++
 	}
+	array_resize(array, at)
 	buffer_delete(main_str_buffer)
 	buffer_delete(element_buffer)
 	
diff --git a/scripts/selection_to_array_ext/selection_to_array_ext.gml b/scripts/selection_to_array_ext/selection_to_array_ext.gml
@@ -17,22 +17,29 @@ function selection_to_array_ext(){
 	var _selection_pit = selection_pit
 	
 	var ret = []
+	var at = 0
 	for (a = 0; a < _selection_l; a += 1) {
-	    if (_selection_colfirst[a] > -1) {
-			array_push(ret, ca)
-	        ca = 0
-	        cb = 0
-	        for (b = 0; b < _selection_h; b += 1) {
-	            if (_selection_exists[a, b]) {
-					array_push(ret, cb, ds_list_find_index(instrument_list, _selection_ins[a, b]), _selection_key[a, b], _selection_vel[a, b], _selection_pan[a, b], _selection_pit[a, b])
+		if (_selection_colfirst[a] > -1) {
+			array_grow_then_set(ret, at++, ca)
+			ca = 0
+			cb = 0
+			for (b = 0; b < _selection_h; b += 1) {
+				if (_selection_exists[a, b]) {
+					array_grow_then_set(ret, at++, cb)
+					array_grow_then_set(ret, at++, ds_list_find_index(instrument_list, _selection_ins[a, b]))
+					array_grow_then_set(ret, at++, _selection_key[a, b])
+					array_grow_then_set(ret, at++, _selection_vel[a, b])
+					array_grow_then_set(ret, at++, _selection_pan[a, b])
+					array_grow_then_set(ret, at++, _selection_pit[a, b])
 					cb = 0
-	            }
-	            cb += 1
-	        }
-			array_push(ret, -1)
-	    }
-	    ca += 1
+				}
+				cb += 1
+			}
+			array_grow_then_set(ret, at++, -1)
+		}
+		ca += 1
 	}
+	array_resize(ret, at)
 
 	return ret
 }

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,7 @@ function draw_window_macro_arpeggio() {`
`63`	`63`	`}`
`64`	`64`	`if val >= total_vals break`
`65`	`65`	`}`
`66`		`- var new_str = array_to_selection(arr_data, total_vals)`
`67`		`- selection_load_ext(selection_x, selection_y, new_str)`
	`66`	`+ selection_load_from_array(selection_x, selection_y, arr_data)`
`68`	`67`	`history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`69`	`68`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`70`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,7 @@ function draw_window_macro_portamento() {`
`54`	`54`	`} else decr = decr + inc`
`55`	`55`	`val ++`
`56`	`56`	`}`
`57`		`- var new_str = array_to_selection(arr_data, total_vals)`
`58`		`- selection_load_ext(selection_x, selection_y, new_str)`
	`57`	`+ selection_load_from_array(selection_x, selection_y, arr_data)`
`59`	`58`	`history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`60`	`59`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`61`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,10 @@ function draw_window_macro_stagger() {`
`86`	`86`	`}`
`87`	`87`	`if val >= total_vals break`
`88`	`88`	`}`
`89`		`- var new_str = array_to_selection(arr_data, total_vals)`
`90`	`89`	`var sel_x = selection_x`
`91`	`90`	`var sel_y = selection_y`
`92`	`91`	`selection_delete(true)`
`93`		`- selection_load_ext(sel_x, sel_y, new_str)`
	`92`	`+ selection_load_from_array(sel_x, sel_y, arr_data)`
`94`	`93`	`history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`95`	`94`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`96`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,7 @@ function draw_window_macro_stereo() {`
`67`	`67`	`}`
`68`	`68`	`val ++`
`69`	`69`	`}`
`70`		`- var new_str = array_to_selection(arr_data, total_vals)`
`71`		`- selection_load_ext(selection_x, selection_y, new_str)`
	`70`	`+ selection_load_from_array(selection_x, selection_y, arr_data)`
`72`	`71`	`history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`73`	`72`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`74`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ function macro_chorus() {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
`44`		`- var new_str = array_to_selection(arr_data, total_vals)`
`45`		`- selection_load_ext(selection_x, selection_y, new_str)`
	`44`	`+ selection_load_from_array(selection_x, selection_y, arr_data)`
`46`	`45`	`history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`47`	`46`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`48`	`47`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ function macro_fadein() {`
`26`	`26`	`decr = decr + inc`
`27`	`27`	`val ++`
`28`	`28`	`}`
`29`		`- var new_str = array_to_selection(arr_data, total_vals)`
`30`		`- selection_load_ext(selection_x, selection_y, new_str)`
	`29`	`+ selection_load_from_array(selection_x, selection_y, arr_data)`
`31`	`30`	`history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)`
`32`	`31`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`33`	`32`