From: hgn Date: Thu, 13 Jul 2023 19:35:05 +0000 (+0100) Subject: workshop patch X-Git-Url: https://skaterift.com/git/?a=commitdiff_plain;h=f1fe55f957a3dbdb6ca20a696f0c1171e2d5e7ca;p=carveJwlIkooP6JGAAIwe30JlM.git workshop patch --- diff --git a/boards_src/skaterift_long/addon.inf b/boards_src/skaterift_long/addon.inf index daf6b76..2947e86 100644 Binary files a/boards_src/skaterift_long/addon.inf and b/boards_src/skaterift_long/addon.inf differ diff --git a/build.c b/build.c index acc4b59..65a7593 100644 --- a/build.c +++ b/build.c @@ -113,6 +113,12 @@ void build_game( enum compiler compiler ) write_generic_addon_inf( k_addon_type_player, "Outlaw", "ch_outlaw.mdl", "playermodels_src/skaterift_outlaw/addon.inf" ); + write_generic_addon_inf( k_addon_type_player, + "Chip", "ch_chip.mdl", + "playermodels_src/skaterift_chip/addon.inf" ); + write_generic_addon_inf( k_addon_type_player, + "Aaron", "ch_aaron.mdl", + "playermodels_src/skaterift_aaron/addon.inf" ); vg_build(); compiled_something = 1; diff --git a/maps_src/mp_flatworld/main.mdl b/maps_src/mp_flatworld/main.mdl deleted file mode 100644 index f51beb2..0000000 Binary files a/maps_src/mp_flatworld/main.mdl and /dev/null differ diff --git a/maps_src/template/addon.inf b/maps_src/template/addon.inf deleted file mode 100644 index b71b466..0000000 Binary files a/maps_src/template/addon.inf and /dev/null differ diff --git a/maps_src/template/main.mdl b/maps_src/template/main.mdl deleted file mode 100644 index ddae72b..0000000 Binary files a/maps_src/template/main.mdl and /dev/null differ diff --git a/maps_src/template/preview.jpg b/maps_src/template/preview.jpg deleted file mode 100644 index 63b72e4..0000000 Binary files a/maps_src/template/preview.jpg and /dev/null differ diff --git a/player_render.c b/player_render.c index b4897fc..ba50fc1 100644 --- a/player_render.c +++ b/player_render.c @@ -364,6 +364,7 @@ VG_STATIC void render_board( camera *cam, world_instance *world, } VG_STATIC void render_playermodel( camera *cam, world_instance *world, + int depth_compare, struct player_model *model, struct skeleton *skeleton ){ if( !model ) return; @@ -375,16 +376,20 @@ VG_STATIC void render_playermodel( camera *cam, world_instance *world, shader_model_character_view_uTexMain( 0 ); shader_model_character_view_uCamera( cam->transform[3] ); shader_model_character_view_uPv( cam->mtx.pv ); - shader_model_character_view_uTexSceneDepth( 1 ); - render_fb_bind_texture( gpipeline.fb_main, 2, 1 ); - v3f inverse; - render_fb_inverse_ratio( gpipeline.fb_main, inverse ); - inverse[2] = skaterift.cam.farz-skaterift.cam.nearz; - shader_model_character_view_uInverseRatioDepth( inverse ); - render_fb_inverse_ratio( NULL, inverse ); - inverse[2] = cam->farz-cam->nearz; - shader_model_character_view_uInverseRatioMain( inverse ); + if( depth_compare ){ + shader_model_character_view_uTexSceneDepth( 1 ); + render_fb_bind_texture( gpipeline.fb_main, 2, 1 ); + v3f inverse; + render_fb_inverse_ratio( gpipeline.fb_main, inverse ); + inverse[2] = skaterift.cam.farz-skaterift.cam.nearz; + + shader_model_character_view_uInverseRatioDepth( inverse ); + render_fb_inverse_ratio( NULL, inverse ); + inverse[2] = cam->farz-cam->nearz; + shader_model_character_view_uInverseRatioMain( inverse ); + } + shader_model_character_view_uDepthCompare( depth_compare ); world_link_lighting_ub( world, _shader_model_character_view.id ); world_bind_position_texture( world, _shader_model_character_view.id, @@ -403,8 +408,7 @@ VG_STATIC void render_playermodel( camera *cam, world_instance *world, mesh_draw( &model->mdl.mesh ); } -PLAYER_API void player__render( camera *cam, player_instance *player ) -{ +PLAYER_API void player__render( camera *cam, player_instance *player ){ world_instance *world = world_current_instance(); SDL_AtomicLock( &addon_system.sl_cache_using_resources ); @@ -413,7 +417,7 @@ PLAYER_API void player__render( camera *cam, player_instance *player ) player->playermodel_view_slot ); if( !model ) model = &player->fallback_model; - render_playermodel( cam, world, model, &player->playeravatar->sk ); + render_playermodel( cam, world, 1, model, &player->playeravatar->sk ); struct player_board *board = addon_cache_item_if_loaded( k_addon_type_board, diff --git a/player_render.h b/player_render.h index d2b17bb..f33e2db 100644 --- a/player_render.h +++ b/player_render.h @@ -87,6 +87,7 @@ VG_STATIC void render_board( camera *cam, world_instance *world, enum board_shader shader ); VG_STATIC void render_playermodel( camera *cam, world_instance *world, + int depth_compare, struct player_model *model, struct skeleton *skeleton ); diff --git a/playermodels_src/skaterift_aaron/addon.inf b/playermodels_src/skaterift_aaron/addon.inf new file mode 100644 index 0000000..b67392d Binary files /dev/null and b/playermodels_src/skaterift_aaron/addon.inf differ diff --git a/playermodels_src/skaterift_chip/addon.inf b/playermodels_src/skaterift_chip/addon.inf new file mode 100644 index 0000000..3ad4bde Binary files /dev/null and b/playermodels_src/skaterift_chip/addon.inf differ diff --git a/playermodels_src/skaterift_new/addon.inf b/playermodels_src/skaterift_new/addon.inf index 9a932a5..d5e35ba 100644 Binary files a/playermodels_src/skaterift_new/addon.inf and b/playermodels_src/skaterift_new/addon.inf differ diff --git a/shaders/model_board_view.h b/shaders/model_board_view.h index 437b1c4..7c26322 100644 --- a/shaders/model_board_view.h +++ b/shaders/model_board_view.h @@ -71,6 +71,7 @@ static struct vg_shader _shader_model_board_view = { "uniform vec3 uCamera;\n" "uniform vec3 uInverseRatioDepth;\n" "uniform vec3 uInverseRatioMain;\n" +"uniform bool uDepthCompare;\n" "\n" "in vec4 aColour;\n" "in vec2 aUv;\n" @@ -380,7 +381,7 @@ static struct vg_shader _shader_model_board_view = { " return scene_apply_fog( diffuse * total_light, fog_colour, fdist );\n" "}\n" "\n" -"#line 14 0 \n" +"#line 15 0 \n" "#line 1 2 \n" "const float k_motion_lerp_amount = 0.01;\n" "\n" @@ -400,7 +401,7 @@ static struct vg_shader _shader_model_board_view = { " oMotionVec = (vmotion1-vmotion0) * (1.0/k_motion_lerp_amount);\n" "}\n" "\n" -"#line 15 0 \n" +"#line 16 0 \n" "\n" "float linear_depth( float depth, float near, float far ) \n" "{\n" @@ -419,19 +420,22 @@ static struct vg_shader _shader_model_board_view = { " float dist = distance( aWorldCo, uCamera ) - 0.08;\n" " float opacity = clamp( dist*dist, 0.0, 1.0 );\n" "\n" -" vec2 back_coord = gl_FragCoord.xy*uInverseRatioMain.xy*uInverseRatioDepth.xy;\n" -" float back_depth = texture( uTexSceneDepth, back_coord ).r;\n" -" float front_depth = gl_FragCoord.z/gl_FragCoord.w;\n" +" if( uDepthCompare ){\n" +" vec2 back_coord = gl_FragCoord.xy * uInverseRatioMain.xy \n" +" * uInverseRatioDepth.xy;\n" +" float back_depth = texture( uTexSceneDepth, back_coord ).r;\n" +" float front_depth = gl_FragCoord.z/gl_FragCoord.w;\n" "\n" -" back_depth = linear_depth( back_depth, 0.1, 2100.0 );\n" -" float diff = back_depth - front_depth;\n" +" back_depth = linear_depth( back_depth, 0.1, 2100.0 );\n" +" float diff = back_depth - front_depth;\n" "\n" -" vec2 ssuv = gl_FragCoord.xy;\n" -" vec3 vDither = vec3( dot( vec2( 171.0, 231.0 ), ssuv) );\n" -" float dither = fract( vDither.g / 71.0 ) - 0.5;\n" +" vec2 ssuv = gl_FragCoord.xy;\n" +" vec3 vDither = vec3( dot( vec2( 171.0, 231.0 ), ssuv) );\n" +" float dither = fract( vDither.g / 71.0 ) - 0.5;\n" "\n" -" if( step(0.0,diff)+dither<0.3 )\n" -" discard;\n" +" if( step(0.0,diff)+dither<0.3 )\n" +" discard;\n" +" }\n" "\n" " oColour = vec4( composite, opacity );\n" "}\n" @@ -446,6 +450,7 @@ static GLuint _uniform_model_board_view_uTexSceneDepth; static GLuint _uniform_model_board_view_uCamera; static GLuint _uniform_model_board_view_uInverseRatioDepth; static GLuint _uniform_model_board_view_uInverseRatioMain; +static GLuint _uniform_model_board_view_uDepthCompare; static GLuint _uniform_model_board_view_g_world_depth; static GLuint _uniform_model_board_view_uLightsArray; static GLuint _uniform_model_board_view_uLightsIndex; @@ -473,6 +478,9 @@ static void shader_model_board_view_uInverseRatioDepth(v3f v){ static void shader_model_board_view_uInverseRatioMain(v3f v){ glUniform3fv(_uniform_model_board_view_uInverseRatioMain,1,v); } +static void shader_model_board_view_uDepthCompare(int b){ + glUniform1f(_uniform_model_board_view_uDepthCompare,b); +} static void shader_model_board_view_g_world_depth(int i){ glUniform1i(_uniform_model_board_view_g_world_depth,i); } @@ -489,6 +497,7 @@ static void shader_model_board_view_link(void){ _uniform_model_board_view_uCamera = glGetUniformLocation( _shader_model_board_view.id, "uCamera" ); _uniform_model_board_view_uInverseRatioDepth = glGetUniformLocation( _shader_model_board_view.id, "uInverseRatioDepth" ); _uniform_model_board_view_uInverseRatioMain = glGetUniformLocation( _shader_model_board_view.id, "uInverseRatioMain" ); + _uniform_model_board_view_uDepthCompare = glGetUniformLocation( _shader_model_board_view.id, "uDepthCompare" ); _uniform_model_board_view_g_world_depth = glGetUniformLocation( _shader_model_board_view.id, "g_world_depth" ); _uniform_model_board_view_uLightsArray = glGetUniformLocation( _shader_model_board_view.id, "uLightsArray" ); _uniform_model_board_view_uLightsIndex = glGetUniformLocation( _shader_model_board_view.id, "uLightsIndex" ); diff --git a/shaders/model_character_view.fs b/shaders/model_character_view.fs index 5f9ee64..efee606 100644 --- a/shaders/model_character_view.fs +++ b/shaders/model_character_view.fs @@ -3,6 +3,7 @@ uniform sampler2D uTexSceneDepth; uniform vec3 uCamera; uniform vec3 uInverseRatioDepth; uniform vec3 uInverseRatioMain; +uniform bool uDepthCompare; in vec4 aColour; in vec2 aUv; @@ -30,19 +31,22 @@ void main() float dist = distance( aWorldCo, uCamera ) - 0.08; float opacity = clamp( dist*dist, 0.0, 1.0 ); - vec2 back_coord = gl_FragCoord.xy*uInverseRatioMain.xy*uInverseRatioDepth.xy; - float back_depth = texture( uTexSceneDepth, back_coord ).r; - float front_depth = gl_FragCoord.z/gl_FragCoord.w; + if( uDepthCompare ){ + vec2 back_coord = gl_FragCoord.xy * uInverseRatioMain.xy + * uInverseRatioDepth.xy; + float back_depth = texture( uTexSceneDepth, back_coord ).r; + float front_depth = gl_FragCoord.z/gl_FragCoord.w; - back_depth = linear_depth( back_depth, 0.1, 2100.0 ); - float diff = back_depth - front_depth; + back_depth = linear_depth( back_depth, 0.1, 2100.0 ); + float diff = back_depth - front_depth; - vec2 ssuv = gl_FragCoord.xy; - vec3 vDither = vec3( dot( vec2( 171.0, 231.0 ), ssuv) ); - float dither = fract( vDither.g / 71.0 ) - 0.5; + vec2 ssuv = gl_FragCoord.xy; + vec3 vDither = vec3( dot( vec2( 171.0, 231.0 ), ssuv) ); + float dither = fract( vDither.g / 71.0 ) - 0.5; - if( step(0.0,diff)+dither<0.3 ) - discard; + if( step(0.0,diff)+dither<0.3 ) + discard; + } oColour = vec4( composite, opacity ); } diff --git a/shaders/model_character_view.h b/shaders/model_character_view.h index 55f8831..5394dc8 100644 --- a/shaders/model_character_view.h +++ b/shaders/model_character_view.h @@ -79,6 +79,7 @@ static struct vg_shader _shader_model_character_view = { "uniform vec3 uCamera;\n" "uniform vec3 uInverseRatioDepth;\n" "uniform vec3 uInverseRatioMain;\n" +"uniform bool uDepthCompare;\n" "\n" "in vec4 aColour;\n" "in vec2 aUv;\n" @@ -388,7 +389,7 @@ static struct vg_shader _shader_model_character_view = { " return scene_apply_fog( diffuse * total_light, fog_colour, fdist );\n" "}\n" "\n" -"#line 14 0 \n" +"#line 15 0 \n" "#line 1 2 \n" "const float k_motion_lerp_amount = 0.01;\n" "\n" @@ -408,7 +409,7 @@ static struct vg_shader _shader_model_character_view = { " oMotionVec = (vmotion1-vmotion0) * (1.0/k_motion_lerp_amount);\n" "}\n" "\n" -"#line 15 0 \n" +"#line 16 0 \n" "\n" "float linear_depth( float depth, float near, float far ) \n" "{\n" @@ -427,19 +428,22 @@ static struct vg_shader _shader_model_character_view = { " float dist = distance( aWorldCo, uCamera ) - 0.08;\n" " float opacity = clamp( dist*dist, 0.0, 1.0 );\n" "\n" -" vec2 back_coord = gl_FragCoord.xy*uInverseRatioMain.xy*uInverseRatioDepth.xy;\n" -" float back_depth = texture( uTexSceneDepth, back_coord ).r;\n" -" float front_depth = gl_FragCoord.z/gl_FragCoord.w;\n" +" if( uDepthCompare ){\n" +" vec2 back_coord = gl_FragCoord.xy * uInverseRatioMain.xy \n" +" * uInverseRatioDepth.xy;\n" +" float back_depth = texture( uTexSceneDepth, back_coord ).r;\n" +" float front_depth = gl_FragCoord.z/gl_FragCoord.w;\n" "\n" -" back_depth = linear_depth( back_depth, 0.1, 2100.0 );\n" -" float diff = back_depth - front_depth;\n" +" back_depth = linear_depth( back_depth, 0.1, 2100.0 );\n" +" float diff = back_depth - front_depth;\n" "\n" -" vec2 ssuv = gl_FragCoord.xy;\n" -" vec3 vDither = vec3( dot( vec2( 171.0, 231.0 ), ssuv) );\n" -" float dither = fract( vDither.g / 71.0 ) - 0.5;\n" +" vec2 ssuv = gl_FragCoord.xy;\n" +" vec3 vDither = vec3( dot( vec2( 171.0, 231.0 ), ssuv) );\n" +" float dither = fract( vDither.g / 71.0 ) - 0.5;\n" "\n" -" if( step(0.0,diff)+dither<0.3 )\n" -" discard;\n" +" if( step(0.0,diff)+dither<0.3 )\n" +" discard;\n" +" }\n" "\n" " oColour = vec4( composite, opacity );\n" "}\n" @@ -453,6 +457,7 @@ static GLuint _uniform_model_character_view_uTexSceneDepth; static GLuint _uniform_model_character_view_uCamera; static GLuint _uniform_model_character_view_uInverseRatioDepth; static GLuint _uniform_model_character_view_uInverseRatioMain; +static GLuint _uniform_model_character_view_uDepthCompare; static GLuint _uniform_model_character_view_g_world_depth; static GLuint _uniform_model_character_view_uLightsArray; static GLuint _uniform_model_character_view_uLightsIndex; @@ -474,6 +479,9 @@ static void shader_model_character_view_uInverseRatioDepth(v3f v){ static void shader_model_character_view_uInverseRatioMain(v3f v){ glUniform3fv(_uniform_model_character_view_uInverseRatioMain,1,v); } +static void shader_model_character_view_uDepthCompare(int b){ + glUniform1f(_uniform_model_character_view_uDepthCompare,b); +} static void shader_model_character_view_g_world_depth(int i){ glUniform1i(_uniform_model_character_view_g_world_depth,i); } @@ -489,6 +497,7 @@ static void shader_model_character_view_link(void){ _uniform_model_character_view_uCamera = glGetUniformLocation( _shader_model_character_view.id, "uCamera" ); _uniform_model_character_view_uInverseRatioDepth = glGetUniformLocation( _shader_model_character_view.id, "uInverseRatioDepth" ); _uniform_model_character_view_uInverseRatioMain = glGetUniformLocation( _shader_model_character_view.id, "uInverseRatioMain" ); + _uniform_model_character_view_uDepthCompare = glGetUniformLocation( _shader_model_character_view.id, "uDepthCompare" ); _uniform_model_character_view_g_world_depth = glGetUniformLocation( _shader_model_character_view.id, "g_world_depth" ); _uniform_model_character_view_uLightsArray = glGetUniformLocation( _shader_model_character_view.id, "uLightsArray" ); _uniform_model_character_view_uLightsIndex = glGetUniformLocation( _shader_model_character_view.id, "uLightsIndex" ); diff --git a/skaterift.c b/skaterift.c index a575fc5..4c0f70e 100644 --- a/skaterift.c +++ b/skaterift.c @@ -14,7 +14,7 @@ #if 1 #define SR_NETWORKED -//#define VG_DEVWINDOW +#define VG_DEVWINDOW /* * system headers diff --git a/workshop.c b/workshop.c index 5f02caa..5deb5c4 100644 --- a/workshop.c +++ b/workshop.c @@ -23,9 +23,10 @@ static struct ui_dropdown_opt workshop_form_visibility_opts[] = { }; static struct ui_dropdown_opt workshop_form_type_opts[] = { - { "None", k_addon_type_none }, - { "Board", k_addon_type_board }, - { "World", k_addon_type_world }, + { "None", k_addon_type_none }, + { "Board", k_addon_type_board }, + { "World", k_addon_type_world }, + { "Player", k_addon_type_player }, }; /* @@ -148,6 +149,16 @@ VG_STATIC void on_workshop_update_result( void *data, void *user ) vg_error( "Error with the submitted file (%d)\n", result->m_eResult ); } + workshop_form.op = k_workshop_op_none; +} + +VG_STATIC const char *workshop_filetype_folder(void){ + enum addon_type type = workshop_form.submission.type; + if ( type == k_addon_type_board ) return "boards/"; + else if( type == k_addon_type_player ) return "playermodels/"; + else if( type == k_addon_type_world ) return "worlds/"; + + return "unknown_addon_type/"; } /* @@ -184,12 +195,7 @@ VG_STATIC void workshop_form_upload_submission( PublishedFileId_t file_id, vg_strnull( &folder, path_buf, 4096 ); vg_strcat( &folder, vg.base_path ); - if( workshop_form.submission.type == k_addon_type_board ){ - vg_strcat( &folder, "boards/" ); - } - else if( workshop_form.submission.type == k_addon_type_world ){ - vg_strcat( &folder, "maps/" ); - } + vg_strcat( &folder, workshop_filetype_folder() ); vg_strcat( &folder, workshop_form.addon_folder ); vg_info( "Setting item content\n" ); @@ -297,16 +303,12 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) vg_str folder; vg_strnull( &folder, path_buf, 4096 ); - if( workshop_form.submission.type == k_addon_type_board ){ - vg_strcat( &folder, "boards/" ); - } - else if( workshop_form.submission.type == k_addon_type_world ){ - vg_strcat( &folder, "maps/" ); - } + vg_strcat( &folder, workshop_filetype_folder() ); vg_strcat( &folder, workshop_form.addon_folder ); if( !vg_strgood(&folder) ){ vg_error( "addon folder path too long\n" ); + workshop_form.op = k_workshop_op_none; return; } @@ -338,6 +340,7 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) vg_dir dir; if( !vg_dir_open( &dir, folder.buffer ) ){ vg_error( "could not open addon folder '%s'\n", folder.buffer ); + workshop_form.op = k_workshop_op_none; return; } @@ -365,6 +368,7 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) vg_strcat( &descriptor_file, "/addon.inf" ); if( !vg_strgood(&descriptor_file) ){ vg_error( "Addon info path too long\n" ); + workshop_form.op = k_workshop_op_none; return; } @@ -372,6 +376,7 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) if( !fp ){ vg_error( "Could not open addon info file '%s'\n", descriptor_file.buffer ); + workshop_form.op = k_workshop_op_none; return; } fwrite( descriptor_buf, descriptor.cur, 1, fp ); @@ -384,6 +389,7 @@ VG_STATIC void _workshop_form_submit_thread( void *data ) if( !vg_strgood(&preview) ){ vg_error( "preview image path too long\n" ); + workshop_form.op = k_workshop_op_none; return; } @@ -406,6 +412,7 @@ VG_STATIC void workshop_op_submit(void){ if( !workshop_form.submission.title[0] ){ ui_start_modal( "Cannot submit because a title is required\n", UI_MODAL_WARN); + workshop_form.op = k_workshop_op_none; return; } } @@ -414,6 +421,7 @@ VG_STATIC void workshop_op_submit(void){ if( !workshop_form.submission.description[0] ){ ui_start_modal( "Cannot submit because a description is required\n", UI_MODAL_WARN ); + workshop_form.op = k_workshop_op_none; return; } } @@ -422,6 +430,7 @@ VG_STATIC void workshop_op_submit(void){ if( workshop_form.file_intent == k_workshop_form_file_intent_none ){ ui_start_modal( "Cannot submit because the file is " "empty or unspecified\n", UI_MODAL_WARN ); + workshop_form.op = k_workshop_op_none; return; } } @@ -450,6 +459,7 @@ VG_STATIC void workshop_form_loadmodel_async_complete( void *payload, u32 size ) workshop_form.file_intent = k_workshop_form_file_intent_new; vg_success( "workshop async load complete\n" ); + workshop_form.op = k_workshop_op_none; } /* @@ -467,15 +477,13 @@ VG_STATIC void _workshop_form_load_thread( void *data ) vg_str folder; vg_strnull( &folder, path_buf, 4096 ); - if( workshop_form.submission.type == k_addon_type_world ) - vg_strcat( &folder, "maps/" ); - else vg_strcat( &folder, "boards/" ); - + vg_strcat( &folder, workshop_filetype_folder() ); vg_strcat( &folder, workshop_form.addon_folder ); if( !vg_strgood(&folder) ){ vg_error( "workshop async load failed: path too long\n" ); vg_async_call( workshop_form_loadmodel_async_error, NULL, 0 ); + workshop_form.op = k_workshop_op_none; return; } @@ -483,6 +491,7 @@ VG_STATIC void _workshop_form_load_thread( void *data ) if( !vg_dir_open( &dir, folder.buffer ) ){ vg_error( "workshop async load failed: could not open folder\n" ); vg_async_call( workshop_form_loadmodel_async_error, NULL, 0 ); + workshop_form.op = k_workshop_op_none; return; } @@ -511,10 +520,15 @@ VG_STATIC void _workshop_form_load_thread( void *data ) if( !found_mdl ){ vg_error( "workshop async load failed: no model files found\n" ); vg_async_call( workshop_form_loadmodel_async_error, NULL, 0 ); + workshop_form.op = k_workshop_op_none; return; } - player_board_load( &workshop_form.board_model, path_buf ); + if( workshop_form.submission.type == k_addon_type_board ) + player_board_load( &workshop_form.board_model, path_buf ); + else if( workshop_form.submission.type == k_addon_type_player ) + player_model_load( &workshop_form.player_model, path_buf ); + vg_async_call( workshop_form_loadmodel_async_complete, NULL, 0 ); } @@ -522,20 +536,26 @@ VG_STATIC void _workshop_form_load_thread( void *data ) * Entry point for load model operation */ VG_STATIC void workshop_op_load_model(void){ - if( workshop_form.submission.type == k_addon_type_world ){ - vg_warn( "WORLD LOAD INFO Currently unsupported\n" ); - return; - } + world_instance *world = world_current_instance(); + workshop_form.view_world = world; - workshop_form.view_world = world_current_instance(); - - if( mdl_arrcount( &workshop_form.view_world->ent_swspreview ) ){ - workshop_form.ptr_ent = - mdl_arritm( &workshop_form.view_world->ent_swspreview, 0 ); + if( workshop_form.submission.type == k_addon_type_board ){ + if( mdl_arrcount( &world->ent_swspreview ) ){ + workshop_form.ptr_ent = + mdl_arritm( &world->ent_swspreview, 0 ); + } + else{ + ui_start_modal( "There is no ent_swspreview in the level. \n" + "Cannot publish here\n", UI_MODAL_BAD ); + workshop_form.op = k_workshop_op_none; + return; + } } - else{ - ui_start_modal( "There is no ent_swspreview in the level. \n" - "Cannot publish here\n", UI_MODAL_BAD ); + else if( workshop_form.submission.type == k_addon_type_player ){} + else { + ui_start_modal( "Don't know how to prepare for this item type. \n" + "Please contact the developers.\n", UI_MODAL_BAD ); + workshop_form.op = k_workshop_op_none; return; } @@ -570,17 +590,17 @@ VG_STATIC void workshop_form_async_imageload( void *data, u32 len ) stbi_failure_reason() ); ui_start_modal( workshop_form.error_msg, UI_MODAL_BAD ); } + workshop_form.op = k_workshop_op_none; } /* * Load the image located at ./workshop_preview.jpg into our framebuffer */ -VG_STATIC void _workshop_load_preview_thread( void *data ) -{ +VG_STATIC void _workshop_load_preview_thread( void *data ){ char path_buf[ 4096 ]; vg_str path; vg_strnull( &path, path_buf, 4096 ); - vg_strcat( &path, "boards/" ); + vg_strcat( &path, workshop_filetype_folder() ); vg_strcat( &path, workshop_form.addon_folder ); vg_strcat( &path, "/preview.jpg" ); @@ -609,27 +629,6 @@ VG_STATIC void _workshop_load_preview_thread( void *data ) } } -#if 0 -/* - * Reciever for the preview download result - */ -VG_STATIC void on_workshop_download_ugcpreview( void *data, void *user ) -{ - struct workshop_loadpreview_info *info = user; - RemoteStorageDownloadUGCResult_t *result = data; - - if( result->m_eResult == k_EResultOK ){ - ISteamRemoteStorage *hSteamRemoteStorage = SteamAPI_SteamRemoteStorage(); - vg_loader_start( _workshop_load_preview_thread, info ); - } - else{ - vg_error( "Error while donwloading UGC preview( %d )\n", - result->m_eResult ); - skaterift_end_op(); - } -} -#endif - /* * Entry point to view operation */ @@ -729,37 +728,10 @@ VG_STATIC void workshop_op_download_and_view_submission( int result_index ) glViewport( 0,0, vg.window_x, vg.window_y ); vg_loader_start( _workshop_load_preview_thread, NULL ); - -#if 0 - if( details.m_hPreviewFile == 0 ){ - vg_error( "m_hPreviewFile is 0\n" ); - skaterift_end_op(); - } - else{ - /* Now need to begin downloading the image so we can display it */ - vg_steam_async_call *call = vg_alloc_async_steam_api_call(); - - struct workshop_loadpreview_info *info = - vg_linear_alloc( vg_mem.scratch, - sizeof( struct workshop_loadpreview_info ) ); - - snprintf( info->abs_preview_image, 1024, - "%smodels/boards/workshop/" PRINTF_U64 ".jpg", - vg.base_path, details.m_hPreviewFile ); - - call->p_handler = on_workshop_download_ugcpreview; - call->userdata = info; - call->id = SteamAPI_ISteamRemoteStorage_UGCDownloadToLocation( - hSteamRemoteStorage, - details.m_hPreviewFile, info->abs_preview_image, 1 ); - - vg_info( "preview file id: " PRINTF_U64 "\n", - details.m_hPreviewFile ); - } -#endif } else{ vg_error( "GetQueryUGCResult: Index out of range\n" ); + workshop_form.op = k_workshop_op_none; } } @@ -775,6 +747,7 @@ VG_STATIC void workshop_view_page( int req ) { if( workshop_form.ugc_query.result != k_EResultOK ){ vg_error( "Tried to change page without complete data\n" ); + workshop_form.op = k_workshop_op_none; return; } @@ -914,6 +887,58 @@ VG_STATIC void workshop_render_world_preview(void){ glViewport( 0,0, vg.window_x, vg.window_y ); } +/* + * Redraw the playermodel into the workshop framebuffer + */ +VG_STATIC void workshop_render_player_preview(void){ + render_fb_bind( gpipeline.fb_workshop_preview, 0 ); + glClearColor( 0.16f, 0.15f, 0.15f, 1.0f ); + glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT ); + glEnable( GL_DEPTH_TEST ); + glDisable( GL_BLEND ); + + struct skeleton *sk = &localplayer.playeravatar->sk; + + player_animation res; + res.type = k_player_animation_type_fk; + + struct skeleton_anim *anim = skeleton_get_anim( sk, "idle_cycle+y" ); + skeleton_sample_anim( sk, anim, vg.time*0.1f, res.pose ); + q_axis_angle( res.root_q, (v3f){0.0f,1.0f,0.0f}, VG_PIf ); + v3_zero( res.root_co ); + res.root_co[1] = 200.0f; + + m4x3f transform; + q_m3x3( res.root_q, transform ); + v3_copy( res.root_co, transform[3] ); + + /* TODO: Function. */ + skeleton_apply_pose( sk, res.pose, k_anim_apply_defer_ik ); + skeleton_apply_ik_pass( sk ); + skeleton_apply_pose( sk, res.pose, k_anim_apply_deffered_only ); + skeleton_apply_inverses( sk ); + skeleton_apply_transform( sk, transform ); + + camera cam; + v3_copy( (v3f){ 0.0f, 201.7f, 1.2f }, cam.pos ); + + cam.nearz = 0.01f; + cam.farz = 100.0f; + cam.fov = 57.0f; + v3_zero( cam.angles ); + + camera_update_transform( &cam ); + camera_update_view( &cam ); + camera_update_projection( &cam ); + camera_finalize( &cam ); + + world_instance *world = localplayer.viewable_world; + render_playermodel( &cam, world, 0, &workshop_form.player_model, sk ); + + glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + glViewport( 0,0, vg.window_x, vg.window_y ); +} + /* * Redraw the model file into the workshop framebuffer */ @@ -1035,7 +1060,7 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){ ui_text( row, "Select the type of item\n", 1, k_ui_align_middle_center,0); ui_split( box, k_ui_axis_h, 28, 0, row, box ); ui_enum( row, "Type:", workshop_form_type_opts, - 3, &workshop_form.submission.submission_type_selection ); + 4, &workshop_form.submission.submission_type_selection ); ui_split( box, k_ui_axis_h, 8, 0, row, box ); ui_split( box, k_ui_axis_h, 28, 0, row, box ); @@ -1158,14 +1183,11 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ ui_split( content, k_ui_axis_h, 8, 0, null, content ); ui_split( content, k_ui_axis_h, 28, 0, file_entry, content ); - if( workshop_form.submission.type == k_addon_type_board ){ - ui_label( file_entry, "Addon folder: skaterift/boards/", - 1, 8, file_entry ); - } - else{ - ui_label( file_entry, "Addon folder: skaterift/maps/", - 1, 8, file_entry ); - } + char buf[128]; + snprintf( buf, 128, "Addon folder: skaterift/%s", + workshop_filetype_folder() ); + + ui_label( file_entry, buf, 1, 8, file_entry ); if( type == k_addon_type_world ){ struct ui_textbox_callbacks callbacks = { @@ -1181,7 +1203,11 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ k_ui_align_middle_left, ui_colour( k_ui_fg+4 ) ); if( ui_button_text( file_button, "Remove", 1 ) ){ - player_board_unload( &workshop_form.board_model ); + if( type == k_addon_type_board ) + player_board_unload( &workshop_form.board_model ); + else if( type == k_addon_type_player ) + player_model_unload( &workshop_form.player_model ); + workshop_form.file_intent = k_workshop_form_file_intent_none; workshop_form.addon_folder[0] = '\0'; } @@ -1321,6 +1347,8 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar ) vg_strcat( &str, "skateboard." ); else if( workshop_form.submission.type == k_addon_type_world ) vg_strcat( &str, "world." ); + else if( workshop_form.submission.type == k_addon_type_player ) + vg_strcat( &str, "playermodel." ); else vg_strcat( &str, "???." ); @@ -1426,11 +1454,11 @@ VG_STATIC void workshop_form_gui(void) * escapes here and we show them a basic string */ - if( !vg_loader_availible() ){ + if( workshop_form.op != k_workshop_op_none ){ const char *op_string = "The programmer has not bothered to describe " "the current operation that is running."; - switch( skaterift.op ){ + switch( workshop_form.op ){ case k_workshop_op_loading_model: op_string = "Operation in progress: Loading model file."; break; @@ -1462,6 +1490,10 @@ VG_STATIC void workshop_form_gui(void) vg_success( "Renders world preview\n" ); workshop_render_world_preview(); } + else if( type == k_addon_type_player ){ + workshop_render_player_preview(); + } + workshop_form.view_changed = 0; } diff --git a/workshop.h b/workshop.h index 4bea096..0ada012 100644 --- a/workshop.h +++ b/workshop.h @@ -73,6 +73,7 @@ struct workshop_form{ char addon_folder[128]; struct player_board board_model; + struct player_model player_model; /* what does the user want to do with the image preview? */ enum workshop_form_file_intent{