X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=render.h;h=751ca1ba54bb9f60e9847697548dcfd75409919e;hb=1d06671f87a9d24596fc6808d8e0db889a818750;hp=41aeef241ef529b7bc33522f8cb1dea880b3d067;hpb=a99e5f5d5c16a3e865796a96ad648e3c570d32ac;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/render.h b/render.h
index 41aeef2..751ca1b 100644
--- a/render.h
+++ b/render.h
@@ -11,21 +11,16 @@
 #include "shaders/blitblur.h"
 #include "shaders/blitcolour.h"
 
-#if 0
-#include "shaders/standard.h"
-#include "shaders/vblend.h"
-#endif
-
-VG_STATIC void render_water_texture( world_instance *world, camera *cam,
-                                     int layer_depth );
-VG_STATIC void render_water_surface( world_instance *world, camera *cam );
-VG_STATIC void render_world( world_instance *world, camera *cam,
-                             int layer_depth );
-VG_STATIC void render_world_depth( world_instance *world, camera *cam );
-
+#define WORKSHOP_PREVIEW_WIDTH  504
+#define WORKSHOP_PREVIEW_HEIGHT 336
 #ifndef RENDER_H
 #define RENDER_H
 
+static f32 k_render_scale  = 1.0f;
+static i32 k_blur_effect   = 1;
+static f32 k_blur_strength = 0.3f;
+static f32 k_fov           = 0.86f;
+
 typedef struct framebuffer framebuffer;
 
 /* 
@@ -39,11 +34,8 @@ VG_STATIC struct pipeline{
                *fb_water_beneath,
                *fb_workshop_preview;
    int ready;
-
-   float view_render_scale,
-         water_render_scale;
 }
-gpipeline = { .view_render_scale = 1.0f };
+gpipeline;
 
 struct framebuffer{
    const char *display_name;
@@ -181,7 +173,7 @@ framebuffers[] =
       "workshop_preview",
       .link = &gpipeline.fb_workshop_preview,
       .resolution_div = 0,
-      .fixed_w = 504, .fixed_h = 336,
+      .fixed_w = WORKSHOP_PREVIEW_WIDTH, .fixed_h = WORKSHOP_PREVIEW_HEIGHT,
       .attachments = 
       {
          {
@@ -241,8 +233,8 @@ VG_STATIC void render_fb_bind( framebuffer *fb, int use_scaling )
    render_fb_get_current_res( fb, &x, &y );
 
    if( use_scaling ){
-      x = gpipeline.view_render_scale*(float)x;
-      y = gpipeline.view_render_scale*(float)y;
+      x = k_render_scale*(float)x;
+      y = k_render_scale*(float)y;
 
       x = VG_MAX( 16, x );
       y = VG_MAX( 16, y );
@@ -511,8 +503,7 @@ VG_STATIC void render_fb_allocate( struct framebuffer *fb )
  */
 VG_STATIC void render_fb_resize(void)
 {
-   if( !gpipeline.ready )
-      return;
+   if( !gpipeline.ready ) return;
 
    for( int i=0; i<vg_list_size(framebuffers); i++ ){
       struct framebuffer *fb = &framebuffers[i];
@@ -536,12 +527,14 @@ VG_STATIC void async_render_init( void *payload, u32 size )
       render_fb_allocate( fb );
    }
 
+   f32 rh = 0x1p-4f, ih = 0.3f;
+
    float quad[] = { 
       0.00f,0.00f, 1.00f,1.00f, 0.00f,1.00f,    /* fsquad */
       0.00f,0.00f, 1.00f,0.00f, 1.00f,1.00f,    
 
-      0.00f,0.00f, 1.00f,0x1p-4f,0.00f,0x1p-4f,    /* fsquad1 */
-      0.00f,0.00f, 1.00f,0.00f,  1.00f,0x1p-4f,
+      0.00f,0.00f, 1.00f,rh,     0.00f,rh,    /* fsquad1 */
+      0.00f,0.00f, 1.00f,0.00f,  1.00f,rh,
 
       /* 9x9 debug grid */
       /* row0 */
@@ -565,11 +558,13 @@ VG_STATIC void async_render_init( void *payload, u32 size )
       0.30f,0.60f, 0.60f,0.60f, 0.60f,0.90f,
       0.60f,0.60f, 0.90f,0.90f, 0.60f,0.90f,
       0.60f,0.60f, 0.90f,0.60f, 0.90f,0.90f,
+
+      0.00f,ih, 1.00f,ih+rh, 0.00f,ih+rh,    /* fsquad2 */
+      0.00f,ih, 1.00f,ih,    1.00f,ih+rh,
    };
 
    vg_console_reg_cmd( "fb", render_framebuffer_control, 
                              render_framebuffer_poll );
-
    glGenVertexArrays( 1, &gpipeline.fsquad.vao );
    glGenBuffers( 1, &gpipeline.fsquad.vbo );
    glBindVertexArray( gpipeline.fsquad.vao );
@@ -588,6 +583,14 @@ VG_STATIC void async_render_init( void *payload, u32 size )
 
 VG_STATIC void render_init(void)
 {
+   vg_console_reg_var( "blur_strength", &k_blur_strength, k_var_dtype_f32, 0 );
+   vg_console_reg_var( "render_scale", &k_render_scale,
+                       k_var_dtype_f32, VG_VAR_PERSISTENT );
+   vg_console_reg_var( "fov", &k_fov, k_var_dtype_f32, VG_VAR_PERSISTENT );
+   vg_console_reg_var( "blur_effect", &k_blur_effect, 
+                        k_var_dtype_i32, VG_VAR_PERSISTENT );
+
+
    shader_blit_register();
    shader_blitblur_register();
    shader_blitcolour_register();
@@ -610,6 +613,12 @@ VG_STATIC void render_fsquad1(void)
    glDrawArrays( GL_TRIANGLES, 6, 6 );
 }
 
+VG_STATIC void render_fsquad2(void)
+{
+   glBindVertexArray( gpipeline.fsquad.vao );
+   glDrawArrays( GL_TRIANGLES, 66,6 );
+}
+
 /*
  * Call this inside the UI function
  */