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

display drag instead of track adhesion in debug window

Browse Source
This commit is contained in:
milek7
2019-10-06 14:41:24 +02:00
parent 8c36751540
commit 582c079d97
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
McZapkie/MOVER.h
View File

@@ -1583,7 +1583,7 @@ public:
void ComputeTotalForce(double dt); void ComputeTotalForce(double dt);
double Adhesive(double staticfriction) const; double Adhesive(double staticfriction) const;
double TractionForce(double dt); double TractionForce(double dt);
double FrictionForce(double R, int TDamage); double FrictionForce() const;
double BrakeForceR(double ratio, double velocity); double BrakeForceR(double ratio, double velocity);
double BrakeForceP(double press, double velocity); double BrakeForceP(double press, double velocity);
double BrakeForce(const TTrackParam &Track); double BrakeForce(const TTrackParam &Track);

4
McZapkie/Mover.cpp
View File

@@ -4407,7 +4407,7 @@ void TMoverParameters::ComputeTotalForce(double dt) {
if( false == PhysicActivation ) { return; } if( false == PhysicActivation ) { return; }
// juz zoptymalizowane: // juz zoptymalizowane:
FStand = FrictionForce(RunningShape.R, RunningTrack.DamageFlag); // siła oporów ruchu FStand = FrictionForce(); // siła oporów ruchu
if( true == TestFlag( DamageFlag, dtrain_out ) ) { if( true == TestFlag( DamageFlag, dtrain_out ) ) {
// HACK: crude way to reduce speed after derailment // HACK: crude way to reduce speed after derailment
// TBD, TODO: more accurate approach? // TBD, TODO: more accurate approach?
@@ -4624,7 +4624,7 @@ double TMoverParameters::BrakeForce( TTrackParam const &Track ) {
// Q: 20160713 // Q: 20160713
// Obliczanie siły tarcia // Obliczanie siły tarcia
// ************************************************************************************************* // *************************************************************************************************
double TMoverParameters::FrictionForce(double R, int TDamage) double TMoverParameters::FrictionForce() const
{ {
double FF = 0; double FF = 0;
// ABu 240205: chyba juz ekstremalnie zoptymalizowana funkcja liczaca sily tarcia // ABu 240205: chyba juz ekstremalnie zoptymalizowana funkcja liczaca sily tarcia

4
driveruipanels.cpp
View File

@@ -692,11 +692,11 @@ debug_panel::update_section_vehicle( std::vector<text_line> &Output ) {
std::snprintf( std::snprintf(
m_buffer.data(), m_buffer.size(), m_buffer.data(), m_buffer.size(),
STR_C("Forces:\n tractive: %.1f, brake: %.1f, friction: %.2f%s\nAcceleration:\n tangential: %.2f, normal: %.2f (path radius: %s)\nVelocity: %.2f, distance traveled: %.2f\nPosition: [%.2f, %.2f, %.2f]"), STR_C("Forces:\n tractive: %.1f, brake: %.1f, drag: %.2f%s\nAcceleration:\n tangential: %.2f, normal: %.2f (path radius: %s)\nVelocity: %.2f, distance traveled: %.2f\nPosition: [%.2f, %.2f, %.2f]"),
// forces // forces
mover.Ft * 0.001f * ( mover.ActiveCab ? mover.ActiveCab : vehicle.ctOwner ? vehicle.ctOwner->Controlling()->ActiveCab : 1 ) + 0.001f, mover.Ft * 0.001f * ( mover.ActiveCab ? mover.ActiveCab : vehicle.ctOwner ? vehicle.ctOwner->Controlling()->ActiveCab : 1 ) + 0.001f,
mover.Fb * 0.001f, mover.Fb * 0.001f,
mover.Adhesive( mover.RunningTrack.friction ), mover.FrictionForce() * 0.001f,
( mover.SlippingWheels ? " (!)" : "" ), ( mover.SlippingWheels ? " (!)" : "" ),
// acceleration // acceleration
mover.AccSVBased, mover.AccSVBased,