X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_skateshop.c;h=12e89233ab670d36a1537eb62f73b3de413421d3;hb=fbc68c65e01838feb77f47b30994b45fcc39ebaf;hp=c10352d5ff0a53f33cfd4fea3161b1f15c4e032c;hpb=1c56bc84c9ad3da49c9d2447ec97aaf7f6038601;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/ent_skateshop.c b/ent_skateshop.c index c10352d..12e8923 100644 --- a/ent_skateshop.c +++ b/ent_skateshop.c @@ -192,18 +192,21 @@ static void skateshop_init_async(void *_data,u32 size){ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + + skaterift.rt_textures[ k_skaterift_rt_workshop_preview ] = + global_skateshop.tex_preview_err; + + skaterift.rt_textures[ k_skaterift_rt_server_status ] = + global_skateshop.tex_preview_err; + render_server_status_gui(); } /* * VG event init */ static void skateshop_init(void){ - vg_async_call( skateshop_init_async, NULL, 0 ); vg_tex2d_replace_with_error( &global_skateshop.tex_preview_err ); - vg_async_stall(); - - skaterift.rt_textures[ k_skaterift_rt_workshop_preview ] = - global_skateshop.tex_preview_err; + vg_async_call( skateshop_init_async, NULL, 0 ); } static u16 skateshop_selected_cache_id(void){ @@ -216,6 +219,17 @@ static u16 skateshop_selected_cache_id(void){ else return 0; } +static void skateshop_server_helper_update(void){ + vg_str text; + vg_strnull( &text, global_skateshop.helper_toggle->text, + sizeof(global_skateshop.helper_toggle->text) ); + + if( network_client.user_intent == k_server_intent_online ) + vg_strcat( &text, "Disconnect" ); + else + vg_strcat( &text, "Go Online" ); +} + /* * VG event preupdate */ @@ -241,8 +255,14 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ mdl_entity_id_id(shop->boards.id_display) ); v3_sub( display->transform.co, localplayer.rb.co, lookat ); } - else if( shop->type == k_skateshop_type_charshop ) + else if( shop->type == k_skateshop_type_charshop ){ v3_sub( ref->transform.co, localplayer.rb.co, lookat ); + } + else if( shop->type == k_skateshop_type_server ){ + ent_prop *prop = mdl_arritm( &world->ent_prop, + mdl_entity_id_id(shop->server.id_lever) ); + v3_sub( prop->transform.co, localplayer.rb.co, lookat ); + } else vg_fatal_error( "Unknown store (%u)\n", shop->type ); @@ -352,7 +372,7 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ if( valid_count && vg_loader_availible() ) browseable = 1; - if( vg_loader_availible() ) + if( valid_count && vg_loader_availible() ) loadable = 1; global_skateshop.helper_browse->greyed = !browseable; @@ -392,6 +412,22 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ } } } + else if( shop->type == k_skateshop_type_server ){ + f64 delta = vg.time_real - network_client.last_intent_change; + + if( delta > 5.0 ){ + global_skateshop.helper_pick->greyed = 0; + if( button_down( k_srbind_maccept ) ){ + network_client.user_intent = !network_client.user_intent; + network_client.last_intent_change = vg.time_real; + skateshop_server_helper_update(); + render_server_status_gui(); + } + } + else { + global_skateshop.helper_pick->greyed = 1; + } + } else{ vg_fatal_error( "Unknown store (%u)\n", shop->type ); } @@ -406,6 +442,25 @@ static void ent_skateshop_preupdate( ent_skateshop *shop, int active ){ } } +static void skateshop_world_preupdate( world_instance *world ){ + for( u32 i=0; ient_skateshop); i++ ){ + ent_skateshop *shop = mdl_arritm( &world->ent_skateshop, i ); + + if( shop->type == k_skateshop_type_server ){ + f32 a = network_client.user_intent; + + vg_slewf( &network_client.fintent, a, vg.time_frame_delta ); + a = (vg_smoothstepf( network_client.fintent ) - 0.5f) * (VG_PIf/2.0f); + + ent_prop *lever = mdl_arritm( &world->ent_prop, + mdl_entity_id_id(shop->server.id_lever) ); + + /* we need parent transforms now? */ + q_axis_angle( lever->transform.q, (v3f){0,0,1}, a ); + } + } +} + static void skateshop_render_boardshop( ent_skateshop *shop ){ world_instance *world = world_current_instance(); u32 slot_count = vg_list_size(global_skateshop.shop_view_slots); @@ -467,11 +522,6 @@ fade_out:; mdl_transform_m4x3( &mark_info->transform, mtext ); mdl_transform_m4x3( &mark_rack->transform, mrack ); -#if 0 - const char *text_title = "Fish - Title"; - const char *text_author = "by Shaniqua"; -#endif - m4x3f mlocal, mmdl; m4x3_identity( mlocal ); @@ -579,21 +629,32 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){ addon_reg *reg = get_addon_from_index( k_addon_type_world, global_skateshop.selected_world_id, ADDON_REG_HIDDEN ); - vg_msg msg; - vg_msg_init( &msg, reg->metadata, reg->metadata_len ); - global_skateshop.render.world_loc = vg_msg_getkvstr( &msg, "location" ); - global_skateshop.render.world_reg = global_skateshop.selected_world_id; + if( !reg ) + goto none; - if( vg_msg_seekframe( &msg, "workshop" ) ){ - global_skateshop.render.world_title = vg_msg_getkvstr( &msg, "title"); - vg_msg_skip_frame( &msg ); + if( reg->alias.workshop_id ){ + vg_msg msg; + vg_msg_init( &msg, reg->metadata, reg->metadata_len ); + + global_skateshop.render.world_loc = vg_msg_getkvstr(&msg,"location"); + global_skateshop.render.world_reg = global_skateshop.selected_world_id; + + if( vg_msg_seekframe( &msg, "workshop" ) ){ + global_skateshop.render.world_title = vg_msg_getkvstr(&msg,"title"); + vg_msg_skip_frame( &msg ); + } + else { + vg_warn( "No workshop body\n" ); + } } else { - vg_warn( "No workshop body\n" ); + global_skateshop.render.world_title = reg->alias.foldername; } } +none:; + /* Text */ char buftext[128], bufsubtext[128]; vg_str info, subtext; @@ -647,20 +708,6 @@ static void skateshop_render_worldshop( ent_skateshop *shop ){ mlocal[3][1] = -scale1*0.3f; m4x3_mul( mtext, mlocal, mtextmdl ); font3d_simple_draw( 0, bufsubtext, &skaterift.cam, mtextmdl ); - -#if 0 - /* pointcloud */ - m4x3f mmdl; - mdl_transform_m4x3( &mark_display->transform, mmdl ); - m4x3_rotate_y( mmdl, vg.time * 0.2 ); - - glEnable(GL_BLEND); - glBlendFunc(GL_ONE, GL_ONE); - glDisable(GL_DEPTH_TEST); - pointcloud_render( world, &skaterift.cam, mmdl ); - glDisable(GL_BLEND); - glEnable(GL_DEPTH_TEST); -#endif } /* @@ -673,10 +720,43 @@ static void skateshop_render( ent_skateshop *shop ){ skateshop_render_charshop( shop ); else if( shop->type == k_skateshop_type_worldshop ) skateshop_render_worldshop( shop ); + else if( shop->type == k_skateshop_type_server ){ + } else vg_fatal_error( "Unknown store (%u)\n", shop->type ); } +static void skateshop_render_nonfocused( world_instance *world, camera *cam ){ + for( u32 j=0; jent_skateshop ); j ++ ){ + ent_skateshop *shop = mdl_arritm(&world->ent_skateshop, j ); + + if( shop->type != k_skateshop_type_boardshop ) continue; + + f32 dist2 = v3_dist2( cam->pos, shop->transform.co ), + maxdist = 50.0f; + + if( dist2 > maxdist*maxdist ) continue; + ent_marker *mark_rack = mdl_arritm( &world->ent_marker, + mdl_entity_id_id(shop->boards.id_rack)); + + u32 slot_count = vg_list_size(global_skateshop.shop_view_slots); + for( u32 i=0; itransform, &xform, &xform ); + + struct player_board_pose pose = {0}; + m4x3f mmdl; + mdl_transform_m4x3( &xform, mmdl ); + render_board( cam, world, board, mmdl, &pose, k_board_shader_entity ); + } + } +} + static void ent_skateshop_helpers_pickable( const char *acceptance ){ vg_str text; @@ -725,6 +805,12 @@ static void ent_skateshop_call( world_instance *world, ent_call *call ){ ent_skateshop_helpers_pickable( "open rift" ); skateshop_op_world_scan(); } + else if( shop->type == k_skateshop_type_server ){ + vg_str text; + global_skateshop.helper_pick = gui_new_helper( + input_button_list[k_srbind_maccept], &text); + skateshop_server_helper_update(); + } } }