X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_remote.c;h=2234c6dc994aa3f50b8fdc0cf217603762dd551a;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=bf3b5d3d83e1d6e8bfd4a2df47b27633a5437350;hpb=c1e54530e1b29e131aad80e242faaf0c0cfee0b0;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_remote.c b/player_remote.c index bf3b5d3..2234c6d 100644 --- a/player_remote.c +++ b/player_remote.c @@ -3,6 +3,12 @@ #include "player_render.h" #include "network_common.h" #include "addon.h" +#include "font.h" +#include "gui.h" +#include "ent_miniworld.h" +#include "ent_region.h" + +static i32 k_show_own_name = 0; static void player_remote_clear( struct network_player *player ){ addon_cache_unwatch( k_addon_type_player, player->playermodel_view_slot ); @@ -20,24 +26,24 @@ static void player_remote_clear( struct network_player *player ){ static void relink_remote_player_worlds( u32 client_id ){ struct network_player *player = &netplayers.list[client_id]; - player->hub_match = 0; - player->client_match = 0; - - addon_alias q0,q1; - addon_uid_to_alias( player->items[k_netmsg_playeritem_world0], &q0 ); - addon_uid_to_alias( player->items[k_netmsg_playeritem_world1], &q1 ); + addon_alias q[2]; + addon_uid_to_alias( player->items[k_netmsg_playeritem_world0], &q[0] ); + addon_uid_to_alias( player->items[k_netmsg_playeritem_world1], &q[1] ); /* * currently in 10.23, the hub world will always be the same. * this might but probably wont change in the future */ - if( world_static.addon_hub ) - if( addon_alias_eq( &q0, &world_static.addon_hub->alias ) ) - player->hub_match = 1; + for( u32 i=0; iworld_match[i] = 0; - if( world_static.addon_client ) - if( addon_alias_eq( &q1, &world_static.addon_client->alias ) ) - player->client_match = 1; + if( reg ){ + if( addon_alias_eq( &q[i], &world_static.instance_addons[i]->alias ) ) + player->world_match[i] = 1; + } + } } /* @@ -54,6 +60,14 @@ static void relink_all_remote_player_worlds(void){ } } +static void player_remote_update_friendflags( struct network_player *remote ){ + ISteamFriends *hSteamFriends = SteamAPI_SteamFriends(); + remote->isfriend = SteamAPI_ISteamFriends_HasFriend( hSteamFriends, + remote->steamid, k_EFriendFlagImmediate ); + remote->isblocked = SteamAPI_ISteamFriends_HasFriend( hSteamFriends, + remote->steamid, k_EFriendFlagBlocked ); +} + static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){ netmsg_blank *tmp = msg->m_pData; @@ -65,6 +79,8 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){ struct network_player *player = &netplayers.list[ playerjoin->index ]; player_remote_clear( player ); player->active = 1; + player->steamid = playerjoin->steamid; + player_remote_update_friendflags( player ); /* TODO: interpret the uids */ player->board_view_slot = 0; @@ -76,7 +92,8 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){ buf->frames[i].active = 0; } - vg_info( "#%u joined\n", playerjoin->index ); + vg_info( "#%u joined friend: %d, blocked: %d\n", + playerjoin->index, player->isfriend, player->isblocked ); } else { vg_error( "inetmsg_playerjoin: player index out of range\n" ); @@ -151,29 +168,65 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){ } dest->active = 1; - dest->timestamp = frame->timestamp; dest->subsystem = frame->subsystem; dest->instance_id = frame->instance_id; + + bitpack_ctx ctx = { + .mode = k_bitpack_decompress, + .buffer = frame->animdata, + .buffer_len = datasize, + .bytes = 0, + }; + + /* animation + * -------------------------------------------------------------*/ + + dest->timestamp = frame->timestamp; dest->boundary_hash = frame->boundary_hash; struct network_player *player = &netplayers.list[ frame->client ]; - struct player_subsystem_interface *sys = player_subsystems[ frame->subsystem ]; if( sys->network_animator_exchange ){ - bitpack_ctx ctx = { - .mode = k_bitpack_decompress, - .buffer = frame->animdata, - .buffer_len = datasize, - .bytes = 0, - }; - memset( &dest->data, 0, sys->animator_size ); sys->network_animator_exchange( &ctx, &dest->data ); } else { - memcpy( &dest->data, frame->animdata, datasize ); + bitpack_bytes( &ctx, sys->animator_size, sys->animator_data ); + } + + /* sfx + * -------------------------------------------------------------*/ + + for( u32 i=0; isound_effects; i ++ ){ + struct net_sfx sfx; + net_sfx_exchange( &ctx, &sfx ); + + f64 t = (frame->timestamp - NETWORK_FRAMERATE) + + (sfx.subframe*NETWORK_FRAMERATE); + + f32 remaining = t - ib->t; + + if( remaining <= 0.0f ) + net_sfx_play( &sfx ); + else{ + struct net_sfx *dst = NULL; + + for( u32 j=0; jsystem == k_player_subsystem_invalid ){ + dst = sj; + break; + } + + if( sj->priority < sfx.priority ) + dst = sj; + } + + *dst = sfx; + dst->subframe = remaining; + } } player->subsystem = frame->subsystem; @@ -224,6 +277,29 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){ relink_remote_player_worlds( item->client ); } } + else if( tmp->inetmsg_id == k_inetmsg_chat ){ + netmsg_chat *chat = msg->m_pData; + + struct network_player *player = &netplayers.list[ chat->client ]; + network_msgstring( chat->msg, msg->m_cbSize, sizeof(netmsg_chat), + player->chat, NETWORK_MAX_CHAT ); + player->chat_time = vg.time_real; + vg_info( "[%d]: %s\n", chat->client, player->chat ); + } + else if( tmp->inetmsg_id == k_inetmsg_region ){ + netmsg_region *region = msg->m_pData; + struct network_player *player = &netplayers.list[ region->client ]; + + u32 l = network_msgstring( + region->loc, msg->m_cbSize, sizeof(netmsg_region), + player->region, NETWORK_REGION_MAX ); + player->region_flags = region->flags; + + if( l ) + player->region_flags |= k_ent_region_flag_hasname; + + player->effect_data.spark.colour = region_spark_colour(region->flags); + } } /* @@ -236,35 +312,46 @@ static void remote_player_send_playerframe(void){ struct player_subsystem_interface *sys = player_subsystems[sysid]; if( sys->animator_size ){ - u32 size = sizeof(netmsg_playerframe)+sys->animator_size; - netmsg_playerframe *frame = alloca(size); + u32 max_buf_size = sys->animator_size + sizeof(localplayer.sfx_buffer), + base_size = sizeof(struct netmsg_playerframe), + max_packet = base_size + max_buf_size; + + netmsg_playerframe *frame = alloca( max_packet ); frame->inetmsg_id = k_inetmsg_playerframe; frame->client = 0xff; frame->subsystem = localplayer.subsystem; - frame->timestamp = vg.time_real; - frame->boundary_hash = localplayer.boundary_hash; frame->instance_id = world_static.active_instance; - if( sys->network_animator_exchange ){ - bitpack_ctx ctx = { - .mode = k_bitpack_compress, - .buffer = frame->animdata, - .buffer_len = sys->animator_size, - .bytes = 0, - }; - + bitpack_ctx ctx = { + .mode = k_bitpack_compress, + .buffer = frame->animdata, + .buffer_len = max_buf_size, + .bytes = 0 + }; + + /* animation + * -----------------------------------------------*/ + + frame->timestamp = vg.time_real; + frame->boundary_hash = localplayer.boundary_hash; + if( sys->network_animator_exchange ) sys->network_animator_exchange( &ctx, sys->animator_data ); - size = ctx.bytes; - } - else{ - memcpy( frame->animdata, sys->animator_data, sys->animator_size ); - } + else + bitpack_bytes( &ctx, sys->animator_size, sys->animator_data ); + + /* sfx + * ---------------------------------------------*/ + + frame->sound_effects = localplayer.sfx_buffer_count; + for( u32 i=0; iusername, sysname, player->down_kbs ); ui_info( panel, buf ); - - v4f wpos = { 0.0f, 2.0f, 0.0f, 1.0f }; - struct player_avatar *av = localplayer.playeravatar; - m4x3_mulv( netplayers.final_mtx[av->sk.bone_count*i], wpos, wpos ); - m4x4_mulv( pv, wpos, wpos ); - - if( wpos[3] > 0.0f ){ - v2_muls( wpos, (1.0f/wpos[3]) * 0.5f, wpos ); - v2_add( wpos, (v2f){ 0.5f, 0.5f }, wpos ); - - ui_rect wr; - wr[0] = vg_clampf(wpos[0] * vg.window_x, -32000.0f,32000.0f)-150; - wr[1] = vg_clampf((1.0f-wpos[1]) * vg.window_y, - -32000.0f,32000.0f); - wr[2] = 300; - wr[3] = 17; - ui_fill( wr, (ui_colour(k_ui_bg)&0x00ffffff)|0x50000000 ); - ui_text( wr, buf, 1, k_ui_align_middle_center, 0 ); - } } } } @@ -378,6 +460,11 @@ static void remote_player_network_imgui( m4x4f pv ){ } } +static void remote_player_effect( struct network_player *player, + player_pose *final_pose ){ + /* effects */ +} + /* * write the remote players final_mtx */ @@ -388,13 +475,16 @@ static void pose_remote_player( u32 index, struct network_player *player = &netplayers.list[ index ]; struct interp_buffer *buf = &netplayers.interp_data[ index ]; - struct player_avatar *av = localplayer.playeravatar; - m4x3f *final_mtx = &netplayers.final_mtx[ av->sk.bone_count*index ]; + struct skeleton *sk = &localplayer.skeleton; + m4x3f *final_mtx = &netplayers.final_mtx[ sk->bone_count*index ]; struct player_board_pose *board_pose = &netplayers.board_poses[index]; struct player_subsystem_interface *sys0 = player_subsystems[f0->subsystem], *sys1 = NULL; + struct player_board *board = + addon_cache_item_if_loaded( k_addon_type_board, player->board_view_slot ); + player_pose pose0, pose1, posed; sys0->pose( &f0->data, &pose0 ); @@ -418,28 +508,33 @@ static void pose_remote_player( u32 index, } instance_id = f1->instance_id; - lerp_player_pose( &pose0, &pose1, t, &posed ); - apply_full_skeleton_pose( &av->sk, &posed, final_mtx ); + effect_blink_apply( &player->effect_data.blink, &posed, vg.time_delta ); + + apply_full_skeleton_pose( sk, &posed, final_mtx ); + + if( t < 0.5f ){ + if( sys0->effects ) + sys0->effects( &f0->data, final_mtx, board, &player->effect_data ); + } + else{ + if( sys1->effects ) + sys1->effects( &f1->data, final_mtx, board, &player->effect_data ); + } + memcpy( board_pose, &posed.board, sizeof(*board_pose) ); } else { instance_id = f0->instance_id; - - apply_full_skeleton_pose( &av->sk, &pose0, final_mtx ); + effect_blink_apply( &player->effect_data.blink, &pose0, vg.time_delta ); + apply_full_skeleton_pose( sk, &pose0, final_mtx ); + if( sys0->effects ) + sys0->effects( &f0->data, final_mtx, board, &player->effect_data ); memcpy( board_pose, &pose0.board, sizeof(*board_pose) ); } - if( instance_id ){ - if( player->client_match ){ - player->active_world = &world_static.instances[ instance_id ]; - } - } - else{ - if( player->hub_match ){ - player->active_world = &world_static.instances[ instance_id ]; - } - } + if( player->world_match[ instance_id ] ) + player->active_world = &world_static.instances[ instance_id ]; } /* @@ -481,7 +576,8 @@ static void animate_remote_player( u32 index ){ } struct network_player *player = &netplayers.list[ index ]; - player->active_world = NULL; + if( player->active != 2 ) + player->active_world = NULL; if( minframe && maxframe ){ pose_remote_player( index, minframe, maxframe ); @@ -513,36 +609,395 @@ static void animate_remote_players(void){ * Draw remote players */ static void render_remote_players( world_instance *world, camera *cam ){ - SDL_AtomicLock( &addon_system.sl_cache_using_resources ); + struct skeleton *sk = &localplayer.skeleton; for( u32 i=0; iactive ) continue; + if( !player->active || player->isblocked ) continue; if( player->active_world != world ) continue; + if( !player->isfriend && + (world-world_static.instances == k_world_purpose_hub)) continue; - struct player_avatar *av = localplayer.playeravatar; - m4x3f *final_mtx = &netplayers.final_mtx[ av->sk.bone_count*i ]; + m4x3f *final_mtx = &netplayers.final_mtx[ sk->bone_count*i ]; struct player_model *model = addon_cache_item_if_loaded( k_addon_type_player, player->playermodel_view_slot ); if( !model ) model = &localplayer.fallback_model; - render_playermodel( cam, world, 0, model, &av->sk, final_mtx ); + render_playermodel( cam, world, 0, model, sk, final_mtx ); struct player_board *board = addon_cache_item_if_loaded( k_addon_type_board, player->board_view_slot ); - render_board( cam, world, board, - final_mtx[localplayer.playeravatar->id_board], - &netplayers.board_poses[ i ], - k_board_shader_player ); + render_board( cam, world, board, final_mtx[localplayer.id_board], + &netplayers.board_poses[ i ], k_board_shader_player ); } SDL_AtomicUnlock( &addon_system.sl_cache_using_resources ); } -/* TODO: Which world is the player in - * nametags with occlusion +static int remote_players_randomize( int argc, const char *argv[] ){ + for( int i=0; iactive = (vg_randu32() & 0x1)? 2: 0; + player->isfriend = vg_randu32() & vg_randu32() & 0x1; + player->isblocked = vg_randu32() & vg_randu32() & vg_randu32() & 0x1; + player->world_match[ 0 ] = vg_randu32() & 0x1; + player->world_match[ 1 ] = 0; + + if( player->world_match[0] ) + player->active_world = &world_static.instances[0]; + else + player->active_world = NULL; + + for( int i=0; iusername)-1; i ++ ){ + player->username[i] = 'a' + (vg_randu32() % 30); + player->username[i+1] = '\0'; + + if( (vg_randu32() % 8) == 3 ) + break; + } + + for( int i=0; i<3; i ++ ){ + player->medals[i] = vg_randu32() % 3; + } + + v3f pos; + + vg_rand_sphere( pos ); + v3_muladds( localplayer.rb.co, pos, 100.0f, + netplayers.final_mtx[ i*localplayer.skeleton.bone_count][3] ); + } + + return 0; +} + +static void remote_players_init(void){ + vg_console_reg_cmd( "add_test_players", remote_players_randomize, NULL ); + vg_console_reg_var( "k_show_own_name", &k_show_own_name, + k_var_dtype_i32, 0 ); + for( u32 i=0; isystem != k_player_subsystem_invalid ){ + si->subframe -= vg.time_frame_delta; + if( si->subframe <= 0.0f ){ + net_sfx_play( si ); + si->system = k_player_subsystem_invalid; + } + } + } +} + +/* + * animator->root_co of remote player + */ +static void remote_player_position( int id, v3f out_co ){ + struct skeleton *sk = &localplayer.skeleton; + m4x3f *final_mtx = &netplayers.final_mtx[ sk->bone_count*id ]; + v3_copy( final_mtx[0][3], out_co ); +} + +enum remote_player_gui_type { + k_remote_player_gui_type_stranger, + k_remote_player_gui_type_friend, + k_remote_player_gui_type_you, +}; + +/* + * Given players' root_co, get the screen point where we should draw tag info. + */ +static int player_tag_position( m4x4f pv, v3f root_co, ui_point out_point ){ + v4f wpos; + v3_copy( root_co, wpos ); + wpos[1] += 2.0f; + wpos[3] = 1.0f; + + m4x4_mulv( pv, wpos, wpos ); + + if( wpos[3] > 0.0f ){ + v2_muls( wpos, (1.0f/wpos[3]) * 0.5f, wpos ); + v2_add( wpos, (v2f){ 0.5f, 0.5f }, wpos ); + + float k_max = 32000.0f; + + out_point[0] = vg_clampf(wpos[0] * vg.window_x, -k_max, k_max ); + out_point[1] = vg_clampf((1.0f-wpos[1]) * vg.window_y, -k_max, k_max ); + return 1; + } + else + return 0; +} + +/* + * Draw chat box relative to the root tag position on the screen + */ +static void chat_box( ui_point tag_root, f64 time, const char *message ){ + if( (vg.time_real - time) > 15.0 ) + return; + + ui_rect wr; + wr[2] = ui_text_line_width( message ) + 8; + wr[3] = vg_ui.font->glyph_height + 2; + wr[0] = tag_root[0]-(wr[2]/2); + wr[1] = tag_root[1] - wr[3] - 8; + + ui_fill( wr, ui_opacity( ui_colour(k_ui_bg), 0.23f ) ); + ui_text( wr, message, 1, k_ui_align_middle_center, 0 ); +} + +/* + * Draw full imgui for remote player */ +static void remote_player_nametag( ui_point tag_root, + struct network_player *player ){ + vg_ui.font = &vg_ui_font_big; + + ui_rect wr; + wr[2] = VG_MAX( ui_text_line_width( player->username ), 140 ) + 8; + wr[3] = 32; + wr[0] = tag_root[0]-(wr[2]/2); + wr[1] = tag_root[1]-(wr[3]/2); + + ui_fill( wr, ui_opacity( ui_colour(k_ui_bg), 0.23f ) ); + ui_text( wr, player->username, 1, k_ui_align_middle_center, 0 ); + + vg_ui.font = &vg_ui_font_small; + + /* medals */ + int cols = 0; + for( int i=0; i<3; i ++ ) + if( player->medals[i] ) + cols ++; + + char buf[32]; + vg_str str; + + if( cols ){ + f32 w = (f32)wr[2] / (f32)cols; + cols = 0; + + for( int i=0; i<3; i ++ ){ + if( player->medals[i] ){ + ui_rect col = { wr[0] + (f32)cols*w, wr[1] + wr[3], w, + vg_ui.font->glyph_height }; + + vg_strnull( &str, buf, 32 ); + vg_strcatch( &str, (char)k_SRglyph_vg_circle ); + vg_strcati32( &str, player->medals[i] ); + + ui_text( col, buf, 1, k_ui_align_middle_center, + ui_colour( (enum ui_scheme_colour[]){ + k_ui_yellow, k_ui_gray, k_ui_orange }[i] ) ); + + cols ++; + } + } + } +} + +static void remote_player_world_gui( m4x4f pv, v3f root_co, + struct network_player *player ){ + ui_point tag_root; + if( !player_tag_position( pv, root_co, tag_root ) ) + return; + + if( player ){ + remote_player_nametag( tag_root, player ); + chat_box( tag_root, player->chat_time, player->chat ); + } + else { + if( netplayers.chatting ) + chat_box( tag_root, vg.time_real, netplayers.chat_buffer ); + else + chat_box( tag_root, netplayers.chat_time, netplayers.chat_message ); + } +} + +static void remote_player_gui_info( ui_rect box, + const char *username, + const char *activity, + enum remote_player_gui_type type, + int in_world ){ + + f32 opacity = in_world? 0.6f: 0.3f; + + if( type == k_remote_player_gui_type_you ) + ui_fill( box, ui_opacity( 0xff555555, opacity ) ); + else + ui_fill( box, ui_opacity( 0xff000000, opacity ) ); + + if( type == k_remote_player_gui_type_friend ) + ui_outline( box, -1, ui_opacity( 0xff00c4f0, opacity ), 0 ); + + ui_rect top, bottom; + ui_split_ratio( box, k_ui_axis_h, 0.6666f, 1, top, bottom ); + + u32 fg; + + if( type == k_remote_player_gui_type_friend ) + fg = ui_colour( k_ui_yellow + (in_world? k_ui_brighter: 0) ); + else + fg = ui_colour( in_world? k_ui_fg: k_ui_fg+4 ); + + vg_ui.font = &vg_ui_font_big; + ui_text( top, username, 1, k_ui_align_middle_center, fg ); + vg_ui.font = &vg_ui_font_small; + + ui_text( bottom, activity, 1, k_ui_align_middle_center, fg ); +} + +static void remote_players_imgui_lobby(void){ + if( network_client.user_intent == k_server_intent_online ){ + if( !(steam_ready && + (network_client.state == k_ESteamNetworkingConnectionState_Connected))) + { + return; + } + } + + ui_px y = 50, width = 200, height = 42, gap = 2, + x = vg.window_x - width; + + vg_ui.font = &vg_ui_font_big; + ui_text( (ui_rect){ x, 0, width, height }, + "In World", 1, k_ui_align_middle_center, 0 ); + vg_ui.font = &vg_ui_font_small; + + + ui_rect us = { x, y, width, height }; + /* FIXME: your location */ + remote_player_gui_info( us, steam_username_at_startup, "you", + k_remote_player_gui_type_you, 1 ); + y += height + gap; + + for( u32 i=0; iactive || player->isblocked ) continue; + + int in_same_world = player->active_world == world_current_instance(); + if( !player->isfriend && !in_same_world ) + continue; + + const char *location = in_same_world? "": "another world"; + if( player->region_flags & k_ent_region_flag_hasname ){ + location = player->region; + } + + ui_rect box = { x, y, width, height }; + remote_player_gui_info( box, player->username, location, + player->isfriend, in_same_world ); + y += height + gap; + } +} + +static void remote_players_imgui_world( world_instance *world, m4x4f pv, + f32 max_dist, int geo_cull ){ + ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y ); + + for( u32 i=0; iactive ){ + v3f co; + remote_player_position( i, co ); + + if( !player->active_world ) + continue; + if( !player->isfriend && + (world-world_static.instances == k_world_purpose_hub)) continue; + + /* their in our active subworld */ + if( player->active_world != world ){ + m4x3_mulv( global_miniworld.mmdl, co, co ); + co[1] -= 2.0f; /* HACK lol */ + } + + f32 d2 = v3_dist2( co, localplayer.rb.co ); + + if( d2 > (max_dist*max_dist) ) + continue; + + f32 dist = sqrtf(d2); + f32 opacity = 0.95f * sqrtf(((max_dist-dist)/max_dist)); + + if( geo_cull ){ + ray_hit hit; + hit.dist = dist; + + v3f dir; + v3_sub( co, skaterift.cam.pos, dir ); + v3_normalize( dir ); + + if( ray_world( world, skaterift.cam.pos, dir, &hit, + k_material_flag_ghosts ) ){ + opacity *= 0.5f; + } + } + + player->opacity = vg_lerpf( player->opacity, opacity, + vg.time_frame_delta * 2.0f ); + + remote_player_world_gui( pv, co, player ); + + vg_ui.colour[3] = player->opacity; + ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y ); + } + } + + vg_ui.colour[3] = 1.0f; + + remote_player_world_gui( pv, localplayer.rb.co, NULL ); + ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y ); +} + +static void chat_escape(void){ + netplayers.chatting = -1; +} + +static void chat_enter( char *buf, u32 len ){ + vg_strncpy( buf, netplayers.chat_message, NETWORK_MAX_CHAT, + k_strncpy_always_add_null ); + netplayers.chatting = -1; + netplayers.chat_time = vg.time_real; + chat_send_message( buf ); +} + +static void remote_players_chat_imgui(void){ + if( netplayers.chatting == 1 ){ + ui_rect box = { 0, 0, 400, 40 }, + window = { 0, 0, vg.window_x, vg.window_y }; + ui_rect_center( window, box ); + + struct ui_textbox_callbacks callbacks = { + .enter = chat_enter, + .escape = chat_escape + }; + + ui_textbox( box, NULL, + netplayers.chat_buffer, NETWORK_MAX_CHAT, 1, + UI_TEXTBOX_AUTOFOCUS, &callbacks ); + } + else { + if( netplayers.chatting == -1 ){ + netplayers.chatting = 0; + srinput.state = k_input_state_resume; + } + else { + if( (skaterift.activity == k_skaterift_default) && + button_down( k_srbind_chat ) ){ + netplayers.chatting = 1; + netplayers.chat_buffer[0] = '\0'; + srinput.state = k_input_state_pause; + } + } + } +}