build system revision

diff --git a/addon.c b/addon.c
index 6f60311c52980fefdcb9c76f97bc82f8a76ded4f..984bb9c62cf40d868a257c012d41b365eacc69f9 100644 (file)
--- a/addon.c
+++ b/addon.c
@@ -335,7 +335,7 @@ static addon_reg *addon_mount_workshop_folder( PublishedFileId_t workshop_id,
    vg_msg_init( &msg, reg->metadata, reg->metadata_len );
 
    if( vg_msg_seekframe( &msg, "workshop" )){
-      type = vg_msg_getkvu32( &msg, "type", 0 );
+      vg_msg_getkvintg( &msg, "type", k_vg_msg_u32, &type );
    }
 
    if( type == k_addon_type_none ){

diff --git a/addon_types.h b/addon_types.h
index b916dd0af0aeeb83096d17eb11163285a8cd52ff..5c6730fd117af91d63376faa727dfbaa63ed5c1d 100644 (file)
--- a/addon_types.h
+++ b/addon_types.h
@@ -15,10 +15,8 @@ enum addon_type{
 #define ADDON_MOUNTED_MAX 128
 #define ADDON_UID_MAX 76
 
-#ifdef VG_GAME
+#ifdef VG_ENGINE
 
-#include "vg/vg_stdint.h"
-#include "stddef.h"
 #include "world.h"
 #include "player.h"
 

diff --git a/audio.h b/audio.h
index 448906be07e9af05c101b3c07766578dc7612f4d..984303aa92bd81787349587ba119feac5b14d1a2 100644 (file)
--- a/audio.h
+++ b/audio.h
@@ -8,6 +8,7 @@
 #define AUDIO_H
 
 #include "world.h"
+#include "vg/vg_audio_dsp.h"
 
 audio_clip audio_board[] =
 {

diff --git a/build.c b/build.c
index cb7a71a26324e40ef1c48388ad34d5e5c71e79b7..9367e81b64929c187d69d6ce5d32e2c337143100 100644 (file)
--- a/build.c
+++ b/build.c
@@ -1,4 +1,4 @@
-#include "vg/vg.h"
+#include "vg/vg_tool.h"
 #include "vg/vg_platform.h"
 #include "vg/vg_log.h"
 #include "vg/vg_opt.h"
@@ -7,8 +7,6 @@
 #include "vg/vg_msg.h"
 #include "addon_types.h"
 
-u32 optimize_test_compile = 0;
-
 /* 
  * Addon metadata utilities 
  * -------------------------------------------------------------------------- */
@@ -26,7 +24,8 @@ void write_msg( vg_msg *msg, const char *path ){
 }
 
 void write_generic_addon_inf( u32 type, const char *title,
-                              const char *content, const char *dest ){
+                              const char *content, const char *dest )
+{
    u8 descriptor_buf[ 512 ];
    vg_msg descriptor = {0};
    descriptor.buf = descriptor_buf;
@@ -34,7 +33,7 @@ void write_generic_addon_inf( u32 type, const char *title,
    vg_msg_frame( &descriptor, "workshop" );
       vg_msg_wkvstr( &descriptor, "title", title );
       vg_msg_wkvstr( &descriptor, "author", "Skaterift" );
-      vg_msg_wkvu32( &descriptor, "type", type );
+      vg_msg_wkvnum( &descriptor, "type", k_vg_msg_u32, 1, &type );
    vg_msg_end_frame( &descriptor );
    vg_msg_wkvstr( &descriptor, "content", content );
    write_msg( &descriptor, dest );
@@ -45,7 +44,8 @@ void write_generic_addon_inf( u32 type, const char *title,
  * -------------------------------------------------------------------------- */
 
 /* operates in the local files, not in the bin folders */
-void build_game_metadata(void){
+void build_game_metadata(void)
+{
    vg_info( "Building game metadata\n" );
    write_generic_addon_inf( k_addon_type_board, 
                             "Longboard", "board.mdl", 
@@ -83,23 +83,70 @@ void build_game_metadata(void){
                             "playermodels_src/skaterift_aaron/addon.inf" );
 }
 
-void build_game_content(void){
-   vg_low( "Building game content structure\n" );
-   const char *project_name = vg_build.project_name.buffer;
-   vg_symlink( "textures_src", "textures" );
-   vg_symlink( "models_src", "models" );
-   vg_symlink( "boards_src", "boards" );
-   vg_symlink( "maps_src", "maps" );
-   vg_symlink( "sound_src", "sound" );
-   vg_symlink( "playermodels_src", "playermodels" );
-   vg_syscall( "mkdir -p bin/%s/cfg", project_name );
-   vg_syscall( "mkdir -p bin/%s/savedata", project_name );
-   vg_syscall( "mkdir -p bin/%s/tools", project_name );
-   vg_syscall( "cp blender_export.py bin/%s/tools/", project_name );
+#define _S( NAME, VS, FS ) \
+   vg_build_shader( "shaders/" VS, "shaders/" FS, NULL, "shaders", NAME )
+
+void build_shaders(void){
+   vg_info( "Compiling shader headers\n" );
+   vg_shader_set_include_dir( "shaders" );
+
+   /* Scene */
+   _S( "scene_standard",            "scene.vs", "scene_standard.fs" );
+   _S( "scene_standard_alphatest",  "scene.vs", "scene_standard_alphatest.fs" );
+   _S( "scene_foliage",             "scene_foliage.vs", "scene_foliage.fs" );
+   _S( "scene_override",            "scene_override.vs", "scene_override.fs" );
+   _S( "scene_fxglow",              "scene_fxglow.vs", "scene_fxglow.fs" );
+   _S( "scene_vertex_blend",        "scene.vs", "scene_vertex_blend.fs" );
+   _S( "scene_terrain",             "scene.vs", "scene_terrain.fs" );
+   _S( "scene_route",               "scene_override.vs", "scene_route.fs" );
+   _S( "scene_depth",               "scene.vs", "scene_depth.fs" );
+   _S( "scene_position",            "scene.vs", "scene_position.fs" );
+   _S( "scene_cubemapped",          "scene.vs", "scene_cubemapped.fs" );
+   _S( "scene_water",               "scene.vs", "scene_water.fs" );
+   _S( "scene_water_fast",          "scene.vs", "scene_water_fast.fs" );
+   _S( "scene_scoretext",           "scene_sfd.vs", "scene_standard.fs" );
+   _S( "scene_font",                "model_font.vs","scene_font.fs" );
+
+   /* Models */
+   _S( "model_sky",            "model.vs",         "model_sky.fs" );
+   _S( "model_sky_space",      "model.vs",         "model_sky_space.fs" );
+   _S( "model_menu",           "model.vs",         "model_menu.fs" );
+   _S( "model_character_view", "model_skinned.vs", "model_character_view.fs" );
+   _S( "model_board_view",     "model.vs",         "model_character_view.fs" );
+   _S( "model_entity",         "model.vs",         "model_entity.fs" );
+   _S( "model_gate",           "model.vs",         "model_gate_lq.fs" );
+   _S( "model_gate_unlinked",  "model.vs",         "model_gate_unlinked.fs" );
+   _S( "model_font",           "model_font.vs",    "model_font.fs" );
+
+   _S( "particle", "particle.vs", "particle.fs" );
+   _S( "trail", "trail.vs", "trail.fs" );
+
+   /* 2D */
+   _S( "blit",      "blit.vs",      "blit.fs" );
+   _S( "blitblur",  "blit.vs",      "blitblur.fs" );
+   _S( "blitcolour","blit.vs",      "colour.fs" );
+   _S( "blit_transition", "blit.vs", "blit_transition.fs" );
+   _S( "routeui",   "routeui.vs",   "routeui.fs" );
+}
+
+void build_game_content( struct vg_project *proj )
+{
+   vg_project_new_target( proj, "Content files", k_obj_type_none );
+
+   vg_symlink( proj, "textures_src", "textures" );
+   vg_symlink( proj, "models_src", "models" );
+   vg_symlink( proj, "boards_src", "boards" );
+   vg_symlink( proj, "maps_src", "maps" );
+   vg_symlink( proj, "sound_src", "sound" );
+   vg_symlink( proj, "playermodels_src", "playermodels" );
+   vg_syscall( "mkdir -p bin/%s/cfg", proj->uid.buffer );
+   vg_syscall( "mkdir -p bin/%s/savedata", proj->uid.buffer );
+   vg_syscall( "mkdir -p bin/%s/tools", proj->uid.buffer );
+   vg_syscall( "cp blender_export.py bin/%s/tools/", proj->uid.buffer );
 }
 
-void build_shaders(void);
-void compile_game( int binaries, int content ){
+void build_game_bin( struct vg_project *proj )
+{
    static int meta = 0;
    if( !meta ){
       meta = 1;
@@ -108,36 +155,51 @@ void compile_game( int binaries, int content ){
       vg_low( "\n\n" );
    }
 
-   vg_build_new( "skaterift" );
+   vg_project_new_target( proj, "skaterift", k_obj_type_exe );
+   vg_add_engine( proj, &(struct vg_engine_config ) 
+         {
+            .fixed_update_hz = 60,
+            .legacy_support_vg_msg1 = 1,
+            .log_source_info = 1,
+            .steam_api = 1,
+            .use_3d = 1,
+            .custom_game_settings = 0
+         });
+
+   vg_add_source( proj, "skaterift.c " );
+   vg_add_controller_database( proj );
+   vg_compile_project( proj );
+}
 
-   if( binaries ){
-      vg_add_source( "skaterift.c" );
-      vg_add_graphics();
-      vg_add_game_stuff();
-      vg_compile( "skaterift" );
-   }
+void build_sqlite_for_env( struct vg_env *env, struct vg_project *out_proj )
+{
+   struct vg_env sqlite_env = *env;
+   sqlite_env.optimization = 3; /* force optimization always */
+   sqlite_env.debug_asan = 0;
 
-   if( content )
-      build_game_content();
-}
+   vg_project_init( out_proj, env, "sqlite3" );
+   vg_project_new_target( out_proj, "sqlite3", k_obj_type_obj );
 
-void compile_sqlite_obj(void){
-   vg_build_new( "sqlite3.o" );
-   vg_add_source( "-c dep/sqlite3/sqlite3.c " );
-   vg_link( "-ldl " );
-   vg_compile( "sqlite3.o" );
+   vg_add_source( out_proj, "-c dep/sqlite3/sqlite3.c " );
+   vg_link( out_proj, "-ldl " );
+   vg_compile_project( out_proj );
 }
 
-void compile_server(void){
-   vg_build_new( "skaterift_server" );
-   vg_add_source( "gameserver.c" );
-   vg_add_source( "bin/sqlite3.o-linux-x86_64-clang/sqlite3.o" );
-   vg_include_dir( "-I./dep " );
-   vg_library_dir( "-L./vg/dep/steam " );
-   vg_link( "-ldl -lpthread -lm -lsdkencryptedappticket -lsteam_api " );
-   vg_add_blob( "vg/dep/steam/libsteam_api.so", "" );
-   vg_add_blob( "vg/dep/steam/libsdkencryptedappticket.so", "" );
-   vg_compile( "server" );
+void compile_server( struct vg_project *proj )
+{
+   struct vg_project sqlite_project;
+   build_sqlite_for_env( proj->env, &sqlite_project );
+
+   vg_project_new_target( proj, "server", k_obj_type_exe );
+   vg_add_source( proj, "gameserver.c vg/vg_tool.c vg/vg_steam.c \\\n " );
+   vg_add_source( proj, sqlite_project.compiled_objects.buffer );
+   vg_include_dir( proj, "-I./dep " );
+   vg_library_dir( proj, "-L./vg/dep/steam " );
+   vg_link( proj, "-ldl -lpthread -lm -lsdkencryptedappticket -lsteam_api " );
+   vg_add_blob( proj, "vg/dep/steam/libsteam_api.so", "" );
+   vg_add_blob( proj, "vg/dep/steam/libsdkencryptedappticket.so", "" );
+
+   vg_compile_project( proj );
 }
 
 /*
@@ -147,67 +209,52 @@ void compile_server(void){
 void s_release_all(void){
    vg_info( "running script: s_release_all(void)\n" );
 
-   vg_build.optimization = 3;
-   vg_build.fresh = 1;
-   vg_build.arch = k_architecture_x86_64;
-   vg_build.compiler = k_compiler_zigcc;
-   vg_build.libc = k_libc_version_2_23;
-
-   /* binaries for windows and linux */
-   vg_build.platform = k_platform_windows;
-   compile_game( 1, 0 );
-   vg_tarball_last_project(); /* windows binary depot: 2103942 */
-   vg_success( "Completed 1/3\n" );
-
-   vg_build.platform = k_platform_linux;
-   compile_game( 1, 0 );
-   vg_tarball_last_project(); /* linux binary depot: 2103941 */
-   vg_success( "Completed 2/3\n" );
-
-   /* content files for any platform */
-   vg_build.platform = k_platform_anyplatform;
-   vg_build.compiler = k_compiler_blob;
-   vg_build.arch = k_architecture_anyarch;
-   vg_build.libc = k_libc_version_native;
-   compile_game( 0, 1 );
-   vg_tarball_last_project(); /* content depot: 2103943 */
-   vg_success( "Completed 3/3\n" );
-
-   /* TODO: DRM thingy? */
+   struct vg_project content_proj, windows_proj, linux_proj;
+
+   struct vg_env env = vg_release_env;
+   env.platform = k_platform_anyplatform;
+   vg_project_init( &content_proj, &env, "skaterift" );
+   build_game_content( &content_proj );
+
+   /* binaries for windows */
+   env = vg_release_env;
+   env.platform = k_platform_windows;
+   vg_project_init( &windows_proj, &env, "skaterift" );
+   build_game_bin( &windows_proj );
+
+   /* binaries for linux */
+   env = vg_release_env;
+   env.platform = k_platform_linux;
+   vg_project_init( &linux_proj, &env, "skaterift" );
+   build_game_bin( &linux_proj );
+
+   /* package them up for storage */
+   vg_tarball_project( &content_proj );
+   vg_tarball_project( &linux_proj );
+   vg_tarball_project( &windows_proj );
+
+   /* extreme DRM solutions */
+   FILE *fp = fopen( "dist/bin/DRM", "w" );
+   fputs( "blibby!", fp );
+   fclose( fp );
 }
 
 void s_testing_build(void){
    vg_info( "running script: s_testing_build(void)\n" );
 
-   vg_build.optimization = optimize_test_compile;
-   vg_build.fresh = 0;
-   vg_build.platform = k_platform_linux;
-   vg_build.arch = k_architecture_x86_64;
-   vg_build.compiler = k_compiler_clang;
-   vg_build.libc = k_libc_version_native;
-
-   compile_game( 1, 1 );
+   struct vg_project test_proj;
+   vg_project_init( &test_proj, &vg_test_env, "skaterift-test" );
 
-   vg_success( "Completed 1/1\n" );
+   build_game_bin( &test_proj );
+   build_game_content( &test_proj );
 }
 
 void s_testing_server(void){
    vg_info( "running script: s_testing_server(void)\n" );
 
-   vg_build.fresh = 0;
-   vg_build.platform = k_platform_linux;
-   vg_build.arch = k_architecture_x86_64;
-   vg_build.compiler = k_compiler_clang;
-   vg_build.libc = k_libc_version_native;
-
-   /* build sqlite3, alwasy optimized */
-   vg_build.optimization = 3;
-   compile_sqlite_obj();
-   vg_success( "Completed 1/2\n" );
-
-   vg_build.optimization = optimize_test_compile;
-   compile_server();
-   vg_success( "Completed 2/2\n" );
+   struct vg_project test_proj;
+   vg_project_init( &test_proj, &vg_test_env, "skaterift-test-server" );
+   compile_server( &test_proj );
 }
 
 int main( int argc, char *argv[] ){
@@ -223,57 +270,8 @@ int main( int argc, char *argv[] ){
          s_testing_server();
 
       if( vg_opt('r') )
-         optimize_test_compile = 3;
+         vg_test_env.optimization = 3;
    }
 
-   if( vg_build.warnings )
-      vg_warn( "Finished with %u warnings\n", vg_build.warnings );
-   else
-      vg_success( "All scripts ran successfully\n" );
-}
-
-#define _S( NAME, VS, FS ) \
-   vg_build_shader( "shaders/" VS, "shaders/" FS, NULL, "shaders", NAME )
-
-void build_shaders(void){
-   vg_info( "Compiling shader headers\n" );
-   vg_shader_set_include_dir( "shaders" );
-
-   /* Scene */
-   _S( "scene_standard",            "scene.vs", "scene_standard.fs" );
-   _S( "scene_standard_alphatest",  "scene.vs", "scene_standard_alphatest.fs" );
-   _S( "scene_foliage",             "scene_foliage.vs", "scene_foliage.fs" );
-   _S( "scene_override",            "scene_override.vs", "scene_override.fs" );
-   _S( "scene_fxglow",              "scene_fxglow.vs", "scene_fxglow.fs" );
-   _S( "scene_vertex_blend",        "scene.vs", "scene_vertex_blend.fs" );
-   _S( "scene_terrain",             "scene.vs", "scene_terrain.fs" );
-   _S( "scene_route",               "scene_override.vs", "scene_route.fs" );
-   _S( "scene_depth",               "scene.vs", "scene_depth.fs" );
-   _S( "scene_position",            "scene.vs", "scene_position.fs" );
-   _S( "scene_cubemapped",          "scene.vs", "scene_cubemapped.fs" );
-   _S( "scene_water",               "scene.vs", "scene_water.fs" );
-   _S( "scene_water_fast",          "scene.vs", "scene_water_fast.fs" );
-   _S( "scene_scoretext",           "scene_sfd.vs", "scene_standard.fs" );
-   _S( "scene_font",                "model_font.vs","scene_font.fs" );
-
-   /* Models */
-   _S( "model_sky",            "model.vs",         "model_sky.fs" );
-   _S( "model_sky_space",      "model.vs",         "model_sky_space.fs" );
-   _S( "model_menu",           "model.vs",         "model_menu.fs" );
-   _S( "model_character_view", "model_skinned.vs", "model_character_view.fs" );
-   _S( "model_board_view",     "model.vs",         "model_character_view.fs" );
-   _S( "model_entity",         "model.vs",         "model_entity.fs" );
-   _S( "model_gate",           "model.vs",         "model_gate_lq.fs" );
-   _S( "model_gate_unlinked",  "model.vs",         "model_gate_unlinked.fs" );
-   _S( "model_font",           "model_font.vs",    "model_font.fs" );
-
-   _S( "particle", "particle.vs", "particle.fs" );
-   _S( "trail", "trail.vs", "trail.fs" );
-
-   /* 2D */
-   _S( "blit",      "blit.vs",      "blit.fs" );
-   _S( "blitblur",  "blit.vs",      "blitblur.fs" );
-   _S( "blitcolour","blit.vs",      "colour.fs" );
-   _S( "blit_transition", "blit.vs", "blit_transition.fs" );
-   _S( "routeui",   "routeui.vs",   "routeui.fs" );
+   vg_success( "All scripts completed\n" );
 }

diff --git a/build.sh b/build.sh
index d807648f5c4c0b8567c1d98974b8037da16bbe8d..f5175ea5c3f07c82faa0ea13608506a7bce68558 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1 +1 @@
-clang -fsanitize=address -O0 -I./vg build.c -o /tmp/tmpsr && /tmp/tmpsr $@
+clang -fsanitize=address -O0 -I./vg build.c vg/vg_tool.c -o /tmp/tmpsr && /tmp/tmpsr $@

diff --git a/bvh.h b/bvh.h
index b04c3de2b95f38342259a85d54386854ce295488..ced346e31af59d3d1bad6af58e890b6629a413dc 100644 (file)
--- a/bvh.h
+++ b/bvh.h
@@ -164,7 +164,8 @@ static void bh_subdivide( bh_tree *bh, u32 inode ){
 
 static bh_tree *bh_create( void *lin_alloc, bh_system *system, 
                               void *user, u32 item_count, u32 max_per_leaf ){
-   assert( max_per_leaf > 0 );
+   if( max_per_leaf == 0 )
+      vg_fatal_error( "Minimum of 1 per leaf\n" );
 
    u32 alloc_count = VG_MAX( 1, item_count );
 

diff --git a/ent_skateshop.c b/ent_skateshop.c
index 85a0fa48b5fda101d32380f03790b9ca3c3532df..86fc9714d039dd11f0563d4d845f9dec084114e1 100644 (file)
--- a/ent_skateshop.c
+++ b/ent_skateshop.c
@@ -1,8 +1,3 @@
-#ifndef ENT_SKATESHOP_C
-#define ENT_SKATESHOP_C
-
-#define VG_GAME
-#include "vg/vg.h"
 #include "vg/vg_steam_ugc.h"
 #include "vg/vg_msg.h"
 #include "ent_skateshop.h"
@@ -817,5 +812,3 @@ static void ent_skateshop_call( world_instance *world, ent_call *call ){
       }
    }
 }
-
-#endif /* ENT_SKATESHOP_C */

diff --git a/entity.h b/entity.h
index 1adeb7e6095643d31c5e4654e02d60d13438f5e0..2874441a51b56b0cfccd440f72d4800d6a4e93eb 100644 (file)
--- a/entity.h
+++ b/entity.h
@@ -1,6 +1,7 @@
-#ifndef ENTITY_H
-#define ENTITY_H
+#pragma once
 
+#include "vg/vg_audio.h"
+#include "vg/vg_imgui.h"
 #include "model.h"
 
 typedef struct ent_spawn ent_spawn;
@@ -565,5 +566,3 @@ struct ent_glider {
 
 #include "world.h"
 static void entity_call( world_instance *world, ent_call *call );
-
-#endif /* ENTITY_H */

diff --git a/font.h b/font.h
index 0647b771a1457ce793466b66370c7a1b4911b77b..a83b73cea7ad82808b8406d7e4d879209fc892d3 100644 (file)
--- a/font.h
+++ b/font.h
@@ -162,7 +162,6 @@ static void font3d_bind( font3d *font, enum font_shader shader,
       shader_model_font_uPv( cam->mtx.pv );
    }
    else if( shader == k_font_shader_world ){
-      assert( world );
       shader_scene_font_use();
       shader_scene_font_uTexGarbage(0);
       shader_scene_font_uTexMain(1);

diff --git a/gameserver.c b/gameserver.c
index 5bbb8ae9685dbaace02f02bf1e1430c349c64d27..d3449e8eafc59784457d279adea39b91a63994aa 100644 (file)
--- a/gameserver.c
+++ b/gameserver.c
@@ -6,6 +6,7 @@
 #include <signal.h>
 #include <unistd.h>
 #include <time.h>
+#include <string.h>
 
 volatile sig_atomic_t sig_stop;
 
@@ -726,8 +727,8 @@ static enum request_status gameserver_cat_table(
             continue;
 
          vg_msg_frame( msg, "" );
-         vg_msg_wkvu32( msg, "time", time );
-         vg_msg_wkvu64( msg, "steamid", steamid );
+         vg_msg_wkvnum( msg, "time", k_vg_msg_u32, 1, &time );
+         vg_msg_wkvnum( msg, "steamid", k_vg_msg_u64, 1, &steamid );
 
          char username[32];
          if( db_getuserinfo( steamid, username, sizeof(username), NULL ) )
@@ -782,7 +783,8 @@ static void gameserver_process_user_request( db_request *db_req ){
    if( !strcmp( endpoint, "scoreboard" ) ){
       const char *mod = vg_msg_getkvstr( &data, "mod" );
       const char *route = vg_msg_getkvstr( &data, "route" );
-      u32 week = vg_msg_getkvu32( &data, "week", 0 );
+      u32 week;
+      vg_msg_getkvintg( &data, "week", k_vg_msg_u32, &week );
       
       if( week == NETWORK_LEADERBOARD_CURRENT_WEEK ){
          gameserver_cat_table( &body, mod, route, 
@@ -826,7 +828,8 @@ static void gameserver_process_user_request( db_request *db_req ){
          return;
       }
 
-      i32 centiseconds = vg_msg_getkvi32( &data, "time", -1 );
+      i32 centiseconds;
+      vg_msg_getkvintg( &data, "time", k_vg_msg_i32, &centiseconds );
       if( centiseconds < 5*100 ){
          gameserver_request_respond( k_request_status_client_error,
                                      res, NULL, msg );
@@ -835,7 +838,6 @@ static void gameserver_process_user_request( db_request *db_req ){
 
       db_writeusertime( alltime_table, client->steamid, centiseconds, 1 );
       db_writeusertime( weekly_table, client->steamid, centiseconds, 1 );
-
       gameserver_request_respond( k_request_status_ok, res, NULL, msg );
    }
    else{

diff --git a/gameserver.h b/gameserver.h
index caa4f0d7e49140305f67abf298f9573eddd4aa01..00df20e2f0a5570f8b9cba777f2d84e05a6531b0 100644 (file)
--- a/gameserver.h
+++ b/gameserver.h
@@ -1,9 +1,7 @@
-#ifndef GAMESERVER_H
-#define GAMESERVER_H
-
+#pragma once
 #define VG_SERVER
 
-#include "vg/vg.h"
+#include "vg/vg_platform.h"
 #include "vg/vg_steam.h"
 #include "vg/vg_steam_networking.h"
 #include "vg/vg_steam_http.h"
@@ -54,5 +52,3 @@ static gameserver = {
 };
 
 static ISteamNetworkingSockets *hSteamNetworkingSockets = NULL;
-
-#endif /* GAMESERVER_H */

diff --git a/input.h b/input.h
index f957ffa211fe6fe931a74b27d053846b60d4fb6a..74a4d912ce5b6ff86516553257de3c616ae13376 100644 (file)
--- a/input.h
+++ b/input.h
@@ -1,8 +1,4 @@
-#ifndef INPUT_H
-#define INPUT_H
-
-#define VG_GAME
-#include "vg/vg.h"
+#pragma once
 #include "vg/vg_platform.h" 
 #include "vg/vg_console.h"
 #include "vg/vg_input.h"
@@ -311,5 +307,3 @@ static void skaterift_preupdate_inputs(void){
       else           srinput.button_states[k_srbind_mdown][0] = 1;
    }
 }
-
-#endif /* INPUT_H */

diff --git a/menu.h b/menu.h
index 73e048f9b17ca1c0f251726a002e42651f5154ef..e8d94748133be9e2343890c06140d6bbdca569ec 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -1,7 +1,4 @@
-#ifndef MENU_H
-#define MENU_H
-
-#include "common.h"
+#pragma once
 #include "model.h"
 #include "world_render.h"
 #include "player.h"
@@ -828,5 +825,3 @@ static void menu_binding_string( char buf[128], u32 pstr ){
    else
       vg_strcat( &str, "error" );
 }
-
-#endif /* MENU_H */

diff --git a/model.h b/model.h
index ba1c3f228c8cc827176bc9a8b4a92126c82cba8a..63e6e7f5ebf84b31a28b5e1e39dd4205fae37092 100644 (file)
--- a/model.h
+++ b/model.h
@@ -1,12 +1,18 @@
 /*
- * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ * Copyright (C) 2021-2024 Mt.ZERO Software, Harry Godden - All Rights Reserved
  */
 
-#ifndef MODEL_H
-#define MODEL_H
+#pragma once
 
 #include "skaterift.h"
 
+#include "vg/vg_io.h"
+#include "vg/vg_async.h"
+#include "vg/vg_tex.h"
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
 #define MDL_VERSION_MIN 101
 #define MDL_VERSION_NR 105
 
@@ -696,5 +702,3 @@ static void mdl_async_full_load_std( mdl_context *mdl ){
                                VG_TEX2D_CLAMP|VG_TEX2D_NEAREST, &tex->glname );
    }
 }
- 
-#endif

diff --git a/network.c b/network.c
index 3bb59b3e6c08e708b34958372587e41756e6332c..4d55707fbeb0feee105fba803aed7e9ff407fee1 100644 (file)
--- a/network.c
+++ b/network.c
@@ -173,7 +173,7 @@ static void network_request_scoreboard( const char *mod_uid,
    vg_msg_wkvstr( &data, "endpoint", "scoreboard" );
    vg_msg_wkvstr( &data, "mod", mod_uid );
    vg_msg_wkvstr( &data, "route", route_uid );
-   vg_msg_wkvu32( &data, "week", week );
+   vg_msg_wkvnum( &data, "week", k_vg_msg_u32, 1, &week );
    network_send_request( req, &data, network_scoreboard_callback, userdata );
 }
 
@@ -199,7 +199,7 @@ static void network_publish_laptime( const char *mod_uid,
    vg_msg_wkvstr( &data, "endpoint", "setlap" );
    vg_msg_wkvstr( &data, "mod", mod_uid );
    vg_msg_wkvstr( &data, "route", route_uid );
-   vg_msg_wkvi32( &data, "time", time_centiseconds );
+   vg_msg_wkvnum( &data, "time", k_vg_msg_i32, 1, &time_centiseconds );
    network_send_request( req, &data, network_publish_callback, 0 );
 }
 
@@ -266,8 +266,6 @@ static void network_send_item( enum netmsg_playeritem_type type ){
          view_id = localplayer.playermodel_view_slot;
          addon_type = k_addon_type_player;
       }
-      else 
-         assert(0);
 
       struct addon_cache *cache = &addon_system.cache[addon_type];
       vg_pool *pool = &cache->pool;

diff --git a/network.h b/network.h
index 6770d323a0e0b7fd7b788172eac54b86a1bd3d20..08a989b3b1edf2f1c627e80b54461f191a1de472 100644 (file)
--- a/network.h
+++ b/network.h
@@ -6,7 +6,7 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include "vg/vg_stdint.h"
+#include "vg/vg_platform.h"
 #include "steam.h"
 #include "network_common.h"
 #include "network_msg.h"

diff --git a/network_common.h b/network_common.h
index af0b4bd5ea509563a4091588824d0c0b7b5c4906..ca46e4784ad0584ccc390836efd40e06cefac79a 100644 (file)
--- a/network_common.h
+++ b/network_common.h
@@ -1,8 +1,6 @@
-#ifndef NETWORK_COMMON_H
-#define NETWORK_COMMON_H
-
-#include "vg/vg_stdint.h"
+#pragma once
 #include "vg/vg_platform.h"
+#include "vg/vg_string.h"
 
 #define NETWORK_USERNAME_MAX 32
 #define NETWORK_MAX_PLAYERS 20
@@ -31,12 +29,14 @@ static u32 network_msgstring( const char *src,
 
 static u32 network_pair_index( u32 _a, u32 _b ){
    const u32 N = NETWORK_MAX_PLAYERS;
-   assert( (_a != _b) && (_a<N) && (_b<N) );
+
+   if( !((_a != _b) && (_a<N) && (_b<N) ) )
+   {
+      vg_fatal_error( "Programming error\n" );
+   }
 
    u32 a = VG_MIN( _a, _b ),
        b = VG_MAX( _a, _b );
 
    return ((N-a)*((N-a)-1))/2 - b + a;
 }
-
-#endif /* NETWORK_COMMON_H */

diff --git a/network_compression.h b/network_compression.h
index 2c000b7e85122bb679f42ed71eec783bc02f75f6..f83f0f589dbd123377765d095cc04b9e31d9936f 100644 (file)
--- a/network_compression.h
+++ b/network_compression.h
@@ -1,7 +1,7 @@
 #ifndef NETWORK_COMPRESSION_H
 #define NETWORK_COMPRESSION_H
 
-#include "vg/vg_stdint.h"
+#include "vg/vg_platform.h"
 #include "vg/vg_m.h"
 
 typedef struct bitpack_ctx bitpack_ctx;

diff --git a/network_msg.h b/network_msg.h
index 5d3beeef1a61ba3329141062ef2d9b28f22fe49b..4dfeb5e44a3cc8a65a0cbe97d159c43caaa1e09d 100644 (file)
--- a/network_msg.h
+++ b/network_msg.h
@@ -5,7 +5,6 @@
 #ifndef NETWORK_MSG_H
 #define NETWORK_MSG_H
 
-#include "vg/vg_stdint.h"
 #include "world_info.h"
 #include "vg/vg_platform.h"
 ;

diff --git a/player.h b/player.h
index ad152270328d8f2d633885ee105bd95a098565ea..b2e910651204212a6035f0661e81bb3084ba7866 100644 (file)
--- a/player.h
+++ b/player.h
@@ -211,7 +211,6 @@ struct player_subsystem_interface static *player_subsystems[] = {
 
 static void player__debugtext( int size, const char *fmt, ... );
 static void player__use_mesh( glmesh *mesh );
-static void player__use_texture( vg_tex2d *tex );
 static void player__use_model( u16 reg_id );
 
 static void player__bind(void);

diff --git a/player_common.c b/player_common.c
index 5236ee5b9227c0358d0966f31e394236baa2725c..bfdef1ab97b306129acfe9cf3c47b6dbe5321884 100644 (file)
--- a/player_common.c
+++ b/player_common.c
@@ -235,8 +235,8 @@ static void player__cam_iterate(void){
    localplayer.cam_trackshake += 
       speed*k_cam_shake_trackspeed*vg.time_frame_delta;
 
-   v2f rnd = {perlin1d( localplayer.cam_trackshake, 1.0f, 4, 20 ),
-              perlin1d( localplayer.cam_trackshake, 1.0f, 4, 63 ) };
+   v2f rnd = {vg_perlin_fract_1d( localplayer.cam_trackshake, 1.0f, 4, 20 ),
+              vg_perlin_fract_1d( localplayer.cam_trackshake, 1.0f, 4, 63 ) };
    v2_muladds( localplayer.cam.angles, rnd, strength, localplayer.cam.angles );
 
    v3f Fd, Fs, F;

diff --git a/player_drive.c b/player_drive.c
index 7881302865b1a2bd2fbe0ad474abf98958a50390..cddd0d43ad3a8179da1acc3cce2e3185205e48fe 100644 (file)
--- a/player_drive.c
+++ b/player_drive.c
@@ -10,7 +10,8 @@ static void player__drive_pre_update(void){
    v2f steer;
    joystick_state( k_srjoystick_steer, steer );
 
-   vehc->steer = vg_lerpf( vehc->steer, steer[0] * 0.4f, k_rb_delta * 8.0f );
+   vehc->steer = vg_lerpf( vehc->steer, steer[0] * 0.4f, 
+                           vg.time_fixed_delta * 8.0f );
    vehc->drive = steer[1];
 }
 

diff --git a/player_glide.c b/player_glide.c
index 96d3eac02f7cccb8b2fe33c519ef57d5fb573605..32768f6d1c866e5deecb94adb053e5a5275be603 100644 (file)
--- a/player_glide.c
+++ b/player_glide.c
@@ -44,12 +44,12 @@ static void player_glide_pre_update(void){
 
 static void massless_accel( rigidbody *rb, v3f delta, v3f impulse ){
    /* linear */
-   v3_muladds( rb->v, impulse, k_rb_delta, rb->v );
+   v3_muladds( rb->v, impulse, vg.time_fixed_delta, rb->v );
    
    /* Angular velocity */
    v3f wa;
    v3_cross( delta, impulse, wa );
-   v3_muladds( rb->w, wa, k_rb_delta, rb->w );
+   v3_muladds( rb->w, wa, vg.time_fixed_delta, rb->w );
 }
 
 static void calculate_lift( v3f vl, f32 aoa_bias, 
@@ -132,12 +132,12 @@ static bool glider_physics( v2f steer ){
    v3_add( F, Fdrag, F );
 
    m3x3_mulv( rb->to_world, F, F );
-   v3_muladds( rb->v, F, k_rb_delta, rb->v );
+   v3_muladds( rb->v, F, vg.time_fixed_delta, rb->v );
 
    v3_add( Fw, FslipW, Fw );
    v3_add( Fw, FliftW, Fw );
    m3x3_mulv( rb->to_world, Fw, Fw );
-   v3_muladds( rb->w, Fw, k_rb_delta, rb->w );
+   v3_muladds( rb->w, Fw, vg.time_fixed_delta, rb->w );
 
 
    /* 
@@ -194,7 +194,8 @@ static bool glider_physics( v2f steer ){
       }
    }
 
-   rb_presolve_contacts( rb_contact_buffer, rb_contact_count );
+   rb_presolve_contacts( rb_contact_buffer, 
+                         vg.time_fixed_delta, rb_contact_count );
    for( u32 i=0; i<10; i ++ )
       rb_solve_contacts( rb_contact_buffer, rb_contact_count );
    
@@ -307,8 +308,8 @@ static int ccmd_player_glider_spawn( int argc, const char *argv[] ){
    return 0;
 }
 
-static void player_glide_bind(void){
-
+static void player_glide_bind(void)
+{
    u32 mask = VG_VAR_CHEAT|VG_VAR_PERSISTENT;
    VG_VAR_F32( k_glide_steer, flags=mask );
    VG_VAR_F32( k_glide_cl, flags=mask );
@@ -322,9 +323,7 @@ static void player_glide_bind(void){
 
    vg_console_reg_cmd( "spawn_glider", ccmd_player_glider_spawn, NULL );
 
-   f32 mass = 0.0f,
-       k_density = 8.0f,
-       k_inertia_scale = 1.0f;
+   f32 mass = 0.0f,k_density = 8.0f;
    m3x3f I;
    m3x3_zero( I );
 

diff --git a/player_model.h b/player_model.h
index 576109c51736cf3dc9c2f15a990de928e71a6f15..8d5dd80efc7ac3c2ff8c59d244267dcccca2e54a 100644 (file)
--- a/player_model.h
+++ b/player_model.h
@@ -2,16 +2,9 @@
  * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
  */
 
-#ifndef CHARACTER_H 
-#define CHARACTER_H
-
-#define VG_GAME
-#include "vg/vg.h"
-
+#pragma once
 #include "model.h"
 #include "skeleton.h"
 #include "player_ragdoll.h"
 
 #include "shaders/model_character_view.h"
-
-#endif

diff --git a/player_ragdoll.c b/player_ragdoll.c
index 6dc171d0f28c73944b13254d43fe76f1634cfe9d..413f9a8d137e73b58466475b7d4713bfd681bc6f 100644 (file)
--- a/player_ragdoll.c
+++ b/player_ragdoll.c
@@ -439,7 +439,8 @@ static void player_ragdoll_iter( struct player_ragdoll *rd ){
       contact_velocities[i] = vn;
    }
 
-   rb_presolve_contacts( rb_contact_buffer, rb_contact_count );
+   rb_presolve_contacts( rb_contact_buffer, vg.time_fixed_delta, 
+                         rb_contact_count );
    rb_presolve_swingtwist_constraints( rd->cone_constraints,
                                        rd->cone_constraints_count );
 
@@ -536,8 +537,6 @@ static void player_ragdoll_iter( struct player_ragdoll *rd ){
    if( run_sim && 
          (v3_length2(player_dead.v_lpf)>(k_ragdoll_active_threshold*
                                          k_ragdoll_active_threshold)) ){
-      assert( rd->cone_constraints_count == rd->position_constraints_count );
-
       mdl_keyframe anim[32];
       skeleton_sample_anim( &localplayer.skeleton, player_dead.anim_bail,
                             0.0f, anim );
@@ -580,14 +579,14 @@ static void player_ragdoll_iter( struct player_ragdoll *rd ){
 
          v3f torque;
          v3_muls( axis, F, torque );
-         v3_muladds( st->rbb->w, torque, k_rb_delta, st->rbb->w );
+         v3_muladds( st->rbb->w, torque, vg.time_fixed_delta, st->rbb->w );
 
          /* apply a adjustment to keep velocity at joint 0 */
 #if 0
          v3f wcb, vcb;
          m3x3_mulv( st->rbb->to_world, pc->lcb, wcb );
          v3_cross( torque, wcb, vcb );
-         v3_muladds( st->rbb->v, vcb, k_rb_delta, st->rbb->v );
+         v3_muladds( st->rbb->v, vcb, vg.time_fixed_delta, st->rbb->v );
 #endif
       }
    }

diff --git a/player_render.c b/player_render.c
index 40c2f9a73b5d5db2c3a828e9970ee93287ea5224..2707c949a6a00515fb0206bab89ab5a83a26c072 100644 (file)
--- a/player_render.c
+++ b/player_render.c
@@ -240,10 +240,6 @@ static void player__animate(void){
       addon_cache_item_if_loaded( k_addon_type_board, 
                                   localplayer.board_view_slot );
 
-   assert( sys->animate );
-   assert( sys->pose );
-   assert( sys->animator_data );
-
    sys->animate();
 
    player_pose *pose = &localplayer.pose;

diff --git a/player_replay.c b/player_replay.c
index 8e6438b3758b62e0c00f49b92320be0b4d86c330..b0df4f27183648d87af07d9ffe9c49936db43faa 100644 (file)
--- a/player_replay.c
+++ b/player_replay.c
@@ -138,7 +138,6 @@ static void replay_emit_frame_sounds( replay_frame *frame ){
 
 static int replay_seek( replay_buffer *replay, f64 t ){
    if( !replay->head ) return 0;
-   assert( replay->tail );
 
    if( t < replay->tail->time ) t = replay->tail->time;
    if( t > replay->head->time ) t = replay->head->time;
@@ -393,7 +392,6 @@ void skaterift_restore_frame( replay_frame *frame ){
       replay_frame_data( frame, k_replay_framedata_internal_gamestate );
    void *src = replay_frame_data( frame, k_replay_framedata_gamestate );
    u16 src_size = frame->data_table[ k_replay_framedata_gamestate ][1];
-   assert( src_size );
    world_static.current_run_version = gs->current_run_version;
 
    if(frame->system == k_player_subsystem_walk ){

diff --git a/player_skate.c b/player_skate.c
index 1aba17a7646535b9c6c01a78759dd5085b771985..b193173b888960bc497c9d2cfecf520a7fdf7171 100644 (file)
--- a/player_skate.c
+++ b/player_skate.c
@@ -4,6 +4,7 @@
 #include "player.h"
 #include "audio.h"
 #include "vg/vg_perlin.h"
+#include "vg/vg_lines.h"
 #include "menu.h"
 #include "ent_skateshop.h"
 #include "addon.h"
@@ -344,7 +345,7 @@ static int create_jumps_to_hit_target( jump_info *jumps,
 static void player__approximate_best_trajectory(void){
    world_instance *world0 = world_current_instance();
 
-   float k_trace_delta = k_rb_delta * 10.0f;
+   float k_trace_delta = vg.time_fixed_delta * 10.0f;
    struct player_skate_state *state = &player_skate.state;
 
    state->air_start = vg.time;
@@ -714,10 +715,10 @@ static void skate_apply_trick_model(void){
    v3_add( Fd, Fs, F );
    v3_mul( strength, F, F );
 
-   v3_muladds( state->trick_residualv, F, k_rb_delta, 
+   v3_muladds( state->trick_residualv, F, vg.time_fixed_delta, 
                state->trick_residualv );
    v3_muladds( state->trick_residuald, state->trick_residualv,
-               k_rb_delta, state->trick_residuald );
+               vg.time_fixed_delta, state->trick_residuald );
 
    if( state->activity <= k_skate_activity_air_to_grind ){
       if( v3_length2( state->trick_vel ) < 0.0001f )
@@ -742,10 +743,10 @@ static void skate_apply_trick_model(void){
 
 
       /* integrate trick velocities */
-      v3_muladds( state->trick_euler, state->trick_vel, k_rb_delta,
+      v3_muladds( state->trick_euler, state->trick_vel, vg.time_fixed_delta,
                   state->trick_euler );
 
-      if( !carry_on && (state->trick_time + k_rb_delta/interval >= next_end) ){
+      if( !carry_on && (state->trick_time + vg.time_fixed_delta/interval >= next_end) ){
          state->trick_time = 0.0f;
          state->trick_euler[0] = roundf( state->trick_euler[0] );
          state->trick_euler[1] = roundf( state->trick_euler[1] );
@@ -759,7 +760,7 @@ static void skate_apply_trick_model(void){
          audio_unlock();
       }
       else 
-         state->trick_time += k_rb_delta / interval;
+         state->trick_time += vg.time_fixed_delta / interval;
    }
    else{
       if( (v3_length2(state->trick_vel) >= 0.0001f ) &&
@@ -791,7 +792,7 @@ static void skate_apply_grab_model(void){
    else
       v2_zero( state->grab_mouse_delta );
 
-   state->grabbing = vg_lerpf( state->grabbing, grabt, 8.4f*k_rb_delta );
+   state->grabbing = vg_lerpf( state->grabbing, grabt, 8.4f*vg.time_fixed_delta );
 }
 
 static void skate_apply_steering_model(void){
@@ -830,7 +831,7 @@ static void skate_apply_steering_model(void){
       else if( state->activity >= k_skate_activity_grind_any ){
          rate *= fabsf(steer);
 
-         float a = 0.8f * -steer * k_rb_delta;
+         float a = 0.8f * -steer * vg.time_fixed_delta;
 
          v4f q;
          q_axis_angle( q, localplayer.rb.to_world[1], a );
@@ -869,13 +870,13 @@ static void skate_apply_steering_model(void){
       }
    }
 
-   vg_slewf( &state->skid, skid_target, k_rb_delta*(1.0f/0.1f) );
+   vg_slewf( &state->skid, skid_target, vg.time_fixed_delta*(1.0f/0.1f) );
    steer = vg_lerpf( steer, state->skid*k_steer_ground*0.5f, 
                      fabsf(state->skid*0.8f) );
 
    float current  = v3_dot( localplayer.rb.to_world[1], localplayer.rb.w ),
          addspeed = (steer * -top) - current,
-         maxaccel = rate * k_rb_delta,
+         maxaccel = rate * vg.time_fixed_delta,
          accel    = vg_clampf( addspeed, -maxaccel, maxaccel );
 
    v3_muladds( localplayer.rb.w, localplayer.rb.to_world[1], 
@@ -922,8 +923,8 @@ static void skate_apply_friction_model(void){
    else if( player_skate.surface == k_surface_prop_sand )
       lat *= 0.6f;
 
-   vel[0] += vg_cfrictf( vel[0], lat * k_rb_delta );
-   vel[2] += vg_cfrictf( vel[2], k_friction_resistance * k_rb_delta );
+   vel[0] += vg_cfrictf( vel[0], lat * vg.time_fixed_delta );
+   vel[2] += vg_cfrictf( vel[2], k_friction_resistance * vg.time_fixed_delta );
 
    /* Pushing additive force */
 
@@ -963,13 +964,13 @@ static void skate_apply_jump_model(void){
    }
 
    if( state->charging_jump ){
-      state->jump_charge += k_rb_delta * k_jump_charge_speed;
+      state->jump_charge += vg.time_fixed_delta * k_jump_charge_speed;
 
       if( !charging_jump_prev )
          state->jump_dir = state->reverse>0.0f? 1: 0;
    }
    else{
-      state->jump_charge -= k_jump_charge_speed * k_rb_delta;
+      state->jump_charge -= k_jump_charge_speed * vg.time_fixed_delta;
    }
 
    state->jump_charge = vg_clampf( state->jump_charge, 0.0f, 1.0f );
@@ -1093,7 +1094,7 @@ static void skate_apply_pump_model(void){
       v3_normalize( dir );
 
       float max = v3_dot( dir, state->throw_v ),
-            amt = vg_minf( k_mmdecay * k_rb_delta, max );
+            amt = vg_minf( k_mmdecay * vg.time_fixed_delta, max );
       v3_muladds( state->throw_v, dir, -amt, state->throw_v );
    }
 }
@@ -1114,29 +1115,29 @@ static void skate_apply_cog_model(void){
    v3_sub( localplayer.rb.v, state->cog_v, rv );
 
    v3f F;
-   v3_muls( ideal_diff, -k_cog_spring * k_rb_rate, F );
-   v3_muladds( F, rv,   -k_cog_damp * k_rb_rate, F );
+   v3_muls( ideal_diff, -k_cog_spring * 60.0f, F );
+   v3_muladds( F, rv,   -k_cog_damp * 60.0f, F );
 
    float ra = k_cog_mass_ratio,
          rb = 1.0f-k_cog_mass_ratio;
 
    /* Apply forces & intergrate */
    v3_muladds( state->cog_v, F, -rb, state->cog_v );
-   state->cog_v[1] += -9.8f * k_rb_delta;
-   v3_muladds( state->cog, state->cog_v, k_rb_delta, state->cog );
+   state->cog_v[1] += -9.8f * vg.time_fixed_delta;
+   v3_muladds( state->cog, state->cog_v, vg.time_fixed_delta, state->cog );
 }
 
 static void skate_integrate(void){
    struct player_skate_state *state = &player_skate.state;
 
-   float rate_x = 1.0f - (k_rb_delta * 3.0f),
+   float rate_x = 1.0f - (vg.time_fixed_delta * 3.0f),
          rate_z = rate_x,
          rate_y = 1.0f;
 
    if( state->activity >= k_skate_activity_grind_any ){
-      rate_x = 1.0f-(16.0f*k_rb_delta);
-      rate_y = 1.0f-(10.0f*k_rb_delta);
-      rate_z = 1.0f-(40.0f*k_rb_delta);
+      rate_x = 1.0f-(16.0f*vg.time_fixed_delta);
+      rate_y = 1.0f-(10.0f*vg.time_fixed_delta);
+      rate_z = 1.0f-(40.0f*vg.time_fixed_delta);
    }
 
    float wx = v3_dot( localplayer.rb.w, localplayer.rb.to_world[0] ) * rate_x,
@@ -1149,7 +1150,7 @@ static void skate_integrate(void){
    v3_muladds( localplayer.rb.w, localplayer.rb.to_world[2], wz, 
                localplayer.rb.w );
 
-   state->flip_time += state->flip_rate * k_rb_delta;
+   state->flip_time += state->flip_rate * vg.time_fixed_delta;
    rb_update_matrices( &localplayer.rb );
 }
 
@@ -1698,7 +1699,7 @@ static void skate_grind_friction( struct grind_info *inf, float strength ){
          dir      = vg_signf( v3_dot( localplayer.rb.v, inf->dir ) ),
          F        = a * -dir * k_grind_max_friction;
 
-   v3_muladds( localplayer.rb.v, inf->dir, F*k_rb_delta*strength, 
+   v3_muladds( localplayer.rb.v, inf->dir, F*vg.time_fixed_delta*strength, 
                localplayer.rb.v );
 }
 
@@ -1710,7 +1711,7 @@ static void skate_grind_decay( struct grind_info *inf, float strength ){
    v3f v_grind;
    m3x3_mulv( mtx_inv, localplayer.rb.v, v_grind );
 
-   float decay = 1.0f - ( k_rb_delta * k_grind_decayxy * strength );
+   float decay = 1.0f - ( vg.time_fixed_delta * k_grind_decayxy * strength );
    v3_mul( v_grind, (v3f){ 1.0f, decay, decay }, v_grind );
    m3x3_mulv( mtx, v_grind, localplayer.rb.v );
 }
@@ -1730,7 +1731,7 @@ static void skate_grind_truck_apply( float sign, struct grind_info *inf,
    v3_sub( inf->co, wsp, delta );
 
    /* spring force */
-   v3_muladds( localplayer.rb.v, delta, k_spring_force*strength*k_rb_delta, 
+   v3_muladds( localplayer.rb.v, delta, k_spring_force*strength*vg.time_fixed_delta, 
                localplayer.rb.v );
 
    skate_grind_decay( inf, strength );
@@ -1770,12 +1771,12 @@ static void skate_grind_truck_apply( float sign, struct grind_info *inf,
    rb_effect_spring_target_vector( &localplayer.rb, up, target_up,
                                     k_grind_spring, 
                                     k_grind_dampener,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
 
    rb_effect_spring_target_vector( &localplayer.rb, fwd, target_fwd,
                                     k_grind_spring*strength, 
                                     k_grind_dampener*strength,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
 
    vg_line_arrow( localplayer.rb.co, target_up, 1.0f, VG__GREEN );
    vg_line_arrow( localplayer.rb.co, fwd, 0.8f, VG__RED );
@@ -1833,7 +1834,7 @@ static void skate_5050_apply( struct grind_info *inf_front,
    rb_effect_spring_target_vector( &localplayer.rb, up, target_up,
                                     k_grind_spring, 
                                     k_grind_dampener,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
    vg_line_arrow( localplayer.rb.co, up, 1.0f, VG__GREEN );
    vg_line_arrow( localplayer.rb.co, target_up, 1.0f, VG__GREEN );
 
@@ -1851,7 +1852,7 @@ static void skate_5050_apply( struct grind_info *inf_front,
    rb_effect_spring_target_vector( &localplayer.rb, fwd_nplane, dir_nplane,
                                     1000.0f,
                                     k_grind_dampener,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
    vg_line_arrow( localplayer.rb.co, fwd_nplane, 0.8f, VG__RED );
    vg_line_arrow( localplayer.rb.co, dir_nplane, 0.8f, VG__RED );
 
@@ -1866,7 +1867,7 @@ static void skate_5050_apply( struct grind_info *inf_front,
    v3_sub( inf_back->co,  pos_back, delta_back );
    v3_add( delta_front, delta_back, delta_total );
 
-   v3_muladds( localplayer.rb.v, delta_total, 50.0f * k_rb_delta, 
+   v3_muladds( localplayer.rb.v, delta_total, 50.0f * vg.time_fixed_delta, 
                localplayer.rb.v );
 
    /* Fake contact */
@@ -1995,12 +1996,12 @@ static void skate_boardslide_apply( struct grind_info *inf ){
    rb_effect_spring_target_vector( &localplayer.rb, localplayer.rb.to_world[0],
                                     dir, 
                                     k_grind_spring, k_grind_dampener,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
 
    rb_effect_spring_target_vector( &localplayer.rb, localplayer.rb.to_world[2],
                                     perp,
                                     k_grind_spring, k_grind_dampener,
-                                    k_rb_delta );
+                                    vg.time_fixed_delta );
 
    vg_line_arrow( localplayer.rb.co, dir, 0.5f, VG__GREEN );
    vg_line_arrow( localplayer.rb.co, perp, 0.5f, VG__BLUE );
@@ -2268,7 +2269,7 @@ static void player__skate_update(void){
       float vy = vg_maxf( 0.0f, localplayer.rb.v[1] );
       slap = vg_clampf( (min_dist/0.5f) + vy, 0.0f, 1.0f )*0.3f;
    }
-   state->slap = vg_lerpf( state->slap, slap, 10.0f*k_rb_delta );
+   state->slap = vg_lerpf( state->slap, slap, 10.0f*vg.time_fixed_delta );
 
    wheels[0].pos[1] = state->slap;
    wheels[1].pos[1] = state->slap;
@@ -2276,7 +2277,7 @@ static void player__skate_update(void){
 
    const int k_wheel_count = 2;
 
-   player_skate.substep = k_rb_delta;
+   player_skate.substep = vg.time_fixed_delta;
    player_skate.substep_delta = player_skate.substep;
    player_skate.limit_count = 0;
 
@@ -2381,7 +2382,7 @@ grinding:;
    ent_tornado_debug();
    v3f a;
    ent_tornado_forces( localplayer.rb.co, localplayer.rb.v, a );
-   v3_muladds( localplayer.rb.v, a, k_rb_delta, localplayer.rb.v );
+   v3_muladds( localplayer.rb.v, a, vg.time_fixed_delta, localplayer.rb.v );
 
 begin_collision:;
 
@@ -2446,7 +2447,7 @@ begin_collision:;
 
    /* clamp to a fraction of delta, to prevent locking */
    float rate_lock = substep_count;
-   rate_lock *= k_rb_delta * 0.1f;
+   rate_lock *= vg.time_fixed_delta * 0.1f;
    rate_lock *= rate_lock;
 
    max_time = vg_maxf( max_time, rate_lock );
@@ -3037,7 +3038,7 @@ static void player__skate_animate(void){
    if( (state->activity <= k_skate_activity_air_to_grind) &&
        (fabsf(state->flip_rate) > 0.01f) ){
       float substep = vg.time_fixed_extrapolate;
-      float t     = state->flip_time+state->flip_rate*substep*k_rb_delta;
+      float t  = state->flip_time+state->flip_rate*substep*vg.time_fixed_delta;
             sign  = vg_signf( t );
 
       t  = 1.0f - vg_minf( 1.0f, fabsf( t * 1.1f ) );
@@ -3364,7 +3365,7 @@ static void player__skate_pose( void *_animator, player_pose *pose ){
          *kf_hand_r  = &pose->keyframes[localplayer.id_ik_hand_r-1],
          *kf_hip     = &pose->keyframes[localplayer.id_hip-1];
 
-      float warble = perlin1d( vg.time, 2.0f, 2, 300 );
+      float warble = vg_perlin_fract_1d( vg.time, 2.0f, 2, 300 );
             warble *= vg_maxf(animator->grind, fabsf(animator->weight)) * 0.3f;
 
       v4f qrot;

diff --git a/player_walk.c b/player_walk.c
index 560d61a69a32fec28bf85268523f01e8825e1323..d673584db88b691c0917bd64e576ad09f2a5ff4d 100644 (file)
--- a/player_walk.c
+++ b/player_walk.c
@@ -370,7 +370,7 @@ static void player_accelerate( v3f v, v3f movedir, f32 speed, f32 accel ){
    if( addspeed <= 0 )
       return;
 
-   float accelspeed = accel * k_rb_delta * speed;
+   float accelspeed = accel * vg.time_fixed_delta * speed;
 
    if( accelspeed > addspeed )
       accelspeed = addspeed;
@@ -386,7 +386,7 @@ static void player_friction( v3f v, f32 friction ){
    if( speed < 0.04f )
       return;
 
-   drop += control * friction * k_rb_delta;
+   drop += control * friction * vg.time_fixed_delta;
 
    float newspeed = vg_maxf( 0.0f, speed - drop );
    newspeed /= speed;
@@ -505,7 +505,7 @@ static void player_walk_update_generic(void){
             w->surface = surf->info.surface_prop;
       }
 
-      rb_prepare_contact( ct, k_rb_delta );
+      rb_prepare_contact( ct, vg.time_fixed_delta );
    }
 
    /* 
@@ -600,7 +600,7 @@ static void player_walk_update_generic(void){
 
             float d = -v3_dot(n,localplayer.rb.v);
             v3_muladds( localplayer.rb.v, n, d, localplayer.rb.v );
-            localplayer.rb.v[1] += -k_gravity * k_rb_delta;
+            localplayer.rb.v[1] += -k_gravity * vg.time_fixed_delta;
          }
       }
    }
@@ -614,7 +614,7 @@ static void player_walk_update_generic(void){
 
    /* integrate */
    if( w->state.activity == k_walk_activity_air ){
-      localplayer.rb.v[1] += -k_gravity*k_rb_delta;
+      localplayer.rb.v[1] += -k_gravity*vg.time_fixed_delta;
    }
 
    if( localplayer.immobile ){
@@ -622,7 +622,7 @@ static void player_walk_update_generic(void){
       localplayer.rb.v[2] = 0.0f;
    }
 
-   v3_muladds( localplayer.rb.co, localplayer.rb.v, k_rb_delta, 
+   v3_muladds( localplayer.rb.co, localplayer.rb.v, vg.time_fixed_delta, 
                localplayer.rb.co );
    v3_add( localplayer.rb.co, (v3f){0,1,0}, mtx[3] );
    vg_line_capsule( mtx, w->collider.r, w->collider.h, VG__GREEN );
@@ -691,7 +691,7 @@ static void player__walk_post_update(void){
    v3_add( localplayer.rb.co, (v3f){0,1,0}, mtx[3] );
 
    float substep = vg.time_fixed_extrapolate;
-   v3_muladds( mtx[3], localplayer.rb.v, k_rb_delta*substep, mtx[3] );
+   v3_muladds( mtx[3], localplayer.rb.v, vg.time_fixed_delta*substep, mtx[3] );
    vg_line_capsule( mtx, w->collider.r, w->collider.h, VG__YELOW );
 
    /* Calculate header */

diff --git a/render.h b/render.h
index 22c05726ddd0222a7b567e6b47c1c87ddea18540..a10422874caa3ee8d80fc4a84a36c6a8a4de5c69 100644 (file)
--- a/render.h
+++ b/render.h
@@ -582,8 +582,6 @@ static void async_render_init( void *payload, u32 size )
       0.00f,ih, 1.00f,ih,    1.00f,ih+rh,
    };
 
-   vg_console_reg_cmd( "fb", render_framebuffer_control, 
-                             render_framebuffer_poll );
    glGenVertexArrays( 1, &gpipeline.fsquad.vao );
    glGenBuffers( 1, &gpipeline.fsquad.vbo );
    glBindVertexArray( gpipeline.fsquad.vao );
@@ -611,6 +609,8 @@ static void render_init(void)
    vg_console_reg_var( "blur_effect", &k_blur_effect, 
                         k_var_dtype_i32, VG_VAR_PERSISTENT );
 
+   vg_console_reg_cmd( "fb", render_framebuffer_control, 
+                             render_framebuffer_poll );
 
    shader_blit_register();
    shader_blitblur_register();

diff --git a/save.c b/save.c
index 88dfada37adfea272434b22bd19f8e6f5091346d..1009e61285e8cc1367a55e4d4ac09e849a85fa1a 100644 (file)
--- a/save.c
+++ b/save.c
@@ -5,6 +5,7 @@
 #include "addon.h"
 #include "vg/vg_msg.h"
 #include "vg/vg_log.h"
+#include "vg/vg_loader.h"
 #include "world.h"
 
 static void savedata_file_write( savedata_file *file ){
@@ -41,7 +42,7 @@ static void savedata_file_read( savedata_file *file ){
 static void skaterift_write_addon_alias( vg_msg *msg, const char *key,
                                          addon_alias *alias ){
    if( alias->workshop_id ) 
-      vg_msg_wkvu64( msg, key, alias->workshop_id );
+      vg_msg_wkvnum( msg, key, k_vg_msg_u64, 1, &alias->workshop_id );
    else
       vg_msg_wkvstr( msg, key, alias->foldername );
 }
@@ -112,7 +113,7 @@ static void skaterift_populate_main_savedata( savedata_file *file ){
 
    vg_msg sav;
    vg_msg_init( &sav, file->buf, sizeof(file->buf) );
-   vg_msg_wkvu32( &sav, "ach", skaterift.achievements );
+   vg_msg_wkvnum( &sav, "ach", k_vg_msg_u32, 1, &skaterift.achievements );
 
    vg_msg_frame( &sav, "player" );
    {

diff --git a/save.h b/save.h
index 4074b89fd1650613b0580a10ffab14b8df0dd40d..4424bd3446204baa2079d2439b6cd252c3673fce 100644 (file)
--- a/save.h
+++ b/save.h
@@ -1,7 +1,7 @@
 #ifndef SAVE_H
 #define SAVE_H
 
-#include "vg/vg_stdint.h"
+#include "vg/vg_platform.h"
 
 static const char *str_skaterift_main_save = "save.bkv";
 static f64 skaterift_last_autosave = 0.0;

diff --git a/skaterift.c b/skaterift.c
index eec32d5b1725b38c96bf8423fb73c765f1bb4b1d..fee0039dc2c05dcea491e3c64f261f87521f058c 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -11,15 +11,8 @@
  * =============================================================================
  */
 
-#define SR_NETWORKED
-#define VG_AUDIO_FORCE_COMPRESSED
-#define SDL_MAIN_HANDLED
 #define SR_ALLOW_REWIND_HUB
 
-#ifndef VG_RELEASE
- #define VG_DEVWINDOW
-#endif
-
 /* 
  *     system headers
  * --------------------- */
@@ -28,6 +21,7 @@
 #include "steam.h"
 #include "render.h"
 #include "audio.h"
+#include "vg/vg_opt.h"
 
 #include "world.h"
 
@@ -71,7 +65,8 @@ int main( int argc, char *argv[] ){
    return 0;
 }
 
-static void vg_launch_opt(void){
+void vg_launch_opt(void)
+{
    const char *arg;
    if( vg_long_opt( "noauth" ) ){
       network_client.auth_mode = eServerModeNoAuthentication;
@@ -95,7 +90,8 @@ static void vg_launch_opt(void){
    }
 }
 
-static void vg_preload(void){
+void vg_preload(void)
+{
 vg_info(" Copyright  .        . .       -----, ,----- ,---.   .---.  \n" );
 vg_info(" 2021-2023  |\\      /| |           /  |      |    | |    /| \n" );
 vg_info("            | \\    / | +--        /   +----- +---'  |   / | \n" );
@@ -135,7 +131,10 @@ static void skaterift_restore_state(void){
 
    vg_msg kvsav;
    vg_msg_init( &kvsav, sav.buf, sizeof(sav.buf) );
-   skaterift.achievements |= vg_msg_getkvu32( &kvsav, "ach", 0 );
+
+   u32 ach;
+   vg_msg_getkvintg( &kvsav, "ach", k_vg_msg_u32, &ach );
+   skaterift.achievements |= ach;
 
    u32 board_reg_id = 0,
        player_reg_id = 0;
@@ -207,12 +206,15 @@ static void skaterift_load_player_content(void){
    player_board_load( &localplayer.fallback_board, "models/board_none.mdl" );
 }
 
-static void vg_load(void){
+void vg_load(void)
+{
    if( k_tools_mode ){
       vg_async_call( async_call_ready, NULL, 0 );
       return;
    }
 
+   vg_audio.always_keep_compressed = 1;
+
    vg_console_reg_cmd( "load_world", skaterift_load_world_command, NULL );
    vg_console_reg_cmd( "switch_active_instance", 
                         skaterift_switch_instance_cmd, NULL );
@@ -288,7 +290,8 @@ static void skaterift_change_client_world_preupdate(void);
  * UPDATE LOOP
  * ---------------------------------------------------------------------------*/
 
-static void vg_pre_update(void){
+void vg_pre_update(void)
+{
    skaterift_preupdate_inputs();
 
    if( k_tools_mode ) return;
@@ -325,7 +328,8 @@ static void vg_pre_update(void){
    world_map_pre_update();
 }
 
-static void vg_fixed_update(void){
+void vg_fixed_update(void)
+{
    if( k_tools_mode ) return;
    if( skaterift.op == k_async_op_clientloading ) return;
 
@@ -335,7 +339,8 @@ static void vg_fixed_update(void){
    testing_update();
 }
 
-static void vg_post_update(void){
+void vg_post_update(void)
+{
    if( k_tools_mode ) return;
    if( skaterift.op == k_async_op_clientloading ) return;
 
@@ -375,7 +380,7 @@ static void vg_post_update(void){
  * RENDERING
  * ---------------------------------------------------------------------------*/
 
-static void vg_framebuffer_resize( int w, int h ){
+void vg_framebuffer_resize( int w, int h ){
    render_fb_resize();
 }
 
@@ -652,7 +657,8 @@ static void render_main_game(void){
    skaterift_replay_post_render();
 }
 
-static void vg_render(void){
+void vg_render(void)
+{
    if( k_tools_mode ){
       glBindFramebuffer( GL_FRAMEBUFFER, 0 );
       glViewport( 0,0, vg.window_x, vg.window_y );
@@ -662,7 +668,7 @@ static void vg_render(void){
    }
 
    if( skaterift.op == k_async_op_clientloading ){
-      _vg_loader_render();
+      vg_loader_render();
       return;
    }
 
@@ -686,7 +692,8 @@ static void vg_render(void){
    gui_draw();
 }
 
-static void vg_gui(void){
+void vg_gui(void)
+{
    if( skaterift.op == k_async_op_clientloading ) return;
 
    if( k_tools_mode ){
@@ -701,17 +708,6 @@ static void vg_gui(void){
 
       ui_rect_pad( panel, (ui_px[2]){ 8, 8 } );
 
-      static i32 example;
-      ui_enum( panel, "example enum", vg_settings_vsync_enum, 3, &example );
-
-      static f32 val = 30.0f;
-      ui_slider( panel, "Slider", 0.0f, 100.0f, &val, NULL );
-
-      ui_dev_colourview();
-
-      static v4f colour = { 0.5f, 0.6f, 0.1f, 1.0f };
-      ui_colourpicker( panel, "hello", colour );
-
       return;
    }
 

diff --git a/skaterift.h b/skaterift.h
index ebab76734b6d909ca475dc5b4b1dce67b16f9379..92a59637dee3f987cc33bc4649b366fd8915a07a 100644 (file)
--- a/skaterift.h
+++ b/skaterift.h
@@ -3,12 +3,7 @@
 
 #define SKATERIFT_APPID 2103940
 
-#define VG_TIMESTEP_FIXED (1.0/60.0)
-#define VG_3D
-#define VG_GAME
-#define VG_MSG_V1_SUPPORT
-#define VG_LOG_SOURCE_INFO
-#include "vg/vg.h"
+#include "vg/vg_engine.h"
 #include "world.h"
 #include "addon.h"
 #include "trail.h"

diff --git a/steam.h b/steam.h
index dadcd90309e6ace26db0dc668d5f7c9b29fda0a1..977f77d47844fa9b2294158cc3e178f6334cfb86 100644 (file)
--- a/steam.h
+++ b/steam.h
@@ -1,12 +1,8 @@
 /*
- * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ * Copyright (C) 2021-2024 Mt.ZERO Software, Harry Godden - All Rights Reserved
  * All trademarks are property of their respective owners
  */
-
-#ifndef STEAM_H
-#define STEAM_H
-
-#define VG_GAME
+#pragma once
 #include "vg/vg_steam.h"
 #include "vg/vg_steam_utils.h"
 #include "vg/vg_steam_networking.h"
@@ -246,7 +242,6 @@ static u32 str_utf8_collapse( const char *str, char *buf, u32 length ){
 static int steam_init(void){
    const char *username = "offline player";
 
-#ifdef SR_NETWORKED
    vg_info( "Initializing steamworks\n" );
 
    if( !SteamAPI_Init() ){
@@ -287,8 +282,6 @@ static int steam_init(void){
 
    vg_console_reg_cmd( "ach", steam_achievement_ccmd, NULL );
 
-#endif
-
    /* TODO: On username update callback */
    str_utf8_collapse( username, steam_username_at_startup, 
                         vg_list_size(steam_username_at_startup) );
@@ -310,5 +303,3 @@ static void steam_end(void)
       SteamAPI_Shutdown();
    }
 }
-
-#endif /* STEAM_H */

diff --git a/testing.c b/testing.c
index 103f62cafeb106fb397ef7475763cc9cd8c0cbd5..a71806ccab935a1eba73743b41dce46ea0243455 100644 (file)
--- a/testing.c
+++ b/testing.c
@@ -1,6 +1,7 @@
 #pragma once
 #include "vg/vg_m.h"
 #include "vg/vg_rigidbody.h"
+#include "vg/vg_input.h"
 #include "scene_rigidbody.h"
 
 struct {
@@ -49,7 +50,8 @@ static void testing_update(void){
       buf[j].rbb = &_null;
    }
 
-   rb_presolve_contacts( rb_contact_buffer, rb_contact_count );
+   rb_presolve_contacts( rb_contact_buffer, 
+                         vg.time_fixed_delta, rb_contact_count );
 
    for( u32 i=0; i<8; i ++ )
       rb_solve_contacts( rb_contact_buffer, rb_contact_count );

diff --git a/vehicle.c b/vehicle.c
index 3555a971ed35c140e15a63f252d243d13e7a6620..0576963e1f59ff8f4bfd0c541c9a7e9f8813a2a6 100644 (file)
--- a/vehicle.c
+++ b/vehicle.c
@@ -2,6 +2,7 @@
 #define VEHICLE_C
 
 #include "vehicle.h"
+#include "scene_rigidbody.h"
 
 static int spawn_car( int argc, const char *argv[] ){
    v3f ra, rb, rx;
@@ -95,7 +96,7 @@ static void vehicle_wheel_force( int index ){
 
    if( t < 1.0f ){
       /* spring force */
-      float Fv = (1.0f-t) * k_car_spring*k_rb_delta;
+      float Fv = (1.0f-t) * k_car_spring*vg.time_fixed_delta;
       
       v3f delta;
       v3_sub( pa, gzoomer.rb.co, delta );
@@ -104,7 +105,8 @@ static void vehicle_wheel_force( int index ){
       v3_cross( gzoomer.rb.w, delta, rv );
       v3_add( gzoomer.rb.v, rv, rv );
 
-      Fv += v3_dot(rv, gzoomer.rb.to_world[1]) * -k_car_spring_damp*k_rb_delta;
+      Fv += v3_dot(rv, gzoomer.rb.to_world[1]) 
+               * -k_car_spring_damp*vg.time_fixed_delta;
 
       /* scale by normal incident */
       Fv *= v3_dot( n, gzoomer.rb.to_world[1] );
@@ -150,7 +152,8 @@ static void vehicle_wheel_force( int index ){
 
       /* apply drive force */
       if( index >= 2 ){
-         v3_muls( ty, -gzoomer.drive * k_car_drive_force * k_rb_delta, F );
+         v3_muls( ty, -gzoomer.drive * k_car_drive_force 
+                                     * vg.time_fixed_delta, F );
          rb_linear_impulse( &gzoomer.rb, raW, F );
       }
    }
@@ -211,8 +214,8 @@ static void vehicle_update_fixed(void)
    v3_muls( rb->to_world[1], -fabsf(v3_dot( rb->v, rb->to_world[2] )) *
                                  k_car_downforce, Fdown );
 
-   v3_muladds( rb->v, Fair,  k_rb_delta, rb->v );
-   v3_muladds( rb->v, Fdown, k_rb_delta, rb->v );
+   v3_muladds( rb->v, Fair,  vg.time_fixed_delta, rb->v );
+   v3_muladds( rb->v, Fdown, vg.time_fixed_delta, rb->v );
    
    for( int i=0; i<4; i++ )
       vehicle_wheel_force( i );
@@ -238,7 +241,7 @@ static void vehicle_update_fixed(void)
    }
    len = rb_manifold_apply_filtered( manifold, len );
 
-   rb_presolve_contacts( manifold, len );
+   rb_presolve_contacts( manifold, vg.time_fixed_delta, len );
    for( int i=0; i<8; i++ ){
       rb_solve_contacts( manifold, len );
       vehicle_solve_friction();

diff --git a/workshop.c b/workshop.c
index a48e1a16956299fc98456d58899110983cc27fe7..469eeea2260d40bca903f93cb0e1990187c6fc28 100644 (file)
--- a/workshop.c
+++ b/workshop.c
@@ -1,13 +1,9 @@
-#ifndef WORKSHOP_C
-#define WORKSHOP_C
-
 #include "workshop.h"
 
-#define VG_GAME
-#include "vg/vg.h"
 #include "vg/vg_tex.h"
 #include "vg/vg_msg.h"
 #include "vg/vg_binstr.h"
+#include "vg/vg_loader.h"
 #include "ent_skateshop.h"
 
 #include "vg/vg_steam_auth.h"
@@ -322,7 +318,8 @@ static void _workshop_form_submit_thread( void *data )
    vg_msg_frame( &descriptor, "workshop" );
       vg_msg_wkvstr( &descriptor, "title", workshop_form.submission.title );
       //vg_msg_wkvstr( &descriptor, "author", "unknown" );
-      vg_msg_wkvu32( &descriptor, "type", workshop_form.submission.type );
+      vg_msg_wkvnum( &descriptor, "type", k_vg_msg_u32, 1,
+                     &workshop_form.submission.type );
       vg_msg_wkvstr( &descriptor, "folder", workshop_form.addon_folder );
    vg_msg_end_frame( &descriptor );
    //vg_msg_wkvstr( &descriptor, "location", "USA" );
@@ -680,7 +677,8 @@ static void workshop_op_download_and_view_submission( int result_index )
          vg_msg_init( &msg, metadata_buf, len/2 );
          
          if( vg_msg_seekframe( &msg, "workshop" )){
-            u32 type = vg_msg_getkvu32( &msg, "type", 0 );
+            u32 type;
+            vg_msg_getkvintg( &msg, "type", k_vg_msg_u32, &type );
             workshop_form.submission.type = type;
             workshop_form.submission.submission_type_selection = type;
 
@@ -1539,5 +1537,3 @@ static void async_workshop_get_installed_files( void *data, u32 len )
 
    *info->len = j;
 }
-
-#endif /* WORKSHOP_C */

diff --git a/workshop.h b/workshop.h
index 7e08781ee9c93f5a78f20e09205d77a40d8af5af..42610d4e2322b9350906f15e17b40ac432371917 100644 (file)
--- a/workshop.h
+++ b/workshop.h
@@ -1,9 +1,5 @@
-#ifndef WORKSHOP_H
-#define WORKSHOP_H
-
-#define VG_GAME
+#pragma once
 #include "addon_types.h"
-#include "vg/vg.h"
 #include "vg/vg_steam_remote_storage.h"
 #include "skaterift.h"
 #include "vg/vg_steam_auth.h"
@@ -137,5 +133,3 @@ static void async_workshop_get_filepath( void *data, u32 len );
 static void async_workshop_get_installed_files( void *data, u32 len );
 static void workshop_load_metadata( const char *path,
                                        struct workshop_file_info *info );
-
-#endif /* WORKSHOP_H */

diff --git a/world.c b/world.c
index 5a97d944b5f0bb6c79899765a636bab0398b450e..9ff62bcb3df1b3471462542c21cda5ea53b82d51 100644 (file)
--- a/world.c
+++ b/world.c
@@ -7,6 +7,8 @@
 
 #include "world.h"
 #include "network.h"
+#include "vg/vg_loader.h"
+#include "vg/vg_mem.h"
 
 static world_instance *world_current_instance(void){
    return &world_static.instances[ world_static.active_instance ];
@@ -73,7 +75,9 @@ static int skaterift_switch_instance_cmd( int argc, const char *argv[] ){
 static void skaterift_world_get_save_path( enum world_purpose which, 
                                            char buf[128] ){
    addon_reg *reg = world_static.instance_addons[ which ];
-   assert( reg );
+
+   if( !reg )
+      vg_fatal_error( "Looking up addon for world without one\n" );
 
    char id[76];
    addon_alias_uid( &reg->alias, id );

diff --git a/world_entity.c b/world_entity.c
index 831e7eb674c4c728d0be1b01c17ccf0635370d25..957891d4f21e059acfdfbcd98e5a3722ae9ec630 100644 (file)
--- a/world_entity.c
+++ b/world_entity.c
@@ -320,7 +320,7 @@ static void ent_volume_call( world_instance *world, ent_call *call ){
       call->id = volume->target;
 
       if( volume->flags & k_ent_volume_flag_particles ){
-         assert(0);
+         vg_warn( "Invalid condition; calling leave on particle volume.\n" );
       }
       else{
          call->function = volume->trigger.event_leave;
@@ -661,7 +661,10 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){
       ent_challenge *challenge = mdl_arritm( &world->ent_challenge, i );
       const char *alias = mdl_pstr( &world->meta, challenge->pstr_alias );
 
-      if( vg_msg_getkvu32( sav, alias, 0 ) ){
+      u32 result;
+      vg_msg_getkvintg( sav, alias, k_vg_msg_u32, &result );
+
+      if( result ){
          ent_call call;
          call.data = NULL;
          call.function = 0;
@@ -678,9 +681,13 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){
          vg_msg route_info = routes_block;
          if( vg_msg_seekframe( &route_info, 
                                mdl_pstr(&world->meta,route->pstr_name) ) ){
-            route->flags |= vg_msg_getkvu32( &route_info, "flags", 0 );
-            route->best_laptime =
-               vg_msg_getkvf64( &route_info, "best_laptime", 0.0 );
+
+            u32 flags;
+            vg_msg_getkvintg( &route_info, "flags", k_vg_msg_u32, &flags );
+            route->flags |= flags;
+
+            vg_msg_getkvintg( &route_info, "best_laptime", k_vg_msg_f64,
+                              &route->best_laptime );
 
             f32 sections[ route->checkpoints_count ];
             vg_msg_cmd cmd;
@@ -731,7 +738,7 @@ static void world_entity_serialize( world_instance *world, vg_msg *sav ){
       ent_challenge *challenge = mdl_arritm(&world->ent_challenge,i);
 
       const char *alias = mdl_pstr(&world->meta,challenge->pstr_alias);
-      vg_msg_wkvu32( sav, alias, challenge->status );
+      vg_msg_wkvnum( sav, alias, k_vg_msg_u32, 1, &challenge->status );
    }
    
    if( mdl_arrcount(&world->ent_route) ){
@@ -741,8 +748,9 @@ static void world_entity_serialize( world_instance *world, vg_msg *sav ){
          
          vg_msg_frame( sav, mdl_pstr( &world->meta, route->pstr_name ) );
          {
-            vg_msg_wkvu32( sav, "flags", route->flags );
-            vg_msg_wkvf64( sav, "best_laptime", route->best_laptime );
+            vg_msg_wkvnum( sav, "flags", k_vg_msg_u32, 1, &route->flags );
+            vg_msg_wkvnum( sav, "best_laptime", 
+                           k_vg_msg_f64, 1, &route->best_laptime );
 
             f32 sections[ route->checkpoints_count ];
 

diff --git a/world_load.c b/world_load.c
index ece92972c080625f6390e4252640363355572921..aaf689fa5e1a533dddfac8af5d9a789a027840a2 100644 (file)
--- a/world_load.c
+++ b/world_load.c
@@ -10,6 +10,7 @@
 #include "vg/vg_msg.h"
 #include "network.h"
 #include "player_remote.h"
+#include "vg/vg_loader.h"
 
 /* 
  * load the .mdl file located in path as a world instance
@@ -173,7 +174,8 @@ static void skaterift_world_load_done( void *payload, u32 size ){
    if( data->purpose != k_world_purpose_hub ){
       vg_msg player_frame = sav;
       if( vg_msg_seekframe( &player_frame, "player" ) ){
-         vg_msg_getkvv3f( &player_frame, "position", world->player_co, NULL );
+         vg_msg_getkvvecf( &player_frame, "position", k_vg_msg_v3f, 
+                           world->player_co, NULL );
       }
    }
 
@@ -204,7 +206,6 @@ static void skaterift_world_load_thread( void *_args ){
    vg_str path;
    vg_strnull( &path, path_buf, 4096 );
 
-   assert( reg );
    addon_get_content_folder( reg, &path, 1 );
 
    vg_str folder = path;

diff --git a/world_render.c b/world_render.c
index 2355e20bf204bd942870515167bbe75d2366e502..c82bc47c90d8f98fc00d1313f66da3d19bcc8169 100644 (file)
--- a/world_render.c
+++ b/world_render.c
@@ -780,7 +780,7 @@ static void render_sky( world_instance *world, camera *cam ){
       glBindTexture( GL_TEXTURE_2D, world_render.tex_terrain_noise );
    }
    else {
-      assert(0);
+      vg_fatal_error( "Programming error\n" );
    }
 
    glDepthMask( GL_FALSE );

diff --git a/world_routes.c b/world_routes.c
index 105e5467726d7d9c4b798f255bb48eb02dd80ddd..4ee50d8cb42539e32c4792818ff31065cd0685fb 100644 (file)
--- a/world_routes.c
+++ b/world_routes.c
@@ -699,7 +699,8 @@ static void world_routes_fixedupdate( world_instance *world ){
       }
    }
 
-   rb_presolve_contacts( rb_contact_buffer, rb_contact_count );
+   rb_presolve_contacts( rb_contact_buffer, 
+                         vg.time_fixed_delta, rb_contact_count );
 
    for( int i=0; i<rb_contact_count; i++ ){
       rb_contact_restitution( rb_contact_buffer+i, vg_randf64(&vg.rand) );

diff --git a/world_sfd.c b/world_sfd.c
index b247ba6e778f5f173627704e38427b4f153c4eb9..fbe07d36d1230319c3e0671d6c2df9a6d4619b53 100644 (file)
--- a/world_sfd.c
+++ b/world_sfd.c
@@ -142,8 +142,11 @@ static void world_sfd_compile_scores( struct leaderboard_cache *board,
 
          /* time */
          vg_strnull( &str, buf, 100 );
-         i32 centiseconds = vg_msg_getkvi32( &body, "time", 0 ),
-             seconds      = centiseconds / 100,
+         
+         u32 centiseconds;
+         vg_msg_getkvintg( &body, "time", k_vg_msg_i32, &centiseconds );
+
+         i32 seconds      = centiseconds / 100,
              minutes      = seconds / 60;
 
          centiseconds %= 100;