projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
begin network integration
[carveJwlIkooP6JGAAIwe30JlM.git]
/
main.c
diff --git
a/main.c
b/main.c
index a2a1f3a8a1151ec18293cbdbac7fb6e1e1dc28b9..bfac7fd7fe2a93c7ac3d495778fa8f61fb1f5669 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-20,6
+20,14
@@
static int lightedit = 0;
static int sv_scene = 0;
/* Components */
static int sv_scene = 0;
/* Components */
+#define SR_NETWORKED
+
+/* uncomment this to run the game without any graphics being drawn */
+#define SR_NETWORK_TEST
+
+#include "steam.h"
+#include "network.h"
+
#include "road.h"
#include "scene.h"
#include "ik.h"
#include "road.h"
#include "scene.h"
#include "ik.h"
@@
-93,6
+101,8
@@
static int playermodel( int argc, char const *argv[] )
void vg_start(void)
{
void vg_start(void)
{
+ steam_init();
+
vg_convar_push( (struct vg_convar){
.name = "fc",
.data = &freecam,
vg_convar_push( (struct vg_convar){
.name = "fc",
.data = &freecam,
@@
-166,13
+176,15
@@
void vg_start(void)
if( sv_scene == 0 )
{
if( sv_scene == 0 )
{
- character_load( &player.mdl, "ch_
outlaw
" );
+ character_load( &player.mdl, "ch_
default
" );
character_init_ragdoll( &player.mdl );
world_load();
reset_player( 1, (const char *[]){ "start" } );
rb_init( &player.rb );
character_init_ragdoll( &player.mdl );
world_load();
reset_player( 1, (const char *[]){ "start" } );
rb_init( &player.rb );
+
+ network_init();
}
else
{
}
else
{
@@
-182,13
+194,19
@@
void vg_start(void)
void vg_free(void)
{
void vg_free(void)
{
+ network_end();
vg_tex2d_free( texture_list, vg_list_size(texture_list) );
vg_tex2d_free( texture_list, vg_list_size(texture_list) );
+ /* TODO: THE REST OF THE GOD DAMN FREEING STUFF */
+ steam_end();
}
void vg_update(void)
{
}
void vg_update(void)
{
+ steam_update();
+
if( sv_scene == 0 )
{
if( sv_scene == 0 )
{
+ network_update();
player_update();
world_update();
//traffic_visualize( world.traffic, world.traffic_count );
player_update();
world_update();
//traffic_visualize( world.traffic, world.traffic_count );
@@
-231,7
+249,7
@@
static void render_main_game(void)
gpipeline.fov = freecam? 60.0f: 135.0f; /* 120 */
m4x4_projection( vg_pv, gpipeline.fov,
(float)vg_window_x / (float)vg_window_y,
gpipeline.fov = freecam? 60.0f: 135.0f; /* 120 */
m4x4_projection( vg_pv, gpipeline.fov,
(float)vg_window_x / (float)vg_window_y,
- 0.
1
f, 2100.0f );
+ 0.
02
f, 2100.0f );
m4x4_mul( vg_pv, world_4x4, vg_pv );
m4x4_mul( vg_pv, world_4x4, vg_pv );
@@
-309,6
+327,7
@@
void vg_render(void)
glClearColor( 0.11f, 0.35f, 0.37f, 1.0f );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
glClearColor( 0.11f, 0.35f, 0.37f, 1.0f );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
+#ifndef SR_NETWORK_TEST
draw_origin_axis();
if( sv_scene == 0 )
draw_origin_axis();
if( sv_scene == 0 )
@@
-319,6
+338,7
@@
void vg_render(void)
{
physics_test_render();
}
{
physics_test_render();
}
+#endif
}
static void run_light_widget( struct light_widget *lw )
}
static void run_light_widget( struct light_widget *lw )
@@
-339,27
+359,26
@@
static void run_light_widget( struct light_widget *lw )
}
}
}
}
-
void vg_ui
(void)
+
static void run_debug_info
(void)
{
{
- char buf[20];
-
-#if 0
- snprintf( buf, 20, "%.2fm/s", v3_length( player.v ) );
+ char buf[40];
+
+ snprintf( buf, 40, "%.2fm/s", v3_length( player.rb.v ) );
gui_text( (ui_px [2]){ 0, 0 }, buf, 1, k_text_align_left );
gui_text( (ui_px [2]){ 0, 0 }, buf, 1, k_text_align_left );
- snprintf( buf,
2
0, "%.2f %.2f %.2f m/s",
+ snprintf( buf,
4
0, "%.2f %.2f %.2f m/s",
player.a[0], player.a[1], player.a[2] );
gui_text( (ui_px [2]){ 0, 20 }, buf, 1, k_text_align_left );
player.a[0], player.a[1], player.a[2] );
gui_text( (ui_px [2]){ 0, 20 }, buf, 1, k_text_align_left );
- snprintf( buf,
2
0, "pos %.2f %.2f %.2f",
- player.
co[0], player.co[1], player
.co[2] );
+ snprintf( buf,
4
0, "pos %.2f %.2f %.2f",
+ player.
rb.co[0], player.rb.co[1], player.rb
.co[2] );
gui_text( (ui_px [2]){ 0, 40 }, buf, 1, k_text_align_left );
if( vg_gamepad_ready )
{
for( int i=0; i<6; i++ )
{
gui_text( (ui_px [2]){ 0, 40 }, buf, 1, k_text_align_left );
if( vg_gamepad_ready )
{
for( int i=0; i<6; i++ )
{
- snprintf( buf,
2
0, "%.2f", vg_gamepad.axes[i] );
+ snprintf( buf,
4
0, "%.2f", vg_gamepad.axes[i] );
gui_text( (ui_px [2]){ 0, (i+3)*20 }, buf, 1, k_text_align_left );
}
}
gui_text( (ui_px [2]){ 0, (i+3)*20 }, buf, 1, k_text_align_left );
}
}
@@
-368,8
+387,10
@@
void vg_ui(void)
gui_text( (ui_px [2]){ 0, 60 },
"Gamepad not ready", 1, k_text_align_left );
}
gui_text( (ui_px [2]){ 0, 60 },
"Gamepad not ready", 1, k_text_align_left );
}
-#endif
-
+}
+
+void vg_ui(void)
+{
if( lightedit )
{
ui_global_ctx.cursor[0] = 10;
if( lightedit )
{
ui_global_ctx.cursor[0] = 10;