* =============================================================================
*
* Copyright . . . -----, ,----- ,---. .---.
- * 2021-2022 |\ /| | / | | | | /|
+ * 2021-2023 |\ /| | / | | | | /|
* | \ / | +-- / +----- +---' | / |
* | \ / | | / | | \ | / |
* | \/ | | / | | \ | / |
#include "render.h"
#include "audio.h"
#include "world.h"
+
+#if 0
#include "player.h"
+#else
+#include "player_interface.h"
+#include "player_device_walk.h"
+#include "player_device_skate.h"
+#include "player_model.h"
+
+/* temp */
+VG_STATIC player_interface localplayer;
+VG_STATIC struct player_device_walk localplayer_walk;
+VG_STATIC struct player_device_skate localplayer_skate;
+VG_STATIC struct player_avatar localplayer_avatar;
+VG_STATIC glmesh localplayer_meshes[3];
+
+#endif
+
#include "network.h"
+
+#if 0
#include "menu.h"
+#endif
+#include "vehicle.h"
static int cl_ui = 1,
- cl_view_id = 0;
+ cl_view_id = 0,
+ cl_light_edit = 0;
int main( int argc, char *argv[] )
{
}
+VG_STATIC int __respawn( int argc, const char *argv[] )
+{
+ struct respawn_point *rp = NULL, *r;
+
+ if( argc == 1 )
+ {
+ for( int i=0; i<world.spawn_count; i++ )
+ {
+ r = &world.spawns[i];
+ if( !strcmp( r->name, argv[0] ) )
+ {
+ rp = r;
+ break;
+ }
+ }
+
+ if( !rp )
+ vg_warn( "No spawn named '%s'\n", argv[0] );
+ }
+
+ if( !rp )
+ {
+ float min_dist = INFINITY;
+
+ for( int i=0; i<world.spawn_count; i++ )
+ {
+ r = &world.spawns[i];
+ float d = v3_dist2( r->co, localplayer.rb.co );
+
+ vg_info( "Dist %s : %f\n", r->name, d );
+ if( d < min_dist )
+ {
+ min_dist = d;
+ rp = r;
+ }
+ }
+ }
+
+ if( !rp )
+ {
+ vg_error( "No spawn found\n" );
+
+ if( !world.spawn_count )
+ return 0;
+
+ rp = &world.spawns[0];
+ }
+
+ player_spawn( &localplayer, rp );
+ return 1;
+}
+
VG_STATIC void vg_preload(void)
{
g_conf_init();
- vg_convar_push( (struct vg_convar){
+ common_var_temp();
+
+ vg_var_push( (struct vg_var){
.name = "cl_ui",
.data = &cl_ui,
- .data_type = k_convar_dtype_i32,
+ .data_type = k_var_dtype_i32,
.opt_i32 = { .min=0, .max=1, .clamp=1 },
.persistent = 0
});
- vg_convar_push( (struct vg_convar){
+ vg_var_push( (struct vg_var){
.name = "cl_view_id",
.data = &cl_view_id,
- .data_type = k_convar_dtype_i32,
+ .data_type = k_var_dtype_i32,
.opt_i32 = { .min=0, .max=1, .clamp=1 },
.persistent = 0
});
+ vg_var_push( (struct vg_var){
+ .name = "ledit",
+ .data = &cl_light_edit,
+ .data_type = k_var_dtype_i32,
+ .opt_i32 = { .min=0, .max=1, .clamp=1 },
+ .persistent = 0
+ });
+
+ vg_function_push( (struct vg_cmd) {
+ .name = "respawn",
+ .function = __respawn,
+ //.poll_suggest = reset_player_poll
+ });
+
vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" );
vg_info(" 2021-2022 |\\ /| | / | | | | /| \n" );
vg_info(" | \\ / | +-- / +----- +---' | / | \n" );
vg_loader_step( network_init, network_end );
}
+VG_STATIC void load_playermodels(void)
+{
+ vg_linear_clear( vg_mem.scratch );
+
+ /*
+ * load in other player models. This may need to be more sophisticated in
+ * the futre if we have more of these guys
+ */
+ mdl_context ctx_default,
+ ctx_outlaw,
+ ctx_jordan;
+
+ mdl_open( &ctx_default, "models/ch_new.mdl" );
+ mdl_load_metadata( &ctx_default, vg_mem.scratch );
+ mdl_load_mesh_data( &ctx_default, vg_mem.scratch );
+ mdl_close( &ctx_default );
+
+ mdl_open( &ctx_outlaw, "models/ch_outlaw.mdl" );
+ mdl_load_metadata( &ctx_outlaw, vg_mem.scratch );
+ mdl_load_mesh_data( &ctx_outlaw, vg_mem.scratch );
+ mdl_close( &ctx_outlaw );
+
+ mdl_open( &ctx_jordan, "models/ch_jordan.mdl" );
+ mdl_load_metadata( &ctx_jordan, vg_mem.scratch );
+ mdl_load_mesh_data( &ctx_jordan, vg_mem.scratch );
+ mdl_close( &ctx_jordan );
+
+ vg_acquire_thread_sync();
+ {
+ mdl_unpack_glmesh( &ctx_default, &localplayer_meshes[0] );
+ mdl_unpack_glmesh( &ctx_outlaw, &localplayer_meshes[1] );
+ mdl_unpack_glmesh( &ctx_jordan, &localplayer_meshes[2] );
+ }
+ vg_release_thread_sync();
+
+ /* FIXME: hack */
+ shader_viewchar_register();
+ vg_acquire_thread_sync();
+ {
+ vg_tex2d_init( (vg_tex2d *[]){ &tex_characters }, 1 );
+ }
+ vg_release_thread_sync();
+}
+
VG_STATIC void vg_load(void)
{
vg_loader_step( render_init, NULL );
- vg_loader_step( menu_init, NULL );
+ //vg_loader_step( menu_init, NULL );
vg_loader_step( world_init, NULL );
- vg_loader_step( player_init, NULL );
+ //vg_loader_step( player_init, NULL );
+ //vg_loader_step( vehicle_init, NULL );
+ //
+ //vg_loader_step( player_model_init, NULL );
+
+ /* ----------------- */
+ vg_loader_step( load_playermodels, NULL );
+
+ /* player setup */
+ player_interface_create_player( &localplayer );
+
+ player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" );
+ player_use_avatar( &localplayer, &localplayer_avatar );
+ player_use_mesh( &localplayer, &localplayer_meshes[0] );
+ player_use_device( &localplayer, &player_device_walk, &localplayer_walk );
+ player_use_device( &localplayer, &player_device_skate, &localplayer_skate );
+
+ /* --------------------- */
vg_bake_shaders();
vg_loader_step( audio_init, audio_free );
VG_STATIC void vg_start(void)
{
- reset_player( 1, (const char *[]){ "start" } );
+ __respawn( 1, (const char *[]){ "start" } );
}
VG_STATIC void draw_origin_axis(void)
{
draw_origin_axis();
network_update();
+
+#if 0
+ if( !gzoomer.inside )
+ player_update_pre();
+#endif
- player_update_pre();
- world_update( player.phys.rb.co );
+ player_pre_update( &localplayer );
+ world_update( localplayer.rb.co );
}
}
{
if( vg.is_loaded )
{
- player_update_fixed();
+#if 0
+ if( !gzoomer.inside )
+ player_update_fixed();
+
+ vehicle_update_fixed();
+#endif
+
+ player_update( &localplayer );
}
}
{
if( vg.is_loaded )
{
- player_update_post();
+#if 0
+ if( gzoomer.inside )
+ {
+ vehicle_camera();
+ }
+ else
+ {
+ player_update_post();
+ }
+#endif
+
+ player_post_update( &localplayer );
+
+#if 0
menu_update();
+ vehicle_update_post();
+#endif
}
}
VG_STATIC void vg_framebuffer_resize( int w, int h )
{
render_fb_resize();
- water_fb_resize();
}
VG_STATIC void present_view_with_post_processing(void)
glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_DST_ALPHA);
glBlendEquation(GL_FUNC_ADD);
- shader_blitblur_use();
- shader_blitblur_uTexMain( 0 );
- shader_blitblur_uTexMotion( 1 );
- shader_blitblur_uBlurStrength( cl_blur_strength );
- glActiveTexture( GL_TEXTURE0 );
+ if( cl_blur )
+ {
+ shader_blitblur_use();
+ shader_blitblur_uTexMain( 0 );
+ shader_blitblur_uTexMotion( 1 );
+ shader_blitblur_uBlurStrength(cl_blur_strength / (vg.frame_delta*60.0f));
+
+ v2f menu_blurring;
+ //v2_muls( (v2f){ 0.04f, 0.001f }, menu_opacity, menu_blurring );
+ v2_muls( (v2f){ 0.04f, 0.001f }, 0.0f, menu_blurring );
+ shader_blitblur_uOverrideDir( menu_blurring );
+
+ if( cl_view_id == 0 )
+ render_fb_bind_texture( gpipeline.fb_main, 0, 0 );
+ else if( cl_view_id == 1 )
+ render_fb_bind_texture( gpipeline.fb_main, 1, 0 );
+ else
+ render_fb_bind_texture( gpipeline.fb_main, 0, 0 );
- if( cl_view_id == 0 )
- glBindTexture( GL_TEXTURE_2D, gpipeline.rgb_background );
- else if( cl_view_id == 1 )
- glBindTexture( GL_TEXTURE_2D, gpipeline.mv_background );
+ render_fb_bind_texture( gpipeline.fb_main, 1, 1 );
+ }
else
- glBindTexture( GL_TEXTURE_2D, gpipeline.rgb_background );
-
- glActiveTexture( GL_TEXTURE1 );
- glBindTexture( GL_TEXTURE_2D, gpipeline.mv_background );
+ {
+ shader_blit_use();
+ shader_blit_uTexMain( 0 );
+ render_fb_bind_texture( gpipeline.fb_main, 0, 0 );
+ }
render_fsquad();
}
+VG_STATIC void render_player_transparent(void)
+{
+ static camera small_cam; /* DOES NOT NEED TO BE STATIC BUT MINGW
+ SAIS OTHERWISE */
+
+ m4x3_copy( main_camera.transform, small_cam.transform );
+
+ small_cam.fov = main_camera.fov;
+ small_cam.nearz = 0.05f;
+ small_cam.farz = 60.0f;
+
+ camera_update_view( &small_cam );
+ camera_update_projection( &small_cam );
+ camera_finalize( &small_cam );
+
+ /* Draw player to window buffer and blend background ontop */
+ glBindFramebuffer( GL_FRAMEBUFFER, 0 );
+ player_render( &small_cam, &localplayer );
+}
+
VG_STATIC void render_scene(void)
{
- glBindFramebuffer( GL_FRAMEBUFFER, gpipeline.fb_background );
+ render_fb_bind( gpipeline.fb_main );
glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
- glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
+ glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT );
/* Draw world */
glEnable( GL_DEPTH_TEST );
-
render_world( &main_camera );
+
+
+
+ int player_transparent = 1,
+ player_draw = 1;
+
+ if( !player_transparent && player_draw )
+ player_render( &main_camera, &localplayer );
+
render_water_texture( &main_camera );
- glBindFramebuffer( GL_FRAMEBUFFER, gpipeline.fb_background );
+ render_fb_bind( gpipeline.fb_main );
render_water_surface( &main_camera );
render_world_gates( &main_camera );
+
+ if( player_transparent && player_draw )
+ render_player_transparent();
}
VG_STATIC void render_menu(void)
{
glClear( GL_DEPTH_BUFFER_BIT );
+#if 0
menu_render( &main_camera );
-}
-
-VG_STATIC void render_player_into_world(void)
-{
- glBindFramebuffer( GL_FRAMEBUFFER, gpipeline.fb_background );
- draw_player( &main_camera );
-}
-
-VG_STATIC void render_player_transparent(void)
-{
- camera small_cam;
- m4x3_copy( main_camera.transform, small_cam.transform );
-
- small_cam.fov = main_camera.fov;
- small_cam.nearz = 0.05f;
- small_cam.farz = 60.0f;
-
- camera_update_view( &small_cam );
- camera_update_projection( &small_cam );
- camera_finalize( &small_cam );
-
- /* Draw player to window buffer and blend background ontop */
-
- glBindFramebuffer( GL_FRAMEBUFFER, 0 );
- draw_player( &small_cam );
+#endif
}
VG_STATIC void render_main_game(void)
{
+#if 0
static float fov = 60.0f;
float fov_target = vg_lerpf( 90.0f, 110.0f, cl_fov );
- if( player.phys.on_board )
+
+ if( player.controller == k_player_controller_skate )
fov_target = vg_lerpf( 97.0f, 135.0f, cl_fov );
+
if( cl_menu )
fov_target = menu_fov_target;
fov = vg_lerpf( fov, fov_target, vg.frame_delta * 2.0f );
fov = freecam? 60.0f: fov;
main_camera.fov = fov;
+#endif
+
+ /* copy camera from player.
+ * TODO: blend with camera from menu */
+
+ /* FIXME: TEMP!! */
+ player_pre_render( &localplayer );
+
+ v3_copy( localplayer.cam.pos, main_camera.pos );
+ v3_copy( localplayer.cam.angles, main_camera.angles );
+ main_camera.fov = localplayer.cam.fov;
main_camera.nearz = 0.1f;
main_camera.farz = 2100.0f;
+ camera_update_transform( &main_camera );
camera_update_view( &main_camera );
camera_update_projection( &main_camera );
camera_finalize( &main_camera );
/* ========== Begin Frame ========== */
render_scene();
-
- if( !cl_menu )
- {
- if( player.is_dead | freecam )
- render_player_into_world();
- else
- render_player_transparent();
- }
-
present_view_with_post_processing();
+#if 0
if( cl_menu )
{
render_menu();
render_player_transparent();
}
+#endif
/* =========== End Frame =========== */
}
glViewport( 0,0, vg.window_x, vg.window_y );
}
+VG_STATIC void run_light_widget( struct light_widget *lw );
VG_STATIC void vg_ui(void)
{
- menu_crap_ui();
+ player_ui( &localplayer );
#if 0
- if( lightedit )
+ menu_crap_ui();
+#endif
+
+ if( cl_light_edit )
{
- ui_global_ctx.cursor[0] = 10;
- ui_global_ctx.cursor[1] = 10;
- ui_global_ctx.cursor[2] = 200;
- ui_global_ctx.cursor[3] = 20;
+ vg_uictx.cursor[0] = 10;
+ vg_uictx.cursor[1] = 10;
+ vg_uictx.cursor[2] = 200;
+ vg_uictx.cursor[3] = 20;
struct ub_world_lighting *wl = &gpipeline.ub_world_lighting;
struct ui_slider_vector
for( int i=0; i<3; i++ )
run_light_widget( &gpipeline.widgets[i] );
-
- gui_text( ui_global_ctx.cursor, "Ambient", 1, 0 );
- ui_global_ctx.cursor[1] += 16;
- ui_slider_vector( &ui_global_ctx, &s5 );
-
- gui_text( ui_global_ctx.cursor, "Shadows", 1, 0 );
- ui_global_ctx.cursor[1] += 16;
- ui_slider( &ui_global_ctx, &s8 );
- ui_slider( &ui_global_ctx, &s9 );
-
- gui_text( ui_global_ctx.cursor, "Misc", 1, 0 );
- ui_global_ctx.cursor[1] += 16;
+
+ ui_text( vg_uictx.cursor, "Ambient", 1, 0 );
+ vg_uictx.cursor[1] += 16;
+ ui_slider_vector( &s5 );
+
+ ui_text( vg_uictx.cursor, "Shadows", 1, 0 );
+ vg_uictx.cursor[1] += 16;
+ ui_slider( &s8 );
+ ui_slider( &s9 );
+
+ ui_text( vg_uictx.cursor, "Misc", 1, 0 );
+ vg_uictx.cursor[1] += 16;
struct ui_checkbox c1 = {.data = &wl->g_light_preview};
- ui_checkbox( &ui_global_ctx, &c1 );
+ ui_checkbox( &c1 );
render_update_lighting_ub();
}
-#endif
//glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
if( cl_ui )
//glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
audio_debug_soundscapes();
-}
+ render_view_framebuffer_ui();
#if 0
+ player_physics_gui();
+#endif
+}
+
VG_STATIC void run_light_widget( struct light_widget *lw )
{
struct ui_checkbox c1 = { .data=&lw->enabled };
- ui_checkbox( &ui_global_ctx, &c1 );
+ ui_checkbox( &c1 );
if( lw->enabled )
{
colour = { .min=0.0f, .max=2.0f, .len=3, .data=lw->colour },
dir = { .min=-VG_PIf, .max=VG_PIf, .len=2, .data=lw->dir };
- ui_slider_vector( &ui_global_ctx, &colour );
- ui_global_ctx.cursor[1] += 4;
- ui_slider_vector( &ui_global_ctx, &dir );
+ ui_slider_vector( &colour );
+ vg_uictx.cursor[1] += 4;
+ ui_slider_vector( &dir );
}
}
-#endif
VG_STATIC void run_debug_info(void)
{
+#if 0
char buf[40];
- snprintf( buf, 40, "%.2fm/s", v3_length( player.phys.rb.v ) );
+ snprintf( buf, 40, "%.2fm/s", v3_length( player.rb.v ) );
ui_text( (ui_px [2]){ 0, 0 }, buf, 1, k_text_align_left );
snprintf( buf, 40, "%.2f %.2f %.2f m/s",
ui_text( (ui_px [2]){ 0, 60 },
"Gamepad not ready", 1, k_text_align_left );
}
+#endif
}
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff