X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gen.c;h=04d6131ec51e52da759a0ddf27b57a8592327576;hb=refs%2Fheads%2Fmaster;hp=047155e6e0cf8d77483c75fff27e6b1a53ba5f50;hpb=5f6a4f9df6c8accc89f1920bfe9ace3cbac4c4b6;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_gen.c b/world_gen.c
index 047155e..04d6131 100644
--- a/world_gen.c
+++ b/world_gen.c
@@ -9,6 +9,7 @@
 #include "world_load.h"
 #include "world_volumes.h"
 #include "world_gate.h"
+#include <string.h>
 
 /*
  * Add all triangles from the model, which match the material ID
@@ -206,7 +207,8 @@ void world_unpack_submesh_dynamic( world_instance *world,
 /*
  * Create the main meshes for the world
  */
-static void world_gen_generate_meshes( world_instance *world ){
+void world_gen_generate_meshes( world_instance *world )
+{
    /* 
     * Compile meshes into the world scenes
     */
@@ -395,7 +397,8 @@ static void async_upload_light_indices( void *payload, u32 size ){
 /*
  * Computes light indices for world
  */
-static void world_gen_compute_light_indices( world_instance *world ){
+void world_gen_compute_light_indices( world_instance *world )
+{
    /* light cubes */
    v3f cubes_min, cubes_max;
    v3_muls( world->scene_geo.bbx[0], 1.0f/k_world_light_cube_size, cubes_min );
@@ -555,7 +558,8 @@ static void world_gen_compute_light_indices( world_instance *world ){
 /*
  * Rendering pass needed to complete the world
  */
-static void async_world_postprocess( void *payload, u32 _size ){
+void async_world_postprocess( void *payload, u32 _size )
+{
    /* create scene lighting buffer */
    world_instance *world = payload;
 
@@ -709,7 +713,8 @@ static void async_world_postprocess( void *payload, u32 _size ){
 }
 
 /* Loads textures from the pack file */
-static void world_gen_load_surfaces( world_instance *world ){
+void world_gen_load_surfaces( world_instance *world )
+{
    vg_info( "Loading textures\n" );
    world->texture_count = 0;
 
@@ -718,10 +723,12 @@ static void world_gen_load_surfaces( world_instance *world ){
                               vg_align8(sizeof(GLuint)*world->texture_count) );
    world->textures[0] = vg.tex_missing;
 
-   for( u32 i=0; i<mdl_arrcount(&world->meta.textures); i++ ){
+   for( u32 i=0; i<mdl_arrcount(&world->meta.textures); i++ )
+   {
       mdl_texture *tex = mdl_arritm( &world->meta.textures, i );
 
-      if( !tex->file.pack_size ){
+      if( !tex->file.pack_size )
+      {
          vg_fatal_error( "World models must have packed textures!" );
       }
 
@@ -745,9 +752,25 @@ static void world_gen_load_surfaces( world_instance *world ){
    struct world_surface *errmat = &world->surfaces[0];
    memset( errmat, 0, sizeof(struct world_surface) );
                        
-   for( u32 i=0; i<mdl_arrcount(&world->meta.materials); i++ ){
+   for( u32 i=0; i<mdl_arrcount(&world->meta.materials); i++ )
+   {
       struct world_surface *surf = &world->surfaces[i+1];
       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 )
+      {
+         struct shader_props_standard *props = surf->info.props.compiled;
+         surf->alpha_tex = props->tex_diffuse;
+      }
+      else
+         surf->alpha_tex = 0;
    }
 }