Merge branch 'master' of github.com:CodingJonas/torcs-1.3.7

CodingJonas · Jan 8, 2018 · f269c47 · f269c47
2 parents 52d5946 + f61634c
commit f269c47
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/src/drivers/hemic/hemic.cpp b/src/drivers/hemic/hemic.cpp
@@ -517,27 +517,23 @@ drive(int index, tCarElt* car, tSituation *s)
         {
             float diffX = 0, diffY = 0;
 
-            if (false)
+            if (true)
             {
-                tTrackSeg *currentSeg = car->pub.trkPos.seg;
                 tTrkLocPos opPos = (closestOponent->pub.trkPos);
-                float opX, opY;
+                float opX, opY, ownX, ownY;
 
                 RtTrackLocal2Global(&opPos, &opX, &opY, 1);
-                RtTrackGlobal2Local(currentSeg, opX, opY, &opPos, 1);
+                RtTrackLocal2Global(&car->pub.trkPos, &ownX, &ownY, 1);
+                //RtTrackGlobal2Local(currentSeg, opX, opY, &opPos, 1);
 
-                diffX = car->pub.trkPos.toLeft - opPos.toLeft;
-                diffY = car->pub.trkPos.toStart - opPos.toStart;
-
-            }
-            else
-            {
-                tTrkLocPos *opPos = &(closestOponent->pub.trkPos);
-
-                diffX = car->pub.trkPos.toLeft - opPos->toLeft;
-                diffY = car->pub.trkPos.toStart - opPos->toStart;
+		diffX = car->pub.trkPos.toLeft - opPos.toLeft;
+		diffY = RtGetDistFromStart(car) - RtGetDistFromStart(closestOponent);
 
+
                 writePositionLog(bot, diffX, diffY);
+                //diffX = car->pub.trkPos.toLeft - opPos.toLeft;
+                //diffY = car->pub.trkPos.toStart - opPos.toStart;
+
             }
 
 
@@ -625,7 +621,7 @@ void openPositionLog(tBot *bot)
     {
         //bot->distanceLog = fopen("relative_distance.csv", "a");
 	std::cout << "Hemic relative position:\n";
-	std::cout << "xDistance, yDistance\n";
+	std::cout << "distanceX,distanceY\n";
     }
 }