Changeset 9965 for code/trunk/src

Timestamp:

Jan 3, 2014, 9:57:52 PM (11 years ago)

Author:

landauf

Message:

simplified algorithm. turns out this code actually tries to find the minimal distance (but it only worked with max 3 possible next checkpoints)

File:

• code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) (1 diff)

code/trunk/src/modules/gametypes/SpaceRaceController.cc

@@ -222 +222 @@
     RaceCheckPoint* SpaceRaceController::nextPointFind(RaceCheckPoint* raceCheckpoint)
     {
-        float distances[] = {-1, -1, -1};
-        int temp_i = 0;
-        for (std::set<int>::iterator it =raceCheckpoint->getNextCheckpoints().begin(); it!= raceCheckpoint->getNextCheckpoints().end(); ++it)
-        {
-            distances[temp_i] = recCalculateDistance(findCheckpoint(*it), this->getControllableEntity()->getPosition());
-            temp_i++;
-        }
-        if (distances[0] > distances[1] && distances[1] >= 0)
-        {
-            if (distances[2] < distances[1] && distances[2] >= 0)
-            {
-                return findCheckpoint(*raceCheckpoint->getNextCheckpoints().end()); // return checkpoint with ID of raceCheckpoint->getNextCheckpoints() [2]
-            }
-            else
-            {
-                std::set<int>::iterator temp = raceCheckpoint->getNextCheckpoints().begin();
-                return findCheckpoint(*(++temp)); // return [1]
-            }
-        }
-        else
-        {
-            if (distances[2] < distances[0] && distances[2] >= 0)
-            {
-                return findCheckpoint(*raceCheckpoint->getNextCheckpoints().end()); // return [2]
-            }
-            else
-            {
-                return findCheckpoint(*raceCheckpoint->getNextCheckpoints().begin()); // return [0]
-            }
-        }
+        float minDistance = 0;
+        RaceCheckPoint* minNextRaceCheckPoint = NULL;
+
+        // find the next checkpoint with the minimal distance
+        for (std::set<int>::iterator it = raceCheckpoint->getNextCheckpoints().begin(); it != raceCheckpoint->getNextCheckpoints().end(); ++it)
+        {
+            RaceCheckPoint* nextRaceCheckPoint = findCheckpoint(*it);
+            float distance = recCalculateDistance(nextRaceCheckPoint, this->getControllableEntity()->getPosition());
+
+            if (distance < minDistance || minNextRaceCheckPoint == NULL)
+            {
+                minDistance = distance;
+                minNextRaceCheckPoint = nextRaceCheckPoint;
+            }
+        }
+
+        return minNextRaceCheckPoint;
     }