TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #145 from Mako88/calibration-menu

Browse source 
Split Sensitivity into Separate Menus (by Mako88/A Future Pilot)
This commit is contained in:
Christian 2015-09-29 13:36:58 +02:00
parent 708372a148 d5c580845e
commit b09cb8f738
1 changed files with 117 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

145
similar/main/menu.cpp
View file

@ -1045,7 +1045,49 @@ void change_res()
game_init_render_buffers(SM_W(Game_screen_mode), SM_H(Game_screen_mode));
}
static void input_config_sensitivity()
static void input_config_keyboard()
{
#define DXX_INPUT_SENSITIVITY(VERB,OPT,VAL) \
DXX_##VERB##_SLIDER(TXT_TURN_LR, opt_##OPT##_turn_lr, VAL[0], 0, 16) \
DXX_##VERB##_SLIDER(TXT_PITCH_UD, opt_##OPT##_pitch_ud, VAL[1], 0, 16) \
DXX_##VERB##_SLIDER(TXT_SLIDE_LR, opt_##OPT##_slide_lr, VAL[2], 0, 16) \
DXX_##VERB##_SLIDER(TXT_SLIDE_UD, opt_##OPT##_slide_ud, VAL[3], 0, 16) \
DXX_##VERB##_SLIDER(TXT_BANK_LR, opt_##OPT##_bank_lr, VAL[4], 0, 16) \
#define DXX_INPUT_CONFIG_MENU(VERB) \
DXX_##VERB##_TEXT("Keyboard Sensitivity:", opt_label_kb) \
DXX_INPUT_SENSITIVITY(VERB,kb,PlayerCfg.KeyboardSens) \
class menu_items
{
public:
enum
{
DXX_INPUT_CONFIG_MENU(ENUM)
};
array<newmenu_item, DXX_INPUT_CONFIG_MENU(COUNT)> m;
menu_items()
{
DXX_INPUT_CONFIG_MENU(ADD);
}
};
#undef DXX_INPUT_CONFIG_MENU
#undef DXX_INPUT_SENSITIVITY
menu_items items;
newmenu_do1(nullptr, "Keyboard Calibration", items.m.size(), items.m.data(), unused_newmenu_subfunction, unused_newmenu_userdata, 1);
constexpr uint_fast32_t keysens = items.opt_label_kb + 1;
const auto &m = items.m;
for (unsigned i = 0; i <= 5; i++)
{
if (i < 5)
PlayerCfg.KeyboardSens[i] = m[keysens+i].value;
}
}
static void input_config_mouse()
{
#define DXX_INPUT_SENSITIVITY(VERB,OPT,VAL) \
DXX_##VERB##_SLIDER(TXT_TURN_LR, opt_##OPT##_turn_lr, VAL[0], 0, 16) \
@ -1059,21 +1101,6 @@ static void input_config_sensitivity()
DXX_##VERB##_SLIDER(TXT_THROTTLE, opt_##OPT##_throttle, VAL[5], 0, 16) \
#define DXX_INPUT_CONFIG_MENU(VERB) \
DXX_##VERB##_TEXT("Keyboard Sensitivity:", opt_label_kb) \
DXX_INPUT_SENSITIVITY(VERB,kb,PlayerCfg.KeyboardSens) \
DXX_##VERB##_TEXT("", opt_label_blank_kb) \
DXX_##VERB##_TEXT("Joystick Sensitivity:", opt_label_js) \
DXX_INPUT_THROTTLE_SENSITIVITY(VERB,js,PlayerCfg.JoystickSens) \
DXX_##VERB##_TEXT("", opt_label_blank_js) \
DXX_##VERB##_TEXT("Joystick Linearity:", opt_label_jl) \
DXX_INPUT_THROTTLE_SENSITIVITY(VERB,jl,PlayerCfg.JoystickLinear) \
DXX_##VERB##_TEXT("", opt_label_blank_jl) \
DXX_##VERB##_TEXT("Joystick Linear Speed:", opt_label_jp) \
DXX_INPUT_THROTTLE_SENSITIVITY(VERB,jp,PlayerCfg.JoystickSpeed) \
DXX_##VERB##_TEXT("", opt_label_blank_jp) \
DXX_##VERB##_TEXT("Joystick Deadzone:", opt_label_jd) \
DXX_INPUT_THROTTLE_SENSITIVITY(VERB,jd,PlayerCfg.JoystickDead) \
DXX_##VERB##_TEXT("", opt_label_blank_jd) \
DXX_##VERB##_TEXT("Mouse Sensitivity:", opt_label_ms) \
DXX_INPUT_THROTTLE_SENSITIVITY(VERB,ms,PlayerCfg.MouseSens) \
DXX_##VERB##_TEXT("", opt_label_blank_ms) \
@ -1100,25 +1127,15 @@ static void input_config_sensitivity()
#undef DXX_INPUT_THROTTLE_SENSITIVITY
#undef DXX_INPUT_SENSITIVITY
menu_items items;
newmenu_do1(nullptr, "SENSITIVITY & DEADZONE", items.m.size(), items.m.data(), unused_newmenu_subfunction, unused_newmenu_userdata, 1);
newmenu_do1(nullptr, "Mouse Calibration", items.m.size(), items.m.data(), unused_newmenu_subfunction, unused_newmenu_userdata, 1);
constexpr uint_fast32_t keysens = items.opt_label_kb + 1;
constexpr uint_fast32_t joysens = items.opt_label_js + 1;
constexpr uint_fast32_t joylin = items.opt_label_jl + 1;
constexpr uint_fast32_t joyspd = items.opt_label_jp + 1;
constexpr uint_fast32_t joydead = items.opt_label_jd + 1;
constexpr uint_fast32_t mousesens = items.opt_label_ms + 1;
constexpr uint_fast32_t mouseoverrun = items.opt_label_mo + 1;
const auto &m = items.m;
for (unsigned i = 0; i <= 5; i++)
{
if (i < 5)
PlayerCfg.KeyboardSens[i] = m[keysens+i].value;
PlayerCfg.JoystickLinear[i] = m[joylin+i].value;
PlayerCfg.JoystickSpeed[i] = m[joyspd+i].value;
PlayerCfg.JoystickSens[i] = m[joysens+i].value;
PlayerCfg.JoystickDead[i] = m[joydead+i].value;
PlayerCfg.MouseSens[i] = m[mousesens+i].value;
PlayerCfg.MouseOverrun[i] = m[mouseoverrun+i].value;
}
@ -1126,6 +1143,66 @@ static void input_config_sensitivity()
PlayerCfg.MouseFSDead = m[mousefsdead].value;
}
static void input_config_joystick()
{
#define DXX_INPUT_SENSITIVITY(VERB,OPT,VAL) \
DXX_##VERB##_SLIDER(TXT_TURN_LR, opt_##OPT##_turn_lr, VAL[0], 0, 16) \
DXX_##VERB##_SLIDER(TXT_PITCH_UD, opt_##OPT##_pitch_ud, VAL[1], 0, 16) \
DXX_##VERB##_SLIDER(TXT_SLIDE_LR, opt_##OPT##_slide_lr, VAL[2], 0, 16) \
DXX_##VERB##_SLIDER(TXT_SLIDE_UD, opt_##OPT##_slide_ud, VAL[3], 0, 16) \
DXX_##VERB##_SLIDER(TXT_BANK_LR, opt_##OPT##_bank_lr, VAL[4], 0, 16) \
#define DXX_INPUT_THROTTLE_SENSITIVITY(VERB,OPT,VAL) \
DXX_INPUT_SENSITIVITY(VERB,OPT,VAL) \
DXX_##VERB##_SLIDER(TXT_THROTTLE, opt_##OPT##_throttle, VAL[5], 0, 16) \
#define DXX_INPUT_CONFIG_MENU(VERB) \
DXX_##VERB##_TEXT("Joystick Sensitivity:", opt_label_js) \
DXX_INPUT_THROTTLE_SENSITIVITY(VERB,js,PlayerCfg.JoystickSens) \
DXX_##VERB##_TEXT("", opt_label_blank_js) \
DXX_##VERB##_TEXT("Joystick Linearity:", opt_label_jl) \
DXX_INPUT_THROTTLE_SENSITIVITY(VERB,jl,PlayerCfg.JoystickLinear) \
DXX_##VERB##_TEXT("", opt_label_blank_jl) \
DXX_##VERB##_TEXT("Joystick Linear Speed:", opt_label_jp) \
DXX_INPUT_THROTTLE_SENSITIVITY(VERB,jp,PlayerCfg.JoystickSpeed) \
DXX_##VERB##_TEXT("", opt_label_blank_jp) \
DXX_##VERB##_TEXT("Joystick Deadzone:", opt_label_jd) \
DXX_INPUT_THROTTLE_SENSITIVITY(VERB,jd,PlayerCfg.JoystickDead) \
class menu_items
{
public:
enum
{
DXX_INPUT_CONFIG_MENU(ENUM)
};
array<newmenu_item, DXX_INPUT_CONFIG_MENU(COUNT)> m;
menu_items()
{
DXX_INPUT_CONFIG_MENU(ADD);
}
};
#undef DXX_INPUT_CONFIG_MENU
#undef DXX_INPUT_THROTTLE_SENSITIVITY
#undef DXX_INPUT_SENSITIVITY
menu_items items;
newmenu_do1(nullptr, "Joystick Calibration", items.m.size(), items.m.data(), unused_newmenu_subfunction, unused_newmenu_userdata, 1);
constexpr uint_fast32_t joysens = items.opt_label_js + 1;
constexpr uint_fast32_t joylin = items.opt_label_jl + 1;
constexpr uint_fast32_t joyspd = items.opt_label_jp + 1;
constexpr uint_fast32_t joydead = items.opt_label_jd + 1;
const auto &m = items.m;
for (unsigned i = 0; i <= 5; i++)
{
PlayerCfg.JoystickLinear[i] = m[joylin+i].value;
PlayerCfg.JoystickSpeed[i] = m[joyspd+i].value;
PlayerCfg.JoystickSens[i] = m[joysens+i].value;
PlayerCfg.JoystickDead[i] = m[joydead+i].value;
}
}
namespace {
class input_config_menu_items
@ -1143,7 +1220,9 @@ class input_config_menu_items
DXX_##VERB##_RADIO("Normal", opt_mouse_control_normal, PlayerCfg.MouseFlightSim == 0, optgrp_mouse_control_type) \
DXX_##VERB##_RADIO("FlightSim", opt_mouse_control_flightsim, PlayerCfg.MouseFlightSim == 1, optgrp_mouse_control_type) \
DXX_##VERB##_TEXT("", opt_label_blank_mouse_control_type) \
DXX_##VERB##_MENU("SENSITIVITY & DEADZONE", opt_ic_joymousesens) \
DXX_##VERB##_MENU("Keyboard Calibration", opt_ic_keyboard) \
DXX_##VERB##_MENU("Mouse Calibration", opt_ic_mouse) \
DXX_##VERB##_MENU("Joysick Calibration", opt_ic_joystick) \
DXX_##VERB##_TEXT("", opt_label_blank_sensitivity_deadzone) \
DXX_##VERB##_CHECK("Keep Keyboard/Mouse focus", opt_ic_grabinput, CGameCfg.Grabinput) \
DXX_##VERB##_CHECK("Mouse FlightSim Indicator", opt_ic_mousefsgauge, PlayerCfg.MouseFSIndicator) \
@ -1217,8 +1296,12 @@ int input_config_menu_items::menuset(newmenu *, const d_event &event, input_conf
kconfig(2, "MOUSE");
if (citem == opt_ic_confweap)
kconfig(3, "WEAPON KEYS");
if (citem == opt_ic_joymousesens)
input_config_sensitivity();
if (citem == opt_ic_keyboard)
input_config_keyboard();
if (citem == opt_ic_mouse)
input_config_mouse();
if (citem == opt_ic_joystick)
input_config_joystick();
if (citem == opt_ic_help0)
show_help();
if (citem == opt_ic_help1)