Skip to content

Update metadata and disable joystick option #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JeodC merged 2 commits into from
May 2, 2025
Merged

Update metadata and disable joystick option #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa50f03
Add option to disable joystick
JeodC May 2, 2025
7c3995e
Update example json and readme
JeodC May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,20 @@ GMLoader-next can load a json formatted configuration file using the `-c` option
**gmloader.json**:
```json
{
"save_dir" : "gamedata",
"apk_path" : "my_game.apk",
"save_dir" : "saves",
"apk_path" : "mygame.apk",
"show_cursor" : false,
"disable_controller" : false,
"disable_depth" : false,
"force_platform" : "os_windows"
"disable_extensions" : false,
"disable_joystick" : true,
"disable_rumble" : false,
"rumble_scale" : 1.0,
"force_platform" : "os_android"
}
```

When no configuration file is present the default values are:

| Parameter name | Default value |
|--------------------|---------------|
| save_dir | ./ |
| apk_path | game.apk |
| show_cursor | true |
| disable_controller | false |
| disable_depth | false |
| force_platform | os_android |
When no configuration file is present the default values are as above.

Supported values for force_platform are:
- os_unknown
Expand Down
7 changes: 0 additions & 7 deletions gmloader.conf.example
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions gmloader.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"save_dir" : "saves",
"apk_path" : "mygame.apk",
"show_cursor" : false,
"disable_controller" : false,
"disable_depth" : false,
"disable_extensions" : false,
"disable_joystick" : true,
"disable_rumble" : false,
"rumble_scale" : 1.0,
"force_platform" : "os_android"
}
9 changes: 6 additions & 3 deletions gmloader/configuration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ void from_json(const json& j, gml_config& c) {
get_if_exists("disable_controller", disable_controller);
get_if_exists("disable_depth", disable_depth);
get_if_exists("disable_extensions", disable_extensions);
get_if_exists("disable_joystick", disable_joystick);
get_if_exists("disable_rumble", disable_rumble);
get_if_exists("rumble_scale", rumble_scale);
get_if_exists("disable_texhack", disable_texhack);
get_if_exists("rumble_scale", rumble_scale);
get_if_exists("force_platform", force_platform);
}

Expand All @@ -25,9 +26,10 @@ void gml_config::init_defaults(){
disable_controller = false;
disable_depth = false;
disable_extensions = true;
disable_joystick = false;
disable_rumble = false;
rumble_scale = 1.0;
disable_texhack = true; /* Disabled by default until properly tested. */
rumble_scale = 1.0;
force_platform = "os_android";
}

Expand Down Expand Up @@ -59,8 +61,9 @@ void gml_config::show_config(){
printf("config: disable_controller = %d\n", disable_controller);
printf("config: disable_depth = %d\n", disable_depth);
printf("config: disable_extensions = %d\n", disable_extensions);
printf("config: disable_joystick = %d\n", disable_joystick);
printf("config: disable_rumble = %d\n", disable_rumble);
printf("config: rumble_scale = %f\n", rumble_scale);
printf("config: disable_texhack = %d\n", disable_texhack);
printf("config: rumble_scale = %f\n", rumble_scale);
printf("config: force_platform = %s\n", force_platform.c_str());
}
3 changes: 2 additions & 1 deletion gmloader/configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ struct gml_config {
bool disable_controller;
bool disable_depth;
bool disable_extensions;
bool disable_joystick;
bool disable_rumble;
float rumble_scale;
bool disable_texhack;
float rumble_scale;
std::string force_platform;

friend void from_json(const json& j, gml_config& c);
Expand Down
15 changes: 11 additions & 4 deletions gmloader/input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,17 @@ int update_inputs(SDL_Window *win)
}

k = 0;
yoyo_gamepads[slot].axis[k++] = ((double)SDL_GameControllerGetAxis(controller->controller, SDL_CONTROLLER_AXIS_LEFTX)) / 32767.f;
yoyo_gamepads[slot].axis[k++] = ((double)SDL_GameControllerGetAxis(controller->controller, SDL_CONTROLLER_AXIS_LEFTY)) / 32767.f;
yoyo_gamepads[slot].axis[k++] = ((double)SDL_GameControllerGetAxis(controller->controller, SDL_CONTROLLER_AXIS_RIGHTX)) / 32767.f;
yoyo_gamepads[slot].axis[k++] = ((double)SDL_GameControllerGetAxis(controller->controller, SDL_CONTROLLER_AXIS_RIGHTY)) / 32767.f;
if (gmloader_config.disable_joystick) {
yoyo_gamepads[slot].axis[k++] = 0.0;
yoyo_gamepads[slot].axis[k++] = 0.0;
yoyo_gamepads[slot].axis[k++] = 0.0;
yoyo_gamepads[slot].axis[k++] = 0.0;
} else {
yoyo_gamepads[slot].axis[k++] = ((double)SDL_GameControllerGetAxis(controller->controller, SDL_CONTROLLER_AXIS_LEFTX)) / 32767.0;
yoyo_gamepads[slot].axis[k++] = ((double)SDL_GameControllerGetAxis(controller->controller, SDL_CONTROLLER_AXIS_LEFTY)) / 32767.0;
yoyo_gamepads[slot].axis[k++] = ((double)SDL_GameControllerGetAxis(controller->controller, SDL_CONTROLLER_AXIS_RIGHTX)) / 32767.0;
yoyo_gamepads[slot].axis[k++] = ((double)SDL_GameControllerGetAxis(controller->controller, SDL_CONTROLLER_AXIS_RIGHTY)) / 32767.0;
}
}

// Mouse Code
Expand Down