X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=scene.h;h=51ce10315c38fdcb47fe84f49eaec103e8445266;hb=47941822dae18a018c985847b052e70214a3ccc6;hp=b76aaee475320ab24a63a3130161de02319539fe;hpb=a6e1ee0f51aa5570b20aad658365dec896f8c9b8;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/scene.h b/scene.h
index b76aaee..51ce103 100644
--- a/scene.h
+++ b/scene.h
@@ -6,208 +6,143 @@
 #include "bvh.h"
 
 typedef struct scene scene;
-#if 0
-typedef struct bvh_node bvh_node;
-#endif
 
 struct scene
 {
-   glmesh mesh;
+   mdl_vert *arrvertices;
+   u32 *arrindices;
 
-   model_vert *verts;
-   u32 *indices;
-   
-#if 0
-   struct 
-   {
-      bvh_node *nodes;
-      u32 node_count;
-   }
-   bvh;
-#else
-   bh_tree bhtris;
-#endif
-
-   u32 vertex_count,
-       indice_count,
-       vertex_cap,
-       indice_cap;
+   u32 vertex_count, indice_count,
+       max_vertices, max_indices;
 
    boxf bbx;
+   mdl_submesh submesh;
+};
 
-   u32 shadower_count,
-       shadower_cap;
+/* Initialize a scene description with bounded buffers */
+VG_STATIC scene *scene_init( void *lin_alloc, u32 max_verts, u32 max_indices )
+{
+   u32 vertex_length = max_verts   * sizeof(mdl_vert),
+       index_length  = max_indices * sizeof(u32),
+       tot_size = sizeof(scene) + vertex_length + index_length;
 
-   submodel submesh;
-};
+   scene *pscene = vg_linear_alloc( lin_alloc, tot_size );
 
-GLuint tex_dual_noise;
+   pscene->arrvertices = (mdl_vert *)(pscene+1);
+   pscene->arrindices  = (u32 *)( pscene->arrvertices + max_verts );
 
-static void scene_init( scene *pscene )
-{
-   pscene->verts = NULL;
-   pscene->indices = NULL;
    pscene->vertex_count = 0;
    pscene->indice_count = 0;
-   pscene->shadower_count = 0;
-   pscene->shadower_cap = 0;
+   pscene->max_vertices = max_verts;
+   pscene->max_indices  = max_indices;
+
    pscene->submesh.indice_start = 0;
    pscene->submesh.indice_count = 0;
 
    v3_fill( pscene->bbx[0],  999999.9f );
    v3_fill( pscene->bbx[1], -999999.9f );
 
-   static int noise_ready = 0;
-   if( !noise_ready )
-   {
-      noise_ready = 1;
-
-      u8 *buf = malloc( 256*256*2 );
-
-      for( int i=0; i<256*256; i++ )
-      {
-         u8 val = rand()&0xff;
-         buf[i*2] = val;
-      }
-
-      for( int y=0; y<256; y++ )
-      {
-         for( int x=0; x<256; x++ )
-         {
-            u8 *pr = &buf[(y*256+x)*2],
-               *pg = &buf[(((y+17)&0xff)*256+((x+37)&0xff))*2+1];
-            *pg = *pr;
-         }
-      }
-      
-      /* TODO: This texture should be delted somewhere */
-      glGenTextures( 1, &tex_dual_noise );
-      glBindTexture( GL_TEXTURE_2D, tex_dual_noise );
-      glTexImage2D( GL_TEXTURE_2D, 0, GL_RG, 256, 256, 0, GL_RG,
-            GL_UNSIGNED_BYTE, buf );
-
-      vg_tex2d_linear();
-      vg_tex2d_repeat();
-
-      free( buf );
-   }
-}
-
-static void *buffer_reserve( void *buffer, u32 count, u32 *cap, u32 amount, 
-      size_t emsize )
-{
-   if( count+amount > *cap )
-   {
-      *cap = VG_MAX( (*cap)*2, (*cap)+amount );
-      
-      return realloc( buffer, (*cap) * emsize );
-   }
-
-   return buffer;
+   return pscene;
 }
 
 /* 
  * Append a model into the scene with a given transform
  */
-static void scene_add_model( scene *pscene, model *mdl, submodel *submodel,
-      v3f pos, float yaw, float scale )
+VG_STATIC void scene_add_submesh( scene *pscene, mdl_context *mdl, 
+                                  mdl_submesh *sm, m4x3f transform )
 {
-   pscene->verts = buffer_reserve( pscene->verts, pscene->vertex_count, 
-         &pscene->vertex_cap, submodel->vertex_count, sizeof(model_vert) );
-   pscene->indices = buffer_reserve( pscene->indices, pscene->indice_count,
-         &pscene->indice_cap, submodel->indice_count, sizeof(u32) );
-   
-   /* Transform and place vertices */
-   model_vert *src_verts = submodel_vert_data( mdl, submodel );
-   u32 *src_indices = submodel_indice_data( mdl, submodel );
-   
-   m4x3f mtx;
-   m4x3_identity( mtx );
-   m4x3_translate( mtx, pos );
-   m4x3_rotate_y( mtx, yaw );
-   m4x3_scale( mtx, scale );
-
-   boxf bbxnew;
-   box_copy( submodel->bbx, bbxnew );
-   m4x3_transform_aabb( mtx, bbxnew );
-   box_concat( pscene->bbx, bbxnew );
-   
-   m3x3f rotation;
-   m4x3_to_3x3( mtx, rotation );
-
-   float rand_hue = vg_randf();
-
-   for( u32 i=0; i<submodel->vertex_count; i++ )
+   if( pscene->vertex_count + sm->vertex_count > pscene->max_vertices )
    {
-      model_vert *pvert = &pscene->verts[ pscene->vertex_count+i ],
-                 *src = &src_verts[ i ];
+      vg_error( "%u(current) + %u > %u\n", pscene->vertex_count,
+                                           sm->vertex_count,
+                                           pscene->max_vertices );
 
-      m4x3_mulv( mtx, src->co, pvert->co );
-      m3x3_mulv( rotation, src->norm, pvert->norm );
-
-      v4_copy( src->colour, pvert->colour );
-      v2_copy( src->uv, pvert->uv );
-      
-      float rel_y = src->co[1] / submodel->bbx[1][1];
-      pvert->colour[0] = rel_y;
-      pvert->colour[2] = rand_hue;
+      vg_warn( "%p ... %p\n", pscene, sm );
+      vg_fatal_exit_loop( "Scene vertex buffer overflow" );
    }
 
-   for( u32 i=0; i<submodel->indice_count; i++ )
+   if( pscene->indice_count + sm->indice_count > pscene->max_indices )
    {
-      u32 *pidx = &pscene->indices[ pscene->indice_count+i ];
-      *pidx = src_indices[i] + pscene->vertex_count;
+      vg_error( "%u(current) + %u > %u\n", pscene->indice_count,
+                                           sm->indice_count,
+                                           pscene->max_indices );
+      vg_warn( "%p ... %p\n", pscene, sm );
+
+      vg_fatal_exit_loop( "Scene index buffer overflow" );
    }
 
-   pscene->vertex_count += submodel->vertex_count;
-   pscene->indice_count += submodel->indice_count;
-}
+   mdl_vert *src_verts =  mdl_submesh_vertices( mdl, sm ),
+            *dst_verts = &pscene->arrvertices[ pscene->vertex_count ];
 
-static void scene_add_foliage( scene *pscene, model *mdl, submodel *submodel,
-      m4x3f transform )
-{
-   pscene->verts = buffer_reserve( pscene->verts, pscene->vertex_count, 
-         &pscene->vertex_cap, submodel->vertex_count, sizeof(model_vert) );
-   pscene->indices = buffer_reserve( pscene->indices, pscene->indice_count,
-         &pscene->indice_cap, submodel->indice_count, sizeof(u32) );
+   u32 *src_indices    =  mdl_submesh_indices( mdl, sm ),
+       *dst_indices    = &pscene->arrindices[ pscene->indice_count ];
    
    /* Transform and place vertices */
-   model_vert *src_verts = submodel_vert_data( mdl, submodel );
-   u32 *src_indices = submodel_indice_data( mdl, submodel );
-   
    boxf bbxnew;
-   box_copy( submodel->bbx, bbxnew );
+   box_copy( sm->bbx, bbxnew );
    m4x3_transform_aabb( transform, bbxnew );
    box_concat( pscene->bbx, bbxnew );
+
+   m3x3f normal_matrix;
+   m3x3_copy( transform, normal_matrix );
+   v3_normalize( normal_matrix[0] );
+   v3_normalize( normal_matrix[1] );
+   v3_normalize( normal_matrix[2] );
    
-   float rand_hue = vg_randf();
-   for( u32 i=0; i<submodel->vertex_count; i++ )
+   for( u32 i=0; i<sm->vertex_count; i++ )
    {
-      model_vert *pvert = &pscene->verts[ pscene->vertex_count+i ],
-                 *src = &src_verts[ i ];
+      mdl_vert *pvert = &dst_verts[ i ],
+               *src = &src_verts[ i ];
 
       m4x3_mulv( transform, src->co, pvert->co );
-      m3x3_mulv( transform, src->norm, pvert->norm );
-
-      v4_copy( src->colour, pvert->colour );
-      v2_copy( src->uv, pvert->uv );
+      m3x3_mulv( normal_matrix, src->norm, pvert->norm );
       
-      float rel_y = src->co[1] / submodel->bbx[1][1];
-      pvert->colour[0] = rel_y;
-      pvert->colour[2] = rand_hue;
+      pvert->colour[0] = src->colour[0];
+      pvert->colour[1] = src->colour[1];
+      pvert->colour[2] = src->colour[2];
+      pvert->colour[3] = src->colour[3];
+      v2_copy( src->uv, pvert->uv );
    }
 
-   for( u32 i=0; i<submodel->indice_count; i++ )
+   for( u32 i=0; i<sm->indice_count; i++ )
    {
-      u32 *pidx = &pscene->indices[ pscene->indice_count+i ];
-      *pidx = src_indices[i] + pscene->vertex_count;
+      dst_indices[i] = src_indices[i] + pscene->vertex_count;
    }
 
-   pscene->vertex_count += submodel->vertex_count;
-   pscene->indice_count += submodel->indice_count;
+   pscene->vertex_count += sm->vertex_count;
+   pscene->indice_count += sm->indice_count;
+
+}
+
+/*
+ * One by one adders for simplified access (mostly procedural stuff)
+ */
+VG_STATIC void scene_push_tri( scene *pscene, u32 tri[3] )
+{
+   if( pscene->indice_count + 3 > pscene->max_indices )
+      vg_fatal_exit_loop( "Scene vertex buffer overflow" );
+
+   u32 *dst = &pscene->arrindices[ pscene->indice_count ];
+
+   dst[0] = tri[0];
+   dst[1] = tri[1];
+   dst[2] = tri[2];
+
+   pscene->indice_count += 3;
+}
+
+VG_STATIC void scene_push_vert( scene *pscene, mdl_vert *v )
+{
+   if( pscene->vertex_count + 1 > pscene->max_vertices )
+      vg_fatal_exit_loop( "Scene vertex buffer overflow" );
+
+   mdl_vert *dst = &pscene->arrvertices[ pscene->vertex_count ];
+   *dst = *v;
+
+   pscene->vertex_count ++;
 }
 
-static void scene_copy_slice( scene *pscene, submodel *sm )
+VG_STATIC void scene_copy_slice( scene *pscene, mdl_submesh *sm )
 {
    sm->indice_start = pscene->submesh.indice_start;
    sm->indice_count = pscene->indice_count - sm->indice_start;
@@ -219,63 +154,99 @@ static void scene_copy_slice( scene *pscene, submodel *sm )
    pscene->submesh.vertex_start = pscene->vertex_count;
 }
 
-static void scene_upload( scene *pscene )
+/* finalization: tightly pack data */
+__attribute__((warn_unused_result))
+VG_STATIC scene *scene_fix( void *lin_alloc, scene *pscene )
 {
-   mesh_upload( &pscene->mesh,
-         pscene->verts, pscene->vertex_count,
-         pscene->indices, pscene->indice_count );
+   u32 vertex_length = pscene->vertex_count * sizeof(mdl_vert),
+       index_length  = pscene->indice_count * sizeof(u32),
+       tot_size = sizeof(scene) + vertex_length + index_length;
 
-   vg_info( "Scene upload\n" );
-   vg_info( "   indices:%u\n", pscene->indice_count );
-   vg_info( "   verts:%u\n", pscene->vertex_count );
-}
+   scene    *src_scene   = pscene;
+   mdl_vert *src_verts   = pscene->arrvertices;
+   u32      *src_indices = pscene->arrindices;
 
-static void scene_bind( scene *pscene )
-{
-   mesh_bind( &pscene->mesh );
+   scene *dst_scene = vg_linear_resize( lin_alloc, pscene, tot_size );
+   memcpy( dst_scene, src_scene, sizeof(scene) );
+
+   void *dst_verts   = dst_scene+1,
+        *dst_indices = dst_verts + vertex_length;
+
+   memcpy( dst_verts, src_verts, vertex_length );
+   memcpy( dst_indices, src_indices, index_length );
+
+   dst_scene->arrvertices = dst_verts;
+   dst_scene->arrindices  = dst_indices;
+   dst_scene->max_vertices = pscene->vertex_count;
+   dst_scene->max_indices  = pscene->indice_count;
+
+   return dst_scene;
 }
 
-static void scene_draw( scene *pscene )
+#if 0
+/* finalization: delete any offline buffers and reduce size */
+__attribute__((warn_unused_result))
+VG_STATIC scene *scene_free_offline_buffers( void *lin_alloc, scene *pscene )
 {
-   mesh_drawn( 0, pscene->indice_count );
+   u32 tot_size = sizeof(scene);
+
+   scene    *src_scene   = pscene;
+   mdl_vert *src_verts   = pscene->arrvertices;
+   u32      *src_indices = pscene->arrindices;
+
+   scene *dst_scene = vg_linear_resize( lin_alloc, pscene, tot_size );
+   memcpy( dst_scene, src_scene, sizeof(scene) );
+
+   dst_scene->arrindices = NULL;
+   dst_scene->arrvertices = NULL;
+
+   return dst_scene;
 }
+#endif
 
-static void scene_register(void)
+VG_STATIC void scene_upload( scene *pscene, glmesh *mesh )
 {
+   mesh_upload( mesh,
+                pscene->arrvertices, pscene->vertex_count,
+                pscene->arrindices,  pscene->indice_count );
+
+   vg_info( "Scene upload\n" );
+   vg_info( "   indices:%u\n", pscene->indice_count );
+   vg_info( "   verts:%u\n", pscene->vertex_count );
 }
 
 /*
  * BVH implementation
  */
 
-static void scene_bh_expand_bound( void *user, boxf bound, u32 item_index )
+VG_STATIC void scene_bh_expand_bound( void *user, boxf bound, u32 item_index )
 {
    scene *s = user;
-   model_vert *pa = &s->verts[ s->indices[item_index*3+0] ],
-              *pb = &s->verts[ s->indices[item_index*3+1] ],
-              *pc = &s->verts[ s->indices[item_index*3+2] ];
+   mdl_vert *pa = &s->arrvertices[ s->arrindices[item_index*3+0] ],
+            *pb = &s->arrvertices[ s->arrindices[item_index*3+1] ],
+            *pc = &s->arrvertices[ s->arrindices[item_index*3+2] ];
    
   box_addpt( bound, pa->co );
   box_addpt( bound, pb->co );
   box_addpt( bound, pc->co );
 }
 
-static float scene_bh_centroid( void *user, u32 item_index, int axis )
+VG_STATIC float scene_bh_centroid( void *user, u32 item_index, int axis )
 {
    scene *s = user;
-   model_vert *pa = &s->verts[ s->indices[item_index*3+0] ],
-              *pb = &s->verts[ s->indices[item_index*3+1] ],
-              *pc = &s->verts[ s->indices[item_index*3+2] ];
+   mdl_vert *pa = &s->arrvertices[ s->arrindices[item_index*3+0] ],
+            *pb = &s->arrvertices[ s->arrindices[item_index*3+1] ],
+            *pc = &s->arrvertices[ s->arrindices[item_index*3+2] ];
 
    return (pa->co[axis] + pb->co[axis] + pc->co[axis]) * (1.0f/3.0f);
 }
 
-static void scene_bh_swap( void *user, u32 ia, u32 ib )
+VG_STATIC void scene_bh_swap( void *user, u32 ia, u32 ib )
 {
    scene *s = user;
 
-   u32 *ti = &s->indices[ia*3];
-   u32 *tj = &s->indices[ib*3];
+   u32 *ti = &s->arrindices[ia*3];
+   u32 *tj = &s->arrindices[ib*3];
 
    u32 temp[3];
    temp[0] = ti[0];
@@ -291,28 +262,29 @@ static void scene_bh_swap( void *user, u32 ia, u32 ib )
    tj[2] = temp[2];
 }
 
-static void scene_bh_debug( void *user, u32 item_index )
+VG_STATIC void scene_bh_debug( void *user, u32 item_index )
 {
    scene *s = user;
    u32 idx = item_index*3;
-   model_vert *pa = &s->verts[ s->indices[ idx+0 ] ],
-              *pb = &s->verts[ s->indices[ idx+1 ] ],
-              *pc = &s->verts[ s->indices[ idx+2 ] ];
+   mdl_vert *pa = &s->arrvertices[ s->arrindices[ idx+0 ] ],
+            *pb = &s->arrvertices[ s->arrindices[ idx+1 ] ],
+            *pc = &s->arrvertices[ s->arrindices[ idx+2 ] ];
 
    vg_line( pa->co, pb->co, 0xff0000ff );
    vg_line( pb->co, pc->co, 0xff0000ff );
    vg_line( pc->co, pa->co, 0xff0000ff );
 }
 
-static int scene_bh_ray( void *user, u32 index, v3f co, v3f dir, ray_hit *hit )
+VG_STATIC int scene_bh_ray( void *user, u32 index, v3f co, 
+                            v3f dir, ray_hit *hit )
 {
    scene *s = user;
    v3f positions[3];
    
-   u32 *tri = &s->indices[ index*3 ];
+   u32 *tri = &s->arrindices[ index*3 ];
 
    for( int i=0; i<3; i++ )
-      v3_copy( s->verts[tri[i]].co, positions[i] );
+      v3_copy( s->arrvertices[tri[i]].co, positions[i] );
    
    float t;
    if(ray_tri( positions, co, dir, &t ))
@@ -328,7 +300,7 @@ static int scene_bh_ray( void *user, u32 index, v3f co, v3f dir, ray_hit *hit )
    return 0;
 }
 
-static bh_system bh_system_scene = 
+VG_STATIC bh_system bh_system_scene = 
 {
    .expand_bound = scene_bh_expand_bound,
    .item_centroid = scene_bh_centroid,
@@ -340,17 +312,18 @@ static bh_system bh_system_scene =
 /*
  * An extra step is added onto the end to calculate the hit normal
  */
-static int scene_raycast( scene *s, v3f co, v3f dir, ray_hit *hit )
+VG_STATIC int scene_raycast( scene *s, bh_tree *bh, 
+                             v3f co, v3f dir, ray_hit *hit )
 {
-   int count = bh_ray( &s->bhtris, 0, co, dir, hit );
+   int count = bh_ray( bh, co, dir, hit );
 
    if( count )
    {
       v3f v0, v1;
       
-      float *pa = s->verts[hit->tri[0]].co,
-            *pb = s->verts[hit->tri[1]].co,
-            *pc = s->verts[hit->tri[2]].co;
+      float *pa = s->arrvertices[hit->tri[0]].co,
+            *pb = s->arrvertices[hit->tri[1]].co,
+            *pc = s->arrvertices[hit->tri[2]].co;
 
       v3_sub( pa, pb, v0 );
       v3_sub( pc, pb, v1 );
@@ -362,10 +335,10 @@ static int scene_raycast( scene *s, v3f co, v3f dir, ray_hit *hit )
    return count;
 }
 
-static void scene_bh_create( scene *s )
+VG_STATIC bh_tree *scene_bh_create( void *lin_alloc, scene *s )
 {
    u32 triangle_count = s->indice_count / 3;
-   bh_create( &s->bhtris, &bh_system_scene, s, triangle_count );
+   return bh_create( lin_alloc, &bh_system_scene, s, triangle_count );
 }
 
 #endif