unlock rendering

[carveJwlIkooP6JGAAIwe30JlM.git] / scene.h

diff --git a/scene.h b/scene.h
index 6d77e42fddd25bd540f25c4448b2364053bed25b..b54587aadf1a1064019bedf7882fd0140eb6b4f7 100644 (file)
--- a/scene.h
+++ b/scene.h
@@ -17,7 +17,8 @@ struct scene_vert
    v3f co;        /* 3*32 */
    v2f uv;        /* 2*32 */
    i8  norm[4];   /* 4*8 */
-   u16 unused[4];
+   u16 flags; /* only for the cpu. its junk on the gpu */
+   u16 unused[3];
 };
 
 #pragma pack(pop)
@@ -135,11 +136,12 @@ VG_STATIC void scene_add_mdl_submesh( scene_context *ctx, mdl_context *mdl,
 
    u32 real_indices = 0;
    for( u32 i=0; i<sm->indice_count/3; i++ ){
-      u32 *tri = &src_indices[i*3];
+      u32 *src = &src_indices[i*3],
+          *dst = &dst_indices[real_indices];
 
       v3f ab, ac, tn;
-      v3_sub( src_verts[tri[2]].co, src_verts[tri[0]].co, ab );
-      v3_sub( src_verts[tri[1]].co, src_verts[tri[0]].co, ac );
+      v3_sub( src_verts[src[2]].co, src_verts[src[0]].co, ab );
+      v3_sub( src_verts[src[1]].co, src_verts[src[0]].co, ac );
       v3_cross( ac, ab, tn );
 
 #if 0
@@ -147,9 +149,9 @@ VG_STATIC void scene_add_mdl_submesh( scene_context *ctx, mdl_context *mdl,
          continue;
 #endif
 
-      dst_indices[real_indices+0] = tri[0] + ctx->vertex_count;
-      dst_indices[real_indices+1] = tri[1] + ctx->vertex_count;
-      dst_indices[real_indices+2] = tri[2] + ctx->vertex_count;
+      dst[0] = src[0] + ctx->vertex_count;
+      dst[1] = src[1] + ctx->vertex_count;
+      dst[2] = src[2] + ctx->vertex_count;
 
       real_indices += 3;
    }
@@ -203,6 +205,12 @@ VG_STATIC void scene_copy_slice( scene_context *ctx, mdl_submesh *sm )
    ctx->submesh.vertex_start = ctx->vertex_count;
 }
 
+VG_STATIC void scene_set_vertex_flags( scene_context *ctx, 
+                                       u32 start, u32 count, u16 flags ){
+   for( u32 i=0; i<count; i++ )
+      ctx->arrvertices[ start + i ].flags = flags;
+}
+
 struct scene_upload_info{
    scene_context *ctx;
    glmesh *mesh;
@@ -363,29 +371,6 @@ VG_STATIC void scene_bh_debug( void *user, u32 item_index )
    vg_line( pc->co, pa->co, 0xff0000ff );
 }
 
-VG_STATIC int scene_bh_ray( void *user, u32 index, v3f co, 
-                            v3f dir, ray_hit *hit )
-{
-   scene_context *s = user;
-   v3f positions[3];
-   
-   u32 *tri = &s->arrindices[ index*3 ];
-
-   for( int i=0; i<3; i++ )
-      v3_copy( s->arrvertices[tri[i]].co, positions[i] );
-   
-   float t;
-   if(ray_tri( positions, co, dir, &t )){
-      if( t < hit->dist ){
-         hit->dist = t;
-         hit->tri = tri;
-         return 1;
-      }
-   }
-
-   return 0;
-}
-
 VG_STATIC void scene_bh_closest( void *user, u32 index, v3f point, v3f closest )
 {
    scene_context *s = user;
@@ -405,18 +390,39 @@ VG_STATIC bh_system bh_system_scene =
    .item_closest = scene_bh_closest,
    .item_swap = scene_bh_swap,
    .item_debug = scene_bh_debug,
-   .cast_ray = scene_bh_ray
 };
 
 /*
  * An extra step is added onto the end to calculate the hit normal
  */
 VG_STATIC int scene_raycast( scene_context *s, bh_tree *bh, 
-                             v3f co, v3f dir, ray_hit *hit )
+                             v3f co, v3f dir, ray_hit *hit, u16 ignore )
 {
-   int count = bh_ray( bh, co, dir, hit );
+   hit->tri = NULL;
+
+   bh_iter it;
+   bh_iter_init_ray( 0, &it, co, dir, hit->dist );
+   i32 idx;
+
+   while( bh_next( bh, &it, &idx ) ){
+      u32 *tri = &s->arrindices[ idx*3 ];
+
+      if( s->arrvertices[tri[0]].flags & ignore )  continue;
+
+      v3f vs[3];
+      for( u32 i=0; i<3; i++ )
+         v3_copy( s->arrvertices[tri[i]].co, vs[i] );
+      
+      f32 t;
+      if( ray_tri( vs, co, dir, &t ) ){
+         if( t < hit->dist ){
+            hit->dist = t;
+            hit->tri = tri;
+         }
+      }
+   }
 
-   if( count ){
+   if( hit->tri ){
       v3f v0, v1;
       
       float *pa = s->arrvertices[hit->tri[0]].co,
@@ -430,7 +436,7 @@ VG_STATIC int scene_raycast( scene_context *s, bh_tree *bh,
       v3_muladds( co, dir, hit->dist, hit->pos );
    }
 
-   return count;
+   return hit->tri?1:0;
 }
 
 VG_STATIC bh_tree *scene_bh_create( void *lin_alloc, scene_context *s )