X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world.h;h=3734dbf353963295c2b75eb8ec25aa4436509436;hb=4a883ac1b2506032f9dddab342712de46f2ca734;hp=73a33c0275208cc9e4312c4c5b6abee059a2319d;hpb=4c49b11c317034277be4d117c5d2847ef2f3492b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world.h b/world.h
index 73a33c0..3734dbf 100644
--- a/world.h
+++ b/world.h
@@ -62,8 +62,10 @@ static struct gworld
    scene geo, foliage;
    rigidbody rb_geo;
 
+   /* TODO Maybe make this less hardcoded */
    mdl_submesh sm_geo_std_oob, sm_geo_std, sm_geo_vb,
-               sm_foliage_main, sm_foliage_alphatest;
+               sm_foliage_main, sm_foliage_alphatest,
+               sm_graffiti, sm_subworld, sm_terrain;
 
    glmesh skybox, skydome;
    mdl_submesh dome_upper, dome_lower;
@@ -99,6 +101,9 @@ vg_tex2d tex_terrain_noise = { .path = "textures/garbage.qoi",
 vg_tex2d tex_alphatest = { .path = "textures/alphatest.qoi",
                                  .flags = VG_TEXTURE_NEAREST };
 
+vg_tex2d tex_graffiti = { .path = "textures/graffitibox.qoi",
+                                 .flags = VG_TEXTURE_NEAREST };
+
 static void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
 {
    for( int i=0; i<3; i++ )
@@ -110,9 +115,22 @@ static int ray_world( v3f pos, v3f dir, ray_hit *hit )
    return scene_raycast( &world.geo, pos, dir, hit );
 }
 
+static int ray_hit_is_terrain( ray_hit *hit )
+{
+   u32 valid_start = 0,
+       valid_end   = world.sm_terrain.vertex_count;
+
+   return (hit->tri[0] >= valid_start) &&
+          (hit->tri[0]  < valid_end);
+}
+
 static int ray_hit_is_ramp( ray_hit *hit )
 {
-   return hit->tri[0] > world.sm_geo_std_oob.vertex_count;
+   u32 valid_start = world.sm_geo_std.vertex_start,
+       valid_end   = world.sm_geo_vb.vertex_start;
+
+   return (hit->tri[0] >= valid_start) &&
+          (hit->tri[0]  < valid_end);
 }
 
 static void world_register(void)
@@ -200,8 +218,8 @@ static void world_apply_procedural_foliage(void)
 
       if( ray_world( pos, (v3f){0.0f,-1.0f,0.0f}, &hit ))
       {
-         if( hit.normal[1] > 0.8f && !ray_hit_is_ramp(&hit) &&
-             hit.pos[1] > water_height()+10.0f )
+         if( (hit.normal[1] > 0.8f) && ray_hit_is_terrain(&hit) &&
+             (hit.pos[1] > water_height()+10.0f) )
          {
             v4f qsurface, qrandom;
             v3f axis;
@@ -349,7 +367,10 @@ static void world_load(void)
    u32 mat_surf = 0,
        mat_surf_oob = 0,
        mat_vertex_blend = 0,
-       mat_alphatest = 0;
+       mat_alphatest = 0,
+       mat_graffiti = 0,
+       mat_subworld = 0,
+       mat_terrain = 0;
 
    for( int i=1; i<mworld->material_count; i++ )
    {
@@ -364,11 +385,19 @@ static void world_load(void)
          mat_vertex_blend = i;
       else if( !strcmp( "alphatest", mat_name ))
          mat_alphatest = i;
+      else if( !strcmp( "graffitibox", mat_name ))
+         mat_graffiti = i;
+      else if( !strcmp( "terrain", mat_name ) )
+         mat_terrain = i;
    }
 
    m4x3f midentity;
    m4x3_identity( midentity );
 
+   if( mat_terrain )
+      add_all_if_material( midentity, &world.geo, mworld, mat_terrain );
+   scene_copy_slice( &world.geo, &world.sm_terrain );
+
    if( mat_surf_oob )
       add_all_if_material( midentity, &world.geo, mworld, mat_surf_oob );
    else
@@ -398,6 +427,9 @@ static void world_load(void)
    add_all_if_material( midentity, &world.foliage, mworld, mat_alphatest );
    scene_copy_slice( &world.foliage, &world.sm_foliage_alphatest );
 
+   add_all_if_material( midentity, &world.foliage, mworld, mat_graffiti );
+   scene_copy_slice( &world.foliage, &world.sm_graffiti );
+
    scene_upload( &world.foliage );
    world_routes_loadfrom( mworld );
 
@@ -485,7 +517,8 @@ static void world_init(void)
 {
    vg_tex2d_init( (vg_tex2d *[]){ &tex_terrain_colours, 
                                   &tex_terrain_noise,
-                                  &tex_alphatest }, 3 );
+                                  &tex_alphatest,
+                                  &tex_graffiti }, 4 );
 
    mdl_header *mcars = mdl_load( "models/rs_cars.mdl" );
    mdl_unpack_glmesh( mcars, &world.cars );
@@ -511,6 +544,7 @@ static void world_init(void)
 
 static void world_update(void)
 {
+   world_routes_update();
    world_routes_debug();
    sfd_update( &world.sfd.tester );
 
@@ -592,6 +626,10 @@ static void render_world_alphatest( m4x4f projection, v3f camera )
    glDisable(GL_CULL_FACE);
    scene_bind( &world.foliage );
    mdl_draw_submesh( &world.sm_foliage_alphatest );
+
+   vg_tex2d_bind( &tex_graffiti, 1 );
+   mdl_draw_submesh( &world.sm_graffiti );
+
    glEnable(GL_CULL_FACE);
 }
 
@@ -611,8 +649,10 @@ static void render_terrain( m4x4f projection, v3f camera )
    shader_terrain_uCamera( camera );
 
    scene_bind( &world.geo );
+   mdl_draw_submesh( &world.sm_terrain );
    mdl_draw_submesh( &world.sm_geo_std_oob );
    mdl_draw_submesh( &world.sm_geo_std );
+   mdl_draw_submesh( &world.sm_subworld );
 
    /* TODO: Dont draw in reflection */
    glDisable(GL_CULL_FACE);
@@ -678,15 +718,22 @@ static void render_sky(m4x3f camera)
 
 static void render_world_gates( m4x4f projection, m4x3f camera )
 {
-   int count = 0;
+   float closest = INFINITY;
+   int   id = 0;
+
    for( int i=0; i<world.routes.gate_count; i++ )
    {
       struct route_gate *rg = &world.routes.gates[i];
-      count += render_gate( &rg->gate, camera );
+      float dist = v3_dist2( rg->gate.co[0], camera[3] );
 
-      if( count == 2 )
-         return;
+      if( dist < closest )
+      {
+         closest = dist;
+         id = i;
+      }
    }
+
+   render_gate( &world.routes.gates[id].gate, camera );
 }
 
 static void render_world( m4x4f projection, m4x3f camera )
@@ -705,7 +752,7 @@ static void render_world( m4x4f projection, m4x3f camera )
    q_axis_angle( t, (v3f){0.0f,1.0f,0.0f}, 2.3f );
    q_m3x3( t, identity_matrix );
 
-   sfd_render( &world.sfd.tester, projection, camera[3], identity_matrix );
+   //sfd_render( &world.sfd.tester, projection, camera[3], identity_matrix );
 }
 
 static void render_world_depth( m4x4f projection, m4x3f camera )