X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_render.h;h=ecbd3d22ec093a78cb68dfb128df537b2a3f3340;hb=859178c6d4b2a9b9a95f8b01b113f589ce0f197f;hp=d7ea51976729012e95dc76dd01e61ab67e108deb;hpb=63fe317d7db724162561da52aa382c82ac3c29be;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_render.h b/world_render.h
index d7ea519..ecbd3d2 100644
--- a/world_render.h
+++ b/world_render.h
@@ -12,6 +12,7 @@
 
 #include "shaders/scene_standard.h"
 #include "shaders/scene_standard_alphatest.h"
+#include "shaders/scene_foliage.h"
 #include "shaders/scene_override.h"
 #include "shaders/scene_cubemapped.h"
 #include "shaders/scene_vertex_blend.h"
@@ -50,12 +51,12 @@ struct world_render{
    u32 timer_text_count;
 
    struct text_particle{
-      rb_object obj;
+      rigidbody rb;
       m4x3f mlocal;
       ent_glyph *glyph;
       v4f colour;
-
       m4x3f mdl;
+      f32 radius;
    }
    text_particles[6*4];
    u32 text_particle_count;
@@ -75,13 +76,16 @@ static void world_bind_light_index( world_instance *world,
                                        int slot );
 static void render_world_position( world_instance *world, camera *cam );
 static void render_world_depth( world_instance *world, camera *cam );
-static void render_world( world_instance *world, camera *cam, 
-                             int layer_depth );
+static void render_world( world_instance *world, camera *cam,
+                          int stenciled, int viewing_from_gate, 
+                          int with_water, int with_cubemaps );
 static void render_world_cubemaps( world_instance *world );
 static void bind_terrain_noise(void);
 static void render_world_override( world_instance *world,
                                    world_instance *lighting_source,
-                                   m4x3f mmdl );
+                                   m4x3f mmdl,
+                                   camera *cam,
+                                   ent_spawn *dest_spawn, v4f map_info );
 
 #define WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( WORLD, SHADER )            \
    world_link_lighting_ub( WORLD, _shader_##SHADER.id );                \