X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=render.h;h=f97d612a37e1fa55ce54bfcdd3973a5b226c47ba;hb=5e22cdfe9f6f83e807ce6456ab538d02104cd01d;hp=cac188d07dcbdf3fc258bcbb4a5ab45256567e50;hpb=b9dedb4dd2a1e94ae76a3986716ee3c57e568213;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/render.h b/render.h index cac188d..f97d612 100644 --- a/render.h +++ b/render.h @@ -1,3 +1,7 @@ +/* + * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved + */ + #include "common.h" #include "model.h" @@ -122,7 +126,7 @@ static void pipeline_projection( m4x4f mat, float nearz, float farz ) { m4x4_projection( mat, gpipeline.fov, - (float)vg_window_x / (float)vg_window_y, + (float)vg.window_x / (float)vg.window_y, nearz, farz ); } @@ -180,19 +184,19 @@ static void fb_use( struct framebuffer *fb ) if( !fb ) { glBindFramebuffer( GL_FRAMEBUFFER, 0 ); - glViewport( 0, 0, vg_window_x, vg_window_y ); + glViewport( 0, 0, vg.window_x, vg.window_y ); } else { glBindFramebuffer( GL_FRAMEBUFFER, fb->fb ); - glViewport( 0, 0, vg_window_x / fb->div, vg_window_y / fb->div ); + glViewport( 0, 0, vg.window_x / fb->div, vg.window_y / fb->div ); } } static void fb_init( struct framebuffer *fb ) { - i32 ix = vg_window_x / fb->div, - iy = vg_window_y / fb->div; + i32 ix = vg.window_x / fb->div, + iy = vg.window_y / fb->div; glGenFramebuffers( 1, &fb->fb ); glBindFramebuffer( GL_FRAMEBUFFER, fb->fb ); @@ -236,8 +240,8 @@ static void fb_resize( struct framebuffer *fb ) if( !fb->allocated ) return; - i32 ix = vg_window_x / fb->div, - iy = vg_window_y / fb->div; + i32 ix = vg.window_x / fb->div, + iy = vg.window_y / fb->div; glBindTexture( GL_TEXTURE_2D, fb->colour ); glTexImage2D( GL_TEXTURE_2D, 0, fb->format, ix, iy, 0, @@ -252,7 +256,7 @@ static void render_fb_resize(void) if( gpipeline.ready ) { glBindTexture( GL_TEXTURE_2D, gpipeline.rgb_background ); - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, vg_window_x, vg_window_y, 0, + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, vg.window_x, vg.window_y, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL ); } } @@ -267,7 +271,7 @@ static void render_init_temp_buffer(void) glGenTextures( 1, &gpipeline.rgb_background ); glBindTexture( GL_TEXTURE_2D, gpipeline.rgb_background ); - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, vg_window_x, vg_window_y, + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, vg.window_x, vg.window_y, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );