helper functions for control manager

Author: mstop4

.gitignore

@@ -0,0 +1 @@
+usefulGMLScripts1.1.yymps

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

@@ -10,18 +10,18 @@ control_labels[CONTROLS.Y] = "Y";
 num_controls = CONTROLS.MAX;
 
 control_manager = instance_create_layer(0, 0, layer, obj_control_manager);
-control_manager.add_player();
+my_player = control_manager.add_player();
 
-control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.UP, vk_up);
-control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.DOWN, vk_down);
-control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.LEFT, vk_left);
-control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.RIGHT, vk_right);
-control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.A, ord("A"));
-control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.B, ord("B"));
-control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.X, ord("X"));
-control_manager.players[| 0].set_control(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.MOUSE, CONTROLS.Y, mb_left);
+my_player.set_control_map(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.UP, vk_up);
+my_player.set_control_map(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.DOWN, vk_down);
+my_player.set_control_map(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.LEFT, vk_left);
+my_player.set_control_map(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.RIGHT, vk_right);
+my_player.set_control_map(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.A, ord("A"));
+my_player.set_control_map(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.B, ord("B"));
+my_player.set_control_map(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.KEYBOARD, CONTROLS.X, ord("X"));
+my_player.set_control_map(CONTROL_TYPE.KEYBOARD, CONTROL_TYPE.MOUSE, CONTROLS.Y, mb_left);
 
-control_manager.players[| 0].set_control(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.A, gp_face1);
-control_manager.players[| 0].set_control(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.B, gp_face2);
-control_manager.players[| 0].set_control(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.X, gp_face3);
-control_manager.players[| 0].set_control(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.Y, gp_face4);
+my_player.set_control_map(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.A, gp_face1);
+my_player.set_control_map(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.B, gp_face2);
+my_player.set_control_map(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.X, gp_face3);
+my_player.set_control_map(CONTROL_TYPE.GAMEPAD, -1, CONTROLS.Y, gp_face4);

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

@@ -1,3 +1,3 @@
 for (var i=0; i<num_controls; i++) {
-	draw_text(8, i*32 + 16, control_labels[i] + ": " + string(control_manager.players[| 0].ctrl_held[i]));
+	draw_text(8, i*32 + 16, control_labels[i] + ": " + string(my_player.get_control_state(i, CONTROL_STATE.HELD)));
 }

current-scripts/Demos/useful-scripts/scripts/control_manager_functions/control_manager_functions.gml

@@ -3,4 +3,12 @@ function add_player() {
 	ds_list_add(players, _new_player);
 	num_players++;
 	return _new_player;
+}
+
+function get_player(_index) {
+	if (ds_list_size(self.players) > _index) {
+		return self.players[| _index];
+	}
+	
+	return noone;
 }

current-scripts/Demos/useful-scripts/scripts/control_manager_structs/control_manager_structs.gml

@@ -17,6 +17,13 @@ enum CONTROL_TYPE {
 	MAX
 }
 
+enum CONTROL_STATE {
+	HELD,
+	PRESSED,
+	RELEASED,
+	MAX
+}
+
 function ControlManagerPlayer() constructor {
 	for (var i=0; i<CONTROLS.MAX; i++) {
 		keyboard_map[i] = -1;
@@ -42,7 +49,7 @@ function ControlManagerPlayer() constructor {
 	stick_deadzone = 0.1;
 	stick_threshold = 0.5;
 
-	function set_control(_control_type, _control_source, _control, _value) {
+	function set_control_map(_control_type, _control_source, _control, _value) {
 		if (_control_type == CONTROL_TYPE.KEYBOARD) {
 			keyboard_control_source[_control] = _control_source;
 			keyboard_map[_control] = _value;
@@ -51,6 +58,34 @@ function ControlManagerPlayer() constructor {
 		}
 	}
 
+	function get_control_map(_control_type, _control) {
+		if (_control_type == CONTROL_TYPE.KEYBOARD) {
+			return {
+				control_source: keyboard_control_source[_control],
+				control: keyboard_map[_control]
+			};
+		} else if (_control_type == CONTROL_TYPE.GAMEPAD) {
+			return {
+				control_source: _control_type,
+				control: gamepad_map[_control]
+			}; 
+		} else {
+			return noone;
+		}
+	}
+	
+	function get_control_state(_control, _control_state) {
+		if (_control_state == CONTROL_STATE.HELD) {
+			return ctrl_held[_control];
+		} else if (_control_state == CONTROL_STATE.PRESSED) {
+			return ctrl_pressed[_control];
+		} else if (_control_state == CONTROL_STATE.RELEASED) {
+			return ctrl_released[_control];
+		} else {
+			return noone;
+		}
+	}
+	
 	function process_input(_control_manager) {
 		prev_stick_input.x = stick_input.x;
 		prev_stick_input.y = stick_input.y;
@@ -61,7 +96,7 @@ function ControlManagerPlayer() constructor {
 			ctrl_released[i] = false;
 		}
 
-			ctrl_any_pressed = false;
+		ctrl_any_pressed = false;
 
 		if (keyboard_enabled) {
 			for (var i=0; i<CONTROLS.MAX; i++) {