basic menu

mstop4 · mstop4 · commit ead974950ff7 · 2020-09-27T21:12:55.000-04:00
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_menu/CleanUp_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_menu/CleanUp_0.gml
@@ -1,5 +1,6 @@
-for (var i=0; i<num_menu_items; i++) {
-	delete menu_items[| i];
+for (var i=0; i<num_items; i++) {
+	delete items[| i];
 }
 		
-ds_list_destroy(menu_items);
+ds_list_destroy(items);
+delete control_state;
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_menu/Create_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_menu/Create_0.gml
@@ -1,11 +1,11 @@
-menu_items = ds_list_create();
-menu_pos = 0;
-num_menu_items = 0;
+items = ds_list_create();
+num_items = 0;
+pos = 0;
 
 draw_set_font(menu_font);
 item_height = string_height("Ij");
 cursor_width = sprite_get_width(cursor_spr);
 
-ctrl_pressed[MENU_CONTROLS.UP]
+control_state = new MenuControlState();
 
 menu_functions();
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_menu/Draw_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_menu/Draw_0.gml
@@ -1,5 +1,5 @@
-for (var i=0; i<num_menu_items; i++) {
-	draw_text(x + cursor_width + cursor_padding, y + (item_height + line_spacing) * i, menu_items[| i].label);
+for (var i=0; i<num_items; i++) {
+	draw_text(x + cursor_width + cursor_padding, y + (item_height + line_spacing) * i, items[| i].label);
 }
 
-draw_sprite(cursor_spr, 0, x, y + (item_height + line_spacing) * menu_pos);
+draw_sprite(cursor_spr, 0, x, y + (item_height + line_spacing) * pos);
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_menu/Step_1.gml b/current-scripts/Demos/useful-scripts/objects/obj_menu/Step_1.gml
@@ -0,0 +1,9 @@
+control_state.poll_input();
+
+if (control_state.pressed_state[MENU_CONTROLS.UP]) {
+	pos = wrap(pos-1, 0, num_items-1);
+}
+
+if (control_state.pressed_state[MENU_CONTROLS.DOWN]) {
+	pos = wrap(pos+1, 0, num_items-1);
+}
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_menu/obj_menu.yy b/current-scripts/Demos/useful-scripts/objects/obj_menu/obj_menu.yy
diff --git a/current-scripts/Demos/useful-scripts/objects/obj_menu_demo/Create_0.gml b/current-scripts/Demos/useful-scripts/objects/obj_menu_demo/Create_0.gml
@@ -1,6 +1,7 @@
 menu = instance_create_layer(32, 32, layer, obj_menu);
-menu.cursor_spr = spr_arrow;
-menu.cursor_padding = sprite_get_width(menu.cursor_spr) + 16;
+menu.menu_init(fnt_demo, spr_arrow, "menu_demo_control_handler");
 
 menu.add_menu_selectable("Foo", -1);
-menu.add_menu_selectable("bar", -1);
+menu.add_menu_selectable("Bar", -1);
+menu.add_menu_selectable("Baz", -1);
+menu.add_menu_selectable("Qux", -1);
diff --git a/current-scripts/Demos/useful-scripts/scripts/math_functions/math_functions.gml b/current-scripts/Demos/useful-scripts/scripts/math_functions/math_functions.gml
@@ -101,7 +101,7 @@ function soft_clamp(_value, _delta, _min, _max) {
 /// @apara {real} min   
 /// @param {real} max   
 function wrap(_value, _min, _max) {
-	var _range = _max - _min;
+	var _range = _max - _min + 1;
 
 	if (_range + _min == 0) return 0;
 
diff --git a/current-scripts/Demos/useful-scripts/scripts/menu_demo_control/menu_demo_control.gml b/current-scripts/Demos/useful-scripts/scripts/menu_demo_control/menu_demo_control.gml
diff --git a/current-scripts/Demos/useful-scripts/scripts/menu_demo_control_handlers/menu_demo_control_handlers.gml b/current-scripts/Demos/useful-scripts/scripts/menu_demo_control_handlers/menu_demo_control_handlers.gml
@@ -0,0 +1,7 @@
+function menu_demo_control_handler() {
+	pressed_state[MENU_CONTROLS.UP] = keyboard_check_pressed(vk_up);
+	pressed_state[MENU_CONTROLS.DOWN] = keyboard_check_pressed(vk_down);
+	
+	held_state[MENU_CONTROLS.UP] = keyboard_check(vk_up);
+	held_state[MENU_CONTROLS.DOWN] = keyboard_check(vk_down);
+}
diff --git a/current-scripts/Demos/useful-scripts/scripts/menu_demo_control_handlers/menu_demo_control_handlers.yy b/current-scripts/Demos/useful-scripts/scripts/menu_demo_control_handlers/menu_demo_control_handlers.yy
diff --git a/current-scripts/Demos/useful-scripts/scripts/menu_functions/menu_functions.gml b/current-scripts/Demos/useful-scripts/scripts/menu_functions/menu_functions.gml
@@ -1,10 +1,14 @@
-function menu_init(_font, _cursor_sprite) {
+function menu_init(_font, _cursor_sprite, _control_handler) {
 	menu_font = _font;
 	cursor_spr = _cursor_sprite;
+	cursor_padding = sprite_get_width(_cursor_sprite) + 16;
+	
+	var _handler = asset_get_index(_control_handler);
+	control_state.control_handler = _handler;
 }
 
 function add_menu_selectable(_label, _on_confirm) {
 	var _new = new MenuSelectable(_label, _on_confirm);
-	ds_list_add(menu_items, _new);
-	num_menu_items++;
+	ds_list_add(items, _new);
+	num_items++;
 }
diff --git a/current-scripts/Demos/useful-scripts/scripts/menu_structs/menu_structs.gml b/current-scripts/Demos/useful-scripts/scripts/menu_structs/menu_structs.gml
@@ -4,7 +4,25 @@ enum MENU_CONTROLS {
 	LEFT,
 	RIGHT,
 	CONFIRM,
-	CANCEL
+	CANCEL,
+	MAX
+}
+
+function MenuControlState() constructor {
+	pressed_state = [];
+	held_state = [];
+	control_handler = -1;
+	
+	for (var i=0; i< MENU_CONTROLS.MAX; i++) {
+		pressed_state[i] = false;
+		held_state[i] = false;
+	}
+	
+	function poll_input() {
+		if (control_handler != -1) {
+			script_execute(control_handler);
+		}
+	}
 }
 
 function MenuItem(_label) constructor {
diff --git a/current-scripts/Demos/useful-scripts/useful-scripts.yyp b/current-scripts/Demos/useful-scripts/useful-scripts.yyp

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`		`-for (var i=0; i<num_menu_items; i++) {`
`2`		`- delete menu_items[\| i];`
	`1`	`+for (var i=0; i<num_items; i++) {`
	`2`	`+ delete items[\| i];`
`3`	`3`	`}`
`4`	`4`
`5`		`-ds_list_destroy(menu_items);`
	`5`	`+ds_list_destroy(items);`
	`6`	`+delete control_state;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-for (var i=0; i<num_menu_items; i++) {`
`2`		`- draw_text(x + cursor_width + cursor_padding, y + (item_height + line_spacing) * i, menu_items[\| i].label);`
	`1`	`+for (var i=0; i<num_items; i++) {`
	`2`	`+ draw_text(x + cursor_width + cursor_padding, y + (item_height + line_spacing) * i, items[\| i].label);`
`3`	`3`	`}`
`4`	`4`
`5`		`-draw_sprite(cursor_spr, 0, x, y + (item_height + line_spacing) * menu_pos);`
	`5`	`+draw_sprite(cursor_spr, 0, x, y + (item_height + line_spacing) * pos);`