X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=render.h;h=6b956de3eb867a8d261057c95dbf5b34e9243ba3;hb=219e917c414052ad3adbb4e9a652b55757a7b6a9;hp=541f047e7396562fd1b74a5c3daf8b4d75205a05;hpb=6a6539bcfeb7bd693251f7aae31056671a65c0f0;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/render.h b/render.h index 541f047..6b956de 100644 --- a/render.h +++ b/render.h @@ -11,21 +11,8 @@ #include "shaders/blitblur.h" #include "shaders/blitcolour.h" -#if 0 -#include "shaders/standard.h" -#include "shaders/vblend.h" -#endif - #define WORKSHOP_PREVIEW_WIDTH 504 #define WORKSHOP_PREVIEW_HEIGHT 336 - -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 ); - #ifndef RENDER_H #define RENDER_H @@ -539,12 +526,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 */ @@ -568,6 +557,9 @@ 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, @@ -615,6 +607,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 */