mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-22 15:09:19 +02:00
maintenance: removed deprecated vehicle control code
This commit is contained in:
1
Train.h
1
Train.h
@@ -82,7 +82,6 @@ class TTrain
|
|||||||
TTrain();
|
TTrain();
|
||||||
// McZapkie-010302
|
// McZapkie-010302
|
||||||
bool Init(TDynamicObject *NewDynamicObject, bool e3d = false);
|
bool Init(TDynamicObject *NewDynamicObject, bool e3d = false);
|
||||||
void OnKeyDown(int cKey);
|
|
||||||
|
|
||||||
inline vector3 GetDirection() { return DynamicObject->VectorFront(); };
|
inline vector3 GetDirection() { return DynamicObject->VectorFront(); };
|
||||||
inline vector3 GetUp() { return DynamicObject->VectorUp(); };
|
inline vector3 GetUp() { return DynamicObject->VectorUp(); };
|
||||||
|
|||||||
138
World.cpp
138
World.cpp
@@ -230,15 +230,6 @@ bool TWorld::Init( GLFWwindow *Window ) {
|
|||||||
"ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others\n" );
|
"ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others\n" );
|
||||||
|
|
||||||
UILayer.set_background( "logo" );
|
UILayer.set_background( "logo" );
|
||||||
#ifdef EU07_USE_OLD_SOUNDCODE
|
|
||||||
if( true == TSoundsManager::Init( glfwGetWin32Window( window ) ) ) {
|
|
||||||
WriteLog( "Sound subsystem setup complete" );
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
ErrorLog( "Sound subsystem setup failed" );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii
|
glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii
|
||||||
UILayer.set_progress(0.01);
|
UILayer.set_progress(0.01);
|
||||||
UILayer.set_progress( "Loading scenery / Wczytywanie scenerii" );
|
UILayer.set_progress( "Loading scenery / Wczytywanie scenerii" );
|
||||||
@@ -643,103 +634,52 @@ void TWorld::OnKeyDown(int cKey) {
|
|||||||
if( Controlled->MoverParameters->Radio )
|
if( Controlled->MoverParameters->Radio )
|
||||||
simulation::Region->RadioStop( Camera.Pos );
|
simulation::Region->RadioStop( Camera.Pos );
|
||||||
}
|
}
|
||||||
else if (!Global::iPause) //podczas pauzy sterownaie nie działa
|
|
||||||
if (Train)
|
|
||||||
if (Controlled)
|
|
||||||
if( ( Controlled->Controller == Humandriver )
|
|
||||||
|| ( true == DebugModeFlag ) ) {
|
|
||||||
Train->OnKeyDown( cKey ); // przekazanie klawisza do kabiny
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FreeFlyModeFlag) // aby nie odluźniało wagonu za lokomotywą
|
|
||||||
{ // operacje wykonywane na dowolnym pojeździe, przeniesione tu z kabiny
|
|
||||||
// NOTE: disabled so it doesn't interfere with new system controls in outside view
|
|
||||||
// TODO: implement as part of the new system
|
|
||||||
#ifdef EU07_USE_OLD_COMMAND_SYSTEM
|
|
||||||
if (cKey == Global::Keys[k_Releaser]) // odluźniacz
|
|
||||||
{ // działa globalnie, sprawdzić zasięg
|
|
||||||
TDynamicObject *temp{ std::get<TDynamicObject *>( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) };
|
|
||||||
if( temp ) {
|
|
||||||
if( Global::ctrlState ) // z ctrl odcinanie {
|
|
||||||
temp->MoverParameters->Hamulec->SetBrakeStatus( temp->MoverParameters->Hamulec->GetBrakeStatus() ^ b_dmg );
|
|
||||||
}
|
|
||||||
else {
|
else {
|
||||||
temp->MoverParameters->BrakeReleaser( 1 );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy
|
|
||||||
{ // zmiana próżny/ładowny; Ra: zabrane z kabiny
|
|
||||||
auto *vehicle { std::get<TDynamicObject *>( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) };
|
|
||||||
if (vehicle)
|
|
||||||
{
|
|
||||||
if (Global::shiftState ? vehicle->MoverParameters->IncBrakeMult() :
|
|
||||||
vehicle->MoverParameters->DecBrakeMult())
|
|
||||||
if (Train)
|
|
||||||
{ // dźwięk oczywiście jest w kabinie
|
|
||||||
Train->dsbSwitch.play();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (cKey == Global::Keys[k_EndSign]) {
|
|
||||||
// Ra 2014-07: zabrane z kabiny
|
|
||||||
auto *vehicle { std::get<TDynamicObject *>( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, true ) ) };
|
|
||||||
|
|
||||||
if( vehicle == nullptr ) { return; }
|
if( ( true == DebugModeFlag )
|
||||||
|
&& ( false == Global::shiftState )
|
||||||
|
&& ( true == Global::ctrlState )
|
||||||
|
&& ( Controlled != nullptr )
|
||||||
|
&& ( Controlled->Controller == Humandriver ) ) {
|
||||||
|
|
||||||
int const CouplNr {
|
if( DebugModeFlag ) {
|
||||||
clamp(
|
// przesuwanie składu o 100m
|
||||||
vehicle->DirectionGet()
|
TDynamicObject *d = Controlled;
|
||||||
* ( LengthSquared3( vehicle->HeadPosition() - Camera.Pos ) > LengthSquared3( vehicle->RearPosition() - Camera.Pos ) ?
|
if( cKey == GLFW_KEY_LEFT_BRACKET ) {
|
||||||
1 :
|
while( d ) {
|
||||||
-1 ),
|
d->Move( 100.0 * d->DirectionGet() );
|
||||||
0, 1 ) }; // z [-1,1] zrobić [0,1]
|
d = d->Next(); // pozostałe też
|
||||||
int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę tapety pulpitu :/
|
}
|
||||||
if (Global::shiftState) // z [Shift] zapalanie
|
d = Controlled->Prev();
|
||||||
set = mask = light::rearendsignals; // bez [Ctrl] założyć tabliczki
|
while( d ) {
|
||||||
else if (Global::ctrlState)
|
d->Move( 100.0 * d->DirectionGet() );
|
||||||
set = mask = ( light::redmarker_left | light::redmarker_right ); // z [Ctrl] zapalić światła czerwone
|
d = d->Prev(); // w drugą stronę też
|
||||||
else
|
}
|
||||||
mask = ( light::rearendsignals | light::redmarker_left | light::redmarker_right ); // wyłączanie ściąga wszystko
|
}
|
||||||
if (((vehicle->iLights[CouplNr]) & mask) != set)
|
else if( cKey == GLFW_KEY_RIGHT_BRACKET ) {
|
||||||
{
|
while( d ) {
|
||||||
vehicle->iLights[CouplNr] = (vehicle->iLights[CouplNr] & ~mask) | set;
|
d->Move( -100.0 * d->DirectionGet() );
|
||||||
if (Train)
|
d = d->Next(); // pozostałe też
|
||||||
{ // Ra: ten dźwięk z kabiny to przegięcie, ale na razie zostawiam
|
}
|
||||||
Train->dsbSwitch.play();
|
d = Controlled->Prev();
|
||||||
|
while( d ) {
|
||||||
|
d->Move( -100.0 * d->DirectionGet() );
|
||||||
|
d = d->Prev(); // w drugą stronę też
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if( cKey == GLFW_KEY_TAB ) {
|
||||||
|
while( d ) {
|
||||||
|
d->MoverParameters->V += d->DirectionGet()*2.78;
|
||||||
|
d = d->Next(); // pozostałe też
|
||||||
|
}
|
||||||
|
d = Controlled->Prev();
|
||||||
|
while( d ) {
|
||||||
|
d->MoverParameters->V += d->DirectionGet()*2.78;
|
||||||
|
d = d->Prev(); // w drugą stronę też
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (cKey == Global::Keys[k_IncLocalBrakeLevel])
|
|
||||||
{ // zahamowanie dowolnego pojazdu
|
|
||||||
auto *vehicle { std::get<TDynamicObject *>( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) };
|
|
||||||
if (vehicle)
|
|
||||||
{
|
|
||||||
if( Global::ctrlState ) {
|
|
||||||
if( ( vehicle->MoverParameters->LocalBrake == ManualBrake )
|
|
||||||
|| ( vehicle->MoverParameters->MBrake == true ) )
|
|
||||||
vehicle->MoverParameters->IncManualBrakeLevel( 1 );
|
|
||||||
}
|
}
|
||||||
else if( vehicle->MoverParameters->LocalBrake != ManualBrake ) {
|
|
||||||
vehicle->MoverParameters->IncLocalBrakeLevelFAST();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (cKey == Global::Keys[k_DecLocalBrakeLevel])
|
|
||||||
{ // odhamowanie dowolnego pojazdu
|
|
||||||
auto *vehicle { std::get<TDynamicObject *>( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) };
|
|
||||||
if (vehicle)
|
|
||||||
{
|
|
||||||
if( Global::ctrlState ) {
|
|
||||||
if( ( vehicle->MoverParameters->LocalBrake == ManualBrake )
|
|
||||||
|| ( vehicle->MoverParameters->MBrake == true ) )
|
|
||||||
vehicle->MoverParameters->DecManualBrakeLevel( 1 );
|
|
||||||
}
|
|
||||||
else if( vehicle->MoverParameters->LocalBrake != ManualBrake ) {
|
|
||||||
vehicle->MoverParameters->DecLocalBrakeLevelFAST();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user