Skip to content
This repository was archived by the owner on Feb 1, 2026. It is now read-only.
/ Input Public archive

Commit de95df4

Browse files
JujuAdamsJujuAdams
committed
Merge branch 'dev'
2 parents 029fb64 + 1b5c574 commit de95df4

File tree

96 files changed

+2464
-1363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+2464
-1363
lines changed

datafiles/sdl2.txt renamed to datafiles/gamecontrollerdb.txt

Lines changed: 67 additions & 16 deletions
Large diffs are not rendered by default.

‎input.yyp‎

Lines changed: 39 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎objects/obj_example/Draw_0.gml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,6 @@ var _string = "Left = " + string(input_value(VERB.LEFT )) + " " +
88
_string += "Recent (all) = " + string(input_check_press_most_recent()) + "\n";
99
_string += "Recent (4dir) = " + string(input_check_press_most_recent([VERB.LEFT, VERB.RIGHT, VERB.UP, VERB.DOWN])) + "\n";
1010

11-
//var _gamepad = input_player_gamepad_get(0);
12-
//var _i = 0;
13-
//repeat(30)
14-
//{
15-
// if (gamepad_button_check(_gamepad, _i))
16-
// {
17-
// _string += "b" + string(_i) + "\n";
18-
// }
19-
//
20-
// ++_i;
21-
//}
22-
//
23-
//var _i = 0;
24-
//repeat(10)
25-
//{
26-
// _string += "a" + string(_i) + " = " + string(gamepad_axis_value(_gamepad, _i)) + "\n";
27-
// ++_i;
28-
//}
29-
//
30-
//_string += "a4106 = " + string(gamepad_axis_value(_gamepad, 4106)) + "\n";
31-
//_string += "a4107 = " + string(gamepad_axis_value(_gamepad, 4107)) + "\n";
32-
3311
draw_text(10, 10, _string);
3412

3513
var _i = 0;

‎objects/obj_example/Other_75.gml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎objects/obj_example/obj_example.yy‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎objects/obj_test/Create_0.gml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
input_cursor_verbs(VERB.UP, VERB.DOWN, VERB.LEFT, VERB.RIGHT, 5);
2+
input_cursor_move(room_width/2, room_height/2);
3+
4+
//input_default_key(vk_left , VERB.LEFT );
5+
//input_default_key(vk_right , VERB.RIGHT );
6+
//input_default_key(vk_up , VERB.UP );
7+
//input_default_key(vk_down , VERB.DOWN );
8+
//input_default_key(vk_space , VERB.CONFIRM );
9+
//input_default_key(vk_backspace, VERB.CANCEL );
10+
//input_default_key(vk_escape , VERB.PAUSE );
11+
//input_default_key(vk_enter , VERB.PAUSE, 1);
12+
13+
input_default_mouse_button(mb_left, VERB.CONFIRM, 1);
14+
15+
input_default_gamepad_axis(gp_axislh , true , VERB.LEFT );
16+
input_default_gamepad_axis(gp_axislh , false, VERB.RIGHT);
17+
input_default_gamepad_axis(gp_axislv , true , VERB.UP );
18+
input_default_gamepad_axis(gp_axislv , false, VERB.DOWN );
19+
input_default_gamepad_button(gp_face1 , VERB.CONFIRM );
20+
input_default_gamepad_button(gp_face2 , VERB.CANCEL );
21+
input_default_gamepad_button(gp_start , VERB.PAUSE );
22+
input_default_gamepad_button(gp_select, VERB.PAUSE , 1);
23+
input_default_gamepad_button(gp_padl , VERB.LEFT , 1);
24+
input_default_gamepad_button(gp_padr , VERB.RIGHT , 1);
25+
input_default_gamepad_button(gp_padu , VERB.UP , 1);
26+
input_default_gamepad_button(gp_padd , VERB.DOWN , 1);
27+
28+
test_index = 0;

‎objects/obj_test/Draw_0.gml‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
var _string = "";
2+
3+
_string += "Gamepad " + string(test_index) + "/" + string(gamepad_get_device_count()) + ", \"" + string(gamepad_get_description(test_index)) + "\"\n";
4+
5+
var _gamepad = test_index;
6+
var _i = 0;
7+
repeat(40)
8+
{
9+
if (gamepad_button_check(_gamepad, _i))
10+
{
11+
_string += "b" + string(_i) + "\n";
12+
}
13+
14+
++_i;
15+
}
16+
17+
var _i = 0;
18+
repeat(10)
19+
{
20+
if (gamepad_hat_value(_gamepad, _i))
21+
{
22+
_string += "h" + string(_i) + " = " + string(gamepad_hat_value(_gamepad, _i)) + "\n";
23+
}
24+
25+
++_i;
26+
}
27+
28+
var _i = 0;
29+
repeat(12)
30+
{
31+
_string += "a" + string(_i) + " = " + string(gamepad_axis_value(_gamepad, _i)) + "\n";
32+
++_i;
33+
}
34+
35+
_string += "a4106 = " + string(gamepad_axis_value(_gamepad, 4106)) + "\n";
36+
_string += "a4107 = " + string(gamepad_axis_value(_gamepad, 4107)) + "\n";
37+
38+
draw_text(10, 10, _string);
39+
40+
var _string = "";
41+
_string += "gp_face1 = " + string(input_gamepad_value(_gamepad, gp_face1 )) + "\n";
42+
_string += "gp_face2 = " + string(input_gamepad_value(_gamepad, gp_face2 )) + "\n";
43+
_string += "gp_face3 = " + string(input_gamepad_value(_gamepad, gp_face3 )) + "\n";
44+
_string += "gp_face4 = " + string(input_gamepad_value(_gamepad, gp_face4 )) + "\n";
45+
_string += "gp_padu = " + string(input_gamepad_value(_gamepad, gp_padu )) + "\n";
46+
_string += "gp_padd = " + string(input_gamepad_value(_gamepad, gp_padd )) + "\n";
47+
_string += "gp_padl = " + string(input_gamepad_value(_gamepad, gp_padl )) + "\n";
48+
_string += "gp_padr = " + string(input_gamepad_value(_gamepad, gp_padr )) + "\n";
49+
_string += "gp_axislh = " + string(input_gamepad_value(_gamepad, gp_axislh )) + "\n";
50+
_string += "gp_axislv = " + string(input_gamepad_value(_gamepad, gp_axislv )) + "\n";
51+
_string += "gp_axisrh = " + string(input_gamepad_value(_gamepad, gp_axisrh )) + "\n";
52+
_string += "gp_axisrv = " + string(input_gamepad_value(_gamepad, gp_axisrv )) + "\n";
53+
_string += "gp_stickl = " + string(input_gamepad_value(_gamepad, gp_stickl )) + "\n";
54+
_string += "gp_stickr = " + string(input_gamepad_value(_gamepad, gp_stickr )) + "\n";
55+
_string += "gp_shoulderl = " + string(input_gamepad_value(_gamepad, gp_shoulderl )) + "\n";
56+
_string += "gp_shoulderlb = " + string(input_gamepad_value(_gamepad, gp_shoulderlb)) + "\n";
57+
_string += "gp_shoulderr = " + string(input_gamepad_value(_gamepad, gp_shoulderr )) + "\n";
58+
_string += "gp_shoulderrb = " + string(input_gamepad_value(_gamepad, gp_shoulderrb)) + "\n";
59+
_string += "gp_select = " + string(input_gamepad_value(_gamepad, gp_select )) + "\n";
60+
_string += "gp_start = " + string(input_gamepad_value(_gamepad, gp_start )) + "\n";
61+
62+
draw_text(270, 30, _string);
63+
64+
65+
66+
draw_rectangle(488, 0, 490, room_height, false);
67+
68+
var _string = "";
69+
70+
_string += "Left = " + string(input_value(VERB.LEFT )) + " " + string(input_binding_get(VERB.LEFT )) + "\n";
71+
_string += "Right = " + string(input_value(VERB.RIGHT )) + " " + string(input_binding_get(VERB.RIGHT )) + "\n";
72+
_string += "Up = " + string(input_value(VERB.UP )) + " " + string(input_binding_get(VERB.UP )) + "\n";
73+
_string += "Down = " + string(input_value(VERB.DOWN )) + " " + string(input_binding_get(VERB.DOWN )) + "\n";
74+
_string += "Confirm = " + string(input_value(VERB.CONFIRM)) + " " + string(input_binding_get(VERB.CONFIRM)) + "\n";
75+
_string += "Cancel = " + string(input_value(VERB.CANCEL )) + " " + string(input_binding_get(VERB.CANCEL )) + "\n";
76+
_string += "Pause = " + string(input_value(VERB.PAUSE )) + " " + string(input_binding_get(VERB.PAUSE )) + "\n";
77+
_string += "Recent (all) = " + string(input_check_press_most_recent()) + "\n";
78+
_string += "Recent (4dir) = " + string(input_check_press_most_recent([VERB.LEFT, VERB.RIGHT, VERB.UP, VERB.DOWN])) + "\n";
79+
80+
draw_text(500, 10, _string);
81+
82+
83+
84+
85+
86+
var _i = 0;
87+
repeat(INPUT_MAX_PLAYERS)
88+
{
89+
if (input_player_connected(_i))
90+
{
91+
var _x = input_cursor_x(_i);
92+
var _y = input_cursor_y(_i);
93+
94+
draw_circle(_x, _y, 4, false);
95+
draw_circle(_x, _y, 6, true);
96+
draw_text(_x + 5, _y + 5, _i);
97+
}
98+
99+
++_i;
100+
}
101+
102+
draw_text(500, 740, current_time);

‎objects/obj_test/Step_1.gml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
input_tick();
2+
input_hotswap_tick();
3+
4+
var _size = gamepad_get_device_count();
5+
var _delta = keyboard_check_pressed(vk_down) - keyboard_check_pressed(vk_up);
6+
test_index = (test_index + _delta + _size) mod _size;

0 commit comments

Comments
 (0)