Update skilling
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@640 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: e581d9e501800e569a52d7bb0a803d13da3684f2 Former-commit-id: 76e1fd62f08cee4a0191f22ebb794fdfb56de31f
This commit is contained in:
parent
ac0a134e6f
commit
b9f39c51fd
6 changed files with 29 additions and 12 deletions
|
@ -137,7 +137,7 @@
|
|||
<attnum name="scale bump" min="0" max="1" val="0.34"/>
|
||||
<attnum name="scale bump outer" min="0" max="2" val="0.6"/>
|
||||
<attnum name="scale min mu" min="0.1" max="1.0" val="0.8"/>
|
||||
<attnum name="scale mu" min="0" max="2" val="0.78"/>
|
||||
<attnum name="scale mu" min="0" max="2" val="0.80"/>
|
||||
<attnum name="scale steer" min="0.1" max="2.0" val="1.0"/>
|
||||
<attnum name="stay together" min="10.0" max="2000.0" val="10"/>
|
||||
<attnum name="length margin" min="1.0" max="10.0" val="2.0"/>
|
||||
|
|
|
@ -23,7 +23,9 @@
|
|||
<attnum name="pit long offset" min="-5" max="5" val="0.0"/>
|
||||
<attnum name="pit scale brake" val="1.0"/>
|
||||
<attnum name="pit stop dist" val="1.5"/>
|
||||
<attnum name="offset skill" val="0.22"/>
|
||||
<attnum name="offset skill" val="0.24"/>
|
||||
<attnum name="scale skill" val="1.120"/>
|
||||
<attnum name="scale bump" min="0" max="1" val="0.01"/>
|
||||
<attnum name="scale bump outer" min="0" max="2" val="0.01"/>
|
||||
</section>
|
||||
</params>
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
<attnum name="pit long offset" min="-5" max="5" val="0.0"/>
|
||||
<attnum name="pit scale brake" val="1.0"/>
|
||||
<attnum name="pit stop dist" val="1.5"/>
|
||||
<attnum name="offset skill" val="0.35"/>
|
||||
<attnum name="offset skill" val="0.30"/>
|
||||
<attnum name="scale skill" val="1.0500"/>
|
||||
<attnum name="scale bump" min="0" max="1" val="0.01"/>
|
||||
<attnum name="scale bump outer" min="0" max="2" val="0.01"/>
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
<attnum name="pit stop dist" val="1.5"/>
|
||||
<attnum name="offset skill" val="0.00"/>
|
||||
<attnum name="scale skill" val="0.920"/>
|
||||
<attnum name="scale bump" min="0" max="1" val="0.01"/>
|
||||
<attnum name="scale bump outer" min="0" max="2" val="0.01"/>
|
||||
<attnum name="scale bump" min="0" max="1" val="0.1"/>
|
||||
<attnum name="scale bump outer" min="0" max="2" val="0.2"/>
|
||||
</section>
|
||||
</params>
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
<attnum name="pit long offset" min="-5" max="5" val="0.0"/>
|
||||
<attnum name="pit scale brake" val="1.0"/>
|
||||
<attnum name="pit stop dist" val="1.5"/>
|
||||
<attnum name="offset skill" val="0.08"/>
|
||||
<attnum name="offset skill" val="0.04"/>
|
||||
<attnum name="scale skill" val="1.200"/>
|
||||
</section>
|
||||
</params>
|
||||
|
|
|
@ -415,6 +415,8 @@ void TTrackDescription::InitTrack
|
|||
LastSegType = LastSeg->type; // reset
|
||||
|
||||
Seg = oSections[I].Seg; // Get torcs segment
|
||||
//if (strncmp(Seg->name,"180",3) == 0)
|
||||
// GfOut("%s\n",Seg->name);
|
||||
|
||||
double DistFromStart = // Distance from start
|
||||
oSections[I].DistFromStart; // of section
|
||||
|
@ -446,6 +448,7 @@ void TTrackDescription::InitTrack
|
|||
double ExtraW = 0; // Initialize add. width
|
||||
double ExtraWpit = 0; // Initialize add. width
|
||||
bool Done = false; // Reset flag
|
||||
bool PitOnly = false; // Reset flag
|
||||
while(PSide) // Loop all side-segments
|
||||
{
|
||||
double Wpit = 0.0; // Initialize
|
||||
|
@ -476,10 +479,16 @@ void TTrackDescription::InitTrack
|
|||
WCurb = MIN(WCurb, 0.15); // use 15 cm only
|
||||
|
||||
// Don't go too far up raised curbs
|
||||
if (slope > 0.15) // If more
|
||||
if (slope > 0.151) // If more
|
||||
WCurb = 0; // keep off
|
||||
else if (slope > 0.10) // Use 15 cm
|
||||
else if (slope > 0.121) // Use 15 cm
|
||||
WCurb = MIN(WCurb, 0.15); //
|
||||
else if (slope > 0.101) // Use 30 cm
|
||||
WCurb = MIN(WCurb, 0.30); //
|
||||
else if (slope > 0.051) // Use 60 cm
|
||||
WCurb = MIN(WCurb, 0.60); //
|
||||
else if (slope > 0.021) // Use 120 cm
|
||||
WCurb = MIN(WCurb, 1.20); //
|
||||
}
|
||||
else if (PSide->style == TR_CURB) // On curbs without height
|
||||
{
|
||||
|
@ -550,10 +559,16 @@ void TTrackDescription::InitTrack
|
|||
}
|
||||
|
||||
ExtraWpit += Wpit;
|
||||
if (Done)
|
||||
ExtraW += WCurb;
|
||||
else
|
||||
ExtraW += W;
|
||||
if (!PitOnly)
|
||||
{
|
||||
if (Done)
|
||||
ExtraW += WCurb;
|
||||
else
|
||||
ExtraW += W;
|
||||
|
||||
if (Done)
|
||||
PitOnly = true;
|
||||
}
|
||||
|
||||
PSide = PSide->side[S];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue