X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=render.h;h=ea88ecc4df956c54f206f50a3b5c5946a17aea43;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=712961ea3f196dc6956aeefe0b3c5164e2aef45c;hpb=b888cce683d95cc01d0b4be9bbe92a0dd47452ac;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/render.h b/render.h index 712961e..ea88ecc 100644 --- a/render.h +++ b/render.h @@ -11,42 +11,34 @@ #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; +static f32 k_cam_height = 0.8f; + typedef struct framebuffer framebuffer; /* * All standard buffers used in rendering */ -VG_STATIC struct pipeline -{ +static struct pipeline{ glmesh fsquad; framebuffer *fb_main, *fb_water_reflection, - *fb_water_beneath; + *fb_water_beneath, + *fb_workshop_preview; int ready; - - float view_render_scale, - water_render_scale; } -gpipeline = { .view_render_scale = 1.0f }; +gpipeline; -struct framebuffer -{ +struct framebuffer{ const char *display_name; int resolution_div, /* definition */ fixed_w, @@ -55,20 +47,18 @@ struct framebuffer render_w, /* runtime */ render_h; - struct framebuffer_attachment - { + struct framebuffer_attachment{ const char *display_name; - enum framebuffer_attachment_type - { + enum framebuffer_attachment_type{ k_framebuffer_attachment_type_none, - k_framebuffer_attachment_type_colour, - k_framebuffer_attachment_type_renderbuffer + k_framebuffer_attachment_type_texture, + k_framebuffer_attachment_type_renderbuffer, + k_framebuffer_attachment_type_texture_depth } purpose; - enum framebuffer_quality_profile - { + enum framebuffer_quality_profile{ k_framebuffer_quality_all, k_framebuffer_quality_high_only } @@ -100,7 +90,7 @@ framebuffers[] = .attachments = { { - "colour", k_framebuffer_attachment_type_colour, + "colour", k_framebuffer_attachment_type_texture, .internalformat = GL_RGB, .format = GL_RGB, @@ -108,7 +98,7 @@ framebuffers[] = .attachment = GL_COLOR_ATTACHMENT0 }, { - "motion", k_framebuffer_attachment_type_colour, + "motion", k_framebuffer_attachment_type_texture, .quality = k_framebuffer_quality_high_only, .internalformat = GL_RG16F, @@ -117,9 +107,16 @@ framebuffers[] = .attachment = GL_COLOR_ATTACHMENT1 }, { +#if 0 "depth_stencil", k_framebuffer_attachment_type_renderbuffer, .internalformat = GL_DEPTH24_STENCIL8, +#else + "depth_stencil", k_framebuffer_attachment_type_texture_depth, + .internalformat = GL_DEPTH24_STENCIL8, + .format = GL_DEPTH_STENCIL, + .type = GL_UNSIGNED_INT_24_8, +#endif .attachment = GL_DEPTH_STENCIL_ATTACHMENT } } @@ -134,7 +131,7 @@ framebuffers[] = .attachments = { { - "colour", k_framebuffer_attachment_type_colour, + "colour", k_framebuffer_attachment_type_texture, .internalformat = GL_RGB, .format = GL_RGB, .type = GL_UNSIGNED_BYTE, @@ -159,7 +156,7 @@ framebuffers[] = .attachments = { { - "colour", k_framebuffer_attachment_type_colour, + "colour", k_framebuffer_attachment_type_texture, .internalformat = GL_RED, .format = GL_RED, .type = GL_UNSIGNED_BYTE, @@ -172,13 +169,34 @@ framebuffers[] = .attachment = GL_DEPTH_STENCIL_ATTACHMENT } } + }, + { + "workshop_preview", + .link = &gpipeline.fb_workshop_preview, + .resolution_div = 0, + .fixed_w = WORKSHOP_PREVIEW_WIDTH, .fixed_h = WORKSHOP_PREVIEW_HEIGHT, + .attachments = + { + { + "colour", k_framebuffer_attachment_type_texture, + .internalformat = GL_RGB, + .format = GL_RGB, + .type = GL_UNSIGNED_BYTE, + .attachment = GL_COLOR_ATTACHMENT0 + }, + { + "depth_stencil", k_framebuffer_attachment_type_renderbuffer, + .internalformat = GL_DEPTH24_STENCIL8, + .attachment = GL_DEPTH_STENCIL_ATTACHMENT + } + } } }; /* * Get the current (automatically scaled or fixed) resolution of framebuffer */ -VG_STATIC void render_fb_get_current_res( struct framebuffer *fb, +static void render_fb_get_current_res( struct framebuffer *fb, int *x, int *y ) { if( fb->resolution_div ){ @@ -191,28 +209,33 @@ VG_STATIC void render_fb_get_current_res( struct framebuffer *fb, } } -VG_STATIC void render_fb_inverse_ratio( framebuffer *fb, v2f inverse ) +static void render_fb_inverse_ratio( framebuffer *fb, v2f inverse ) { - int x, y; - render_fb_get_current_res( fb, &x, &y ); + if( fb ){ + int x, y; + render_fb_get_current_res( fb, &x, &y ); - v2f render = { fb->render_w, fb->render_h }, - original = { x, y }; + v2f render = { fb->render_w, fb->render_h }, + original = { x, y }; - v2_div( render, original, inverse ); + v2_div( render, original, inverse ); + } + else{ + v2_div( (v2f){1.0f,1.0f}, (v2f){ vg.window_x, vg.window_y }, inverse ); + } } /* * Bind framebuffer for drawing to */ -VG_STATIC void render_fb_bind( framebuffer *fb, int use_scaling ) +static void render_fb_bind( framebuffer *fb, int use_scaling ) { int x, y; 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 ); @@ -228,14 +251,15 @@ VG_STATIC void render_fb_bind( framebuffer *fb, int use_scaling ) /* * Bind framebuffer attachment's texture */ -VG_STATIC void render_fb_bind_texture( framebuffer *fb, +static void render_fb_bind_texture( framebuffer *fb, int attachment, int slot ) { struct framebuffer_attachment *at = &fb->attachments[attachment]; - if( at->purpose != k_framebuffer_attachment_type_colour ) + if( (at->purpose != k_framebuffer_attachment_type_texture) && + (at->purpose != k_framebuffer_attachment_type_texture_depth) ) { - vg_fatal_exit_loop( "illegal operation: bind non-colour framebuffer" + vg_fatal_error( "illegal operation: bind non-texture framebuffer" " attachment to texture slot" ); } @@ -253,7 +277,7 @@ VG_STATIC void render_fb_bind_texture( framebuffer *fb, /* * Convert OpenGL attachment ID enum to string */ -VG_STATIC const char *render_fb_attachment_str( GLenum e ) +static const char *render_fb_attachment_str( GLenum e ) { struct { GLenum e; const char *str; } formats[] = @@ -277,7 +301,7 @@ VG_STATIC const char *render_fb_attachment_str( GLenum e ) * Convert OpenGL texture format enums from TexImage2D table 1,2 & * RenderBufferStorage Table 1, into strings */ -VG_STATIC const char *render_fb_format_str( GLenum format ) +static const char *render_fb_format_str( GLenum format ) { struct { GLenum e; const char *str; } formats[] = @@ -372,18 +396,18 @@ VG_STATIC const char *render_fb_format_str( GLenum format ) /* * Bind and allocate texture for framebuffer attachment */ -VG_STATIC void render_fb_allocate_texture( struct framebuffer *fb, +static void render_fb_allocate_texture( struct framebuffer *fb, struct framebuffer_attachment *a ) { int rx, ry; render_fb_get_current_res( fb, &rx, &ry ); - if( a->purpose == k_framebuffer_attachment_type_renderbuffer ) - { + if( a->purpose == k_framebuffer_attachment_type_renderbuffer ){ glBindRenderbuffer( GL_RENDERBUFFER, a->id ); - glRenderbufferStorage( GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, rx, ry ); + glRenderbufferStorage( GL_RENDERBUFFER, a->internalformat, rx, ry ); } - else if( a->purpose == k_framebuffer_attachment_type_colour ) + else if( a->purpose == k_framebuffer_attachment_type_texture || + a->purpose == k_framebuffer_attachment_type_texture_depth ) { glBindTexture( GL_TEXTURE_2D, a->id ); glTexImage2D( GL_TEXTURE_2D, 0, a->internalformat, rx, ry, @@ -394,7 +418,7 @@ VG_STATIC void render_fb_allocate_texture( struct framebuffer *fb, /* * Full allocation of a framebuffer */ -VG_STATIC void render_fb_allocate( struct framebuffer *fb ) +static void render_fb_allocate( struct framebuffer *fb ) { glGenFramebuffers( 1, &fb->fb ); glBindFramebuffer( GL_FRAMEBUFFER, fb->fb ); @@ -408,8 +432,7 @@ VG_STATIC void render_fb_allocate( struct framebuffer *fb ) GLenum colour_attachments[4]; u32 colour_count = 0; - for( int j=0; jattachments); j++ ) - { + for( int j=0; jattachments); j++ ){ struct framebuffer_attachment *attachment = &fb->attachments[j]; if( attachment->purpose == k_framebuffer_attachment_type_none ) @@ -419,15 +442,15 @@ VG_STATIC void render_fb_allocate( struct framebuffer *fb ) render_fb_attachment_str( attachment->attachment ), render_fb_format_str( attachment->internalformat ) ); - if( attachment->purpose == k_framebuffer_attachment_type_renderbuffer ) - { + if( attachment->purpose == k_framebuffer_attachment_type_renderbuffer ){ glGenRenderbuffers( 1, &attachment->id ); render_fb_allocate_texture( fb, attachment ); glFramebufferRenderbuffer( GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, attachment->id ); } - else if( attachment->purpose == k_framebuffer_attachment_type_colour ) + else if( attachment->purpose == k_framebuffer_attachment_type_texture || + attachment->purpose == k_framebuffer_attachment_type_texture_depth ) { glGenTextures( 1, &attachment->id ); render_fb_allocate_texture( fb, attachment ); @@ -439,7 +462,8 @@ VG_STATIC void render_fb_allocate( struct framebuffer *fb ) glFramebufferTexture2D( GL_FRAMEBUFFER, attachment->attachment, GL_TEXTURE_2D, attachment->id, 0 ); - colour_attachments[ colour_count ++ ] = attachment->attachment; + if( attachment->purpose == k_framebuffer_attachment_type_texture ) + colour_attachments[ colour_count ++ ] = attachment->attachment; } } @@ -450,8 +474,7 @@ VG_STATIC void render_fb_allocate( struct framebuffer *fb ) */ GLenum result = glCheckFramebufferStatus( GL_FRAMEBUFFER ); - if( result == GL_FRAMEBUFFER_COMPLETE ) - { + if( result == GL_FRAMEBUFFER_COMPLETE ){ /* * Attatch to gpipeline */ @@ -461,8 +484,7 @@ VG_STATIC void render_fb_allocate( struct framebuffer *fb ) vg_success( " status: complete\n" ); vg_info( "}\n" ); } - else - { + else{ if( result == GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT ) vg_error( " status: Incomplete attachment" ); else if( result == GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT ) @@ -473,42 +495,47 @@ VG_STATIC void render_fb_allocate( struct framebuffer *fb ) vg_error( " status: Generic Error" ); vg_info( "}\n" ); - vg_fatal_exit_loop( "Incomplete framebuffer (see logs)" ); + vg_fatal_error( "Incomplete framebuffer (see logs)" ); } } /* * Resize/Update all framebuffers(we know about) */ -VG_STATIC void render_fb_resize(void) +static void render_fb_resize(void) { - if( !gpipeline.ready ) - return; + if( !gpipeline.ready ) return; - for( int i=0; iattachments); j++ ) - { + for( int j=0; jattachments); j++ ){ struct framebuffer_attachment *attachment = &fb->attachments[j]; render_fb_allocate_texture( fb, attachment ); } } } -VG_STATIC int render_framebuffer_control( int argc, char const *argv[] ); -VG_STATIC void render_framebuffer_poll( int argc, char const *argv[] ); -VG_STATIC void render_init_fs_quad(void) +static int render_framebuffer_control( int argc, char const *argv[] ); +static void render_framebuffer_poll( int argc, char const *argv[] ); + +static void async_render_init( void *payload, u32 size ) { - vg_info( "[render] Allocate quad\n" ); + /* + * Complete Framebuffers + */ + for( int i=0; i/"all" * arg2: subname /none */ -VG_STATIC int render_framebuffer_control( int argc, char const *argv[] ) +static int render_framebuffer_control( int argc, char const *argv[] ) { - if( argc < 2 ) - { + if( argc < 2 ){ vg_error( "Usage: fb \"show/hide\" /\"all\" /none\n" ); return 0; } @@ -681,8 +709,7 @@ VG_STATIC int render_framebuffer_control( int argc, char const *argv[] ) operation = 1; else if( !strcmp( argv[0], "hide" ) ) operation = 0; - else - { + else{ vg_error( "Unknown framebuffer operation: '%s'\n", argv[0] ); return 0; } @@ -690,25 +717,20 @@ VG_STATIC int render_framebuffer_control( int argc, char const *argv[] ) if( !strcmp( argv[1], "all" ) ) modify_all = 1; - for( int i=0; iattachments); j++ ) - { + for( int j=0; jattachments); j++ ){ struct framebuffer_attachment *at = &fb->attachments[j]; if( at->purpose == k_framebuffer_attachment_type_none ) continue; - if( modify_all ) - { + if( modify_all ){ render_framebuffer_show( fb, at, operation ); } - else - { - if( !strcmp( fb->display_name, argv[1] ) ) - { + else{ + if( !strcmp( fb->display_name, argv[1] ) ){ if( argc == 2 ) render_framebuffer_show( fb, at, operation ); else if( !strcmp( at->display_name, argv[2] ) ) @@ -721,49 +743,41 @@ VG_STATIC int render_framebuffer_control( int argc, char const *argv[] ) return 0; } -VG_STATIC void render_framebuffer_poll( int argc, char const *argv[] ) +static void render_framebuffer_poll( int argc, char const *argv[] ) { const char *term = argv[argc-1]; - if( argc == 1 ) - { + if( argc == 1 ){ console_suggest_score_text( "show", term, 0 ); console_suggest_score_text( "hide", term, 0 ); } - else if( argc == 2 ) - { + else if( argc == 2 ){ console_suggest_score_text( "all", term, 0 ); - for( int i=0; idisplay_name, term, 0 ); } } - else if( argc == 3 ) - { + else if( argc == 3 ){ int modify_all = 0; if( !strcmp( argv[1], "all" ) ) modify_all = 1; - for( int i=0; iattachments); j++ ) - { + for( int j=0; jattachments); j++ ){ struct framebuffer_attachment *at = &fb->attachments[j]; if( at->purpose == k_framebuffer_attachment_type_none ) continue; - if( modify_all ) - { + if( modify_all ){ console_suggest_score_text( at->display_name, term, 0 ); } - else if( !strcmp( fb->display_name, argv[1] ) ) - { + else if( !strcmp( fb->display_name, argv[1] ) ){ console_suggest_score_text( at->display_name, term, 0 ); } }