foliage windy shader

[carveJwlIkooP6JGAAIwe30JlM.git] / world_render.c

diff --git a/world_render.c b/world_render.c
index 990a1abfcc3ed6e565e322f36d67307d6b87114e..33814858c1eacc564be511b85718678b2bb6279e 100644 (file)
--- 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();
@@ -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;
          }
 
@@ -916,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 ){