speed-dreams/speed-dreams-code
6
1
Fork 2
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity Actions 2

Update simplix_mpa1

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

Former-commit-id: c301965ee430ae2f490e63ac6a852062a10f430c
Former-commit-id: c2ddc1f38cf99758fbc3520bf55f7d4582184668
This commit is contained in:
wdbee 2013-07-11 14:59:26 +00:00
parent eed3386ca7
commit 073d7ec0fb
4 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -564,12 +564,14 @@ void TDriver::AdjustDriving(
Param.oCarParam.oScaleBump;
Param.oCarParam.oScaleBumpRight =
Param.oCarParam.oScaleBump;
LogSimplix.debug("#Scale Bump: %g\n",Param.oCarParam.oScaleBump);
LogSimplix.error("#-------------------------------------------\n");
LogSimplix.error("#Scale Bump: %g\n",Param.oCarParam.oScaleBump);
Param.oCarParam.oScaleBumpOuter =
GfParmGetNum(Handle,TDriver::SECT_PRIV,PRV_SCALE_BUMPOUTER,NULL,
(float) Param.oCarParam.oScaleBump);
LogSimplix.debug("#Scale Bump Outer: %g\n",Param.oCarParam.oScaleBumpOuter);
LogSimplix.error("#Scale Bump Outer: %g\n",Param.oCarParam.oScaleBumpOuter);
LogSimplix.error("#-------------------------------------------\n");
Param.oCarParam.oLimitSideUse =
GfParmGetNum(Handle,TDriver::SECT_PRIV,PRV_LIMIT_SIDE_USE,NULL,
@ -850,7 +852,7 @@ void TDriver::AdjustPitting(PCarHandle Handle)
LogSimplix.debug("#oExitLong %g\n",Param.Pit.oExitLong);
Param.Pit.oExitLength =
GfParmGetNum(Handle,TDriver::SECT_PRIV,PRV_PIT_EXIT_LEN,0,0);
-GfParmGetNum(Handle,TDriver::SECT_PRIV,PRV_PIT_EXIT_LEN,0,0);
LogSimplix.debug("#oExitLength %g\n",Param.Pit.oExitLength);
Param.Pit.oLatOffset =
@ -1213,7 +1215,7 @@ void TDriver::InitTrack
// Get the private parameters now.
oBrakeRep = // Bremsdruckverteilung
GfParmGetNum(Handle, (char*) SECT_BRKSYST,
PRM_BRKREP, (char*)NULL, 0.6);
PRM_BRKREP, (char*)NULL, 0.6f);
float Press =
GfParmGetNum(Handle, (char*) SECT_BRKSYST,
@ -2727,9 +2729,13 @@ void TDriver::GetLanePoint(int Path, double Pos, TLanePoint& LanePoint)
{
//LogSimplix.debug("+");
oStrategy->oPit->oPitLane[Path].GetLanePoint(Pos, LanePoint);
oLookScale = 0.05;
// oLookScale = 0.05;
// oOmegaScale = 0.2;
// oLookBase = Param.Fix.oLength / 4;
// oOmegaBase = Param.Fix.oLength / 2;
oLookScale = 0.02;
oOmegaScale = 0.2;
oLookBase = Param.Fix.oLength / 4;
oLookBase = Param.Fix.oLength / 10;
oOmegaBase = Param.Fix.oLength / 2;
oGoToPit = true;
}

2
src/drivers/simplix/src/unitfixcarparam.cpp
View file

@ -339,7 +339,7 @@ double TFixCarParam::CalcBrakingPit
double Acc = CarParam.oScaleBrakePit * Ftanroad
/ oTmpCarParam->oMass;
if (TDriver::UseBrakeLimit)
//if (TDriver::UseBrakeLimit)
{
double Radius = 1.0 / fabs(Crv);
double factor = MIN(1.0,MAX(0.39, (Radius - 190.0) / 100.0));

5
src/drivers/simplix/src/unitlane.cpp
View file

@ -578,7 +578,7 @@ void TLane::PropagatePitBreaking
{
/*const float base = 0.5f; */
int Step = 1;
int L = 30;
int L = 10;
const int N = oTrack->Count();
const int M = Step * ((Len - 1) / Step);
@ -604,7 +604,7 @@ void TLane::PropagatePitBreaking
double Factor = MIN(1.0,fabs(oPathPoints[Q].Dist() - PitStopPos) / oFixCarParam.oPitBrakeDist);
double Friction = oTrack->Friction(P) * (Factor * ScaleMu + (1 - Factor) * oCarParam.oScaleBrakePit * ScaleMu);
if (L)
Friction *= 0.9;
Friction *= 0.5;
//LogSimplix.debug("F %g: %g/%g )",Factor,oTrack->Friction(P),Friction);
//LogSimplix.debug("SQ %g )",oPathPoints[Q].Speed);
@ -632,6 +632,7 @@ void TLane::PropagatePitBreaking
if (oPathPoints[P].Speed > U)
oPathPoints[P].Speed = oPathPoints[P].AccSpd = U;
if (!L)
if (oPathPoints[P].FlyHeight > 0.1)
oPathPoints[P].Speed = oPathPoints[Q].Speed;

6
src/drivers/simplix/src/unitpit.cpp
View file

@ -369,7 +369,7 @@ void TPitLane::MakePath
// braking parameters. The simplix allows a manual fine tuning using some
// additional parameters.
oStoppingDist = Param.Pit.oStoppingDist; // Distance to brake
oPitStopOffset = Param.Pit.oLongOffset; // Offset for fine tuning
oPitStopOffset = -Param.Pit.oLongOffset; // Offset for fine tuning
oCarParam.oScaleBrake = // Limit brake to be used
MAX(0.10f,CarParam.oScaleBrake); // in pitlane
oCarParam.oScaleMu = // Scale friction estimation
@ -932,7 +932,7 @@ void TPitLane::MakePath
// Section at pit stop
oStopIdx = Idx0 = oTrack->IndexFromPos(StopPos);
/*
// Set speed to restart faster or at Aalborg
for (I = 0; I < 15; I++)
{
@ -941,7 +941,7 @@ void TPitLane::MakePath
oPathPoints[Idx0].Speed =
PitInfo->speedLimit - 0.5;
}
*/
// This is where we stop in track coordinates
oPitStopPos = oPathPoints[oStopIdx].Dist();