optimize draw_set_alphas

mstop4 · mstop4 · commit bc239f96c8d1 · 2022-11-30T17:21:32.000-05:00
(cherry picked from commit 8004d5a)
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_column_menu/Draw_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_column_menu/Draw_0.gml
@@ -23,7 +23,6 @@ for (var i=view_area.x; i<=view_area.y; i++) {
 		}
 
 		self.menu_base_draw_item(_item, _x, _y + _y_offset);
-		draw_set_alpha(menu_alpha.v);
 	}
 	_y += item_height + line_spacing;
 }
@@ -35,19 +34,19 @@ if (view_height > 0) {
 		if (is_struct(_item)) {
 			draw_set_alpha(abs(view_scroll_progress_y.v));
 			self.menu_base_draw_item(_item, _x, y - (item_height + line_spacing) + _y_offset);
-			draw_set_alpha(menu_alpha.v);
 		}
 	} else if (view_scroll_progress_y.v > 0 && view_area.y + 1 < num_items) {
 		// Scroll down last element
 		_item = items[| view_area.y + 1];
 		if (is_struct(_item)) {
 			draw_set_alpha(abs(view_scroll_progress_y.v));
 			self.menu_base_draw_item(_item, _x, _y + _y_offset);
-			draw_set_alpha(menu_alpha.v);
 		}
 	}
 }
 
+draw_set_alpha(menu_alpha.v);
+
 if (enabled) {
 	draw_sprite(cursor_spr, 0, x, y + (item_height + line_spacing) * (pos - view_area.x) + item_height / 2 + _y_offset);
 	
@@ -60,5 +59,4 @@ if (enabled) {
 			draw_sprite_ext(view_scroll_arrows_spr, 0, x + view_scroll_arrows_x, _y + view_scroll_arrows_margin, 1, -1, 0, c_white, 1);
 		}
 	}
-}
-draw_set_alpha(menu_alpha.v);
+}
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_grid_menu/Draw_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_grid_menu/Draw_0.gml
@@ -59,7 +59,6 @@ for (var i=view_area.left; i<=view_area.right; i++) {
 			}
 		}
 		
-		draw_set_alpha(menu_alpha.v);
 		_y += item_height + line_spacing;
 	}
 	
@@ -68,22 +67,22 @@ for (var i=view_area.left; i<=view_area.right; i++) {
 			// Scroll up first element
 			_item = items[# i, view_area.top - 1];
 			if (is_struct(_item)) {
-					draw_set_alpha(abs(view_scroll_progress_y.v));
+				draw_set_alpha(abs(view_scroll_progress_y.v));
 				self.menu_base_draw_item(_item, _x + _x_offset, y - (item_height + line_spacing) + _y_offset);
-				draw_set_alpha(menu_alpha.v);
 			}
 		} else if (view_scroll_progress_y.v > 0 && view_area.bottom + 1 < items_height) {
 			// Scroll down last element
 			_item = items[# i, view_area.bottom + 1];
 			if (is_struct(_item)) {
 				draw_set_alpha(abs(view_scroll_progress_y.v));
 				self.menu_base_draw_item(_item, _x + _x_offset, _y + _y_offset);
-				draw_set_alpha(menu_alpha.v);
 			}
 		}
 	}
 }
 
+draw_set_alpha(menu_alpha.v);
+
 if (enabled) {
 	draw_sprite(cursor_spr, 0,
 		x + (cursor_padding + column_width) * (pos.x - view_area.left),
@@ -108,5 +107,4 @@ if (enabled) {
 			draw_sprite_ext(view_scroll_arrows_spr, 0, _x + view_scroll_arrows_margin + cursor_padding, y + view_scroll_arrows_y, 1, 1, 270, c_white, 1);
 		}
 	}
-}
-draw_set_alpha(menu_alpha.v);
+}

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ for (var i=view_area.x; i<=view_area.y; i++) {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`self.menu_base_draw_item(_item, _x, _y + _y_offset);`
`26`		`- draw_set_alpha(menu_alpha.v);`
`27`	`26`	`}`
`28`	`27`	`_y += item_height + line_spacing;`
`29`	`28`	`}`
`@@ -35,19 +34,19 @@ if (view_height > 0) {`
`35`	`34`	`if (is_struct(_item)) {`
`36`	`35`	`draw_set_alpha(abs(view_scroll_progress_y.v));`
`37`	`36`	`self.menu_base_draw_item(_item, _x, y - (item_height + line_spacing) + _y_offset);`
`38`		`- draw_set_alpha(menu_alpha.v);`
`39`	`37`	`}`
`40`	`38`	`} else if (view_scroll_progress_y.v > 0 && view_area.y + 1 < num_items) {`
`41`	`39`	`// Scroll down last element`
`42`	`40`	`_item = items[\| view_area.y + 1];`
`43`	`41`	`if (is_struct(_item)) {`
`44`	`42`	`draw_set_alpha(abs(view_scroll_progress_y.v));`
`45`	`43`	`self.menu_base_draw_item(_item, _x, _y + _y_offset);`
`46`		`- draw_set_alpha(menu_alpha.v);`
`47`	`44`	`}`
`48`	`45`	`}`
`49`	`46`	`}`
`50`	`47`
	`48`	`+draw_set_alpha(menu_alpha.v);`
	`49`	`+`
`51`	`50`	`if (enabled) {`
`52`	`51`	`draw_sprite(cursor_spr, 0, x, y + (item_height + line_spacing) * (pos - view_area.x) + item_height / 2 + _y_offset);`
`53`	`52`
`@@ -60,5 +59,4 @@ if (enabled) {`
`60`	`59`	`draw_sprite_ext(view_scroll_arrows_spr, 0, x + view_scroll_arrows_x, _y + view_scroll_arrows_margin, 1, -1, 0, c_white, 1);`
`61`	`60`	`}`
`62`	`61`	`}`
`63`		`-}`
`64`		`-draw_set_alpha(menu_alpha.v);`
	`62`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ for (var i=view_area.left; i<=view_area.right; i++) {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- draw_set_alpha(menu_alpha.v);`
`63`	`62`	`_y += item_height + line_spacing;`
`64`	`63`	`}`
`65`	`64`
`@@ -68,22 +67,22 @@ for (var i=view_area.left; i<=view_area.right; i++) {`
`68`	`67`	`// Scroll up first element`
`69`	`68`	`_item = items[# i, view_area.top - 1];`
`70`	`69`	`if (is_struct(_item)) {`
`71`		`- draw_set_alpha(abs(view_scroll_progress_y.v));`
	`70`	`+ draw_set_alpha(abs(view_scroll_progress_y.v));`
`72`	`71`	`self.menu_base_draw_item(_item, _x + _x_offset, y - (item_height + line_spacing) + _y_offset);`
`73`		`- draw_set_alpha(menu_alpha.v);`
`74`	`72`	`}`
`75`	`73`	`} else if (view_scroll_progress_y.v > 0 && view_area.bottom + 1 < items_height) {`
`76`	`74`	`// Scroll down last element`
`77`	`75`	`_item = items[# i, view_area.bottom + 1];`
`78`	`76`	`if (is_struct(_item)) {`
`79`	`77`	`draw_set_alpha(abs(view_scroll_progress_y.v));`
`80`	`78`	`self.menu_base_draw_item(_item, _x + _x_offset, _y + _y_offset);`
`81`		`- draw_set_alpha(menu_alpha.v);`
`82`	`79`	`}`
`83`	`80`	`}`
`84`	`81`	`}`
`85`	`82`	`}`
`86`	`83`
	`84`	`+draw_set_alpha(menu_alpha.v);`
	`85`	`+`
`87`	`86`	`if (enabled) {`
`88`	`87`	`draw_sprite(cursor_spr, 0,`
`89`	`88`	`x + (cursor_padding + column_width) * (pos.x - view_area.left),`
`@@ -108,5 +107,4 @@ if (enabled) {`
`108`	`107`	`draw_sprite_ext(view_scroll_arrows_spr, 0, _x + view_scroll_arrows_margin + cursor_padding, y + view_scroll_arrows_y, 1, 1, 270, c_white, 1);`
`109`	`108`	`}`
`110`	`109`	`}`
`111`		`-}`
`112`		`-draw_set_alpha(menu_alpha.v);`
	`110`	`+}`