eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added volume switch and buttons for radio

Browse Source
This commit is contained in:
Królik Uszasty
2019-10-31 23:33:48 +01:00
parent b1237e7245
commit 7c4f2008e0
5 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Train.cpp
View File

@@ -350,6 +350,8 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = {
{ user_command::radiostopsend, &TTrain::OnCommand_radiostopsend },
{ user_command::radiostoptest, &TTrain::OnCommand_radiostoptest },
{ user_command::radiocall3send, &TTrain::OnCommand_radiocall3send },
{ user_command::radiovolumeincrease, &TTrain::OnCommand_radiovolumeincrease },
{ user_command::radiovolumedecrease, &TTrain::OnCommand_radiovolumedecrease },
{ user_command::cabchangeforward, &TTrain::OnCommand_cabchangeforward },
{ user_command::cabchangebackward, &TTrain::OnCommand_cabchangebackward },
{ user_command::generictoggle0, &TTrain::OnCommand_generictoggle },
@@ -527,6 +529,7 @@ dictionary_source *TTrain::GetTrainState() {
dict->insert( "pantpress", std::abs( mvControlled->PantPress ) );
dict->insert( "universal3", InstrumentLightActive );
dict->insert( "radio_channel", iRadioChannel );
dict->insert( "radio_volume", Global.RadioVolume );
dict->insert( "door_lock", mvOccupied->Doors.lock_enabled );
// movement data
dict->insert( "velocity", std::abs( mvOccupied->Vel ) );
@@ -5393,6 +5396,34 @@ void TTrain::OnCommand_radiocall3send( TTrain *Train, command_data const &Comman
}
}
void TTrain::OnCommand_radiovolumeincrease(TTrain *Train, command_data const &Command) {
if (Command.action == GLFW_PRESS) {
Global.RadioVolume = clamp(Global.RadioVolume + 0.125, 0.0, 1.0);
// visual feedback
Train->ggRadioVolumeSelector.UpdateValue(Global.RadioVolume);
Train->ggRadioVolumeNext.UpdateValue(1.0);
}
else if (Command.action == GLFW_RELEASE) {
// visual feedback
Train->ggRadioVolumeNext.UpdateValue(0.0);
}
}
void TTrain::OnCommand_radiovolumedecrease(TTrain *Train, command_data const &Command) {
if (Command.action == GLFW_PRESS) {
Global.RadioVolume = clamp(Global.RadioVolume - 0.125, 0.0, 1.0);
// visual feedback
Train->ggRadioVolumeSelector.UpdateValue(Global.RadioVolume);
Train->ggRadioVolumePrevious.UpdateValue(1.0);
}
else if (Command.action == GLFW_RELEASE) {
// visual feedback
Train->ggRadioVolumePrevious.UpdateValue(0.0);
}
}
void TTrain::OnCommand_cabchangeforward( TTrain *Train, command_data const &Command ) {
if( Command.action == GLFW_PRESS ) {
@@ -6559,6 +6590,9 @@ bool TTrain::Update( double const Deltatime )
ggRadioStop.Update();
ggRadioTest.Update();
ggRadioCall3.Update();
ggRadioVolumeSelector.Update();
ggRadioVolumePrevious.Update();
ggRadioVolumeNext.Update();
ggDepartureSignalButton.Update();
ggPantFrontButton.Update();
@@ -7834,6 +7868,9 @@ void TTrain::clear_cab_controls()
ggRadioStop.Clear();
ggRadioTest.Clear();
ggRadioCall3.Clear();
ggRadioVolumeSelector.Clear();
ggRadioVolumePrevious.Clear();
ggRadioVolumeNext.Clear();
ggDoorLeftPermitButton.Clear();
ggDoorRightPermitButton.Clear();
ggDoorPermitPresetButton.Clear();
@@ -8540,6 +8577,9 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con
{ "radiostop_sw:", ggRadioStop },
{ "radiotest_sw:", ggRadioTest },
{ "radiocall3_sw:", ggRadioCall3 },
{ "radiovolume_sw:", ggRadioVolumeSelector },
{ "radiovolumeprev_sw:", ggRadioVolumePrevious },
{ "radiovolumenext_sw:", ggRadioVolumeNext },
{ "pantfront_sw:", ggPantFrontButton },
{ "pantrear_sw:", ggPantRearButton },
{ "pantfrontoff_sw:", ggPantFrontButtonOff },