Simplix Preset of brake parameters

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

Former-commit-id: 6a4b897ede6ff8c39e1cb673fe7e65ca20a14c87
Former-commit-id: c06ef7dfd25dd9500b4de5ede963664acad94237

src/drivers/simplix/src/unitcollision.cpp

@@ -156,17 +156,23 @@ double TCollision::AvoidTo
     Me.DistBetweenRL(oCar,OL,OR,O);
     if (AvoidTo > 0)
     {
-  	  double B = Coll.ToR - 2.0;
+	  TempOffset = OR;
-	  TempOffset = OR - B/2;
+/*
+  	  double B = MAX(0.0,Coll.ToR - 4.0);
+	  TempOffset = OR - B/3;
 	  if (TempOffset < O)
 		TempOffset = O;
+*/
     }
     else if (AvoidTo < 0)
     {
-	  double B = Coll.ToL - 2.0;
+	  TempOffset = OL;
-	  TempOffset = B/2 + OL;
+/*
+	  double B = MAX(0.0,Coll.ToL - 4.0);
+	  TempOffset = OL + B/3;
 	  if (TempOffset > O)
 		TempOffset = O;
+*/
     }
   }
 

src/drivers/simplix/src/unitdriver.cpp

@@ -170,7 +170,6 @@ void TDriver::InterpolatePointInfo
 {
   double DeltaOAngle = P1.Angle - P0.Angle;
 
-//  P0.Crv = TUtils::InterpCurvature(P0.Crv, P1.Crv, Q);
   P0.Crv = TUtils::InterpCurvature(P0.Crv, P1.Crv, (1 - Q));
   P0.Crvz = TUtils::InterpCurvature(P0.Crvz, P1.Crvz, (1 - Q));
   DOUBLE_NORM_PI_PI(DeltaOAngle);
@@ -192,6 +191,7 @@ TDriver::TDriver(int Index):
   oScaleSteer(1.0),
   oStayTogether(10.0),
   oCrvComp(true),
+  oMinSpeedFirstKm(0.0),
   oAvoidScale(8.0),
   oAvoidWidth(0.5),
   oGoToPit(false),
@@ -300,7 +300,7 @@ TDriver::TDriver(int Index):
   oTrackLoadRight(NULL),
   //oPitLoad
   oTrack(NULL),
-  oTolerance(2.0),
+  oTolerance(0.10),
   //oLanePoint
   oUnstucking(false),
   oWheelRadius(0),
@@ -628,6 +628,11 @@ void TDriver::AdjustDriving(
 	(float) oScaleBrakeRain);
   LogSimplix.debug("#Scale Brake Rain%g\n",oScaleBrakeRain);
 
+  oMinSpeedFirstKm =
+	GfParmGetNum(Handle,TDriver::SECT_PRIV,PRV_FIRST_KM,0,
+	(float) oMinSpeedFirstKm);
+  LogSimplix.error("#Min speed first km %g\n",oMinSpeedFirstKm);
+
   oAvoidScale =
 	GfParmGetNum(Handle,TDriver::SECT_PRIV,PRV_AVOID_SCALE,0,
 	(float) oAvoidScale);
@@ -2156,7 +2161,7 @@ void TDriver::InitBrake()
 	oBrakeForce = (3*oBrakeMaxTqFront * (WheelRad(FRNT_LFT) + WheelRad(FRNT_RGT)) 
 		+ oBrakeMaxTqRear * (WheelRad(REAR_LFT) + WheelRad(REAR_RGT)))/4; 
 	LogSimplix.debug("#Brake force       : %0.2f\n",oBrakeForce);
-
+/*
     oPIDCBrake.oP = 
 		GfParmGetNum(oCarHandle, TDriver::SECT_PRIV, 
 			"BC_P", (char*)NULL, (float) oPIDCBrake.oP);
@@ -2181,7 +2186,7 @@ void TDriver::InitBrake()
 		GfParmGetNum(oCarHandle, TDriver::SECT_PRIV, 
 			"BC_MIN", (char*)NULL, (float) oPIDCBrake.oMinTotal);
 	LogSimplix.debug("#BC_MIN            : %0.5f\n",oPIDCBrake.oMinTotal);
-
+*/
 	LogSimplix.debug("\n#<<< Init Brake\n\n");
 
 }
@@ -3124,6 +3129,7 @@ void TDriver::EvaluateCollisionFlags(
 
   if (OppInfo.GotFlags(F_AT_SIDE))               // Is Opponent at side
   {
+    oAvoidRange = 1.0;
     Coll.OppsAtSide |= OppInfo.State.CarDistLat < 0 ? F_LEFT : F_RIGHT;
 
 	if (OppInfo.State.CarDistLat < 0)
@@ -3478,7 +3484,7 @@ void TDriver::AvoidOtherCars(double K, bool& IsClose, bool& IsLapper)
   // ... Skilling from Andrew Sumner
 
   IsClose = (Coll.Flags & F_CLOSE) != 0;         // Set flag, if opponent is close by
-  if ((IsClose) && (DistanceRaced > 200))
+  if ((IsClose) && (DistanceRaced > 400))
   {
     double F = MAX(0,20 - Coll.MinOppDistance) / 20;
 	oTargetSpeed *= (F * 0.98f + (1 - F));  
@@ -3500,19 +3506,33 @@ void TDriver::AvoidOtherCars(double K, bool& IsClose, bool& IsLapper)
     DistBetweenRL(oCar,OL,OR,O);
 
     const int BLEN = 128;
+    const int BULEN = BLEN+3;
     int B = BLEN/2-1;
-    char buf[BLEN];
+    char buf[BULEN];
-    for (I = 0; I < BLEN; I++)
+    char buf2[2*BULEN];
+
+    for (I = 0; I < BULEN; I++)
 	  buf[I] = ' ';
 
-    buf[BLEN - 1] = 0;
+    buf[BULEN - 1] = 0;   // Terminate string
+
     buf[0] = 'T';         // Track left edge
     buf[BLEN - 2] = 'T';  // Track rigth edge
     buf[BLEN/2-1] = 'M';  // Middle of the track 
+/*
 	I = (int) MAX(0,MIN(BLEN - 2,(B - B*OL/HalfWidth)));
     buf[I] = 'L';         // Left racingline
     I = (int) MAX(0,MIN(BLEN - 2,(B - B*OR/HalfWidth)));
     buf[I] = 'R';         // Right racingline 
+*/
+	double Delta = (O - OL) * oAvoidRange;
+    I = (int) MAX(0,MIN(BLEN - 2,(B - B*(O-Delta)/HalfWidth)));
+    buf[I] = 'L';         // Racingline
+
+	Delta = (O - OR) * oAvoidRange;
+    I = (int) MAX(0,MIN(BLEN - 2,(B - B*(O-Delta)/HalfWidth)));
+    buf[I] = 'R';         // Racingline
+
 	I = (int) MAX(0,MIN(BLEN - 2,(B - B*O/HalfWidth)));
     buf[I] = '.';         // Racingline
 
@@ -3531,7 +3551,14 @@ void TDriver::AvoidOtherCars(double K, bool& IsClose, bool& IsLapper)
     I = (int) MAX(0,MIN(BLEN - 2,(B + B*CarToMiddle/HalfWidth)));
     buf[I] = '*';         // Car
 
-    LogSimplix.error("%s\n",buf);
+	if (oDoAvoid)
+      buf[BLEN+1] = 'A';
+	else
+      buf[BLEN+1] = '-';
+
+	sprintf(buf2,"%s AVR:%.2f AVO:%.2f TS:%.2f CS:%.2f",buf,oAvoidRange,oAvoidOffset,oTargetSpeed*3.6,oCurrSpeed*3.6);
+
+    LogSimplix.error("%s\n",buf2);
     /* Plotter <<< */
   }
 
@@ -3549,6 +3576,9 @@ double TDriver::FilterStart(double Speed)
   {
     double Offset = 0.01;
     Speed *= MAX(0.6,(1.0 - (oCar->race.pos - 1) * Offset));
+
+	if (oCar->race.pos == 1)
+		Speed = MAX(oMinSpeedFirstKm / 3.6f,Speed);
   }
 
   // For unknown tracks do not limit speed to much
@@ -3837,7 +3867,7 @@ double TDriver::FilterTrack(double Accel)
   {
 	if (fabs(oDeltaOffset) > oTolerance)         // Check offset difference
 	  Accel *= (float)                           //   Decrease acceleration
-	    (MAX(1.0 - (fabs(oDeltaOffset) - oTolerance) * 0.2, 0.4));
+	    (MAX(1.0 - (fabs(oDeltaOffset) - oTolerance) * 0.4, 0.2));
 
     Accel *= oSideReduction;
   }

src/drivers/simplix/src/unitdriver.h

@@ -226,6 +226,7 @@ private:
 	double oScaleSteer;                          // scale steering
 	double oStayTogether;			             // Dist in m.
 	bool oCrvComp;   			                 // Crv compensation
+    double oMinSpeedFirstKm;
     double oAvoidScale;			                 // scale avoiding 
 	double oAvoidWidth;			                 // In m.
 	bool oGoToPit;                               // Enter pit flag

src/drivers/simplix/src/unitglobal.h

@@ -474,6 +474,7 @@ enum
 #define PRV_SIDE_BRAKE       "side brake"         // Scale brake calculation for sides
 #define PRV_RAIN_BRAKE       "scale brake rain"   // Scale brake calculation for sides
 
+#define PRV_FIRST_KM         "first km"
 #define PRV_AVOID_SCALE		 "avoid scale"
 #define PRV_AVOID_WIDTH		 "avoid width"
 

src/drivers/simplix/src/unitopponent.cpp

@@ -362,7 +362,7 @@ bool TOpponent::Classify(
 	// Aside?
 //    if ((OpState.CarDistLong > -3.5)
 //	  && (OpState.CarDistLong < 10.0))
-    if ((OpState.CarDistLong > -5)
+    if ((OpState.CarDistLong > -1.5)
 	  && (OpState.CarDistLong < 20.0))
 	{
       oInfo.Flags |= F_AT_SIDE;                  // Set flags