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

diff --git a/bvh.h b/bvh.h
index 21bfb39..945d3cb 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:
@@ -18,8 +21,8 @@
  *   system: the system we created above which will deal with the data
  *
  * call bh_create( bh_tree *bh, u32 item_count )
- * VG_STATIC int bh_ray( bh_tree *bh, u32 inode, v3f co, v3f dir, ray_hit *hit )
- * VG_STATIC int bh_select( bh_tree *bh, boxf box, u32 *buffer, int len )
+ * 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;
@@ -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 )
-{
+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 )
-{
+static void bh_subdivide( bh_tree *bh, u32 inode ){
    bh_node *node = &bh->nodes[ inode ];
 
    if( node->count <= bh->max_per_leaf )
@@ -142,9 +141,8 @@ VG_STATIC void bh_subdivide( bh_tree *bh, u32 inode )
    bh_subdivide( bh, ir );
 }
 
-VG_STATIC bh_tree *bh_create( void *lin_alloc, bh_system *system, 
-                              void *user, u32 item_count, u32 max_per_leaf )
-{
+static bh_tree *bh_create( void *lin_alloc, bh_system *system, 
+                              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 )
-{
+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 )
-{
+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,59 +210,8 @@ 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 )
-{
-   if( bh->node_count < 2 )
-      return 0;
-
-   int count = 0;
-   u32 stack[100];
-   u32 depth = 2;
-
-   stack[0] = 0;
-   stack[1] = bh->nodes[0].il;
-   stack[2] = bh->nodes[0].ir;
-
-   v3f dir_inv;
-   v3_div( (v3f){1.0f,1.0f,1.0f}, dir, dir_inv );
-   
-   while(depth){
-      bh_node *inode = &bh->nodes[ stack[depth] ];
-      if( ray_aabb1( inode->bbx, co, dir_inv, hit->dist ) ){
-         if( inode->count ){
-            for( u32 i=0; i<inode->count; i++ ){
-               u32 idx = inode->start+i;
-
-               if( bh->system->cast_ray )
-                  count += bh->system->cast_ray( bh->user, idx, co, dir, hit );
-               else
-                  count ++;
-            }
-
-            depth --;
-         }
-         else{
-            if( depth+1 >= vg_list_size(stack) ){
-               vg_error( "Maximum stack reached!\n" );
-               return count;
-            }
-
-            stack[depth] = inode->il;
-            stack[depth+1] = inode->ir;
-            depth ++;
-         }
-      }
-      else{
-         depth --;
-      }
-   }
-
-   return count;
-}
-
 typedef struct bh_iter bh_iter;
-struct bh_iter
-{
+struct bh_iter{
    struct {
       i32 id, depth;
    }
@@ -274,7 +219,8 @@ struct bh_iter
 
    enum bh_query_type{
       k_bh_query_box,
-      k_bh_query_ray
+      k_bh_query_ray,
+      k_bh_query_range
    }
    query;
 
@@ -289,49 +235,77 @@ struct bh_iter
          f32 max_dist;
       }
       ray;
+
+      struct {
+         v3f co;
+         f32 dist_sqr;
+      }
+      range;
    };
 
    i32 depth, i;
 };
 
-VG_STATIC void bh_iter_init_box( i32 root, bh_iter *it, boxf box )
-{
-   it->query = k_bh_query_box;
+static void bh_iter_init_generic( i32 root, bh_iter *it ){
    it->stack[0].id = root;
    it->stack[0].depth = 0;
    it->depth = 0;
    it->i = 0;
+}
+
+static void bh_iter_init_box( i32 root, bh_iter *it, boxf box ){
+   bh_iter_init_generic( root, it );
+   it->query = k_bh_query_box;
 
    box_copy( box, it->box.box );
 }
 
-VG_STATIC void bh_iter_init_ray( i32 root, bh_iter *it, v3f co, 
-                                 v3f dir, f32 max_dist )
-{
+static void bh_iter_init_ray( i32 root, bh_iter *it, v3f co, 
+                                 v3f dir, f32 max_dist ){
+   bh_iter_init_generic( root, it );
    it->query = k_bh_query_ray;
-   it->stack[0].id = root;
-   it->stack[0].depth = 0;
-   it->depth = 0;
-   it->i = 0;
    
    v3_div( (v3f){1.0f,1.0f,1.0f}, dir, it->ray.inv_dir );
    v3_copy( co, it->ray.co );
    it->ray.max_dist = max_dist;
 }
 
-VG_STATIC i32 bh_next( bh_tree *bh, bh_iter *it, i32 *em )
-{
+static void bh_iter_init_range( i32 root, bh_iter *it, v3f co, f32 range ){
+   bh_iter_init_generic( root, it );
+   it->query = k_bh_query_range;
+
+   v3_copy( co, it->range.co );
+   it->range.dist_sqr = range*range;
+}
+
+/* NOTE: does not compute anything beyond the leaf level. element level tests
+ *       should be implemented by the users code.
+ *
+ *       this is like a 'broad phase only' deal.
+ */
+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 ];
       
       /* Only process overlapping nodes */
       i32 q = 0;
 
-      if( it->query == k_bh_query_box )
-         q = box_overlap( inode->bbx, it->box.box );
-      else
-         q = ray_aabb1( inode->bbx, it->ray.co, 
-                        it->ray.inv_dir, it->ray.max_dist );
+      if( it->i ) /* already checked */
+         q = 1;
+      else{
+         if( it->query == k_bh_query_box )
+            q = box_overlap( inode->bbx, it->box.box );
+         else if( it->query == k_bh_query_ray )
+            q = ray_aabb1( inode->bbx, it->ray.co, 
+                           it->ray.inv_dir, it->ray.max_dist );
+         else {
+            v3f nearest;
+            closest_point_aabb( it->range.co, inode->bbx, nearest );
+
+            if( v3_dist2( nearest, it->range.co ) <= it->range.dist_sqr )
+               q = 1;
+         }
+      }
 
       if( !q ){
          it->depth --;
@@ -365,7 +339,7 @@ VG_STATIC i32 bh_next( bh_tree *bh, bh_iter *it, i32 *em )
    return 0;
 }
 
-VG_STATIC int bh_closest_point( bh_tree *bh, v3f pos, 
+static int bh_closest_point( bh_tree *bh, v3f pos, 
                                 v3f closest, float max_dist )
 {
    if( bh->node_count < 2 )