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@6039 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 6f92f1e05f13a304d2ab9eeb48e740f442f15516
Former-commit-id: f4c971fdacf58409afaee5e03cad42a086e1384d
This commit is contained in:
torcs-ng 2015-07-06 02:02:08 +00:00
parent 6a1eb0f26d
commit 17d5058ddb
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -193,7 +193,9 @@ TDriver::TDriver(int Index, const int robot_type):
m_FuelNeeded(0), m_FuelNeeded(0),
m_Strategy(NULL) m_Strategy(NULL),
m_raceType(0)
{ {
INDEX = Index; INDEX = Index;
@ -445,6 +447,8 @@ void TDriver::InitTrack( tTrack* pTrack, void* pCarHandle, void** ppCarParmHandl
// //
const char* raceType[] = { "practice", "qualify", "race" }; const char* raceType[] = { "practice", "qualify", "race" };
m_raceType = pS->_raceType;
LogSHADOW.info("#RaceType = %d\n", m_raceType);
m_WeatherCode = GetWeather(); m_WeatherCode = GetWeather();
@ -461,15 +465,20 @@ void TDriver::InitTrack( tTrack* pTrack, void* pCarHandle, void** ppCarParmHandl
// ok, lets read/merge the car parms. // ok, lets read/merge the car parms.
// //
Meteorology();
// default params for car type (e.g. clkdtm) // default params for car type (e.g. clkdtm)
snprintf( buf, BUFSIZE, "drivers/%s/%s/%s.xml", robot_name, m_CarType, trackName ); snprintf( buf, BUFSIZE, "drivers/%s/%s/%s.xml", robot_name, m_CarType, trackName );
LogSHADOW.info("#Override params for car type with params of track: %s\n", buf); LogSHADOW.info("#Override params for car type with params of track: %s\n", buf);
hCarParm = MergeParamFile(hCarParm, buf); hCarParm = MergeParamFile(hCarParm, buf);
if (m_Rain)
{
// Override params for car type with params of track and weather // Override params for car type with params of track and weather
snprintf(buf, BUFSIZE, "drivers/%s/%s/%s-%d.xml", robot_name, m_CarType, trackName, m_WeatherCode); snprintf(buf, BUFSIZE, "drivers/%s/%s/%s-%d.xml", robot_name, m_CarType, trackName, m_WeatherCode);
LogSHADOW.info("#Override params for car type with params of track and weather: %s\n", buf); LogSHADOW.info("#Override params for car type with params of track and weather: %s\n", buf);
hCarParm = MergeParamFile(hCarParm, buf); hCarParm = MergeParamFile(hCarParm, buf);
}
// override params for car type on track of specific race type. // override params for car type on track of specific race type.
snprintf( buf, sizeof(buf), "drivers/%s/%s/track-%s-%s.xml", robot_name, m_CarType, trackName, raceType[pS->_raceType] ); snprintf( buf, sizeof(buf), "drivers/%s/%s/track-%s-%s.xml", robot_name, m_CarType, trackName, raceType[pS->_raceType] );
@ -487,16 +496,17 @@ void TDriver::InitTrack( tTrack* pTrack, void* pCarHandle, void** ppCarParmHandl
m_cm.AERO = (int)GfParmGetNum(hCarParm, SECT_PRIV, PRV_AERO_MOD, 0, 0); m_cm.AERO = (int)GfParmGetNum(hCarParm, SECT_PRIV, PRV_AERO_MOD, 0, 0);
m_cm.MU_SCALE = GfParmGetNum(hCarParm, SECT_PRIV, PRV_MU_SCALE, NULL, 0.9f); m_cm.MU_SCALE = GfParmGetNum(hCarParm, SECT_PRIV, PRV_MU_SCALE, NULL, 0.9f);
if (raceType[pS->_raceType] == "qualify") if (m_raceType == 1)
{
m_cm.MU_SCALE = m_cm.MU_SCALE + 0.02; m_cm.MU_SCALE = m_cm.MU_SCALE + 0.02;
LogSHADOW.info("#Scale Mu Qualification\n");
}
m_cm.KZ_SCALE = GfParmGetNum(hCarParm, SECT_PRIV, PRV_KZ_SCALE, NULL, 0.43f); m_cm.KZ_SCALE = GfParmGetNum(hCarParm, SECT_PRIV, PRV_KZ_SCALE, NULL, 0.43f);
m_cm.BUMP_FACTOR = GfParmGetNum(hCarParm, SECT_PRIV, PRV_BUMP_FACTOR, NULL, 1.0); m_cm.BUMP_FACTOR = GfParmGetNum(hCarParm, SECT_PRIV, PRV_BUMP_FACTOR, NULL, 1.0);
m_cm.NEEDSINLONG = GfParmGetNum(hCarParm, SECT_PRIV, PRV_NEED_SIN, NULL, 0); m_cm.NEEDSINLONG = GfParmGetNum(hCarParm, SECT_PRIV, PRV_NEED_SIN, NULL, 0);
m_cm.USEDACCEXIT = GfParmGetNum(hCarParm, SECT_PRIV, PRV_USED_ACC, NULL, 0); m_cm.USEDACCEXIT = GfParmGetNum(hCarParm, SECT_PRIV, PRV_USED_ACC, NULL, 0);
Meteorology();
FACTORS.RemoveAll(); FACTORS.RemoveAll();
for( int i = 0; ; i++ ) for( int i = 0; ; i++ )

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

@ -458,6 +458,8 @@ private:
double DecelAdjustTarget; // double DecelAdjustTarget; //
double DecelAdjustPerc; // double DecelAdjustPerc; //
int m_raceType;
unsigned int RandomSeed; // seed of generator unsigned int RandomSeed; // seed of generator
double CA; double CA;