eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Code Issues 121 Wiki Activity

Merge remote-tracking branch 'upstream/master' into utilities-simplification

Browse Source
This commit is contained in:
docentYT
2026-05-05 23:08:43 +02:00
parent d464628a8e 5ce03b5bcb
commit 5367cb9940
17 changed files with 10693 additions and 9119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
input/command.cpp
View File

@@ -29,6 +29,13 @@ commanddescription_sequence Commands_descriptions = {
{"mastercontrollerdecrease", command_target::vehicle, command_mode::oneoff},
{"mastercontrollerdecreasefast", command_target::vehicle, command_mode::oneoff},
{"mastercontrollerset", command_target::vehicle, command_mode::oneoff},
{"dynamicbrakecontrollerincrease", command_target::vehicle, command_mode::oneoff},
{"dynamicbrakecontrollerdecrease", command_target::vehicle, command_mode::oneoff},
{"dynamicbrakecontrollerset", command_target::vehicle, command_mode::oneoff},
{"dynamicbrakecontrollerincreasefast", command_target::vehicle, command_mode::oneoff},
{"dynamicbrakecontrollerdecreasefast", command_target::vehicle, command_mode::oneoff},
{"secondcontrollerincrease", command_target::vehicle, command_mode::oneoff},
{"secondcontrollerincreasefast", command_target::vehicle, command_mode::oneoff},
{"secondcontrollerdecrease", command_target::vehicle, command_mode::oneoff},
@@ -409,6 +416,11 @@ std::unordered_map<std::string, user_command> commandMap = {
{"mastercontrollerdecrease", user_command::mastercontrollerdecrease},
{"mastercontrollerdecreasefast", user_command::mastercontrollerdecreasefast},
{"mastercontrollerset", user_command::mastercontrollerset},
{"dynamicbrakecontrollerincrease", user_command::dynamicbrakecontrollerincrease},
{"dynamicbrakecontrollerdecrease", user_command::dynamicbrakecontrollerdecrease},
{"dynamicbrakecontrollerset", user_command::dynamicbrakecontrollerset},
{"dynamicbrakecontrollerincreasefast", user_command::dynamicbrakecontrollerincreasefast},
{"dynamicbrakecontrollerdecreasefast", user_command::dynamicbrakecontrollerdecreasefast},
{"secondcontrollerincrease", user_command::secondcontrollerincrease},
{"secondcontrollerincreasefast", user_command::secondcontrollerincreasefast},
{"secondcontrollerdecrease", user_command::secondcontrollerdecrease},

5
input/command.h
View File

@@ -24,6 +24,11 @@ enum class user_command
mastercontrollerdecrease,
mastercontrollerdecreasefast,
mastercontrollerset,
dynamicbrakecontrollerincrease,
dynamicbrakecontrollerdecrease,
dynamicbrakecontrollerset,
dynamicbrakecontrollerincreasefast,
dynamicbrakecontrollerdecreasefast,
secondcontrollerincrease,
secondcontrollerincreasefast,
secondcontrollerdecrease,

7
input/driverkeyboardinput.cpp
View File

@@ -32,6 +32,13 @@ driverkeyboard_input::default_bindings() {
{ user_command::mastercontrollerdecrease, {GLFW_KEY_KP_SUBTRACT, ""} },
{ user_command::mastercontrollerdecreasefast, {GLFW_KEY_KP_SUBTRACT | keymodifier::shift, ""} },
// mastercontrollerset,
{ user_command::dynamicbrakecontrollerincrease, {GLFW_KEY_KP_3 | keymodifier::control, ""} },
{ user_command::dynamicbrakecontrollerdecrease, {GLFW_KEY_KP_9 | keymodifier::control, ""} },
// mastercontrollerset,
{ user_command::dynamicbrakecontrollerincreasefast, {GLFW_KEY_KP_3 | keymodifier::control | keymodifier::shift, ""} },
{ user_command::dynamicbrakecontrollerdecreasefast, {GLFW_KEY_KP_9 | keymodifier::control | keymodifier::shift, ""} },
{ user_command::secondcontrollerincrease, {GLFW_KEY_KP_DIVIDE, ""} },
{ user_command::secondcontrollerincreasefast, {GLFW_KEY_KP_DIVIDE | keymodifier::shift, ""} },
{ user_command::secondcontrollerdecrease, {GLFW_KEY_KP_MULTIPLY, ""} },

3
input/drivermouseinput.cpp
View File

@@ -533,6 +533,9 @@ drivermouse_input::default_bindings() {
{ "mainctrl:", {
user_command::mastercontrollerset,
user_command::none } },
{ "dynamicbrakectrl:", {
user_command::dynamicbrakecontrollerset,
user_command::none } },
{ "scndctrl:", {
user_command::secondcontrollerset,
user_command::none } },