libix3: s/ix3_search_cb/ix3_object_cb_t/g

In preparation of adding an aabb-callback based search, rename the
existing callback to something more object-specific since that's
the context it applies to.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/ix3.c b/src/ix3.c
index 1d7ba43..f135cdd 100644
--- a/src/ix3.c
+++ b/src/ix3.c
@@ -587,7 +587,7 @@ ix3_object_t * ix3_object_new(ix3_t *ix3, v3f_t *object_position, v3f_t *object_
 
 /* Remove object from the index ix3 and free it. */
 /* This may be either the object handle returned by ix3_node_insert(), or
- * the handle supplied to ix3_search_cb().
+ * the handle supplied to ix3_object_cb_t().
  */
 void ix3_object_free(ix3_t *ix3, ix3_object_t *object)
 {
@@ -640,7 +640,7 @@ ix3_object_t * ix3_object_move(ix3_t *ix3, ix3_object_t *object, v3f_t *object_p
 
 /* Search for objects overlapping a point in index ix3. */
 /* Returns number of cb calls performed on hits, if cb is NULL calls will be skipped but hits still counted for return. */
-unsigned ix3_search_by_point(ix3_t *ix3, v3f_t *point, ix3_search_cb *cb, void *cb_context)
+unsigned ix3_search_by_point(ix3_t *ix3, v3f_t *point, ix3_object_cb_t *cb, void *cb_context)
 {
 	unsigned		n_hits = 0;
 	ix3_object_ref_t	*ref, *_ref;
@@ -746,7 +746,7 @@ static void search_node_by_aabb(const ix3_t *ix3, ix3_node_t *node, bb3f_t *node
 
 /* Search for objects overlapping an aabb in index ix3. */
 /* Returns number of cb calls performed on hits, if cb is NULL calls will be skipped but hits still counted for return. */
-unsigned ix3_search_by_aabb(ix3_t *ix3, v3f_t *search_position, v3f_t *search_origin, bb3f_t *search_aabb, ix3_search_cb *cb, void *cb_context)
+unsigned ix3_search_by_aabb(ix3_t *ix3, v3f_t *search_position, v3f_t *search_origin, bb3f_t *search_aabb, ix3_object_cb_t *cb, void *cb_context)
 {
 	unsigned	n_hits = 0;
 	LIST_HEAD	(hits);
diff --git a/src/ix3.h b/src/ix3.h
index 99c1530..dd15e9f 100644
--- a/src/ix3.h
+++ b/src/ix3.h
@@ -29,7 +29,7 @@ typedef enum ix3_search_status_t {
 	IX3_SEARCH_MORE_HIT,
 } ix3_search_status_t;
 
-typedef ix3_search_status_t (ix3_search_cb)(void *cb_context, ix3_object_t *ix3_object, v3f_t *ix3_object_position, bb3f_t *ix3_object_aabb, void *object);
+typedef ix3_search_status_t (ix3_object_cb_t)(void *cb_context, ix3_object_t *ix3_object, v3f_t *ix3_object_position, bb3f_t *ix3_object_aabb, void *object);
 
 ix3_t * ix3_new(bb3f_t *aabb, unsigned max_per_node, unsigned max_depth, unsigned max_asip);
 void ix3_free(ix3_t *ix3);
@@ -38,8 +38,8 @@ void ix3_reset(ix3_t *ix3);
 void ix3_object_free(ix3_t *ix3, ix3_object_t *object);
 ix3_object_t * ix3_object_move(ix3_t *ix3, ix3_object_t *object, v3f_t *object_position, v3f_t *object_origin, bb3f_t *object_aabb);
 int ix3_object_aabb_overlap(ix3_t *ix3, ix3_object_t *object, v3f_t *aabb_position, v3f_t *aabb_origin, bb3f_t *aabb);
-unsigned ix3_search_by_point(ix3_t *ix3, v3f_t *point, ix3_search_cb *cb, void *arg);
-unsigned ix3_search_by_aabb(ix3_t *ix3, v3f_t *search_position, v3f_t *search_origin, bb3f_t *search_aabb, ix3_search_cb *cb, void *arg);
-unsigned ix3_search_by_ray(ix3_t *ix3, v3f_t *origin, v3f_t *direction, ix3_search_cb *cb, void *arg);
+unsigned ix3_search_by_point(ix3_t *ix3, v3f_t *point, ix3_object_cb_t *cb, void *arg);
+unsigned ix3_search_by_aabb(ix3_t *ix3, v3f_t *search_position, v3f_t *search_origin, bb3f_t *search_aabb, ix3_object_cb_t *cb, void *arg);
+unsigned ix3_search_by_ray(ix3_t *ix3, v3f_t *origin, v3f_t *direction, ix3_object_cb_t *cb, void *arg);
 
 #endif