X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_routes.c;h=2fe52a66367e61c76441c31b01295f64ada2610b;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=0bfdcac8bf92ac1406032a6f0c427f73e04ecad4;hpb=d1860effe17d86ef47b7c879668eb97ef8c3ab51;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_routes.c b/world_routes.c index 0bfdcac..2fe52a6 100644 --- a/world_routes.c +++ b/world_routes.c @@ -315,8 +315,8 @@ void world_routes_place_curve( world_instance *world, ent_route *route, v3_muladds( ha.pos, up, 0.06f+gap, va.co ); v3_muladds( hb.pos, up, 0.06f+gap, vb.co ); - scene_vert_pack_norm( &va, up ); - scene_vert_pack_norm( &vb, up ); + scene_vert_pack_norm( &va, up, 0.0f ); + scene_vert_pack_norm( &vb, up, 0.0f ); float t1 = (travel_length / total_length) * patch_count; va.uv[0] = t1; @@ -904,7 +904,10 @@ static void render_gate_markers( m4x3f world_mmdl, int run_id, ent_gate *gate ){ for( u32 j=0; j<4; j++ ){ if( gate->routes[j] == run_id ){ m4x3f mmdl; - ent_gate_get_mdl_mtx( gate, mmdl ); + m4x3_copy( gate->to_world, mmdl ); + m3x3_scale( mmdl, (v3f){ gate->dimensions[0], + gate->dimensions[1], 1.0f } ); + m4x3_mul( world_mmdl, mmdl, mmdl ); shader_model_gate_uMdl( mmdl ); mdl_draw_submesh( &world_gates.sm_marker[j] );