projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model fmt & heisenbug
[carveJwlIkooP6JGAAIwe30JlM.git]
/
bvh.h
diff --git
a/bvh.h
b/bvh.h
index c841939d0cab9d40f7c0741bc637eac5711d8314..9fdbe985040f51e0cadfd0a183b921240c82a036 100644
(file)
--- a/
bvh.h
+++ b/
bvh.h
@@
-1,3
+1,7
@@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ */
+
#ifndef BVH_H
#define BVH_H
#include "common.h"
#ifndef BVH_H
#define BVH_H
#include "common.h"
@@
-13,29
+17,31
@@
* user: a pointer back the base of the data you are ordering
* system: the system we created above which will deal with the data
*
* 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 )
+ * 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 )
*/
typedef struct bh_node bh_node;
typedef struct bh_tree bh_tree;
typedef struct bh_system bh_system;
*/
typedef struct bh_node bh_node;
typedef struct bh_tree bh_tree;
typedef struct bh_system bh_system;
-struct bh_node
-{
- boxf bbx;
-
- /* if il is 0, this is a leaf */
- u32 il, count;
- union{ u32 ir, start; };
-};
-
struct bh_tree
{
struct bh_tree
{
- bh_node *nodes;
u32 node_count;
bh_system *system;
void *user;
u32 node_count;
bh_system *system;
void *user;
+
+ struct bh_node
+ {
+ boxf bbx;
+
+ /* if il is 0, this is a leaf */
+ u32 il, count;
+ union{ u32 ir, start; };
+ }
+ nodes[];
};
struct bh_system
};
struct bh_system
@@
-43,7
+49,6
@@
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_swap)( void *user, u32 ia, u32 ib );
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:
/*
* Optional:
@@
-53,10
+58,10
@@
struct bh_system
*/
void (*item_debug)( void *user, u32 item_index );
*/
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 )
+
VG_STATIC
void bh_update_bounds( bh_tree *bh, u32 inode )
{
bh_node *node = &bh->nodes[ inode ];
{
bh_node *node = &bh->nodes[ inode ];
@@
-68,7
+73,7
@@
static void bh_update_bounds( bh_tree *bh, u32 inode )
}
}
}
}
-
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 ];
{
bh_node *node = &bh->nodes[ inode ];
@@
-123,17
+128,19
@@
static void bh_subdivide( bh_tree *bh, u32 inode )
node->ir = ir;
node->count = 0;
node->ir = ir;
node->count = 0;
- /* TODO: Implement max depth, or stack */
bh_update_bounds( bh, il );
bh_update_bounds( bh, ir );
bh_subdivide( bh, il );
bh_subdivide( bh, ir );
}
bh_update_bounds( bh, il );
bh_update_bounds( bh, ir );
bh_subdivide( bh, il );
bh_subdivide( bh, ir );
}
-static void bh_create( bh_tree *bh, bh_system *sys, u32 item_count )
+VG_STATIC bh_tree *bh_create( void *lin_alloc, bh_system *system,
+ void *user, u32 item_count )
{
{
- bh->system = sys;
- bh->nodes = malloc( sys->item_size * (item_count*2-1) );
+ u32 totsize = sizeof(bh_tree) + sizeof(bh_node)*(item_count*2-1);
+ bh_tree *bh = vg_linear_alloc( lin_alloc, totsize );
+ bh->system = system;
+ bh->user = user;
bh_node *root = &bh->nodes[0];
bh->node_count = 1;
bh_node *root = &bh->nodes[0];
bh->node_count = 1;
@@
-146,11
+153,14
@@
static void bh_create( bh_tree *bh, bh_system *sys, u32 item_count )
bh_update_bounds( bh, 0 );
bh_subdivide( bh, 0 );
bh_update_bounds( bh, 0 );
bh_subdivide( bh, 0 );
- bh->nodes = realloc( bh->nodes, sys->item_size * bh->node_count );
+ totsize = sizeof(bh_tree) + sizeof(bh_node) * bh->node_count;
+ bh = vg_linear_resize( lin_alloc, bh, totsize );
+
vg_success( "BVH done, size: %u/%u\n", bh->node_count, (item_count*2-1) );
vg_success( "BVH done, size: %u/%u\n", bh->node_count, (item_count*2-1) );
+ return bh;
}
}
-
static
void bh_debug_node( bh_tree *bh, u32 inode, v3f pos, u32 colour )
+
VG_STATIC
void bh_debug_node( bh_tree *bh, u32 inode, v3f pos, u32 colour )
{
bh_node *node = &bh->nodes[ inode ];
{
bh_node *node = &bh->nodes[ inode ];
@@
-180,7
+190,7
@@
static void bh_debug_node( bh_tree *bh, u32 inode, v3f pos, u32 colour )
}
}
}
}
-
static int bh_ray( bh_tree *bh, u32 inode
, v3f co, v3f dir, ray_hit *hit )
+
VG_STATIC int bh_ray( bh_tree *bh
, v3f co, v3f dir, ray_hit *hit )
{
int count = 0;
u32 stack[100];
{
int count = 0;
u32 stack[100];
@@
-202,7
+212,7
@@
static int bh_ray( bh_tree *bh, u32 inode, v3f co, v3f dir, ray_hit *hit )
u32 idx = inode->start+i;
if( bh->system->cast_ray )
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 ++;
}
else
count ++;
}
@@
-231,7
+241,7
@@
static int bh_ray( bh_tree *bh, u32 inode, v3f co, v3f dir, ray_hit *hit )
return count;
}
return count;
}
-
static
int bh_select( bh_tree *bh, boxf box, u32 *buffer, int len )
+
VG_STATIC
int bh_select( bh_tree *bh, boxf box, u32 *buffer, int len )
{
int count = 0;
u32 stack[100];
{
int count = 0;
u32 stack[100];
@@
-249,10
+259,7
@@
static int bh_select( bh_tree *bh, boxf box, u32 *buffer, int len )
if( inode->count )
{
if( count + inode->count >= len )
if( inode->count )
{
if( count + inode->count >= len )
- {
- vg_error( "Maximum buffer reached!\n" );
return count;
return count;
- }
for( u32 i=0; i<inode->count; i++ )
buffer[ count ++ ] = inode->start+i;
for( u32 i=0; i<inode->count; i++ )
buffer[ count ++ ] = inode->start+i;