speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests Projects Releases 1 Packages Wiki Activity Actions 5

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@2008 30fe4595-0a0c-4342-8851-515496e4dcbd

Browse source 
Former-commit-id: 243618b0df1f9723b1515543ddb2c4e7c004649d
Former-commit-id: db433ed92415c5b9718653646d59e90dc8f59767
This commit is contained in:
wdbee 2009-12-19 09:19:51 +00:00
parent b2583eff05
commit 7cb8d99f5d
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/drivers/simplix/src/unitdriver.cpp
View file

@ -9,7 +9,7 @@
//
// File : unitdriver.cpp
// Created : 2007.11.25
// Last changed : 2009.12.12
// Last changed : 2009.12.16
// Copyright : © 2007-2009 Wolf-Dieter Beelitz
// eMail : wdb@wdbee.de
// Version : 2.00.000
@ -1169,7 +1169,7 @@ void TDriver::Drive()
// GfOut("t:%.2f s v:(%.1f)%.1f km/h A:%.3f C:%.3f G:%d R:%.1f H:%.3f\n",CurrSimTime,oTargetSpeed*3.6,oCurrSpeed*3.6,oAccel,oClutch,oGear,1/oLanePoint.Crv,CalcHairpin_simplix_36GP(fabs(oLanePoint.Crv)));
//else
// GfOut("t:%.2f s v:(%.1f)%.1f km/h A:%.3f C:%.3f G:%d R:%.1f F:%.3f\n",CurrSimTime,oTargetSpeed*3.6,oCurrSpeed*3.6,oAccel,oClutch,oGear,1/oLanePoint.Crv,CalcCrv_simplix_36GP(fabs(oLanePoint.Crv)));
//GfOut("v:(%.1f)%.1f km/h RA:%.3f RAD:%.1f H:%.3f\n",oTargetSpeed*3.6,oCurrSpeed*3.6,1/oLanePoint.Crv,1/(oLanePoint.Crv*CalcCrv_simplix_SC(fabs(oLanePoint.Crv))),1/(oLanePoint.Crv*CalcHairpin_simplix_SC(fabs(oLanePoint.Crv))));
//GfOut("v:(%.1f)%.1f km/h R:%.3f\n",oTargetSpeed*3.6,oCurrSpeed*3.6,1/oLanePoint.Crv);
}
//==========================================================================*
@ -3273,6 +3273,18 @@ double TDriver::CalcHairpin(double Crv)
//--------------------------------------------------------------------------*
double TDriver::CalcCrv_simplix(double Crv)
{
double Offset = 800;
if (oCrvComp)
{
if (Crv < 0.01)
return 1.0;
else
return ((1+Crv) * (200 + Offset)/(1/Crv + Offset));
}
else
return 1.0;
/*
if (oCrvComp)
{
if (Crv < 0.0025)
@ -3282,6 +3294,7 @@ double TDriver::CalcCrv_simplix(double Crv)
}
else
return 1.0;
*/
}
//==========================================================================*