remove references to glide in master

[carveJwlIkooP6JGAAIwe30JlM.git] / world_render.h

diff --git a/world_render.h b/world_render.h
index 0229b9d5ef756994c9fc6c7d10291075d5e0ce22..540e0be2aa5bb85f29e0d0ddddd78c6d085f9e5b 100644 (file)
--- a/world_render.h
+++ b/world_render.h
@@ -12,13 +12,17 @@
 
 #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"
 #include "shaders/scene_terrain.h"
 #include "shaders/scene_fxglow.h"
 #include "shaders/scene_depth.h"
 #include "shaders/scene_position.h"
+#include "shaders/scene_font.h"
 #include "shaders/model_sky.h"
+#include "shaders/model_sky_space.h"
 
 static const float k_world_light_cube_size = 8.0f;
 
@@ -58,22 +62,38 @@ struct world_render{
    u32 text_particle_count;
 }
 static world_render;
-VG_STATIC void world_render_init(void);
+static void world_render_init(void);
 
-VG_STATIC void world_link_lighting_ub( world_instance *world, GLuint shader );
-VG_STATIC void world_bind_position_texture( world_instance *world, 
+static void world_link_lighting_ub( world_instance *world, GLuint shader );
+static void world_bind_position_texture( world_instance *world, 
                                             GLuint shader, GLuint location,
                                             int slot );
-VG_STATIC void world_bind_light_array( world_instance *world,
+static void world_bind_light_array( world_instance *world,
                                        GLuint shader, GLuint location, 
                                        int slot );
-VG_STATIC void world_bind_light_index( world_instance *world,
+static void world_bind_light_index( world_instance *world,
                                        GLuint shader, GLuint location,
                                        int slot );
-VG_STATIC void render_world_position( world_instance *world, camera *cam );
-VG_STATIC void render_world_depth( world_instance *world, camera *cam );
-VG_STATIC void render_world( world_instance *world, camera *cam,
-                             int layer_depth );
-VG_STATIC void render_world_cubemaps( world_instance *world );
+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 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,
+                                   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 );                \
+   world_bind_position_texture( WORLD, _shader_##SHADER.id,             \
+                                _uniform_##SHADER##_g_world_depth, 2 ); \
+   world_bind_light_array( WORLD, _shader_##SHADER.id,                  \
+                           _uniform_##SHADER##_uLightsArray, 3 );       \
+   world_bind_light_index( WORLD, _shader_##SHADER.id,                  \
+                           _uniform_##SHADER##_uLightsIndex, 4 );
 
 #endif /* WORLD_RENDER_H */