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 34e42f39cd5ed8ee533490a37aa8971d6ab77419..0e1f85221bbb9cd8abbcb03c1992af2e822664b9 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-58,6
+58,7
@@
#include "vg/vg_audio_dsp.h"
static struct player_avatar localplayer_avatar;
#include "vg/vg_audio_dsp.h"
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;
@@
-76,6
+77,10
@@
static void vg_launch_opt(void){
vg_strncpy( arg, network_client.server_adress, 64,
k_strncpy_overflow_fatal );
}
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){
@@
-89,6
+94,9
@@
vg_info(" | \\/ | | / | | \\ | / | \n" );
vg_info(" ' ' '--' [] '----- '----- ' ' '---' "
"SOFTWARE\n" );
vg_info(" ' ' '--' [] '----- '----- ' ' '---' "
"SOFTWARE\n" );
+ if( k_tools_mode )
+ return;
+
steam_init();
vg_loader_step( NULL, steam_end );
vg_loader_step( remote_players_init, NULL );
steam_init();
vg_loader_step( NULL, steam_end );
vg_loader_step( remote_players_init, NULL );
@@
-177,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 );
@@
-303,9
+316,11
@@
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();
if( skaterift.op == k_async_op_clientloading ) return;
if( world_static.load_state == k_world_loader_preload )
skaterift_change_client_world_preupdate();
@@
-335,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() );
@@
-343,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();
@@
-612,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;
@@
-653,6
+678,7
@@
static void vg_gui(void){
workshop_form_gui();
render_view_framebuffer_ui();
remote_player_network_imgui( vg.pv );
workshop_form_gui();
render_view_framebuffer_ui();
remote_player_network_imgui( vg.pv );
+ remote_players_imgui();
}
}