projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update model format
[carveJwlIkooP6JGAAIwe30JlM.git]
/
main.c
diff --git
a/main.c
b/main.c
index 4610d5288ff09b88247b14901aaa440b13e6bad7..8c1ddef2811b537bcbec692426b676fa8f056ec7 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-20,7
+20,7
@@
static int lightedit = 0;
static int sv_scene = 0;
/* Components */
static int sv_scene = 0;
/* Components */
-#define SR_NETWORKED
+
//
#define SR_NETWORKED
/* uncomment this to run the game without any graphics being drawn */
//#define SR_NETWORK_TEST
/* uncomment this to run the game without any graphics being drawn */
//#define SR_NETWORK_TEST
@@
-119,6
+119,14
@@
void vg_start(void)
.persistent = 1
});
.persistent = 1
});
+ vg_convar_push( (struct vg_convar){
+ .name = "fcs",
+ .data = &fc_speed,
+ .data_type = k_convar_dtype_f32,
+ .opt_f32 = { .clamp = 0 },
+ .persistent = 1
+ });
+
vg_convar_push( (struct vg_convar){
.name = "ledit",
.data = &lightedit,
vg_convar_push( (struct vg_convar){
.name = "ledit",
.data = &lightedit,
@@
-191,7
+199,6
@@
void vg_start(void)
physics_test_start();
}
physics_test_start();
}
- world_routes_ui_newseg( 0, 0.0f );
}
void vg_free(void)
}
void vg_free(void)
@@
-291,7
+298,7
@@
static void render_main_game(void)
{
m4x4_projection( vg_pv, gpipeline.fov,
(float)vg_window_x / (float)vg_window_y,
{
m4x4_projection( vg_pv, gpipeline.fov,
(float)vg_window_x / (float)vg_window_y,
- 0.0
4
f, 600.0f );
+ 0.0
1
f, 600.0f );
m4x4_mul( vg_pv, world_4x4, vg_pv );
}
draw_player();
m4x4_mul( vg_pv, world_4x4, vg_pv );
}
draw_player();
@@
-427,13
+434,18
@@
void vg_ui(void)
render_update_lighting_ub();
}
render_update_lighting_ub();
}
+
+ //glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
+ render_world_routes_ui();
+ //glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
+#if 0
static double last_b_press = 0.0;
double localtime = vg_time - last_b_press;
world_routes_ui_updatetime( 0, localtime );
static double last_b_press = 0.0;
double localtime = vg_time - last_b_press;
world_routes_ui_updatetime( 0, localtime );
- world_routes_ui_draw( 0 );
+ world_routes_ui_draw( 0
, (v4f){ 1.0f,0.0f,1.0f,1.0f}, 9.0f
);
if( glfwGetKey(vg_window,GLFW_KEY_B) )
world_routes_ui_notch( 0, localtime );
if( glfwGetKey(vg_window,GLFW_KEY_B) )
world_routes_ui_notch( 0, localtime );
@@
-442,7
+454,7
@@
void vg_ui(void)
if( glfwGetKey(vg_window,GLFW_KEY_N) )
{
last_b_press = vg_time;
if( glfwGetKey(vg_window,GLFW_KEY_N) )
{
last_b_press = vg_time;
- world_routes_ui_newseg( 0
, localtime
);
+ world_routes_ui_newseg( 0 );
}
static double last_m_press;
}
static double last_m_press;
@@
-450,6
+462,12
@@
void vg_ui(void)
if( glfwGetKey( vg_window, GLFW_KEY_M) )
{
last_m_press = vg_time;
if( glfwGetKey( vg_window, GLFW_KEY_M) )
{
last_m_press = vg_time;
- world_routes_ui_popfirst(0);
+
+ vg_info( "start: %u\n",world.routes.routes[0].ui.segment_count );
+ for( int i=0; i<world.routes.routes[0].ui.segment_count; i++ )
+ world_routes_ui_popfirst(0);
+
+ vg_info( "new: %u\n",world.routes.routes[0].ui.segment_count );
}
}
+#endif
}
}