X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=terrain.h;fp=terrain.h;h=81b311ac737d64c861d67a67fc6b841e3d8c0bc7;hb=3bb0287d544a4cb75de9afe2927ac8e946f3a18e;hp=d35dc0ab0f39ffdaa3c57b53bb891d86b48ee124;hpb=cb16ccb05a796178c879ea8d5091663d215a5217;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/terrain.h b/terrain.h index d35dc0a..81b311a 100644 --- a/terrain.h +++ b/terrain.h @@ -12,6 +12,7 @@ static void render_sky(m4x3f camera); #include "shaders/terrain.h" #include "shaders/sky.h" +#include "shaders/planeinf.h" vg_tex2d tex_terrain_colours = { .path = "textures/gradients.qoi", .flags = VG_TEXTURE_CLAMP | VG_TEXTURE_NEAREST @@ -22,6 +23,8 @@ vg_tex2d tex_terrain_noise = { .path = "textures/garbage.qoi", static struct { glmesh skydome; + submodel dome_upper, + dome_lower; } trender; @@ -29,6 +32,7 @@ static void terrain_register(void) { shader_terrain_register(); shader_sky_register(); + shader_planeinf_register(); } static void terrain_init(void) @@ -39,6 +43,10 @@ static void terrain_init(void) model *msky = vg_asset_read("models/rs_skydome.mdl"); model_unpack( msky, &trender.skydome ); + + trender.dome_lower = *submodel_get( msky, "dome_lower" ); + trender.dome_upper = *submodel_get( msky, "dome_upper" ); + free(msky); } @@ -59,6 +67,29 @@ static void render_terrain(m4x4f projection, v3f camera) shader_terrain_uPlane( (v4f){ 0.0f,1.0f,0.0f, wrender.height } ); } +static void render_lowerdome( m4x3f camera ) +{ + m4x4f projection, full; + pipeline_projection( projection, 0.4f, 1000.0f ); + + m4x3f inverse; + m3x3_transpose( camera, inverse ); + v3_copy((v3f){0.0f,0.0f,0.0f}, inverse[3]); + m4x3_expand( inverse, full ); + m4x4_mul( projection, full, full ); + + m4x3f identity_matrix; + m4x3_identity( identity_matrix ); + + shader_planeinf_use(); + shader_planeinf_uMdl(identity_matrix); + shader_planeinf_uPv(full); + shader_planeinf_uCamera(camera[3]); + shader_planeinf_uPlane( (v4f){0.0f,1.0f,0.0f, water_height()} ); + + submodel_draw( &trender.dome_lower ); +} + static void render_sky(m4x3f camera) { m4x4f projection, full; @@ -78,14 +109,16 @@ static void render_sky(m4x3f camera) shader_sky_uPv(full); shader_sky_uTexGarbage(0); shader_sky_uTime( vg_time ); + + vg_tex2d_bind( &tex_terrain_noise, 0 ); glDepthMask(GL_FALSE); glDisable(GL_DEPTH_TEST); mesh_bind( &trender.skydome ); - mesh_draw( &trender.skydome ); - + submodel_draw( &trender.dome_upper ); + glEnable(GL_DEPTH_TEST); glDepthMask(GL_TRUE); }