Merge pull request #71 from gtker/update-c-api

pathfind: Add new Python API functions to C API and update dependencies

Common.hpp

@@ -203,5 +203,7 @@ enum class Result {
     MAP_DOES_NOT_HAVE_ADT = 87,
     UNABLE_TO_FIND_RANDOM_POINT_IN_CIRCLE = 88,
 
+    FAILED_TO_FIND_POINT_BETWEEN_VECTORS = 89,
+
     UNKNOWN_EXCEPTION = 0xFF,
 };

pathfind/pathfind_c_bindings.cpp

@@ -123,6 +123,19 @@ PathfindResultType pathfind_is_adt_loaded(pathfind::Map* const map, int x, int y
     return static_cast<PathfindResultType>(Result::SUCCESS);
 }
 
+PathfindResultType pathfind_has_adts(pathfind::Map* const map, bool* has_adts) {
+    try {
+        *has_adts = map->HasADTs();
+        return static_cast<PathfindResultType>(Result::SUCCESS);
+    }
+    catch (utility::exception& e) {
+        return static_cast<PathfindResultType>(e.ResultCode());
+    }
+    catch (...) {
+        return static_cast<PathfindResultType>(Result::UNKNOWN_EXCEPTION);
+    }
+}
+
 PathfindResultType pathfind_get_zone_and_area(pathfind::Map* const map,
                        float x,
                        float y,
@@ -154,6 +167,37 @@ PathfindResultType pathfind_get_zone_and_area(pathfind::Map* const map,
     }
 }
 
+PathfindResultType pathfind_find_point_in_between_vectors(pathfind::Map* const map,
+                                                          float distance,
+                                                          float x1,
+                                                          float y1,
+                                                          float z1,
+                                                          float x2,
+                                                          float y2,
+                                                          float z2,
+                                                          Vertex* out_vertex) {
+    try {
+        const math::Vertex start {x1, y1, z1};
+        const math::Vertex end {x2, y2, z2};
+        math::Vertex in_between_point {};
+        if (!map->FindPointInBetweenVectors(start, end, distance, in_between_point)) {
+            return static_cast<PathfindResultType>(Result::FAILED_TO_FIND_POINT_BETWEEN_VECTORS);
+        }
+
+        out_vertex->x = in_between_point.X;
+        out_vertex->y = in_between_point.Y;
+        out_vertex->z = in_between_point.Z;
+
+        return static_cast<PathfindResultType>(Result::SUCCESS);
+    }
+    catch (utility::exception& e) {
+        return static_cast<PathfindResultType>(e.ResultCode());
+    }
+    catch (...) {
+        return static_cast<PathfindResultType>(Result::UNKNOWN_EXCEPTION);
+    }
+}
+
 PathfindResultType pathfind_find_path(pathfind::Map* const map,
                float start_x,
                float start_y,

pathfind/pathfind_c_bindings.hpp

@@ -59,6 +59,12 @@ PathfindResultType pathfind_unload_adt(pathfind::Map* const map, int x, int y);
 */
 PathfindResultType pathfind_is_adt_loaded(pathfind::Map* const map, int x, int y, uint8_t* const loaded);
 
+
+/*
+    Returns `true` if the map has any ADTs.
+*/
+PathfindResultType pathfind_has_adts(pathfind::Map* const map, bool* has_adts);
+
 /*
     Returns the zone and area of a particular x, y, z.
 */
@@ -67,6 +73,19 @@ PathfindResultType pathfind_get_zone_and_area(pathfind::Map* const map, float x,
                                               unsigned int* const out_zone,
                                               unsigned int* const out_area);
 
+/*
+    Finds a point between the two vectors with a given distance.
+*/
+PathfindResultType pathfind_find_point_in_between_vectors(pathfind::Map* const map,
+                                                          float distance,
+                                                          float x1,
+                                                          float y1,
+                                                          float z1,
+                                                          float x2,
+                                                          float y2,
+                                                          float z2,
+                                                          Vertex* out_vertex);
+
 /*
     Calculates a path from `start_x`, `start_y`, and `start_z` to
     `stop_x`, `stop_y`, and `stop_z`.