X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gen.h;h=b5481c044f100effcb99f2ab15805e34616bd5d0;hb=0124cd309a7db70cdd74b5661f2df8b862ca2f2f;hp=4e96d96be15bda08408deff3205afe498e2bf5e2;hpb=b528a849aba893cee8c8bfbaa01ff13cf59fb429;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_gen.h b/world_gen.h
index 4e96d96..b5481c0 100644
--- a/world_gen.h
+++ b/world_gen.h
@@ -54,7 +54,14 @@ VG_STATIC void world_apply_procedural_foliage( struct world_material *mat )
    mdl_node *mblob = mdl_node_from_name( mfoliage, "blob" );
    mdl_submesh *sm_blob = mdl_node_submesh( mfoliage, mblob, 0 );
 
-   for( int i=0;i<100000;i++ )
+   int count = 0;
+
+   float area = volume[0]*volume[2];
+   u32 particles = 0.08f * area;
+
+   vg_info( "Map area: %f. Max particles: %u\n", area, particles );
+
+   for( int i=0;i<particles;i++ )
    {
       v3f pos;
       v3_mul( volume, (v3f){ vg_randf(), 1000.0f, vg_randf() }, pos );
@@ -64,7 +71,7 @@ VG_STATIC void world_apply_procedural_foliage( struct world_material *mat )
       ray_hit hit;
       hit.dist = INFINITY;
 
-      if( ray_world( pos, (v3f){0.0f,-1.0f,0.0f}, &hit ))
+      if( ray_world( pos, (v3f){0.0001f,-1.0f,0.0001f}, &hit ))
       {
          struct world_material *m1 = ray_hit_material( &hit );
          if((hit.normal[1] > 0.8f) && (m1 == mat) && (hit.pos[1] > 0.0f+10.0f))
@@ -83,9 +90,13 @@ VG_STATIC void world_apply_procedural_foliage( struct world_material *mat )
             v3_copy( hit.pos, transform[3] );
             scene_add_submesh( world.scene_no_collide, mfoliage, 
                                sm_blob, transform);
+
+            count ++;
          }
       }
    }
+
+   vg_info( "%d foliage models added\n", count );
 }
 
 VG_STATIC void world_ents_allocate(void)
@@ -544,8 +555,7 @@ VG_STATIC void world_post_process(void)
       glDisable(GL_DEPTH_TEST);
       glDisable(GL_BLEND);
       glDisable(GL_CULL_FACE);
-      glBindFramebuffer( GL_FRAMEBUFFER, gpipeline.fb_depthmap );
-      glViewport( 0, 0, 1024, 1024 );
+      render_fb_bind( gpipeline.fb_heightmap );
       shader_blitcolour_use();
       shader_blitcolour_uColour( (v4f){-9999.0f,-9999.0f,-9999.0f,-9999.0f} );
       render_fsquad();