X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=render.h;h=2c4926d79e07d7fecfa409aa4e69c098d29c66dd;hb=61d4952a59c72dab12aa5cb9100d4433b2cdcedf;hp=64556ffbcfac1390a7c4789976c524e990d2608a;hpb=93790b71d3a89724255dc73239e38c08ad4bbac7;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/render.h b/render.h
index 64556ff..2c4926d 100644
--- a/render.h
+++ b/render.h
@@ -5,6 +5,7 @@
 #include "common.h"
 #include "model.h"
 #include "camera.h"
+#include "shader_props.h"
 
 #include "shaders/blit.h"
 #include "shaders/blitblur.h"
@@ -79,47 +80,11 @@ struct framebuffer{
 }
 extern framebuffers[];
 
-
-struct shader_props_standard
-{
-   u32 tex_diffuse;
-};
-
-struct shader_props_terrain
-{
-   u32 tex_diffuse;
-   v2f blend_offset;
-   v4f sand_colour;
-};
-
-struct shader_props_vertex_blend
-{
-   u32 tex_diffuse;
-   v2f blend_offset;
-};
-
-struct shader_props_water
-{
-   v4f shore_colour;
-   v4f deep_colour;
-   f32 fog_scale;
-   f32 fresnel;
-   f32 water_sale;
-   v4f wave_speed;
-};
-
-struct shader_props_cubemapped
-{
-   u32 tex_diffuse;
-   u32 cubemap_entity;
-   v4f tint;
-};
-
 void render_init(void);
 void render_fsquad(void);
 void render_fsquad1(void);
 void render_fsquad2(void);
-void render_view_framebuffer_ui(void);
+void render_view_framebuffer_ui( ui_context *ctx );
 void render_fb_bind_texture( framebuffer *fb, int attachment, int slot );
 void render_fb_inverse_ratio( framebuffer *fb, v2f inverse );
 void render_fb_get_current_res( struct framebuffer *fb, int *x, int *y );