iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

- update shadow's driver

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

Former-commit-id: f4939cf74d73b87d372c73447fbc413b9283ae91
Former-commit-id: 64c2cfc0b605a42c4912d3b0418cb7a975d39c01
This commit is contained in:
torcs-ng 2015-10-26 01:01:44 +00:00
parent 8ac9ebcc7c
commit 6d7b38b45f
3 changed files with 38 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/drivers/shadow/src/CarModel.cpp
View file

@ -63,9 +63,7 @@ CarModel::CarModel()
WIDTH(2),
HASTYC(false),
TYRECONDITIONFRONT(0),
TYRECONDITIONREAR(0),
TYRETREADDEPTHFRONT(0),
TYRETREADDEPTHREAR(0)
TYRECONDITIONREAR(0)
{
}
@ -138,7 +136,7 @@ double CarModel::CalcMaxSpeed(double k, double k1, double kz, double kFriction,
double TcR = TYRECONDITIONREAR;
MuF = TcF * MuF;
MuR = TcR * MuR;
Mu = MIN(MuF, MuR) / SKILL;
Mu = MIN(MuF, MuR); // SKILL;
}
else
Mu = MIN(MuF, MuR); // oTmpCarParam->oSkill;
@ -261,7 +259,7 @@ double CarModel::CalcBreaking(double k0, double kz0, double k1, double kz1, doub
double TcR = TYRECONDITIONREAR;
MU_F = TcF * MU_F;
MU_R = TcR * MU_R;
MU = MIN(MU_F, MU_R) / SKILL;
MU = MIN(MU_F, MU_R); // SKILL;
}
else
MU = MIN(MU_F, MU_R); // oTmpCarParam->oSkill;

2
src/drivers/shadow/src/CarModel.h
View file

@ -72,8 +72,6 @@ public:
bool HASTYC;
double TYRECONDITIONFRONT;
double TYRECONDITIONREAR;
double TYRETREADDEPTHFRONT;
double TYRETREADDEPTHREAR;
};
#endif

74
src/drivers/shadow/src/Driver.cpp
View file

@ -694,8 +694,7 @@ void TDriver::NewRace( tCarElt* pCar, tSituation* pS )
m_cm.HASTYC = true;
m_cm.TYRECONDITIONFRONT = TyreConditionFront();
m_cm.TYRECONDITIONREAR = TyreConditionRear();
m_cm.TYRETREADDEPTHFRONT = TyreTreadDepthFront();
m_cm.TYRETREADDEPTHREAR = TyreTreadDepthRear();
LogSHADOW.debug("Tyre Front = %d - Tyre Rear = %d\n", m_cm.TYRECONDITIONFRONT, m_cm.TYRECONDITIONREAR);
}
else
m_cm.HASTYC = false;
@ -1518,24 +1517,21 @@ void TDriver::Drive( tSituation* s )
double carFuel = car->_fuel;
if( fabs(m_cm.FUEL - carFuel) > 5 || fabs(m_cm.DAMAGE - car->_dammage) > 250 )
if(HasTYC)
{
m_cm.TYRECONDITIONFRONT = TyreConditionFront();
m_cm.TYRECONDITIONREAR = TyreConditionRear();
LogSHADOW.debug("Tyre Front = %3f - Tyre Rear = %3f\n", m_cm.TYRECONDITIONFRONT, m_cm.TYRECONDITIONREAR);
m_cm2.TYRECONDITIONFRONT = TyreConditionFront();
m_cm2.TYRECONDITIONREAR = TyreConditionRear();
}
if((fabs(m_cm.FUEL - carFuel) > 5) || (fabs(m_cm.DAMAGE - car->_dammage) > 250))
{
m_cm.FUEL = 5 * floor(carFuel / 5);
m_cm.DAMAGE = car->_dammage;
if(HasTYC)
{
m_cm.TYRECONDITIONFRONT = TyreConditionFront();
m_cm.TYRECONDITIONREAR = TyreConditionRear();
m_cm.TYRETREADDEPTHFRONT = TyreTreadDepthFront();
m_cm.TYRETREADDEPTHREAR = TyreTreadDepthRear();
m_cm2.TYRECONDITIONFRONT = TyreConditionFront();
m_cm2.TYRECONDITIONREAR = TyreConditionRear();
m_cm2.TYRETREADDEPTHFRONT = TyreTreadDepthFront();
m_cm2.TYRETREADDEPTHREAR = TyreTreadDepthRear();
}
m_cm2.FUEL = m_cm.FUEL;
m_cm2.DAMAGE = m_cm.DAMAGE;
@ -3504,27 +3500,27 @@ bool TDriver::CheckPitSharing()
}
}
double TDriver::TyreConditionFront()
{
return MIN(car->_tyreCondition(0), car->_tyreCondition(1));
}
double TDriver::TyreConditionRear()
{
return MIN(car->_tyreCondition(2), car->_tyreCondition(3));
}
double TDriver::TyreTreadDepthFront()
{
double Right = (car->_tyreTreadDepth(0) - car->_tyreCritTreadDepth(0));
double Left = (car->_tyreTreadDepth(1) - car->_tyreCritTreadDepth(1));
return 100 * MIN(Right, Left);
}
double TDriver::TyreTreadDepthRear()
{
double Right = (car->_tyreTreadDepth(2) - car->_tyreCritTreadDepth(2));
double Left = (car->_tyreTreadDepth(3) - car->_tyreCritTreadDepth(3));
return 100 * MIN(Right, Left);
}
double TDriver::TyreConditionFront()
{
return MIN(car->_tyreCondition(0), car->_tyreCondition(1));
}
double TDriver::TyreConditionRear()
{
return MIN(car->_tyreCondition(2), car->_tyreCondition(3));
}
double TDriver::TyreTreadDepthFront()
{
double Right = (car->_tyreTreadDepth(0) - car->_tyreCritTreadDepth(0));
double Left = (car->_tyreTreadDepth(1) - car->_tyreCritTreadDepth(1));
return 100 * MIN(Right, Left);
}
double TDriver::TyreTreadDepthRear()
{
double Right = (car->_tyreTreadDepth(2) - car->_tyreCritTreadDepth(2));
double Left = (car->_tyreTreadDepth(3) - car->_tyreCritTreadDepth(3));
return 100 * MIN(Right, Left);
}