X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gate.h;h=a073b26af051d6edcd08b7bc1e866a165ea4c882;hb=e70b6d550d63af95cafd9ffdee1918faf02a6892;hp=93322aaa0af11392955e34af7f6d604b671f7e3b;hpb=7a2032debc2c3bff7e4f795f39fd0e798186b4c2;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_gate.h b/world_gate.h index 93322aa..a073b26 100644 --- a/world_gate.h +++ b/world_gate.h @@ -27,8 +27,8 @@ VG_STATIC void gate_transform_update( ent_gate *gate ) v3_copy( gate->co[1], recv_to_world[3] ); m4x3_mul( recv_to_world, to_local, gate->transport ); - m4x3_scalev( gate->to_world, (v3f){ gate->dimensions[0], - gate->dimensions[1], 1.0f } ); + m3x3_scale( gate->to_world, (v3f){ gate->dimensions[0], + gate->dimensions[1], 1.0f } ); } VG_STATIC void world_gates_init(void) @@ -130,8 +130,6 @@ VG_STATIC int render_gate( world_instance *world_inside, shader_model_gate_uPv( cam->mtx.pv ); shader_model_gate_uMdl( gate->to_world ); shader_model_gate_uCam( cam->pos ); - - /* TODO(ART IMPROVEMENT): animate alpha of this? */ shader_model_gate_uColour( (v4f){0.0f,1.0f,0.0f,0.0f} ); shader_model_gate_uTime( vg.time*0.25f ); shader_model_gate_uInvRes( (v2f){ @@ -157,7 +155,7 @@ VG_STATIC int render_gate( world_instance *world_inside, glDisable( GL_STENCIL_TEST ); render_water_texture( world_inside, &gate_camera, layer_depth ); - render_fb_bind( gpipeline.fb_main ); + render_fb_bind( gpipeline.fb_main, 1 ); glEnable( GL_STENCIL_TEST );