projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a mess but stable
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_gen.c
diff --git
a/world_gen.c
b/world_gen.c
index 3d88ecd72f87312d9f6e2ef389005c73b444675f..91e5b7bef5d63ae6dada59aba05a366870e74cde 100644
(file)
--- a/
world_gen.c
+++ b/
world_gen.c
@@
-650,7
+650,7
@@
void async_world_postprocess( void *payload, u32 _size )
glDisable(GL_DEPTH_TEST);
glDisable(GL_BLEND);
glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST);
glDisable(GL_BLEND);
glDisable(GL_CULL_FACE);
-
render_fb_bind( &world->heightmap, 0
);
+
vg_framebuffer_bind( world->heightmap, 1.0f
);
shader_blitcolour_use();
shader_blitcolour_uColour( (v4f){-9999.0f,-9999.0f,-9999.0f,-9999.0f} );
render_fsquad();
shader_blitcolour_use();
shader_blitcolour_uColour( (v4f){-9999.0f,-9999.0f,-9999.0f,-9999.0f} );
render_fsquad();
@@
-758,6
+758,12
@@
void world_gen_load_surfaces( world_instance *world )
surf->info = *(mdl_material *)mdl_arritm( &world->meta.materials, i );
surf->flags = 0;
surf->info = *(mdl_material *)mdl_arritm( &world->meta.materials, i );
surf->flags = 0;
+ if( surf->info.shader == k_shader_water )
+ {
+ struct shader_props_water *props = surf->info.props.compiled;
+ world->ub_lighting.g_water_fog = props->fog_scale;
+ }
+
if( surf->info.shader == k_shader_standard_cutout ||
surf->info.shader == k_shader_foliage )
{
if( surf->info.shader == k_shader_standard_cutout ||
surf->info.shader == k_shader_foliage )
{