mini world rendering adjustments

[carveJwlIkooP6JGAAIwe30JlM.git] / world_render.c

diff --git a/world_render.c b/world_render.c
index 1e99566e68ddd9f9e8169758473364b9722750ca..14631421c25304a3dc4de936de1987ae999a827f 100644 (file)
--- a/world_render.c
+++ b/world_render.c
@@ -84,6 +84,7 @@ static void world_render_init(void)
    shader_scene_depth_register();
    shader_scene_position_register();
    shader_model_sky_register();
+   shader_model_sky_space_register();
 
    vg_info( "Loading world resources\n" );
    vg_linear_clear( vg_mem.scratch );
@@ -644,8 +645,7 @@ static void render_terrain( world_instance *world, camera *cam ){
    world_render_both_stages( world, &pass );
 }
 
-static void render_sky( world_instance *world, camera *cam )
-{
+static void render_sky( world_instance *world, camera *cam ){
    /* 
     * Modify matrix to remove clipping and view translation
     */
@@ -673,15 +673,32 @@ static void render_sky( world_instance *world, camera *cam )
    /*
     * Draw
     */
-   shader_model_sky_use();
-   shader_model_sky_uMdl( identity_matrix );
-   shader_model_sky_uPv( pv );
-   shader_model_sky_uPvmPrev( pv_prev );
-   shader_model_sky_uTexGarbage(0);
-   world_link_lighting_ub( world, _shader_model_sky.id );
+   if( world->skybox == k_skybox_default ){
+      shader_model_sky_use();
+      shader_model_sky_uMdl( identity_matrix );
+      shader_model_sky_uPv( pv );
+      shader_model_sky_uPvmPrev( pv_prev );
+      shader_model_sky_uTexGarbage(0);
+      world_link_lighting_ub( world, _shader_model_sky.id );
+
+      glActiveTexture( GL_TEXTURE0 );
+      glBindTexture( GL_TEXTURE_2D, world_render.tex_terrain_noise );
+   }
+   else if( world->skybox == k_skybox_space ){
+      shader_model_sky_space_use();
 
-   glActiveTexture( GL_TEXTURE0 );
-   glBindTexture( GL_TEXTURE_2D, world_render.tex_terrain_noise );
+      shader_model_sky_space_uMdl( identity_matrix );
+      shader_model_sky_space_uPv( pv );
+      shader_model_sky_space_uPvmPrev( pv_prev );
+      shader_model_sky_space_uTexGarbage(0);
+      world_link_lighting_ub( world, _shader_model_sky_space.id );
+
+      glActiveTexture( GL_TEXTURE0 );
+      glBindTexture( GL_TEXTURE_2D, world_render.tex_terrain_noise );
+   }
+   else {
+      assert(0);
+   }
 
    glDepthMask( GL_FALSE );
    glDisable( GL_DEPTH_TEST );
@@ -858,7 +875,9 @@ static void render_world_override_pass( world_instance *world,
    }
 }
 
-static void render_world_override( world_instance *world, m4x3f mmdl ){
+static void render_world_override( world_instance *world,
+                                   world_instance *lighting_source,
+                                   m4x3f mmdl ){
    struct world_pass pass = {
       .cam = &skaterift.cam,
       .fn_bind_textures = bindpoint_override,
@@ -869,32 +888,51 @@ static void render_world_override( world_instance *world, m4x3f mmdl ){
    };
 
    shader_scene_override_use();
+#if 0
    respawn_chooser_shader_uniforms();
+#endif
    shader_scene_override_uTexGarbage(0);
    shader_scene_override_uTexMain(1);
    shader_scene_override_uPv( pass.cam->mtx.pv );
 
-   WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( world, scene_override );
+   WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( lighting_source, scene_override );
    bind_terrain_noise();
 
-   m4x3f mmdl_inv;
-   m4x3_invert_full( mmdl, mmdl_inv );
-
-   v3f cam_pos;
-   m4x3_mulv( mmdl_inv, pass.cam->transform[3], cam_pos );
-   shader_scene_override_uCamera( cam_pos );
+   shader_scene_override_uCamera( pass.cam->transform[3] );
 
    m4x4f mpvm_prev;
    m4x3_expand( mmdl, mpvm_prev );
    m4x4_mul( skaterift.cam.mtx_prev.pv, mpvm_prev, mpvm_prev );
 
    m3x3f mnormal;
-   m3x3_inv( mmdl_inv, mnormal );
+   m3x3_inv( mmdl, mnormal );
    m3x3_transpose( mnormal, mnormal );
    v3_normalize( mnormal[0] );
    v3_normalize( mnormal[1] );
    v3_normalize( mnormal[2] );
 
+   v4f uPlayerPos, uSpawnPos;
+   v4_zero( uPlayerPos );
+   v4_zero( uSpawnPos );
+
+   v3_copy( world->player_co, uPlayerPos );
+   
+   m4x3f mmdl_inv;
+   m4x3_invert_full( mmdl, mmdl_inv );
+   v3f localized;
+   m4x3_mulv( mmdl_inv, localplayer.rb.co, localized );
+   ent_spawn *spawn = world_find_closest_spawn( world, localized );
+   if( spawn )
+      v3_copy( spawn->transform.co, uSpawnPos );
+
+   uPlayerPos[3] = v3_dist(uPlayerPos,uSpawnPos);
+   uSpawnPos[3] = 1.0f/uPlayerPos[3];
+
+   shader_scene_override_uPlayerPos( uPlayerPos );
+   shader_scene_override_uSpawnPos( uSpawnPos );
+
+
+
    glDisable( GL_CULL_FACE );
    mesh_bind( &world->mesh_geo );
    pass.geo_type = k_world_geo_type_solid;