impl: Use array_length() to calculate total_vals faster

IoeCmcomc · IoeCmcomc · commit 2c2a7655949a · 2024-04-16T17:05:20.000+07:00
diff --git a/scripts/check_custom_instrument/check_custom_instrument.gml b/scripts/check_custom_instrument/check_custom_instrument.gml
@@ -2,8 +2,8 @@ function check_custom_instrument(argument0) {
 	// check_custom_instrument(string)
 	var str, total_vals, val
 	str = argument0
-	arr_data = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_data = selection_to_array(str)
+	total_vals = array_length(arr_data)
 	val = 0
 	//show_debug_message(string_count("-1", str))
 	//for (var i = 0; i < total_vals; i++;) {show_debug_message(arr_data[i])}
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,8 +37,8 @@ function draw_window_macro_arpeggio() {
 	windowopen = 0
 	window = 0
 	str = selection_code
-	arr_data = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_data = selection_to_array(str)
+	total_vals = array_length(arr_data)
 	val = 0
 	pattern = string_digits_symbol(pattern, "|")
 	pattern = string(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
@@ -33,9 +33,9 @@ function draw_window_macro_portamento() {
 		val = 0
 		decr = port_cent / string_count("-1", str)
 		inc = decr
-		arr_data = selection_to_array(str)
+		var arr_data = selection_to_array(str)
 		window = 0
-		total_vals = string_count("|", str)
+		total_vals = array_length(arr_data)
 		val = 0
 		while (val < total_vals) {
 			val += 6
diff --git a/scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml b/scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml
@@ -31,9 +31,9 @@ function draw_window_macro_setpanning() {
 		windowopen = 0
 		str = selection_code
 		val = 0
-		arr_data = selection_to_array(str)
+		var arr_data = selection_to_array(str)
 		window = 0
-		total_vals = string_count("|", str)
+		total_vals = array_length(arr_data)
 		val = 0
 		while (val < total_vals) {
 			val += 5
diff --git a/scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml b/scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml
@@ -32,9 +32,9 @@ function draw_window_macro_setpitch() {
 		windowopen = 0
 		str = selection_code
 		val = 0
-		arr_data = selection_to_array(str)
+		var arr_data = selection_to_array(str)
 		window = 0
-		total_vals = string_count("|", str)
+		total_vals = array_length(arr_data)
 		val = 0
 		while (val < total_vals) {
 			val += 6
diff --git a/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml b/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml
@@ -32,9 +32,9 @@ function draw_window_macro_setvelocity() {
 		windowopen = 0
 		str = selection_code
 		val = 0
-		arr_data = selection_to_array(str)
+		var arr_data = selection_to_array(str)
 		window = 0
-		total_vals = string_count("|", str)
+		total_vals = array_length(arr_data)
 		val = 0
 		while (val < total_vals) {
 			val += 4
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,8 +47,8 @@ function draw_window_macro_stagger() {
 		windowopen = 0
 		window = 0
 		str = selection_code
-		arr_data = selection_to_array(str)
-		total_vals = string_count("|", str)
+		var arr_data = selection_to_array(str)
+		total_vals = array_length(arr_data)
 		val = 0
 		conf = 0
 		pattern = string_digits_symbol(pattern, "|")
@@ -58,7 +58,7 @@ function draw_window_macro_stagger() {
 
 		maxlength = 0;
 	
-		var patlen = array_length_1d(arp);
+		var patlen = array_length(arp);
 		for (i = 0; i < patlen; i++) { // Calculate highest number in given pattern
 		    if (arp[i] > arp[maxlength]) {
 		        maxlength = i;
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,9 +33,9 @@ function draw_window_macro_stereo() {
 		windowclose = 0
 		windowopen = 0
 		str = selection_code
-		arr_data = selection_to_array(str)
+		var arr_data = selection_to_array(str)
 		window = 0
-		total_vals = string_count("|", str)
+		total_vals = array_length(arr_data)
 		val = 0
 		while (val < total_vals) {
 			// First column panned left
diff --git a/scripts/macro_chorus/macro_chorus.gml b/scripts/macro_chorus/macro_chorus.gml
@@ -2,9 +2,9 @@ function macro_chorus() {
 	// macro_chorus()
 	var str, total_vals, val;
 	str = selection_code
-	arr_data = selection_to_array(str)
+	var arr_data = selection_to_array(str)
 	window = 0
-	total_vals = string_count("|", str)
+	total_vals = array_length(arr_data)
 	show_debug_message(str)
 	val = 0
 	while (val < total_vals) {
diff --git a/scripts/macro_fadein/macro_fadein.gml b/scripts/macro_fadein/macro_fadein.gml
@@ -3,8 +3,8 @@ function macro_fadein() {
 	var str, total_vals, val, decr, inc, maxdecr, velval
 	str = selection_code
 	if (selected = 0) return 0
-	arr_data = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_data = selection_to_array(str)
+	total_vals = array_length(arr_data)
 	val = 0
 	// Check bottom-right note block's velocity value, calculate fade out from that.
 	velval = array_length_1d(arr_data)
diff --git a/scripts/macro_fadeout/macro_fadeout.gml b/scripts/macro_fadeout/macro_fadeout.gml
@@ -3,8 +3,8 @@ function macro_fadeout() {
 	var str, total_vals, val, decr, inc, maxdecr
 	str = selection_code
 	if (selected = 0) return 0
-	arr_data = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_data = selection_to_array(str)
+	total_vals = array_length(arr_data)
 	val = 0
 	// Check top-left note block's velocity value, calculate fade out from that.
 	maxdecr = arr_data[4]
diff --git a/scripts/macro_replacekey/macro_replacekey.gml b/scripts/macro_replacekey/macro_replacekey.gml
@@ -4,8 +4,8 @@ function macro_replacekey() {
 	var str, total_vals, val, key
 	str = selection_code
 	if (selected = 0) return 0
-	arr_data = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_data = selection_to_array(str)
+	total_vals = array_length(arr_data)
 	val = 0
 	key = arr_data[3]
 	//show_debug_message(string_count("-1", str))
diff --git a/scripts/macro_reset/macro_reset.gml b/scripts/macro_reset/macro_reset.gml
@@ -3,8 +3,8 @@ function macro_reset() {
 	var str, total_vals, val
 	str = selection_code
 	if (selected = 0) return 0
-	arr_data = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_data = selection_to_array(str)
+	total_vals = array_length(arr_data)
 	val = 0
 	//show_debug_message(string_count("-1", str))
 	//for (var i = 0; i < total_vals; i++;) {show_debug_message(arr_data[i])}
diff --git a/scripts/macro_tremolo/macro_tremolo.gml b/scripts/macro_tremolo/macro_tremolo.gml
@@ -3,8 +3,8 @@ 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
-	arr_temp = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_temp = selection_to_array(str)
+	total_vals = array_length(arr_temp)
 	//show_debug_message("total vals is "+string(total_vals))
 	total_cols = string_count("-1", str)
 	//show_debug_message("total cols is "+string(total_cols))
diff --git a/scripts/macro_tremolo_fadein/macro_tremolo_fadein.gml b/scripts/macro_tremolo_fadein/macro_tremolo_fadein.gml
@@ -3,8 +3,8 @@ 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
-	arr_temp = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_temp = selection_to_array(str)
+	total_vals = array_length(arr_temp)
 	//show_debug_message("total vals is "+string(total_vals))
 	total_cols = string_count("-1", str)
 	//show_debug_message("total cols is "+string(total_cols))
@@ -46,7 +46,7 @@ function macro_tremolo_fadein() {
 	    // show_debug_message("End loop. arr_data is now " + string(array_to_selection(arr_data, c)))
 		colcount++
 		current_colsegment = string_count("-1", string(array_to_selection(arr_data, c))) - previous_colsegment
-		tremolo_duration = (real(array_length_1d(arr_data)) - prevlength) // Calculate Fade-In
+		tremolo_duration = (real(array_length(arr_data)) - prevlength) // Calculate Fade-In
 		f = 0
 		if fade_auto = 1 {
 			if (current_colsegment - 4 > 0) decr = 100 / (current_colsegment - 4)
@@ -73,7 +73,7 @@ function macro_tremolo_fadein() {
 			decr = decr + inc
 			f ++
 		}
-		prevlength = real(array_length_1d(arr_data))
+		prevlength = real(array_length(arr_data))
 		previous_colsegment += current_colsegment
 		decr = 0
 		inc = 0
diff --git a/scripts/macro_tremolo_fadeout/macro_tremolo_fadeout.gml b/scripts/macro_tremolo_fadeout/macro_tremolo_fadeout.gml
@@ -3,8 +3,8 @@ 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
-	arr_temp = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_temp = selection_to_array(str)
+	total_vals = array_length(arr_temp)
 	//show_debug_message("total vals is "+string(total_vals))
 	total_cols = string_count("-1", str)
 	//show_debug_message("total cols is "+string(total_cols))
diff --git a/scripts/macro_velocitylfo/macro_velocitylfo.gml b/scripts/macro_velocitylfo/macro_velocitylfo.gml
@@ -3,8 +3,8 @@ function macro_velocitylfo() {
 	var str, total_vals, val, decr
 	str = selection_code
 	if (selected = 0) return 0
-	arr_data = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_data = selection_to_array(str)
+	total_vals = array_length(arr_data)
 	val = 0
 	decr = 100/string_count("-1", str)
 	//for (var i = 0; i < total_vals; i++;) {show_debug_message(arr_data[i])}
diff --git a/scripts/macro_vibrato/macro_vibrato.gml b/scripts/macro_vibrato/macro_vibrato.gml
@@ -3,8 +3,8 @@ function macro_vibrato() {
 	var str, total_vals, val, decr
 	str = selection_code
 	if (selected = 0) return 0
-	arr_data = selection_to_array(str)
-	total_vals = string_count("|", str)
+	var arr_data = selection_to_array(str)
+	total_vals = array_length(arr_data)
 	val = 0
 	decr = 100/string_count("-1", str)
 	//for (var i = 0; i < total_vals; i++;) {show_debug_message(arr_data[i])}
