* =============================================================================
*
* Copyright . . . -----, ,----- ,---. .---.
- * 2021-2023 |\ /| | / | | | | /|
+ * 2021-2024 |\ /| | / | | | | /|
* | \ / | +-- / +----- +---' | / |
* | \ / | | / | | \ | / |
* | \/ | | / | | \ | / |
* =============================================================================
*/
-#if 1
-
#define SR_NETWORKED
-#define SR_USE_LOCALHOST
+#define VG_AUDIO_FORCE_COMPRESSED
+#define SDL_MAIN_HANDLED
#ifndef VG_RELEASE
#define VG_DEVWINDOW
#include "entity.c"
#include "workshop.c"
#include "addon.c"
-#include "highscores.c"
#include "save.c"
-#include "respawn.c"
+#include "world_map.c"
#include "network.c"
#include "player_remote.c"
#include "vg/vg_audio_dsp.h"
#include "world_routes_ui.c"
#include "particle.c"
#include "player_effects.c"
+#include "freecam.c"
+#include "testing.c"
static int k_tools_mode = 0;
if( vg_long_opt( "tools" ) ){
k_tools_mode = 1;
}
+
+ if( vg_long_opt( "demo" ) ){
+ skaterift.demo_mode = 1;
+ }
+
+ if( (arg = vg_long_opt_arg( "world" )) ){
+ skaterift.hub_world = arg;
+ }
}
static void vg_preload(void){
vg_info(" ' ' '--' [] '----- '----- ' ' '---' "
"SOFTWARE\n" );
+ /* please forgive me! */
+ u32 sz; char *drm;
+ if( (drm = vg_file_read_text( vg_mem.scratch, "DRM", &sz )) )
+ if( !strcmp(drm, "blibby!") )
+ skaterift.demo_mode = 0;
+
vg_loader_step( remote_players_init, NULL );
if( k_tools_mode )
vg_loader_step( network_init, network_end );
}
-static void load_playermodels(void){
- /* FIXME: hack */
- shader_model_character_view_register();
- shader_model_board_view_register();
- shader_model_entity_register();
-}
-
static void async_skaterift_player_start( void *payload, u32 size ){
world_switch_instance(0);
}
kvsav.cur = orig;
}
-static addon_reg *skaterift_mount_world_unloadable( const char *path ){
+static addon_reg *skaterift_mount_world_unloadable( const char *path, u32 ext ){
addon_reg *reg = addon_mount_local_addon( path, k_addon_type_world, ".mdl" );
- reg->flags |= ADDON_REG_HIDDEN;
+ if( !reg ) vg_fatal_error( "world not found\n" );
+ reg->flags |= (ADDON_REG_HIDDEN | ext);
return reg;
}
+static void skaterift_load_world_content(void){
+ /* hub world */
+ addon_reg *hub = skaterift_mount_world_unloadable( skaterift.hub_world, 0 );
+ skaterift_mount_world_unloadable( "maps/mp_spawn",
+ ADDON_REG_CITY|ADDON_REG_PREMIUM );
+ skaterift_mount_world_unloadable( "maps/mp_mtzero",
+ ADDON_REG_MTZERO|ADDON_REG_PREMIUM );
+ skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 );
+ skaterift_mount_world_unloadable( "maps/dev_flatworld", 0 );
+
+ world_static.load_state = k_world_loader_load;
+
+ struct world_load_args args = {
+ .purpose = k_world_purpose_hub,
+ .reg = hub
+ };
+ skaterift_world_load_thread( &args );
+}
+
+static void skaterift_load_player_content(void){
+ u32 bytes = 1024*1024*10;
+ skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes );
+ skaterift.replay.size = bytes;
+ replay_clear( &skaterift.replay );
+
+ particle_alloc( &particles_grind, 300 );
+ particle_alloc( &particles_env, 200 );
+
+ player_load_animation_reference( "models/ch_none.mdl" );
+ player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
+ player__bind();
+ player_board_load( &localplayer.fallback_board, "models/board_none.mdl" );
+}
+
static void vg_load(void){
if( k_tools_mode ){
vg_async_call( async_call_ready, NULL, 0 );
vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL );
vg_console_reg_cmd( "switch_active_instance",
skaterift_switch_instance_cmd, NULL );
+ vg_console_reg_cmd( "fc", freecam_cmd, NULL );
+ vg_console_reg_var( "immobile", &localplayer.immobile, k_var_dtype_i32, 0 );
vg_loader_step( render_init, NULL );
vg_loader_step( menu_init, NULL );
vg_loader_step( addon_system_init, NULL );
vg_loader_step( workshop_init, NULL );
vg_loader_step( skateshop_init, NULL );
-
- /* ----------------- */
- vg_loader_step( load_playermodels, NULL );
+ vg_loader_step( ent_tornado_init, NULL );
+ vg_loader_step( testing_init, NULL );
- /* player setup */
- u32 bytes = 1024*1024*10;
- skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes );
- skaterift.replay.size = bytes;
- replay_clear( &skaterift.replay );
-
- particle_alloc( &particles_grind, 300 );
-
- player_load_animation_reference( "models/ch_none.mdl" );
- player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
- player__bind();
-
- player_board_load( &localplayer.fallback_board, "models/board_none.mdl" );
+ vg_loader_step( skaterift_load_player_content, NULL );
/* --------------------- */
* -------------------------------------
*/
- /* hub world */
- addon_reg *hub = skaterift_mount_world_unloadable( "maps/dev_hub" );
- skaterift_mount_world_unloadable( "maps/mp_spawn" );
- skaterift_mount_world_unloadable( "maps/mp_mtzero" );
-
/* load home/permanent world manually */
- world_static.load_state = k_world_loader_load;
-
- struct world_load_args args = {
- .purpose = k_world_purpose_hub,
- .reg = hub
- };
- skaterift_world_load_thread( &args );
-
+ vg_loader_step( skaterift_load_world_content, NULL );
vg_async_call( async_skaterift_player_start, NULL, 0 );
vg_async_stall();
/* time rate */
f32 target = 1;
if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
- k_skaterift_respawning) ){
+ k_skaterift_world_map) ){
target = 0;
}
world_update( world_current_instance(), localplayer.rb.co );
audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
- respawn_chooser_pre_update();
+ world_map_pre_update();
}
static void vg_fixed_update(void){
world_routes_fixedupdate( world_current_instance() );
player__update();
vehicle_update_fixed();
+ testing_update();
}
static void vg_post_update(void){
}
}
- if( skaterift.activity == k_skaterift_respawning ){
+ if( skaterift.activity == k_skaterift_world_map ){
world_instance *world = world_current_instance();
glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
m4x3f identity;
m4x3_identity( identity );
render_world_override( world, world, identity, &skaterift.cam,
- respawn_chooser.spawn,
+ world_map.spawn,
(v4f){world->tar_min, world->tar_max, 1.0f, 0.0f});
render_world_routes( world, world, identity, &skaterift.cam, 0, 1 );
return;
world_instance *view_world = get_view_world();
render_world( view_world, &skaterift.cam, 0, 0, 1, 1 );
-#if 0
- particle_spawn( &particles_grind, localplayer.rb.co,
- (v3f){vg_randf64()*2.0f,vg_randf64()*3.0f,vg_randf64()*2.0f},
- vg_randf64(), 0xff0000ff );
-#endif
particle_system_update( &particles_grind, vg.time_delta );
//particle_system_debug( &particles_grind );
particle_system_prerender( &particles_grind );
particle_system_render( &particles_grind, &skaterift.cam );
+
+ ent_tornado_pre_update();
+ particle_system_update( &particles_env, vg.time_delta );
+ particle_system_prerender( &particles_env );
+ particle_system_render( &particles_env, &skaterift.cam );
/*
* render transition
camera_lerp( &localplayer.cam, &world_static.focus_cam,
vg_smoothstepf(world_static.focus_strength), &skaterift.cam );
- if( skaterift.activity == k_skaterift_replay ){
- skaterift_get_replay_camera( &skaterift.cam );
+ if( skaterift.freecam ){
+ freecam_preupdate();
+ v3_copy( skaterift.replay_freecam.pos, skaterift.cam.pos );
+ v3_copy( skaterift.replay_freecam.angles, skaterift.cam.angles );
+ skaterift.cam.fov = skaterift.replay_freecam.fov;
+ }
+ else {
+ if( skaterift.activity == k_skaterift_replay ){
+ replay_get_camera( &skaterift.replay, &skaterift.cam );
+ }
}
skaterift.cam.nearz = 0.1f;
skaterift.cam.farz = 2100.0f;
- if( skaterift.activity == k_skaterift_respawning ){
- camera_copy( &respawn_chooser.cam, &skaterift.cam );
+ if( skaterift.activity == k_skaterift_world_map ){
+ camera_copy( &world_map.cam, &skaterift.cam );
skaterift.cam.nearz = 4.0f;
skaterift.cam.farz = 3100.0f;
}
global_miniworld.t += s * dt;
if( (global_miniworld.t > 1.0f) || (global_miniworld.t < 0.0f) ){
- /* TODO: maybe next frame! */
global_miniworld.t = vg_clampf( global_miniworld.t, 0.0f, 1.0f );
global_miniworld.transition = 0;
}
- else {
- }
}
camera_update_transform( &skaterift.cam );
}
else{
player__animate();
- skaterift_record_frame( &skaterift.replay, 0 );
+ skaterift_record_frame( &skaterift.replay,
+ localplayer.deferred_frame_record );
+ localplayer.deferred_frame_record = 0;
}
animate_remote_players();
player__pre_render();
skaterift_composite_maincamera();
/* --------------------------------------------------------------------- */
- if( skaterift.activity != k_skaterift_respawning ){
+ if( skaterift.activity != k_skaterift_world_map ){
world_instance *world = world_current_instance();
render_world_cubemaps( world );
/* continue with variable rate */
if( !global_miniworld.transition &&
- (skaterift.activity != k_skaterift_respawning) ){
+ (skaterift.activity != k_skaterift_world_map) ){
render_fb_bind( gpipeline.fb_main, 1 );
render_world_gates( get_view_world(), &skaterift.cam );
}
static void vg_gui(void){
if( skaterift.op == k_async_op_clientloading ) return;
+ vg_ui.tex_bg = gpipeline.fb_main->attachments[0].id;
+ render_fb_inverse_ratio( gpipeline.fb_main, vg_ui.bg_inverse_ratio );
+
menu_update();
if( skaterift.activity == k_skaterift_menu ){
glClear( GL_DEPTH_BUFFER_BIT );
render_view_framebuffer_ui();
remote_player_network_imgui( vg.pv );
- if( skaterift.activity == k_skaterift_respawning ){
+ if( skaterift.activity == k_skaterift_world_map ){
remote_players_imgui_world( world_current_instance(), vg.pv, 2000.0f, 0 );
remote_players_imgui_lobby();
}
remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
}
}
-
-
-#else
-
-#include "skaterift_imgui_dev.c"
-
-#endif
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff