projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initial gui for remote players lobby
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift.c
diff --git
a/skaterift.c
b/skaterift.c
index 7f384f63780f276d71178e17cb8d001a638e2f7f..0e1f85221bbb9cd8abbcb03c1992af2e822664b9 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-55,8
+55,10
@@
#include "respawn.c"
#include "network.c"
#include "player_remote.c"
#include "respawn.c"
#include "network.c"
#include "player_remote.c"
+#include "vg/vg_audio_dsp.h"
static struct player_avatar localplayer_avatar;
static struct player_avatar localplayer_avatar;
+static int k_tools_mode = 0;
int main( int argc, char *argv[] ){
vg_mem.use_libc_malloc = 0;
int main( int argc, char *argv[] ){
vg_mem.use_libc_malloc = 0;
@@
-66,9
+68,19
@@
int main( int argc, char *argv[] ){
}
static void vg_launch_opt(void){
}
static void vg_launch_opt(void){
+ const char *arg;
if( vg_long_opt( "noauth" ) ){
network_client.auth_mode = eServerModeNoAuthentication;
}
if( vg_long_opt( "noauth" ) ){
network_client.auth_mode = eServerModeNoAuthentication;
}
+
+ if( (arg = vg_long_opt_arg( "server" )) ){
+ vg_strncpy( arg, network_client.server_adress, 64,
+ k_strncpy_overflow_fatal );
+ }
+
+ if( vg_long_opt( "tools" ) ){
+ k_tools_mode = 1;
+ }
}
static void vg_preload(void){
}
static void vg_preload(void){
@@
-82,8
+94,12
@@
vg_info(" | \\/ | | / | | \\ | / | \n" );
vg_info(" ' ' '--' [] '----- '----- ' ' '---' "
"SOFTWARE\n" );
vg_info(" ' ' '--' [] '----- '----- ' ' '---' "
"SOFTWARE\n" );
+ if( k_tools_mode )
+ return;
+
steam_init();
vg_loader_step( NULL, steam_end );
steam_init();
vg_loader_step( NULL, steam_end );
+ vg_loader_step( remote_players_init, NULL );
vg_loader_step( network_init, network_end );
}
vg_loader_step( network_init, network_end );
}
@@
-108,27
+124,25
@@
static void skaterift_restore_state(void){
strcpy( sav.path, str_skaterift_main_save );
savedata_file_read( &sav );
strcpy( sav.path, str_skaterift_main_save );
savedata_file_read( &sav );
- vg_msg kvsav = {0};
- kvsav.buf = sav.buf;
- kvsav.len = sav.len;
- kvsav.max = sizeof(sav.buf);
+ vg_msg kvsav;
+ vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) );
u32 board_reg_id = 0,
player_reg_id = 0;
u32 board_reg_id = 0,
player_reg_id = 0;
- vg_msg player = kvsav;
- if( vg_msg_seekframe( &player, "player", 0 ) ){
+ vg_msg_cursor orig = kvsav.cur;
+
+ if( vg_msg_seekframe( &kvsav, "player" ) ){
addon_alias q;
/* board */
addon_alias q;
/* board */
- skaterift_read_addon_alias( &
player
, "board", k_addon_type_board, &q );
+ skaterift_read_addon_alias( &
kvsav
, "board", k_addon_type_board, &q );
u32 reg_id = addon_match( &q );
if( reg_id != 0xffffffff )
board_reg_id = reg_id;
u32 reg_id = addon_match( &q );
if( reg_id != 0xffffffff )
board_reg_id = reg_id;
-
/* playermodel */
/* playermodel */
- skaterift_read_addon_alias( &
player
, "playermodel",
+ skaterift_read_addon_alias( &
kvsav
, "playermodel",
k_addon_type_player, &q );
reg_id = addon_match( &q );
if( reg_id != 0xffffffff )
k_addon_type_player, &q );
reg_id = addon_match( &q );
if( reg_id != 0xffffffff )
@@
-140,12
+154,12
@@
static void skaterift_restore_state(void){
localplayer.playermodel_view_slot =
addon_cache_create_viewer( k_addon_type_player, player_reg_id );
localplayer.playermodel_view_slot =
addon_cache_create_viewer( k_addon_type_player, player_reg_id );
-
vg_msg world = kvsav
;
- if( vg_msg_seekframe( &
world, "world", 0
) ){
+
kvsav.cur = orig
;
+ if( vg_msg_seekframe( &
kvsav, "world"
) ){
addon_alias q;
/* world */
addon_alias q;
/* world */
- skaterift_read_addon_alias( &
world
, "alias", k_addon_type_world, &q );
+ skaterift_read_addon_alias( &
kvsav
, "alias", k_addon_type_world, &q );
u32 reg_id = addon_match( &q );
if( reg_id != 0xffffffff ){
addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
u32 reg_id = addon_match( &q );
if( reg_id != 0xffffffff ){
addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
@@
-157,14
+171,13
@@
static void skaterift_restore_state(void){
};
skaterift_world_load_thread( &args );
};
skaterift_world_load_thread( &args );
- world_set_active_instance( vg_msg_
seekkvu32( &world
, "index", 0 ) );
+ world_set_active_instance( vg_msg_
getkvu32( &kvsav
, "index", 0 ) );
world_static.active_trigger_volume_count = 0;
localplayer.viewable_world = world_current_instance();
}
world_static.active_trigger_volume_count = 0;
localplayer.viewable_world = world_current_instance();
}
- vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
v3f pos;
v3f pos;
- vg_msg_
convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos
);
+ vg_msg_
getkvv3f( &kvsav, "position", pos, (v3f){0.0f,0.0f,0.0f}
);
if( v3_length2(pos) > 1.0f )
player__setpos( pos );
if( v3_length2(pos) > 1.0f )
player__setpos( pos );
@@
-172,6
+185,11
@@
static void skaterift_restore_state(void){
}
static void vg_load(void){
}
static void vg_load(void){
+ if( k_tools_mode ){
+ vg_async_call( async_call_ready, NULL, 0 );
+ return;
+ }
+
vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL );
vg_loader_step( render_init, NULL );
vg_console_reg_cmd( "changeworld", skaterift_change_world_command, NULL );
vg_loader_step( render_init, NULL );
@@
-201,6
+219,13
@@
static void vg_load(void){
player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" );
player__use_avatar( &localplayer_avatar );
player_avatar_load( &localplayer_avatar, "models/ch_none.mdl" );
player__use_avatar( &localplayer_avatar );
+
+ /* FIXME FIXME FIXME FIXME FIXME */
+ u32 mtx_size = sizeof(m4x3f)*localplayer_avatar.sk.bone_count;
+ localplayer.final_mtx = vg_linear_alloc( vg_mem.rtmemory, mtx_size );
+ netplayers.final_mtx = vg_linear_alloc( vg_mem.rtmemory,
+ mtx_size*NETWORK_MAX_PLAYERS );
+
player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
player__bind();
player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
player__bind();
@@
-220,14
+245,13
@@
static void vg_load(void){
k_addon_type_world,
".mdl" );
{
k_addon_type_world,
".mdl" );
{
- vg_msg msg = {0};
- msg.buf = spawn->metadata;
- msg.max = sizeof(spawn->metadata);
+ vg_msg msg;
+ vg_msg_init( &msg, spawn->metadata, 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" );
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;
+ spawn->metadata_len = msg.cur
.co
;
}
/* mtzero island */
}
/* mtzero island */
@@
-235,14
+259,13
@@
static void vg_load(void){
k_addon_type_world,
".mdl" );
{
k_addon_type_world,
".mdl" );
{
- vg_msg msg = {0};
- msg.buf = mtzero->metadata;
- msg.max = sizeof(mtzero->metadata);
+ vg_msg msg;
+ vg_msg_init( &msg, spawn->metadata, 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" );
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;
+ mtzero->metadata_len = msg.cur
.co
;
}
/* load home/permanent world manually */
}
/* load home/permanent world manually */
@@
-276,7
+299,7
@@
static void vg_load(void){
skaterift_restore_state();
vg_loader_step( NULL, skaterift_autosave_synchronous );
skaterift_restore_state();
vg_loader_step( NULL, skaterift_autosave_synchronous );
- board_processview_thread(NULL);
+
//
board_processview_thread(NULL);
vg_async_call( async_call_ready, NULL, 0 );
}
vg_async_call( async_call_ready, NULL, 0 );
}
@@
-293,14
+316,17
@@
static void skaterift_change_client_world_preupdate(void);
static void vg_pre_update(void){
srinput.enabled = 1;
static void vg_pre_update(void){
srinput.enabled = 1;
+ skaterift_preupdate_inputs();
+
+ if( k_tools_mode ) return;
steam_update();
steam_update();
- skaterift_preupdate_inputs();
if( skaterift.op == k_async_op_clientloading ) return;
if( world_static.load_state == k_world_loader_preload )
skaterift_change_client_world_preupdate();
draw_origin_axis();
if( skaterift.op == k_async_op_clientloading ) return;
if( world_static.load_state == k_world_loader_preload )
skaterift_change_client_world_preupdate();
draw_origin_axis();
+ skateshop_autostart_loading();
network_update();
/* time rate */
network_update();
/* time rate */
@@
-316,6
+342,7
@@
static void vg_pre_update(void){
player__pre_update();
world_entity_focus_preupdate();
skaterift_replay_pre_update();
player__pre_update();
world_entity_focus_preupdate();
skaterift_replay_pre_update();
+ remote_sfx_pre_update();
world_update( world_current_instance(), localplayer.rb.co );
audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
world_update( world_current_instance(), localplayer.rb.co );
audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
@@
-323,6
+350,7
@@
static void vg_pre_update(void){
}
static void vg_fixed_update(void){
}
static void vg_fixed_update(void){
+ if( k_tools_mode ) return;
if( skaterift.op == k_async_op_clientloading ) return;
world_routes_fixedupdate( world_current_instance() );
if( skaterift.op == k_async_op_clientloading ) return;
world_routes_fixedupdate( world_current_instance() );
@@
-331,6
+359,7
@@
static void vg_fixed_update(void){
}
static void vg_post_update(void){
}
static void vg_post_update(void){
+ if( k_tools_mode ) return;
if( skaterift.op == k_async_op_clientloading ) return;
player__post_update();
if( skaterift.op == k_async_op_clientloading ) return;
player__post_update();
@@
-447,6
+476,7
@@
static void render_player_transparent(void){
/* Draw player to window buffer and blend background ontop */
player__render( &small_cam );
/* Draw player to window buffer and blend background ontop */
player__render( &small_cam );
+ render_remote_players_tags( localplayer.viewable_world, &skaterift.cam );
}
static void render_scene(void){
}
static void render_scene(void){
@@
-475,12
+505,14
@@
static void render_scene(void){
GL_COLOR_ATTACHMENT1 } );
view_world = &world_static.instances[respawn_chooser.world_id];
render_world_override( view_world );
GL_COLOR_ATTACHMENT1 } );
view_world = &world_static.instances[respawn_chooser.world_id];
render_world_override( view_world );
+ render_world_routes( view_world, &skaterift.cam, 1 );
}
else{
render_world( view_world, &skaterift.cam, 0 );
render_water_texture( view_world, &skaterift.cam, 0 );
render_fb_bind( gpipeline.fb_main, 1 );
render_water_surface( view_world, &skaterift.cam );
}
else{
render_world( view_world, &skaterift.cam, 0 );
render_water_texture( view_world, &skaterift.cam, 0 );
render_fb_bind( gpipeline.fb_main, 1 );
render_water_surface( view_world, &skaterift.cam );
+ render_remote_players( view_world, &skaterift.cam );
}
}
}
}
@@
-538,6
+570,7
@@
static void render_main_game(void){
player__animate();
skaterift_record_frame( &skaterift.replay, 0 );
}
player__animate();
skaterift_record_frame( &skaterift.replay, 0 );
}
+ animate_remote_players();
player__pre_render();
skaterift_composite_maincamera();
player__pre_render();
skaterift_composite_maincamera();
@@
-545,7
+578,7
@@
static void render_main_game(void){
/* --------------------------------------------------------------------- */
world_instance *view_world = localplayer.viewable_world;
/* --------------------------------------------------------------------- */
world_instance *view_world = localplayer.viewable_world;
- if(
view_world != NULL
){
+ if(
(view_world != NULL) && (skaterift.activity != k_skaterift_respawning)
){
render_world_cubemaps( view_world );
ent_gate *gate = view_world->rendering_gate;
render_world_cubemaps( view_world );
ent_gate *gate = view_world->rendering_gate;
@@
-596,6
+629,14
@@
static void render_main_game(void){
}
static void vg_render(void){
}
static void vg_render(void){
+ if( k_tools_mode ){
+ glBindFramebuffer( GL_FRAMEBUFFER, 0 );
+ glViewport( 0,0, vg.window_x, vg.window_y );
+ glClearColor( 0.0f, 0.0f, 0.0f, 0.0f );
+ glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
+ return;
+ }
+
if( skaterift.op == k_async_op_clientloading ){
_vg_loader_render();
return;
if( skaterift.op == k_async_op_clientloading ){
_vg_loader_render();
return;
@@
-636,7
+677,8
@@
static void vg_gui(void){
skaterift_replay_imgui();
workshop_form_gui();
render_view_framebuffer_ui();
skaterift_replay_imgui();
workshop_form_gui();
render_view_framebuffer_ui();
- remote_player_network_imgui();
+ remote_player_network_imgui( vg.pv );
+ remote_players_imgui();
}
}