X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gate.h;h=6a6a0a9f91c59e37f66d38db2535850f04d88c42;hb=39378a28bc0b7c9beaf9f2191f5dc51b8c8865a0;hp=2f2b21ef096246537863ad80e2209b08cb9b1ac5;hpb=7758c7efec3956c68294bc914e7524045a2b1bd7;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/gate.h b/gate.h index 2f2b21e..6a6a0a9 100644 --- a/gate.h +++ b/gate.h @@ -11,7 +11,7 @@ typedef struct teleport_gate teleport_gate; static struct { - GLuint fb, rgb, rb, vao, vbo; + GLuint fb, rgb, rb; glmesh mdl; } grender; @@ -39,27 +39,9 @@ static void gate_register(void) shader_gate_register(); } -static void gate_init( void (*newfb)(GLuint*,GLuint*,GLuint*) ) +static void gate_init(void) { - newfb( &grender.fb, &grender.rgb, &grender.rb ); - { - float ksz = 1.0f; - float quad[] = { -ksz,-ksz,0.0f, ksz, ksz,0.0f, -ksz, ksz,0.0f, - -ksz,-ksz,0.0f, ksz,-ksz,0.0f, ksz, ksz,0.0f, - -ksz,-ksz,-0.1f, ksz, ksz,-0.1f, -ksz, ksz,-0.1f, - -ksz,-ksz,-0.1f, ksz,-ksz,-0.1f, ksz, ksz,-0.1f }; - - glGenVertexArrays( 1, &grender.vao ); - glGenBuffers( 1, &grender.vbo ); - glBindVertexArray( grender.vao ); - glBindBuffer( GL_ARRAY_BUFFER, grender.vbo ); - glBufferData( GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STATIC_DRAW ); - glBindVertexArray( grender.vao ); - glVertexAttribPointer( 0, 3, GL_FLOAT, GL_FALSE, - sizeof(float)*3, (void*)0 ); - glEnableVertexAttribArray( 0 ); - VG_CHECK_GL(); - } + create_renderbuffer_std( &grender.fb, &grender.rgb, &grender.rb ); model *mgate = vg_asset_read( "models/rs_gate.mdl" ); model_unpack( mgate, &grender.mdl ); @@ -228,9 +210,6 @@ static void render_gate( teleport_gate *gate, m4x3f camera ) mesh_draw( &grender.mdl ); glDisable(GL_BLEND); - return; - glBindVertexArray( grender.vao ); - glDrawArrays( GL_TRIANGLES, 0, 12 ); } static int gate_intersect( teleport_gate *gate, v3f pos, v3f last )