impl: Improve speed of nonsimple macro operations

IoeCmcomc · IoeCmcomc · commit e6351f84661c · 2024-04-22T17:06:30.000+07:00
- Add a new function `selection_to_array_ext()` which generate a selection code array based from the current selections;
- Utilize `selection_to_array_ext()` in macros instead of `selection_to_array()` for selection code;
- This method works well for selection of less than 20k notes.
diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp
diff --git a/scripts/check_custom_instrument/check_custom_instrument.gml b/scripts/check_custom_instrument/check_custom_instrument.gml
@@ -2,7 +2,7 @@ function check_custom_instrument(argument0) {
 	// check_custom_instrument(string)
 	var str, total_vals, val
 	str = argument0
-	var arr_data = selection_to_array(str)
+	var arr_data = selection_to_array_ext()
 	total_vals = array_length(arr_data)
 	val = 0
 	//show_debug_message(string_count("-1", str))
diff --git a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml
@@ -37,7 +37,7 @@ function draw_window_macro_arpeggio() {
 	windowopen = 0
 	window = 0
 	str = selection_code
-	var arr_data = selection_to_array(str)
+	var arr_data = selection_to_array_ext()
 	total_vals = array_length(arr_data)
 	val = 0
 	pattern = string_digits_symbol(pattern, "|")
diff --git a/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml b/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml
@@ -31,7 +31,7 @@ function draw_window_macro_portamento() {
 		windowopen = 0
 		window = 0
 		str = selection_code
-		var arr_data = selection_to_array(str)
+		var arr_data = selection_to_array_ext()
 		total_vals = array_length(arr_data)
 		decr = port_cent / macro_column_count(arr_data)
 		inc = decr
diff --git a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml
@@ -47,7 +47,7 @@ function draw_window_macro_stagger() {
 		windowopen = 0
 		window = 0
 		str = selection_code
-		var arr_data = selection_to_array(str)
+		var arr_data = selection_to_array_ext()
 		total_vals = array_length(arr_data)
 		val = 0
 		conf = 0
diff --git a/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml b/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml
@@ -33,7 +33,7 @@ function draw_window_macro_stereo() {
 		windowclose = 0
 		windowopen = 0
 		str = selection_code
-		var arr_data = selection_to_array(str)
+		var arr_data = selection_to_array_ext()
 		window = 0
 		total_vals = array_length(arr_data)
 		val = 0
diff --git a/scripts/macro_chorus/macro_chorus.gml b/scripts/macro_chorus/macro_chorus.gml
@@ -2,7 +2,7 @@ function macro_chorus() {
 	// macro_chorus()
 	var str, total_vals, val;
 	str = selection_code
-	var arr_data = selection_to_array(str)
+	var arr_data = selection_to_array_ext()
 	window = 0
 	total_vals = array_length(arr_data)
 	show_debug_message(str)
diff --git a/scripts/macro_fadein/macro_fadein.gml b/scripts/macro_fadein/macro_fadein.gml
@@ -3,7 +3,7 @@ function macro_fadein() {
 	var str, total_vals, val, decr, inc, maxdecr, velval
 	str = selection_code
 	if (selected = 0) return 0
-	var arr_data = selection_to_array(str)
+	var arr_data = selection_to_array_ext()
 	total_vals = array_length(arr_data)
 	val = 0
 	// Check bottom-right note block's velocity value, calculate fade out from that.
diff --git a/scripts/macro_fadeout/macro_fadeout.gml b/scripts/macro_fadeout/macro_fadeout.gml
@@ -3,7 +3,7 @@ function macro_fadeout() {
 	var str, total_vals, val, decr, inc, maxdecr
 	str = selection_code
 	if (selected = 0) return 0
-	var arr_data = selection_to_array(str)
+	var arr_data = selection_to_array_ext()
 	total_vals = array_length(arr_data)
 	val = 0
 	// Check top-left note block's velocity value, calculate fade out from that.
diff --git a/scripts/macro_replacekey/macro_replacekey.gml b/scripts/macro_replacekey/macro_replacekey.gml
@@ -4,7 +4,7 @@ function macro_replacekey() {
 	var str, key
 	str = selection_code
 	if (selected = 0) return 0
-	var arr_data = selection_to_array(str)
+	var arr_data = selection_to_array_ext()
 	key = arr_data[3]
 	selection_change(m_key, key, false)
 	if(!keyboard_check(vk_alt)) selection_place(false)
diff --git a/scripts/macro_tremolo/macro_tremolo.gml b/scripts/macro_tremolo/macro_tremolo.gml
@@ -3,7 +3,7 @@ function macro_tremolo() {
 	var k, l, d, c, e, str, total_vals, total_cols, val, replength, colcount;
 	if (selected = 0) return 0
 	str = selection_code
-	var arr_temp = selection_to_array(str)
+	var arr_temp = selection_to_array_ext()
 	total_vals = array_length(arr_temp)
 	//show_debug_message("total vals is "+string(total_vals))
 	total_cols = macro_column_count(arr_temp)
diff --git a/scripts/macro_tremolo_fadein/macro_tremolo_fadein.gml b/scripts/macro_tremolo_fadein/macro_tremolo_fadein.gml
@@ -3,7 +3,7 @@ function macro_tremolo_fadein() {
 	var c, d , e, f, str, total_vals, total_cols, val, replength, colcount, decr, inc, tremolo_duration, prevlength, previous_colsegment, current_colsegment;
 	str = selection_code
 	if (selected = 0) return 0
-	var arr_temp = selection_to_array(str)
+	var arr_temp = selection_to_array_ext()
 	total_vals = array_length(arr_temp)
 	//show_debug_message("total vals is "+string(total_vals))
 	total_cols = macro_column_count(arr_temp)
diff --git a/scripts/macro_tremolo_fadeout/macro_tremolo_fadeout.gml b/scripts/macro_tremolo_fadeout/macro_tremolo_fadeout.gml
@@ -3,7 +3,7 @@ function macro_tremolo_fadeout() {
 	var c, d , e, f, str, total_vals, total_cols, val, replength, colcount, decr, inc, tremolo_duration, prevlength, previous_colsegment, current_colsegment;
 	str = selection_code
 	if (selected = 0) return 0
-	var arr_temp = selection_to_array(str)
+	var arr_temp = selection_to_array_ext()
 	total_vals = array_length(arr_temp)
 	//show_debug_message("total vals is "+string(total_vals))
 	total_cols = macro_column_count(arr_temp)
diff --git a/scripts/macro_velocitylfo/macro_velocitylfo.gml b/scripts/macro_velocitylfo/macro_velocitylfo.gml
@@ -3,7 +3,7 @@ function macro_velocitylfo() {
 	var str, total_vals, val, decr
 	str = selection_code
 	if (selected = 0) return 0
-	var arr_data = selection_to_array(str)
+	var arr_data = selection_to_array_ext()
 	total_vals = array_length(arr_data)
 	val = 0
 	decr = 100/macro_column_count(arr_data)
diff --git a/scripts/macro_vibrato/macro_vibrato.gml b/scripts/macro_vibrato/macro_vibrato.gml
@@ -3,7 +3,7 @@ function macro_vibrato() {
 	var str, total_vals, val, decr
 	str = selection_code
 	if (selected = 0) return 0
-	var arr_data = selection_to_array(str)
+	var arr_data = selection_to_array_ext()
 	total_vals = array_length(arr_data)
 	val = 0
 	decr = 100/macro_column_count(arr_data)
diff --git a/scripts/selection_to_array_ext/selection_to_array_ext.gml b/scripts/selection_to_array_ext/selection_to_array_ext.gml
@@ -0,0 +1,38 @@
+function selection_to_array_ext(){
+	// Generate a selection code array based from the current selections
+		
+	var a, b, ca, cb;
+	
+	if (selected = 0) return []
+	ca = 0
+	
+	var _selection_l = selection_l
+	var _selection_h = selection_h
+	var _selection_colfirst = selection_colfirst
+	var _selection_exists = selection_exists
+	var _selection_ins = selection_ins
+	var _selection_key = selection_key
+	var _selection_vel = selection_vel
+	var _selection_pan = selection_pan
+	var _selection_pit = selection_pit
+	
+	var ret = []
+	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])
+					cb = 0
+	            }
+	            cb += 1
+	        }
+			array_push(ret, -1)
+	    }
+	    ca += 1
+	}
+
+	return ret
+}
diff --git a/scripts/selection_to_array_ext/selection_to_array_ext.yy b/scripts/selection_to_array_ext/selection_to_array_ext.yy
