#define SR_NETWORKED
#define VG_DEVWINDOW
-#include "common.h"
+
+/*
+ * system headers
+ * --------------------- */
+
+#include "skaterift.h"
#include "conf.h"
#include "steam.h"
#include "render.h"
#include "audio.h"
+
#include "world.h"
+
#include "font.h"
#include "player.h"
+#include "network.h"
+#include "menu.h"
+#include "vehicle.h"
+#include "pointcloud.h"
+#include "save.h"
+
+/* unity build
+ * ----------------- */
+
+#include "world.c"
+#include "player.c"
+#include "vehicle.c"
#include "entity.c"
#include "workshop.c"
+#include "addon.c"
+#include "highscores.c"
+#include "save.c"
-VG_STATIC struct player_avatar localplayer_avatar;
-VG_STATIC struct player_model localplayer_models[3];
-VG_STATIC int skaterift_status = 0;
+static struct player_avatar localplayer_avatar;
-#include "network.h"
-#include "menu.h"
-#include "vehicle.h"
+#if 0
+static struct player_model localplayer_models[3];
+#endif
int main( int argc, char *argv[] )
{
return 0;
}
+#if 0
VG_STATIC void highscores_save_at_exit(void)
{
highscores_serialize_all();
}
+#endif
VG_STATIC void vg_launch_opt(void)
{
VG_STATIC void vg_preload(void)
{
- g_conf_init();
+ conf_init();
+ skaterift_read_savedata();
vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" );
vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" );
vg_info(" ' ' '--' [] '----- '----- ' ' '---' "
"SOFTWARE\n" );
+ /* 31.05.23 (hgn): this is only a server feature now */
+#if 0
highscores_init( 2000, 50 );
if( !highscores_read() )
highscores_create_db();
-
vg_loader_step( NULL, highscores_save_at_exit );
+#endif
steam_init();
vg_loader_step( NULL, steam_end );
VG_STATIC void load_playermodels(void)
{
+#if 0
player_model_load( &localplayer_models[0], "models/ch_new.mdl" );
player_model_load( &localplayer_models[1], "models/ch_outlaw.mdl" );
player_model_load( &localplayer_models[2], "models/ch_jordan.mdl" );
-
- /* load default board */
-#if 0
- player_board_load( &localplayer_boards[0],
- "models/boards/skaterift_fish.mdl" );
#endif
/* FIXME: hack */
}
void temp_update_playermodel(void){
- player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] );
+#if 0
+ player__use_model( &localplayer, &localplayer_models[k_playermdl_id] );
+#endif
}
-VG_STATIC void async_skaterift_complete( void *payload, u32 size )
+VG_STATIC void async_skaterift_player_start( void *payload, u32 size )
{
- skaterift_status = 1;
-
- localplayer.viewable_world = get_active_world();
+ localplayer.viewable_world = world_current_instance();
localplayer_cmd_respawn( 1, (const char *[]){ "start" } );
}
VG_STATIC void vg_load(void)
{
+ vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL );
+
vg_loader_step( render_init, NULL );
vg_loader_step( menu_init, NULL );
+ vg_loader_step( pointcloud_init, NULL );
vg_loader_step( world_init, NULL );
vg_loader_step( vehicle_init, NULL );
vg_loader_step( font3d_init, NULL );
-
- font3d_load( &world_global.font, "models/rs_font.mdl", vg_mem.rtmemory );
+ vg_loader_step( gui_init, NULL );
vg_loader_step( player_init, NULL );
vg_loader_step( player_ragdoll_init, NULL );
+
+ /* content stuff */
+ vg_loader_step( addon_system_init, NULL );
vg_loader_step( workshop_init, NULL );
vg_loader_step( skateshop_init, NULL );
player__create( &localplayer );
player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" );
player__use_avatar( &localplayer, &localplayer_avatar );
- player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] );
- //localplayer.board = &localplayer_boards[0];
+#if 0
+ player__use_model( &localplayer, &localplayer_models[k_playermdl_id] );
+#endif
player__bind( &localplayer );
/* --------------------- */
vg_loader_step( audio_init, audio_free );
/* 'systems' are completely loaded now */
- /* load home world */
+
+ /* load home/permanent world manually */
+ world_loader.reg = NULL;
+ strcpy( world_loader.override_name, "mp_spawn" );
+ world_loader.generate_point_cloud = 1;
+ world_loader.world_index = 0;
+ world_load_mdl( "maps/mp_spawn/main.mdl" );
+
+ /* Completing addon registrations
+ * -------------------------------------
+ */
+
+ /* understate diy. */
+ addon_reg *spawn = addon_mount_local_addon( "maps/mp_spawn",
+ k_workshop_file_type_world,
+ ".mdl" );
+ {
+ vg_msg msg = {0};
+ msg.buf = spawn->metadata;
+ msg.max = sizeof(spawn->metadata);
+ vg_msg_frame( &msg, "workshop" );
+ vg_msg_wkvstr( &msg, "title", "Understate DIY" );
+ vg_msg_end_frame( &msg );
+ vg_msg_wkvstr( &msg, "location", "USA" );
+ spawn->metadata_len = msg.cur;
+ }
-#if 1
- world_load( 0, "maps/mp_spawn.mdl" );
-#else
- world_load( 0, "maps/mp_mtzero.mdl" );
-#endif
+ /* mtzero island */
+ addon_reg *mtzero = addon_mount_local_addon( "maps/mp_mtzero",
+ k_workshop_file_type_world,
+ ".mdl" );
+ {
+ vg_msg msg = {0};
+ msg.buf = mtzero->metadata;
+ msg.max = sizeof(mtzero->metadata);
+ vg_msg_frame( &msg, "workshop" );
+ vg_msg_wkvstr( &msg, "title", "Mt.Zero Island" );
+ vg_msg_end_frame( &msg );
+ vg_msg_wkvstr( &msg, "location", "Australia" );
+ mtzero->metadata_len = msg.cur;
+ }
-#if 0
- world_load( &world_global.worlds[1], "maps/mp_gridmap.mdl" );
- world_link_nonlocal_gates( 0, 1 );
- world_load( &world_global.worlds[2], "maps/mp_mtzero.mdl" );
- world_link_nonlocal_gates( 0, 2 );
-#endif
+ global_skateshop.selected_world_id=1;
+ global_skateshop.pointcloud_world_id=1;
+ skateshop_preview_loader_thread( mtzero ); /* HACK */
+ vg_async_call( async_addon_reg_update, NULL, 0 );
vg_console_load_autos();
menu_link();
+ temp_update_playermodel();
+
+ //vg_mem_log( vg_mem.rtmemory, 0, "Root" );
+
+ vg_async_call( async_skaterift_player_start, NULL, 0 );
+
+ skaterift_shift_op( k_async_op_board_scan );
+ addon_mount_content_folder( k_workshop_file_type_player,
+ "playermodels", ".mdl" );
+ addon_mount_content_folder( k_workshop_file_type_board, "boards", ".mdl" );
+ addon_mount_workshop_items();
+ vg_async_call( async_addon_reg_update, NULL, 0 );
+ vg_async_stall();
+
+ /* and now */
+
+ vg_msg sav = {0};
+ sav.buf = savedata.buf;
+ sav.len = savedata.len;
+ sav.max = sizeof(savedata.buf);
+
+ u64 query_workshop_id = 0;
+ const char *query_local_folder = "";
+
+ if( vg_msg_seekframe(&sav, "player",0) ){
+ vg_msg_print( &sav );
+ vg_msg_cmd board = vg_msg_seekkv( &sav, "board", 0 );
+ if( board.code == k_vg_msg_kvstring )
+ query_local_folder = board.value;
+ else
+ query_workshop_id = vg_msg_read_as_u64( &board );
+ }
+ else{
+ vg_error( "%u\n", sav.error );
+ }
- vg_async_call( async_skaterift_complete, NULL, 0 );
+ vg_info( "search: %lu '%s'\n", query_workshop_id, query_local_folder );
+
+ u32 reg_id = addon_match( k_workshop_file_type_board,
+ query_workshop_id, query_local_folder );
+ if( reg_id != 0xffffffff ){
+ localplayer.board_view_slot = skateshop_cache_fetch_board( reg_id );
+ vg_pool_watch( &addon_system.board_cache, localplayer.board_view_slot );
+ }
+
+ board_processview_thread(NULL); /* END_OP!! */
}
VG_STATIC void draw_origin_axis(void)
vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff );
}
+static void skaterift_change_world_preupdate(void);
VG_STATIC void vg_update(void)
{
steam_update();
-
skaterift_preupdate_inputs();
+ if( skaterift.async_op == k_async_op_clientloading ) return;
+ if( skaterift.async_op == k_async_op_world_preloading ){
+ skaterift_change_world_preupdate();
+ }
- if( skaterift_status == 1 ){
- draw_origin_axis();
- network_update();
-
- player__pre_update( &localplayer );
- global_skateshop_preupdate();
+ draw_origin_axis();
+ network_update();
+
+ player__pre_update( &localplayer );
+ global_skateshop_preupdate();
- world_update( get_active_world(), localplayer.rb.co );
- audio_ambient_sprites_update( get_active_world(), localplayer.rb.co );
- //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" );
- }
+ world_update( world_current_instance(), localplayer.rb.co );
+ audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
+ //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" );
}
VG_STATIC void vg_update_fixed(void)
{
- if( skaterift_status == 1 ){
- world_routes_fixedupdate( get_active_world() );
+ if( skaterift.async_op == k_async_op_clientloading ) return;
- player__update( &localplayer );
- vehicle_update_fixed();
- }
+ world_routes_fixedupdate( world_current_instance() );
+ player__update( &localplayer );
+ vehicle_update_fixed();
}
VG_STATIC void vg_update_post(void)
{
- if( skaterift_status == 1 ){
- player__post_update( &localplayer );
+ if( skaterift.async_op == k_async_op_clientloading ) return;
- float dist;
- int sample_index;
- world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist );
+ player__post_update( &localplayer );
- audio_lock();
- vg_dsp.echo_distances[sample_index] = dist;
+ float dist;
+ int sample_index;
+ world_audio_sample_distances( localplayer.rb.co, &sample_index, &dist );
- v3f ears = { 1.0f,0.0f,0.0f };
- m3x3_mulv( main_camera.transform, ears, ears );
- v3_copy( ears, vg_audio.external_listener_ears );
- v3_copy( main_camera.transform[3], vg_audio.external_listener_pos );
+ audio_lock();
+ vg_dsp.echo_distances[sample_index] = dist;
- if( localplayer.gate_waiting ){
- m4x3_mulv( localplayer.gate_waiting->transport,
- vg_audio.external_listener_pos,
- vg_audio.external_listener_pos );
- }
-
- v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity );
- audio_unlock();
+ v3f ears = { 1.0f,0.0f,0.0f };
+ m3x3_mulv( main_camera.transform, ears, ears );
+ v3_copy( ears, vg_audio.external_listener_ears );
+ v3_copy( main_camera.transform[3], vg_audio.external_listener_pos );
- vg.time_rate = 1.0f-menu.factive;
- vehicle_update_post();
+ if( localplayer.gate_waiting ){
+ m4x3_mulv( localplayer.gate_waiting->transport,
+ vg_audio.external_listener_pos,
+ vg_audio.external_listener_pos );
}
+
+ v3_copy( localplayer.rb.v, vg_audio.external_lister_velocity );
+ audio_unlock();
+
+ vg.time_rate = 1.0f-menu.factive;
+ vehicle_update_post();
}
VG_STATIC void vg_framebuffer_resize( int w, int h )
v2f inverse;
render_fb_inverse_ratio( gpipeline.fb_main, inverse );
- if( cl_blur ){
+ if( k_blur_effect ){
shader_blitblur_use();
shader_blitblur_uTexMain( 0 );
shader_blitblur_uTexMotion( 1 );
- shader_blitblur_uBlurStrength( cl_blur_strength /
+ shader_blitblur_uBlurStrength( k_blur_strength /
(vg.time_frame_delta*60.0) );
shader_blitblur_uInverseRatio( inverse );
return;
}
- world_prerender( view_world );
+ for( u32 i=0; i<vg_list_size(world_static.worlds); i++ ){
+ if( world_static.worlds[i].status == k_world_status_loaded ){
+ world_prerender( &world_static.worlds[i] );
+ }
+ }
+
render_world( view_world, &main_camera, 0 );
render_water_texture( view_world, &main_camera, 0 );
{
render_fb_bind( gpipeline.fb_main, 1 );
world_instance *view_world = localplayer.viewable_world;
+ if( !view_world ) return; /* ??? */
int depth = 1;
if( localplayer.gate_waiting ) depth = 0;
VG_STATIC void vg_render(void)
{
- if( skaterift_status == 0 ){
+ if( skaterift.async_op == k_async_op_clientloading ){
_vg_loader_render();
return;
}
VG_STATIC void vg_gui(void)
{
- if( skaterift_status == 0 ){
- return;
- }
+ if( skaterift.async_op == k_async_op_clientloading ) return;
menu_update();
if( menu.active ){
#if 0
player__im_gui( &localplayer );
#endif
- world_instance *world = get_active_world();
+ world_instance *world = world_current_instance();
workshop_form_gui();
render_view_framebuffer_ui();
}
+
#else
#include "skaterift_imgui_dev.c"
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff