!BREAKING refactor(WayNet): improved way-net edges API

Author: lmichaelis

include/zenkit-capi/world/WayNet.h

@@ -19,8 +19,11 @@ typedef struct ZkInternal_WayEdge ZkWayEdge;
 #endif
 
 typedef ZkBool (*ZkWayPointEnumerator)(void* ctx, ZkWayPoint const* point);
+typedef ZkBool (*ZkWayEdgeEnumerator)(void* ctx, ZkWayEdge const* edge);
 
-ZKC_API ZkWayEdge const* ZkWayNet_getEdges(ZkWayNet const* slf, ZkSize* count);
+ZKC_API ZkSize ZkWayNet_getEdgeCount(ZkWayNet const* slf);
+ZKC_API ZkWayEdge const* ZkWayNet_getEdge(ZkWayNet const* slf, ZkSize i);
+ZKC_API void ZkWayNet_enumerateEdges(ZkWayNet const* slf, ZkWayEdgeEnumerator cb, void* ctx);
 
 ZKC_API ZkSize ZkWayNet_getPointCount(ZkWayNet const* slf);
 ZKC_API ZkWayPoint const* ZkWayNet_getPoint(ZkWayNet const* slf, ZkSize i);

src/world/WayNet.cc

@@ -4,12 +4,26 @@
 
 #include "../Internal.hh"
 
-ZkWayEdge const* ZkWayNet_getEdges(ZkWayNet const* slf, ZkSize* count) {
+ZkSize ZkWayNet_getEdgeCount(ZkWayNet const* slf) {
 	ZKC_TRACE_FN();
-	ZKC_CHECK_NULL(slf, count);
+	ZKC_CHECK_NULL(slf);
+	return slf->edges.size();
+}
+
+ZkWayEdge const* ZkWayNet_getEdge(ZkWayNet const* slf, ZkSize i) {
+	ZKC_TRACE_FN();
+	ZKC_CHECK_NULL(slf);
+	ZKC_CHECK_LEN(slf->edges, i);
+	return &slf->edges[i];
+}
 
-	*count = slf->edges.size();
-	return slf->edges.data();
+void ZkWayNet_enumerateEdges(ZkWayNet const* slf, ZkWayEdgeEnumerator cb, void* ctx) {
+	ZKC_TRACE_FN();
+	ZKC_CHECK_NULLV(slf, cb);
+
+	for (auto& edge : slf->edges) {
+		if (cb(ctx, &edge)) break;
+	}
 }
 
 ZkSize ZkWayNet_getPointCount(ZkWayNet const* slf) {