Replace nested data struct with sycl::float4 for checkpoints

Author: sami-hatna66

external/Actor.cpp

@@ -86,11 +86,11 @@ SYCL_EXTERNAL void Actor::setSeed(uint newSeed) { seed = newSeed; }
 SYCL_EXTERNAL void Actor::setForce(float newForce) { force = newForce; }
 
 SYCL_EXTERNAL void
-Actor::checkAtDestination(std::array<sycl::float2, 2> destination,
+Actor::checkAtDestination(sycl::float4 destination,
                           int pathSize) {
     // Destinations are defined as rectangular regions
-    if (pos[0] >= destination[0][0] && pos[0] <= destination[1][0] &&
-        pos[1] >= destination[0][1] && pos[1] <= destination[1][1]) {
+    if (pos[0] >= destination[0] && pos[0] <= destination[2] &&
+        pos[1] >= destination[1] && pos[1] <= destination[3]) {
         if (destinationIndex >= PATHALLOCATIONSIZE - 1 ||
             destinationIndex >= pathSize - 1) {
             this->setAtDestination(true);

external/Actor.hpp

@@ -77,7 +77,7 @@ class Actor {
     SYCL_EXTERNAL void setForce(float newForce);
 
     SYCL_EXTERNAL void
-    checkAtDestination(std::array<sycl::float2, 2> destination, int pathSize);
+    checkAtDestination(sycl::float4 destination, int pathSize);
 };
 
 #endif

external/DifferentialEq.cpp

@@ -39,17 +39,17 @@ SYCL_EXTERNAL void differentialEq(
     // Calculate personal impulse
     float mi = currentActor->getMass();
     float v0i = currentActor->getDesiredSpeed();
-    std::array<sycl::float2, 2> destination =
+    sycl::float4 destination =
         paths[currentActor->getPathId()]
             .getCheckpoints()[currentActor->getDestinationIndex()];
 
     // Find direction vector to nearest point in destination region
     std::pair<float, sycl::float2> minRegionDistance;
     std::array<sycl::float2, 4> destinationRect = {
-        destination[0],
-        {destination[1][0], destination[0][1]},
-        destination[1],
-        {destination[0][0], destination[1][1]}};
+        sycl::float2{destination[0], destination[1]},
+        sycl::float2{destination[2], destination[1]},
+        sycl::float2{destination[2], destination[3]},
+        sycl::float2{destination[0], destination[3]}};
     for (int x = 0; x < 4; x++) {
         int endIndex = x == 3 ? 0 : x + 1;
         auto dniw =

external/ParseInputFile.cpp

@@ -120,18 +120,18 @@ void parseInputFile(std::string filename, std::vector<Actor> &actors,
     for (auto &p : jsonPaths) {
         int id = p["id"].GetInt();
         auto jsonCheckpoints = p["checkpoints"].GetArray();
-        std::array<std::array<sycl::float2, 2>, PATHALLOCATIONSIZE> checkpoints;
+        std::array<sycl::float4, PATHALLOCATIONSIZE> checkpoints;
         if (jsonCheckpoints.Size() > PATHALLOCATIONSIZE) {
             throw JSONException(
                 "Path Size exceeds amount allocated in memory\nEither reduce "
                 "path size or increase PATHALLOCATIONSIZE in 'Path.hpp'");
         }
         for (int i = 0; i < jsonCheckpoints.Size(); i++) {
-            std::array<sycl::float2, 2> region;
-            region[0] = sycl::float2({jsonCheckpoints[i][0][0].GetFloat(),
-                                      jsonCheckpoints[i][0][1].GetFloat()});
-            region[1] = sycl::float2({jsonCheckpoints[i][1][0].GetFloat(),
-                                      jsonCheckpoints[i][1][1].GetFloat()});
+            sycl::float4 region;
+            region = sycl::float4({jsonCheckpoints[i][0][0].GetFloat(),
+                                   jsonCheckpoints[i][0][1].GetFloat(),
+                                   jsonCheckpoints[i][1][0].GetFloat(),
+                                   jsonCheckpoints[i][1][1].GetFloat()});
             checkpoints[i] = region;
         }
         int pathSize = jsonCheckpoints.Size();

external/Path.cpp

@@ -27,13 +27,13 @@
 
 Path::Path(
     int pId,
-    std::array<std::array<sycl::float2, 2>, PATHALLOCATIONSIZE> pCheckpoints,
+    std::array<sycl::float4, PATHALLOCATIONSIZE> pCheckpoints,
     int pPathSize)
     : id(pId), checkpoints(pCheckpoints), pathSize(pPathSize) {}
 
 SYCL_EXTERNAL int Path::getId() const { return id; }
 
-SYCL_EXTERNAL std::array<std::array<sycl::float2, 2>, PATHALLOCATIONSIZE>
+SYCL_EXTERNAL std::array<sycl::float4, PATHALLOCATIONSIZE>
 Path::getCheckpoints() const {
     return checkpoints;
 }
@@ -43,7 +43,7 @@ SYCL_EXTERNAL int Path::getPathSize() const { return pathSize; }
 void Path::setId(int newId) { id = newId; }
 
 void Path::setCheckpoints(
-    std::array<std::array<sycl::float2, 2>, PATHALLOCATIONSIZE>
+    std::array<sycl::float4, PATHALLOCATIONSIZE>
         newCheckpoints) {
     checkpoints = newCheckpoints;
 }

external/Path.hpp

@@ -37,24 +37,24 @@ const int PATHALLOCATIONSIZE = 10;
 
 class Path {
   private:
-    std::array<std::array<sycl::float2, 2>, PATHALLOCATIONSIZE> checkpoints;
+    std::array<sycl::float4, PATHALLOCATIONSIZE> checkpoints;
     int id;
     int pathSize;
 
   public:
     Path(int pId,
-         std::array<std::array<sycl::float2, 2>, PATHALLOCATIONSIZE>
+         std::array<sycl::float4, PATHALLOCATIONSIZE>
              pCheckpoints,
          int pPathSize);
 
     SYCL_EXTERNAL int getId() const;
-    SYCL_EXTERNAL std::array<std::array<sycl::float2, 2>, PATHALLOCATIONSIZE>
+    SYCL_EXTERNAL std::array<sycl::float4, PATHALLOCATIONSIZE>
     getCheckpoints() const;
     SYCL_EXTERNAL int getPathSize() const;
 
     void setId(int newId);
     void
-    setCheckpoints(std::array<std::array<sycl::float2, 2>, PATHALLOCATIONSIZE>
+    setCheckpoints(std::array<sycl::float4, PATHALLOCATIONSIZE>
                        newCheckpoints);
 };