X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=bvh.h;h=fa51c5936157d261028f3468099154050e281d86;hb=f48c3935c01da796b7ecb011a42d6576788b7648;hp=21bfb39c3b162ceca22d22a207b3021f6931747a;hpb=63b5ac44f74599b21c4b9b18398c29b797337bea;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/bvh.h b/bvh.h
index 21bfb39..fa51c59 100644
--- a/bvh.h
+++ b/bvh.h
@@ -4,7 +4,10 @@
 
 #ifndef BVH_H
 #define BVH_H
-#include "common.h"
+
+#include "vg/vg_mem.h"
+#include "vg/vg_m.h"
+#include "vg/vg_lines.h"
 
 /*
  * Usage:
@@ -33,8 +36,7 @@ struct ray_hit{
    v3f pos, normal;
 };
 
-struct bh_tree
-{
+struct bh_tree{
    u32 node_count;
 
    bh_system *system;
@@ -52,8 +54,7 @@ struct bh_tree
    nodes[];
 };
 
-struct bh_system
-{
+struct bh_system{
    void  (*expand_bound)( void *user, boxf bound, u32 item_index );
    float (*item_centroid)( void *user, u32 item_index, int axis );
    void  (*item_closest)( void *user, u32 item_index, v3f point, v3f closest );
@@ -70,8 +71,7 @@ struct bh_system
    int   (*cast_ray)( void *user, u32 index, v3f co, v3f dir, ray_hit *hit );
 };
 
-VG_STATIC void bh_update_bounds( bh_tree *bh, u32 inode )
-{
+VG_STATIC void bh_update_bounds( bh_tree *bh, u32 inode ){
    bh_node *node = &bh->nodes[ inode ];
 
    box_init_inf( node->bbx );
@@ -81,8 +81,7 @@ VG_STATIC void bh_update_bounds( bh_tree *bh, u32 inode )
    }
 }
 
-VG_STATIC void bh_subdivide( bh_tree *bh, u32 inode )
-{
+VG_STATIC void bh_subdivide( bh_tree *bh, u32 inode ){
    bh_node *node = &bh->nodes[ inode ];
 
    if( node->count <= bh->max_per_leaf )
@@ -143,8 +142,7 @@ VG_STATIC void bh_subdivide( bh_tree *bh, u32 inode )
 }
 
 VG_STATIC bh_tree *bh_create( void *lin_alloc, bh_system *system, 
-                              void *user, u32 item_count, u32 max_per_leaf )
-{
+                              void *user, u32 item_count, u32 max_per_leaf ){
    assert( max_per_leaf > 0 );
 
    u32 alloc_count = VG_MAX( 1, item_count );
@@ -179,8 +177,7 @@ VG_STATIC bh_tree *bh_create( void *lin_alloc, bh_system *system,
  * Draw items in this leaf node.
  * *item_debug() must be set!
  */
-VG_STATIC void bh_debug_leaf( bh_tree *bh, bh_node *node )
-{
+VG_STATIC void bh_debug_leaf( bh_tree *bh, bh_node *node ){
    vg_line_boxf( node->bbx, 0xff00ff00 );
 
    if( bh->system->item_debug ){
@@ -194,8 +191,7 @@ VG_STATIC void bh_debug_leaf( bh_tree *bh, bh_node *node )
 /*
  * Trace the bh tree all the way down to the leaf nodes where pos is inside
  */
-VG_STATIC void bh_debug_trace( bh_tree *bh, u32 inode, v3f pos, u32 colour )
-{
+VG_STATIC void bh_debug_trace( bh_tree *bh, u32 inode, v3f pos, u32 colour ){
    bh_node *node = &bh->nodes[ inode ];
 
    if( (pos[0] >= node->bbx[0][0] && pos[0] <= node->bbx[1][0]) &&
@@ -214,8 +210,7 @@ VG_STATIC void bh_debug_trace( bh_tree *bh, u32 inode, v3f pos, u32 colour )
    }
 }
 
-VG_STATIC int bh_ray( bh_tree *bh, v3f co, v3f dir, ray_hit *hit )
-{
+VG_STATIC int bh_ray( bh_tree *bh, v3f co, v3f dir, ray_hit *hit ){
    if( bh->node_count < 2 )
       return 0;
 
@@ -265,8 +260,7 @@ VG_STATIC int bh_ray( bh_tree *bh, v3f co, v3f dir, ray_hit *hit )
 }
 
 typedef struct bh_iter bh_iter;
-struct bh_iter
-{
+struct bh_iter{
    struct {
       i32 id, depth;
    }
@@ -294,8 +288,7 @@ struct bh_iter
    i32 depth, i;
 };
 
-VG_STATIC void bh_iter_init_box( i32 root, bh_iter *it, boxf box )
-{
+VG_STATIC void bh_iter_init_box( i32 root, bh_iter *it, boxf box ){
    it->query = k_bh_query_box;
    it->stack[0].id = root;
    it->stack[0].depth = 0;
@@ -306,8 +299,7 @@ VG_STATIC void bh_iter_init_box( i32 root, bh_iter *it, boxf box )
 }
 
 VG_STATIC void bh_iter_init_ray( i32 root, bh_iter *it, v3f co, 
-                                 v3f dir, f32 max_dist )
-{
+                                 v3f dir, f32 max_dist ){
    it->query = k_bh_query_ray;
    it->stack[0].id = root;
    it->stack[0].depth = 0;
@@ -319,8 +311,7 @@ VG_STATIC void bh_iter_init_ray( i32 root, bh_iter *it, v3f co,
    it->ray.max_dist = max_dist;
 }
 
-VG_STATIC i32 bh_next( bh_tree *bh, bh_iter *it, i32 *em )
-{
+VG_STATIC i32 bh_next( bh_tree *bh, bh_iter *it, i32 *em ){
    while( it->depth >= 0 ){
       bh_node *inode = &bh->nodes[ it->stack[it->depth].id ];