X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=render.h;h=a4005ddbcec76028b77fd873c6b9b8dca479a7b1;hb=8c376ed2e4021a18b0a6c6e800109d67ad09d198;hp=91fe39ea0516585ee37cafecea6ba710e53aca6a;hpb=56f320d8ce6e8997370ec8e02fe50ca2d07b67f0;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/render.h b/render.h index 91fe39e..a4005dd 100644 --- a/render.h +++ b/render.h @@ -16,9 +16,11 @@ #include "shaders/vblend.h" #endif -VG_STATIC void render_water_texture( world_instance *world, camera *cam ); +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 ); +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 @@ -26,75 +28,43 @@ VG_STATIC void render_world_depth( world_instance *world, camera *cam ); typedef struct framebuffer framebuffer; - /* * All standard buffers used in rendering */ -VG_STATIC struct pipeline -{ +VG_STATIC struct pipeline{ glmesh fsquad; framebuffer *fb_main, *fb_water_reflection, *fb_water_beneath; - - struct light_widget - { - int enabled; - v2f dir; - v3f colour; - } - widgets[3]; - - float shadow_spread, shadow_length; - int ready; + + float view_render_scale, + water_render_scale; } -gpipeline = -{ - .widgets = - { - { - .enabled = 1, - .colour = { 1.36f, 1.35f, 1.01f }, - .dir = { 0.63f, -0.08f } - }, - { - .enabled = 1, - .colour = { 0.33f, 0.56f, 0.64f }, - .dir = { -2.60f, -0.13f } - }, - { - .enabled = 1, - .colour = { 0.05f, 0.05f, 0.23f }, - .dir = { 2.60f, -0.84f } - } - }, - .shadow_spread = 0.65f, - .shadow_length = 9.50f, -}; +gpipeline = { .view_render_scale = 1.0f }; -struct framebuffer -{ +struct framebuffer{ const char *display_name; - int resolution_div, + int resolution_div, /* definition */ fixed_w, - fixed_h; + fixed_h, - struct framebuffer_attachment - { + render_w, /* runtime */ + render_h; + + 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 } @@ -126,7 +96,7 @@ framebuffers[] = .attachments = { { - "colour", k_framebuffer_attachment_type_colour, + "colour", k_framebuffer_attachment_type_texture, .internalformat = GL_RGB, .format = GL_RGB, @@ -134,7 +104,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, @@ -143,9 +113,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 } } @@ -156,11 +133,11 @@ framebuffers[] = */ "water_reflection", .link = &gpipeline.fb_water_reflection, - .resolution_div = 3, + .resolution_div = 2, .attachments = { { - "colour", k_framebuffer_attachment_type_colour, + "colour", k_framebuffer_attachment_type_texture, .internalformat = GL_RGB, .format = GL_RGB, .type = GL_UNSIGNED_BYTE, @@ -181,13 +158,13 @@ framebuffers[] = */ "water_beneath", .link = &gpipeline.fb_water_beneath, - .resolution_div = 4, + .resolution_div = 2, .attachments = { { - "colour", k_framebuffer_attachment_type_colour, - .internalformat = GL_RGBA, - .format = GL_RGBA, + "colour", k_framebuffer_attachment_type_texture, + .internalformat = GL_RED, + .format = GL_RED, .type = GL_UNSIGNED_BYTE, .attachment = GL_COLOR_ATTACHMENT0 }, @@ -207,25 +184,51 @@ framebuffers[] = VG_STATIC void render_fb_get_current_res( struct framebuffer *fb, int *x, int *y ) { - if( fb->resolution_div ) - { + if( fb->resolution_div ){ *x = vg.window_x / fb->resolution_div; *y = vg.window_y / fb->resolution_div; } - else - { + else{ *x = fb->fixed_w; *y = fb->fixed_h; } } +VG_STATIC void render_fb_inverse_ratio( framebuffer *fb, v2f inverse ) +{ + if( fb ){ + int x, y; + render_fb_get_current_res( fb, &x, &y ); + + v2f render = { fb->render_w, fb->render_h }, + original = { x, y }; + + 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 ) +VG_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 = VG_MAX( 16, x ); + y = VG_MAX( 16, y ); + + fb->render_w = x; + fb->render_h = y; + } + glBindFramebuffer( GL_FRAMEBUFFER, fb->fb ); glViewport( 0, 0, x, y ); } @@ -238,9 +241,10 @@ VG_STATIC void render_fb_bind_texture( framebuffer *fb, { 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_exit_loop( "illegal operation: bind non-texture framebuffer" " attachment to texture slot" ); } @@ -383,12 +387,12 @@ VG_STATIC void render_fb_allocate_texture( struct framebuffer *fb, 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, @@ -413,8 +417,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 ) @@ -424,15 +427,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 ); @@ -444,7 +447,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; } } @@ -455,8 +459,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 */ @@ -466,8 +469,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 ) @@ -490,11 +492,9 @@ VG_STATIC void render_fb_resize(void) 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 ); } @@ -507,8 +507,7 @@ VG_STATIC void render_init_fs_quad(void) { vg_info( "[render] Allocate quad\n" ); - float quad[] = - { + float quad[] = { 0.00f,0.00f, 1.00f,1.00f, 0.00f,1.00f, 0.00f,0.00f, 1.00f,0.00f, 1.00f,1.00f, @@ -539,12 +538,8 @@ VG_STATIC void render_init_fs_quad(void) 0.60f,0.60f, 0.90f,0.60f, 0.90f,0.90f, }; - vg_function_push( (struct vg_cmd) - { - .name = "fb", - .function = render_framebuffer_control, - .poll_suggest = render_framebuffer_poll - }); + vg_console_reg_cmd( "fb", render_framebuffer_control, + render_framebuffer_poll ); glGenVertexArrays( 1, &gpipeline.fsquad.vao ); glGenBuffers( 1, &gpipeline.fsquad.vbo ); @@ -570,8 +565,7 @@ VG_STATIC void render_init(void) /* * Complete Framebuffers */ - for( int i=0; iattachments); j++ ) - { + for( int j=0; jattachments); j++ ){ struct framebuffer_attachment *at = &fb->attachments[j]; if( !at->debug_view ) @@ -636,16 +631,14 @@ VG_STATIC void render_view_framebuffer_ui(void) ui_text( (ui_rect){ corner[0], corner[1] + 32, 0.0f, 0.0f, }, at->display_name, 1, k_text_align_left ); - if( at->purpose == k_framebuffer_attachment_type_renderbuffer ) - { + if( at->purpose == k_framebuffer_attachment_type_renderbuffer ){ v2f center; v2_muladds( corner, window, 0.15f, center ); ui_text( (ui_rect){ center[0], center[1], 0.0f, 0.0f }, "", 1, k_text_align_center ); } - else - { + else{ render_fb_bind_texture( fb, j, 0 ); int start = (viewing_count+2) * 6, @@ -674,8 +667,7 @@ VG_STATIC void render_framebuffer_show( struct framebuffer *fb, */ VG_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; } @@ -687,8 +679,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; } @@ -696,25 +687,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] ) ) @@ -731,45 +717,37 @@ VG_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 ); } }