From c984f4e13279a63391fef5137038e8243810847c Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Fri, 18 May 2018 13:51:05 -0700 Subject: libix2: rename ix2_object_t functions ix2_insert_object ix2_remove_object ix2_move_object becomes ix2_object_new ix2_object_free ix2_object_move to be more consistent with the other libraries intended to be used with this. --- src/ix2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ix2.c') diff --git a/src/ix2.c b/src/ix2.c index dad06b1..9a93b46 100644 --- a/src/ix2.c +++ b/src/ix2.c @@ -417,8 +417,8 @@ void ix2_free(ix2_t *ix2) } -/* Insert object spatially described by object_aabb into the index ix2 */ -ix2_object_t * ix2_insert_object(ix2_t *ix2, float x, float y, aabb_t *object_aabb, void *object) +/* Create and insert object spatially described by x,y,object_aabb into the index ix2 */ +ix2_object_t * ix2_object_new(ix2_t *ix2, float x, float y, aabb_t *object_aabb, void *object) { unsigned depth = 0; ix2_object_t *o; @@ -452,7 +452,7 @@ ix2_object_t * ix2_insert_object(ix2_t *ix2, float x, float y, aabb_t *object_aa /* This may be either the object handle returned by ix2_node_insert(), or * the handle supplied to ix2_search_cb(). */ -void ix2_remove_object(ix2_t *ix2, ix2_object_t *object) +void ix2_object_free(ix2_t *ix2, ix2_object_t *object) { assert(ix2); assert(object); @@ -465,7 +465,7 @@ void ix2_remove_object(ix2_t *ix2, ix2_object_t *object) /* If object_aabb is omitted, only the x,y coordinates are updated */ /* Returns object on success, NULL on failure. */ /* On failure object is removed and freed. XXX: change to leave where it was? */ -ix2_object_t * ix2_move_object(ix2_t *ix2, ix2_object_t *object, float object_x, float object_y, aabb_t *object_aabb) +ix2_object_t * ix2_object_move(ix2_t *ix2, ix2_object_t *object, float object_x, float object_y, aabb_t *object_aabb) { unsigned depth = 0; -- cgit v1.2.3