X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=bf58144a3b8727c9b80fc5fea3bfa7752d1fa968;hb=777083e1f715a26d3f68be4ba5bdf2cbcaa84a05;hp=e5c039a495113f8ae528ed8b7e4890d1e3ad7064;hpb=1f0e3292c021e8263716e5f4544a1efcedf3f03d;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index e5c039a..bf58144 100644
--- a/world.h
+++ b/world.h
@@ -53,12 +53,6 @@ enum geo_type
    k_geo_type_water = 2
 };
 
-enum material_flag
-{
-   k_material_flag_skate_surface = 0x1,
-   k_material_flag_collision = 0x2
-};
-
 VG_STATIC struct gworld
 {
    /*
@@ -312,10 +306,18 @@ VG_STATIC struct gworld
          *scene_no_collide,
          *scene_lines;
 
+   struct grind_edge
+   {
+      v3f p0, p1;
+   }
+   *grind_edges;
+   u32 grind_edge_count;
+
    /* spacial mappings */
    bh_tree *audio_bh,
            *trigger_bh,
-           *geo_bh;
+           *geo_bh,
+           *grind_bh;
 
    /* graphics */
    glmesh mesh_route_lines;
@@ -335,7 +337,7 @@ world;
  */
 
 VG_STATIC int ray_hit_is_ramp( ray_hit *hit );
-VG_STATIC int ray_hit_is_terrain( ray_hit *hit );
+VG_STATIC struct world_material *ray_hit_material( ray_hit *hit );
 VG_STATIC void ray_world_get_tri( ray_hit *hit, v3f tri[3] );
 VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit );
 
@@ -456,7 +458,7 @@ VG_STATIC void world_init(void)
    vg_loader_highwater( world_routes_init, NULL, NULL );
 
    /* Allocate dynamic world memory arena */
-   u32 max_size = 72*1024*1024;
+   u32 max_size = 76*1024*1024;
    world.dynamic_vgl = vg_create_linear_allocator( vg_mem.rtmemory, max_size,
                                                    VG_MEMORY_SYSTEM );
 }
@@ -569,36 +571,40 @@ VG_STATIC void world_update( v3f pos )
    world_routes_debug();
 #endif
    
-   int closest = 0;
-   float min_dist = INFINITY;
-
-   for( int i=0; i<world.route_count; i++ )
+   if( world.route_count > 0 )
    {
-      float d = v3_dist2( world.routes[i].scoreboard_transform[3], pos );
+      int closest = 0;
+      float min_dist = INFINITY;
 
-      if( d < min_dist )
+      for( int i=0; i<world.route_count; i++ )
       {
-         min_dist = d;
-         closest = i;
-      }
-   }
+         float d = v3_dist2( world.routes[i].scoreboard_transform[3], pos );
 
-   if( (world.active_route_board != closest) || network_scores_updated )
-   {
-      network_scores_updated = 0;
-      world.active_route_board = closest;
+         if( d < min_dist )
+         {
+            min_dist = d;
+            closest = i;
+         }
+      }
 
-      struct route *route = &world.routes[closest];
+      if( (world.active_route_board != closest) || network_scores_updated )
+      {
+         network_scores_updated = 0;
+         world.active_route_board = closest;
 
-      u32 id = route->track_id;
+         struct route *route = &world.routes[closest];
 
-      if( id != 0xffffffff )
-      {
-         struct netmsg_board *local_board = &scoreboard_client_data.boards[id];
+         u32 id = route->track_id;
 
-         for( int i=0; i<13; i++ )
+         if( id != 0xffffffff )
          {
-            sfd_encode( i, &local_board->data[27*i] );
+            struct netmsg_board *local_board = 
+               &scoreboard_client_data.boards[id];
+
+            for( int i=0; i<13; i++ )
+            {
+               sfd_encode( i, &local_board->data[27*i] );
+            }
          }
       }
    }
@@ -649,28 +655,31 @@ VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit )
    return scene_raycast( world.scene_geo, world.geo_bh, pos, dir, hit );
 }
 
-VG_STATIC int ray_hit_is_terrain( ray_hit *hit )
+VG_STATIC struct world_material *world_tri_index_material( u32 index )
 {
-   return 0;
-#if 0
-   u32 valid_start = 0,
-       valid_end   = world.sm_terrain.vertex_count;
+   for( int i=1; i<world.material_count; i++ )
+   {
+      struct world_material *mat = &world.materials[i];
 
-   return (hit->tri[0] >= valid_start) &&
-          (hit->tri[0]  < valid_end);
-#endif
+      if( (index >= mat->sm_geo.vertex_start) &&
+          (index  < mat->sm_geo.vertex_start+mat->sm_geo.vertex_count ) )
+      {
+         return mat;
+      }
+   }
+
+   /* error material */
+   return &world.materials[0];
 }
 
-VG_STATIC int ray_hit_is_ramp( ray_hit *hit )
+VG_STATIC struct world_material *world_contact_material( rb_ct *ct )
 {
-   return 1;
-#if 0
-   u32 valid_start = world.sm_geo_std.vertex_start,
-       valid_end   = world.sm_geo_vb.vertex_start;
+   return world_tri_index_material( ct->element_id );
+}
 
-   return (hit->tri[0] >= valid_start) &&
-          (hit->tri[0]  < valid_end);
-#endif
+VG_STATIC struct world_material *ray_hit_material( ray_hit *hit )
+{
+   return world_tri_index_material( hit->tri[0] );
 }
 
 #endif /* WORLD_H */