added more demos, fixed cursor wrapping in menu

Author: mstop4

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

@@ -9,12 +9,12 @@ if (!enabled) exit;
 control_state.poll_input();
 
 if (control_state.pressed_state[MENU_CONTROLS.UP]) {
-	pos = wrap(pos-1, 0, num_items-1);
+	pos = wrap(pos-1, 0, num_items);
 	audio_play_sound(cursor_move_sfx, 1, false);
 }
 
 if (control_state.pressed_state[MENU_CONTROLS.DOWN]) {
-	pos = wrap(pos+1, 0, num_items-1);
+	pos = wrap(pos+1, 0, num_items);
 	audio_play_sound(cursor_move_sfx, 1, false);
 }
 

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

@@ -0,0 +1,3 @@
+randomise();
+test_array = [1, -3, "foo", { n: "bar" }, [0, 2.333]];
+choice = choose_from_array(test_array);

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

@@ -0,0 +1,13 @@
+draw_set_font(fnt_title);
+draw_set_halign(fa_center);
+draw_set_colour(c_white);
+draw_text(room_width/2, 16, "Data Structures Demo");
+
+draw_set_halign(fa_left);
+draw_text(16, 64, "Choose From Array");
+
+draw_set_font(fnt_demo);
+
+// Choose From Array
+draw_text(16, 96, "Original Array: " + string(test_array));
+draw_text(16, 128, "Random Choice: " + string(choice));

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

@@ -1,5 +1,6 @@
 rooms = [
 	room_control_manager_demo,
+	room_data_structures_demo,
 	room_drawing_demo,
 	room_dta_demo,
 	room_easing_demo,
@@ -15,6 +16,7 @@ num_rooms = array_length(rooms);
 
 room_names = [
 	"Control Manager",
+	"Data Structures",
 	"Drawing",
 	"Delta Time Alarm",
 	"Easings",

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

@@ -14,7 +14,7 @@ if (control_state.pressed_state[MENU_CONTROLS.UP]) {
 	var _item = -1;
 
 	do {
-		pos.y = wrap(pos.y-1, 0, ds_grid_height(items)-1);
+		pos.y = wrap(pos.y-1, 0, ds_grid_height(items));
 		_item = items[# pos.x, pos.y];
 	} until (is_struct(_item) || _cur_pos == pos.y)
 
@@ -26,7 +26,7 @@ if (control_state.pressed_state[MENU_CONTROLS.DOWN]) {
 	var _item = -1;
 
 	do {
-		pos.y = wrap(pos.y+1, 0, ds_grid_height(items)-1);
+		pos.y = wrap(pos.y+1, 0, ds_grid_height(items));
 		_item = items[# pos.x, pos.y];
 	} until (is_struct(_item) || _cur_pos == pos.y)
 
@@ -45,7 +45,7 @@ if (control_state.pressed_state[MENU_CONTROLS.LEFT]) {
 	}
 
 	do {
-		pos.x = wrap(pos.x-1, 0, ds_grid_width(items)-1);
+		pos.x = wrap(pos.x-1, 0, ds_grid_width(items));
 		_item = items[# pos.x, pos.y];
 	} until (is_struct(_item) || _cur_pos == pos.x)
 
@@ -64,7 +64,7 @@ if (control_state.pressed_state[MENU_CONTROLS.RIGHT]) {
 	}
 
 	do {
-		pos.x = wrap(pos.x+1, 0, ds_grid_width(items)-1);
+		pos.x = wrap(pos.x+1, 0, ds_grid_width(items));
 		_item = items[# pos.x, pos.y];
 	} until (is_struct(_item) || _cur_pos == pos.x)
 

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

@@ -15,8 +15,10 @@ draw_text(16, 256, "Pulse");
 draw_sprite_ext(spr_meter, 0, 16, 288, 0.25, 0.25, 0, c_gray, 1);
 draw_sprite_ext(spr_meter, 0, 16, 288, 0.25, 0.25, 0, $80FFFF, pulse_t);
 
-draw_text(640, 256, "Wrap");
-draw_text(640, 336, "Blin");
+draw_text(640, 256, "Vector Operations");
+
+draw_text(640, 368, "Wrap");
+draw_text(640, 448, "Blin");
 
 draw_set_font(fnt_demo);
 // Vectors
@@ -40,13 +42,17 @@ draw_text(640, 208, "c x d / |c x d| = " + cross_product_normalized(vec_C, vec_D
 draw_text(96, 288, "t: " + string(pulse_counter.v));
 draw_text(176, 288, "p(t): " + string(pulse_t));
 
+// Vector Operations
+draw_text(640, 288, "a + b = " + string(vec_A.add(vec_B).to_string()));
+draw_text(640, 320, "c - d = " + string(vec_C.subtract(vec_D).to_string()));
+
 // Wrap
-draw_text(640, 288, "t: " + string(wrap_counter.v));
-draw_text(720, 288, "w(t): " + string(wrapped_value));
+draw_text(640, 400, "t: " + string(wrap_counter.v));
+draw_text(720, 400, "w(t): " + string(wrapped_value));
 
 // Blin
 for (var i=0; i<5; i++) {
 	for (var j=0; j<5; j++) {
-		draw_text(640 + i*64, 368 + j*32, string(blin_values[# i, j]));
+		draw_text(640 + i*64, 480 + j*32, string(blin_values[# i, j]));
 	}
 }

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

@@ -0,0 +1,3 @@
+original_str = "Lorem|ipsum|dolor|sit|amet|consectetur|adipiscing|elit";
+tokens = split_string(original_str, "|");
+hide_overflow_str = hide_overflow(original_str, "...", fnt_demo, 320);

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

@@ -1,4 +1,20 @@
 draw_set_font(fnt_title);
 draw_set_halign(fa_center);
 draw_set_colour(c_white);
-draw_text(room_width/2, 16, "Strings Demo");
+draw_text(room_width/2, 16, "Strings Demo");
+
+draw_set_halign(fa_left);
+draw_text(16, 64, "Split String");
+draw_text(640, 64, "Hide Overflow");
+
+draw_set_font(fnt_demo);
+
+// Split String
+draw_text(16, 96, original_str);
+
+for (var i=0; i<array_length(tokens); i++) {
+	draw_text(16, 128+i*32, tokens[i]);
+}
+
+// Hide Overflow
+draw_text(640, 96, hide_overflow_str);