Merge pull request #7 from mstop4/grid-menus

Grid menus

Author: mstop4

current-scripts/Demos/useful-scripts/notes/info/info.txt

@@ -1 +1 @@
-Version: 2.3
+Version: 2.4

…l-scripts/objects/obj_menu/CleanUp_0.gml …ts/objects/obj_column_menu/CleanUp_0.gmlcurrent-scripts/Demos/useful-scripts/objects/obj_menu/CleanUp_0.gml renamed to current-scripts/Demos/useful-scripts/objects/obj_column_menu/CleanUp_0.gml current-scripts/Demos/useful-scripts/objects/obj_menu/CleanUp_0.gml renamed to current-scripts/Demos/useful-scripts/objects/obj_column_menu/CleanUp_0.gml

@@ -0,0 +1,7 @@
+event_inherited();
+
+items = ds_list_create();
+num_items = 0;
+pos = 0;
+
+column_menu_functions();

current-scripts/Demos/useful-scripts/objects/obj_column_menu/Create_0.gml

@@ -0,0 +1,29 @@
+draw_set_font(menu_font);
+var _x = x + cursor_width + cursor_padding;
+
+for (var i=0; i<num_items; i++) {
+	var _item = items[| i];
+	var _type = _item.types[| ds_list_size(_item.types)-1];
+	
+	var _y = y + (item_height + line_spacing) * i;
+	
+	switch (_type) {
+		case "item":
+		case "selectable":
+			draw_text(_x, _y, _item.label);
+			break;
+			
+		case "spinner":
+			draw_text(_x, _y, _item.get_full_label());
+			break;
+			
+		case "keyconfig":
+			draw_text(_x, _y, _item.get_full_label());
+			break;
+		
+		default:
+			draw_text(_x, _y, _item.label);
+	}
+}
+
+draw_sprite(cursor_spr, 0, x, y + (item_height + line_spacing) * pos);

current-scripts/Demos/useful-scripts/objects/obj_column_menu/Draw_0.gml

@@ -0,0 +1,44 @@
+if (keyboard_check_pressed(vk_anykey)) {
+	if (active_key_config != noone) {
+		self.handle_key_config(active_key_config);
+	}
+}
+
+
+if (!enabled) exit;
+
+control_state.poll_input();
+
+if (control_state.pressed_state[MENU_CONTROLS.UP]) {
+	pos = wrap(pos-1, 0, num_items-1);
+	audio_play_sound(cursor_move_sfx, 1, false);
+}
+
+if (control_state.pressed_state[MENU_CONTROLS.DOWN]) {
+	pos = wrap(pos+1, 0, num_items-1);
+	audio_play_sound(cursor_move_sfx, 1, false);
+}
+
+if (control_state.pressed_state[MENU_CONTROLS.LEFT]) {
+	var _item = items[| pos];
+
+	if (ds_list_find_index(_item.types, "spinner") != -1)
+		self.handle_spinner(_item, -1);
+}
+
+if (control_state.pressed_state[MENU_CONTROLS.RIGHT]) {
+	var _item = items[| pos];
+
+	if (ds_list_find_index(_item.types, "spinner") != -1)
+		self.handle_spinner(_item, 1);
+}
+
+if (control_state.pressed_state[MENU_CONTROLS.CONFIRM]) {
+	var _item = items[| pos];	
+	
+	if (ds_list_find_index(_item.types, "selectable") != -1)
+		self.handle_selectable(_item);
+		
+	else if (ds_list_find_index(_item.types, "keyconfig") != -1)
+		self.handle_key_config(_item);
+}

current-scripts/Demos/useful-scripts/objects/obj_column_menu/Step_1.gml

@@ -1,13 +1,13 @@
-menu = instance_create_layer(32, 32, layer, obj_menu);
-menu.menu_init({
+menu = instance_create_layer(32, 32, layer, obj_column_menu);
+menu.column_menu_init({
 	font: fnt_demo,
 	cursor_spr: spr_arrow, 
 	cursor_move_sfx: snd_menu_move,
 	cursor_change_sfx: snd_menu_move,
 	cursor_confirm_sfx: -1,
 });
 
-menu.add_menu_selectable({ 
+menu.column_menu_add_selectable({ 
 	label: "Foo",
 	on_confirm_func: "menu_demo_on_confirm",
 	on_confirm_args: ["Foo"],
@@ -24,7 +24,7 @@ menu.add_menu_selectable({
 //         - {boolean}  silent_on_confirm
 //         - {boolean}  silent_on_change
 
-menu.add_menu_spinner({ 
+menu.column_menu_add_spinner({ 
 	label: "Bar",
 	values: ["A", 1, "B", 2, "C", 3],
 	init_index: 0,
@@ -36,14 +36,14 @@ menu.add_menu_spinner({
 	silent_on_change: false
 });
 
-menu.add_menu_selectable({ 
+menu.column_menu_add_selectable({ 
 	label: "Baz",
 	on_confirm_func: "menu_demo_on_confirm",
 	on_confirm_args: ["Baz"],
 	silent_on_confirm: false
 });
 
-menu.add_menu_selectable({ 
+menu.column_menu_add_selectable({ 
 	label: "Qux",
 	on_confirm_func: "menu_demo_on_confirm",
 	on_confirm_args: ["Qux"],

current-scripts/Demos/useful-scripts/objects/obj_column_menu/obj_column_menu.yy

@@ -6,7 +6,8 @@ rooms = [
 	room_laser_demo,
 	room_input_demo,
 	room_math_demo,
-	room_menu_demo,
+	room_column_menu_demo,
+	room_grid_menu_demo,
 	room_strings_demo,
 	room_web_demo
 ];
@@ -20,13 +21,14 @@ room_names = [
 	"Geometry",
 	"Input",
 	"Math",
-	"Menu",
+	"Column Menu",
+	"Grid Menu",
 	"Strings",
 	"Web"
 ];
 
-menu = instance_create_layer(32, 64, layer, obj_menu);
-menu.menu_init({
+menu = instance_create_layer(32, 64, layer, obj_column_menu);
+menu.column_menu_init({
 	font: fnt_demo,
 	cursor_spr: spr_arrow, 
 	cursor_move_sfx: snd_menu_move,
@@ -36,7 +38,7 @@ menu.menu_init({
 menu.line_spacing = 16;
 
 for (var i=0; i<num_rooms; i++) {
-	menu.add_menu_selectable({
+	menu.column_menu_add_selectable({
 		label: room_names[i],
 		on_confirm_func: "go_to_demo",
 		on_confirm_args: [ rooms[i] ],

…ripts/objects/obj_menu_demo/Create_0.gml …bjects/obj_column_menu_demo/Create_0.gmlcurrent-scripts/Demos/useful-scripts/objects/obj_menu_demo/Create_0.gml renamed to current-scripts/Demos/useful-scripts/objects/obj_column_menu_demo/Create_0.gml current-scripts/Demos/useful-scripts/objects/obj_menu_demo/Create_0.gml renamed to current-scripts/Demos/useful-scripts/objects/obj_column_menu_demo/Create_0.gml

@@ -0,0 +1,10 @@
+for (var i=0; i<ds_grid_width(items); i++) {
+	for (var j=0; j<ds_grid_height(items); j++) {
+		if (!is_struct(items[# i, j])) continue;
+		items[# i, j].destroy();
+		delete items[# i, j];
+	}
+}
+		
+ds_grid_destroy(items);
+delete control_state;