* user: a pointer back the base of the data you are ordering
* system: the system we created above which will deal with the data
*
- * call bh_create( bh_tree *bh, u32 item_count, u32 item_size )
+ * call bh_create( bh_tree *bh, u32 item_count )
+ * static int bh_ray( bh_tree *bh, u32 inode, v3f co, v3f dir, ray_hit *hit )
+ * static int bh_select( bh_tree *bh, boxf box, u32 *buffer, int len )
*/
typedef struct bh_node bh_node;
void (*expand_bound)( void *user, boxf bound, u32 item_index );
float (*item_centroid)( void *user, u32 item_index, int axis );
void (*item_swap)( void *user, u32 ia, u32 ib );
- u32 item_size;
/*
* Optional:
*/
void (*item_debug)( void *user, u32 item_index );
- int (*cast_ray)( void *user, v3f co, v3f dir, ray_hit *hit );
+ int (*cast_ray)( void *user, u32 index, v3f co, v3f dir, ray_hit *hit );
};
static void bh_update_bounds( bh_tree *bh, u32 inode )
bh_subdivide( bh, ir );
}
-static void bh_create( bh_tree *bh, bh_system *sys, u32 item_count )
+static void bh_create( bh_tree *bh, bh_system *sys, void *user, u32 item_count )
{
bh->system = sys;
- bh->nodes = malloc( sys->item_size * (item_count*2-1) );
+ bh->user = user;
+ bh->nodes = vg_alloc( sizeof(bh_node) * (item_count*2-1) );
bh_node *root = &bh->nodes[0];
bh->node_count = 1;
bh_update_bounds( bh, 0 );
bh_subdivide( bh, 0 );
- bh->nodes = realloc( bh->nodes, sys->item_size * bh->node_count );
+ bh->nodes = vg_realloc( bh->nodes, sizeof(bh_node) * bh->node_count );
vg_success( "BVH done, size: %u/%u\n", bh->node_count, (item_count*2-1) );
+
+#if 0
+ vg_fatal_exit_loop( "Test crash from loader" );
+#endif
+}
+
+static void bh_free( bh_tree *bh )
+{
+ vg_free( bh->nodes );
}
static void bh_debug_node( bh_tree *bh, u32 inode, v3f pos, u32 colour )
u32 idx = inode->start+i;
if( bh->system->cast_ray )
- count += bh->system->cast_ray( bh->user, co, dir, hit );
+ count += bh->system->cast_ray( bh->user, idx, co, dir, hit );
else
count ++;
}
if( inode->count )
{
if( count + inode->count >= len )
- {
- vg_error( "Maximum buffer reached!\n" );
return count;
- }
for( u32 i=0; i<inode->count; i++ )
buffer[ count ++ ] = inode->start+i;