From 6a2ee7ef7198d23ba89429683bebaf553ec2a1fa Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 26 Dec 2018 20:40:01 -0800 Subject: 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. --- src/ix3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ix3.c') 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); -- cgit v1.2.3