X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_render.c;h=33814858c1eacc564be511b85718678b2bb6279e;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=4d5321bc2a2db50a019b8b141845b093a4603c56;hpb=23ba25574349652d86979fc787ec4b0214001333;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_render.c b/world_render.c
index 4d5321b..3381485 100644
--- a/world_render.c
+++ b/world_render.c
@@ -79,6 +79,7 @@ static void world_render_init(void)
 
    shader_scene_standard_register();
    shader_scene_standard_alphatest_register();
+   shader_scene_foliage_register();
    shader_scene_override_register();
    shader_scene_cubemapped_register();
    shader_scene_fxglow_register();
@@ -95,7 +96,7 @@ static void world_render_init(void)
    mdl_context msky;
    mdl_open( &msky, "models/rs_skydome.mdl", vg_mem.scratch );
    mdl_load_metadata_block( &msky, vg_mem.scratch );
-   mdl_async_load_glmesh( &msky, &world_render.skydome );
+   mdl_async_load_glmesh( &msky, &world_render.skydome, NULL );
    mdl_close( &msky );
 
    vg_info( "Loading default world textures\n" );
@@ -453,6 +454,29 @@ static void render_world_alphatest( world_instance *world, camera *cam ){
    glEnable(GL_CULL_FACE);
 }
 
+static void render_world_foliage( world_instance *world, camera *cam ){
+   shader_scene_foliage_use();
+   shader_scene_foliage_uTexGarbage(0);
+   shader_scene_foliage_uTexMain(1);
+   shader_scene_foliage_uPv( cam->mtx.pv );
+   shader_scene_foliage_uTime( vg.time );
+
+   WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( world, scene_foliage );
+   bind_terrain_noise();
+
+   shader_scene_foliage_uCamera( cam->transform[3] );
+   glDisable(GL_CULL_FACE);
+   struct world_pass pass = {
+      .shader = k_shader_foliage,
+      .cam = cam,
+      .fn_bind_textures = bindpoint_diffuse_texture1,
+      .fn_set_mdl = shader_scene_foliage_uMdl,
+      .fn_set_uPvmPrev = shader_scene_foliage_uPvmPrev,
+   };
+   world_render_both_stages( world, &pass );
+   glEnable(GL_CULL_FACE);
+}
+
 static void world_render_challenges( world_instance *world, 
                                      struct world_pass *pass, v3f pos ){
    if( !world ) return;
@@ -808,8 +832,10 @@ static void render_world_gates( world_instance *world, camera *cam ){
 
    for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
       ent_gate *gi = mdl_arritm( &world->ent_gate, i );
-      if( !(gi->flags & k_ent_gate_linked) )
-         continue;
+
+      if( !(gi->flags & k_ent_gate_nonlocal) )
+         if( !(gi->flags & k_ent_gate_linked) )
+            continue;
 
       float dist = v3_dist2( gi->co[0], cam->transform[3] );
 
@@ -830,8 +856,10 @@ static void render_world_gates( world_instance *world, camera *cam ){
       }
 
       if( gate->flags & k_ent_gate_nonlocal ){
-         if( world_static.load_state != k_world_loader_none ){
+         if( !(gate->flags & k_ent_gate_linked) ||
+             (world_static.load_state != k_world_loader_none) ){
             world->rendering_gate = NULL;
+            render_gate_unlinked( world, gate, cam );
             return;
          }
 
@@ -852,6 +880,10 @@ static void world_prerender( world_instance *world ){
       world->time = 0.834;
    }
 
+   if( world->info.flags & 0x1 ){
+      world->time = world->info.timezone;
+   }
+
    struct ub_world_lighting *state = &world->ub_lighting;
 
    state->g_time = world->time;
@@ -912,6 +944,7 @@ static void render_world( world_instance *world, camera *cam,
 
    render_world_vb( world, cam );
    render_world_alphatest( world, cam );
+   render_world_foliage( world, cam );
    render_terrain( world, cam );
 
    if( !viewing_from_gate ){