X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_volumes.h;h=5bdc2d9ffdc5e52a01fb46536d2e3fde0c1bb012;hb=342fcbf6fda017bdd38d56ce0fa7c9e59e589f3b;hp=da39d265644848fd93989ae3ecbac8f9b78cfec5;hpb=63b5ac44f74599b21c4b9b18398c29b797337bea;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_volumes.h b/world_volumes.h
index da39d26..5bdc2d9 100644
--- a/world_volumes.h
+++ b/world_volumes.h
@@ -2,57 +2,19 @@
 #define WORLD_VOLUMES_H
 
 #include "world.h"
+#include "bvh.h"
 
-/*
- * BVH implementation
- * ----------------------------------------------------------------------------
- */
-
-VG_STATIC void volume_vg_expand_bound( void *user, boxf bound, u32 item_index )
-{
-   world_instance *world = user;
-
-   ent_volume *volume = mdl_arritm( &world->ent_volume, item_index );
-
-   m4x3_expand_aabb_point( volume->to_world, bound, (v3f){ 1.0f, 1.0f, 1.0f} );
-   m4x3_expand_aabb_point( volume->to_world, bound, (v3f){ 1.0f, 1.0f,-1.0f} );
-   m4x3_expand_aabb_point( volume->to_world, bound, (v3f){ 1.0f,-1.0f, 1.0f} );
-   m4x3_expand_aabb_point( volume->to_world, bound, (v3f){ 1.0f,-1.0f,-1.0f} );
-   m4x3_expand_aabb_point( volume->to_world, bound, (v3f){-1.0f, 1.0f, 1.0f} );
-   m4x3_expand_aabb_point( volume->to_world, bound, (v3f){-1.0f, 1.0f,-1.0f} );
-   m4x3_expand_aabb_point( volume->to_world, bound, (v3f){-1.0f,-1.0f, 1.0f} );
-   m4x3_expand_aabb_point( volume->to_world, bound, (v3f){-1.0f,-1.0f,-1.0f} );
-}
-
-VG_STATIC float volume_vg_centroid( void *user, u32 item_index, int axis )
-{
-   world_instance *world = user;
-   ent_volume *volume = mdl_arritm( &world->ent_volume, item_index );
-   return volume->to_world[3][axis];
+struct {
+   int inside;
 }
+static world_volumes;
 
-VG_STATIC void volume_vg_swap( void *user, u32 ia, u32 ib )
-{
-   world_instance *world = user;
-   ent_volume *a = mdl_arritm( &world->ent_volume, ia ),
-              *b = mdl_arritm( &world->ent_volume, ib ),
-              temp;
-
-   temp = *a;
-   *a = *b;
-   *b = temp;
-}
-
-VG_STATIC void volume_vg_debug( void *user, u32 item_index )
-{
-   world_instance *world = user;
-   ent_volume *volume = mdl_arritm( &world->ent_volume, item_index );
-   vg_line_boxf_transformed( volume->to_world, (boxf){{-1.0f,-1.0f,-1.0f},
-                                                      { 1.0f, 1.0f, 1.0f}}, 
-                                                      0xff00ff00 );
-}
+VG_STATIC void volume_vg_expand_bound( void *user, boxf bound, u32 item_index );
+VG_STATIC float volume_vg_centroid( void *user, u32 item_index, int axis );
+VG_STATIC void volume_vg_swap( void *user, u32 ia, u32 ib );
+VG_STATIC void volume_vg_debug( void *user, u32 item_index );
 
-VG_STATIC bh_system bh_system_volumes = 
+static bh_system bh_system_volumes = 
 {
    .expand_bound = volume_vg_expand_bound,
    .item_centroid = volume_vg_centroid,