X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=build.c;h=154c4744f306b402c3bf54d2f2f00e7bda5f6874;hb=ca35eceae3abfcfb9ba266d6ea8e664bc06b0a3e;hp=6d3b521a8a6a92f6003b51dfc0c5b2d226a878c0;hpb=6afe1eb8c0283fdf65aaf117db8c33689c21552d;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/build.c b/build.c
index 6d3b521..154c474 100644
--- a/build.c
+++ b/build.c
@@ -5,7 +5,7 @@
 #include "vg/vg_build.h"
 #include "vg/vg_build_utils_shader.h"
 #include "vg/vg_msg.h"
-#include "workshop_types.h"
+#include "addon_types.h"
 
 /* 
  * c build.c --release --clang 
@@ -30,6 +30,33 @@ void build_server( enum compiler compiler )
    compiled_something = 1;
 }
 
+void write_msg( vg_msg *msg, const char *path ){
+   FILE *fp = fopen( path, "wb" );
+   if( !fp ){
+      vg_error( "Cannot open %s for writing.\n", path );
+      exit(0);
+   }
+
+   fwrite( msg->buf, msg->cur, 1, fp );
+   fclose( fp );
+   vg_success( "Written %s (%ub)\n", path, msg->cur );
+}
+
+void write_generic_addon_inf( u32 type, const char *title,
+                              const char *content, const char *dest ){
+   u8 descriptor_buf[ 512 ];
+   vg_msg descriptor = {0};
+   descriptor.buf = descriptor_buf;
+   descriptor.max = sizeof(descriptor_buf);
+   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_end_frame( &descriptor );
+   vg_msg_wkvstr( &descriptor, "content", content );
+   write_msg( &descriptor, dest );
+}
+
 void build_shaders(void);
 void build_game( enum compiler compiler )
 {
@@ -52,49 +79,52 @@ void build_game( enum compiler compiler )
    vg_build_symbolic_link( "boards_src", "boards" );
    vg_build_symbolic_link( "maps_src", "maps" );
    vg_build_symbolic_link( "sound_src", "sound" );
+   vg_build_symbolic_link( "playermodels_src", "playermodels" );
    vg_build_syscall( "mkdir -p %s/cfg", vg_compiler.build_dir );
 
-   u8 descriptor_buf[ 512 ];
-   vg_msg descriptor;
-   vg_msg_init( &descriptor, descriptor_buf, 512 );
-   vg_msg_frame( &descriptor, "workshop" );
-      vg_msg_wkvstr( &descriptor, "title", "Understate DIY Park" );
-      vg_msg_wkvstr( &descriptor, "author", "Skaterift" );
-      vg_msg_wkvuint(&descriptor, "type", u32 value=k_workshop_file_type_world);
-   vg_msg_end_frame( &descriptor );
-   vg_msg_wkvstr( &descriptor, "location", "USA" );
-   vg_msg_wkvstr( &descriptor, "content", "main.mdl" );
-
-   if( descriptor.error == k_vg_msg_error_OK ){
-      FILE *fp = fopen( "maps_src/mp_spawn/addon.inf", "wb" );
-      fwrite( descriptor_buf, descriptor.cur, 1, fp );
-      fclose( fp );
-
-      vg_msg recvtest;
-      vg_msg_init( &recvtest, descriptor_buf, descriptor.cur );
-
-      vg_msg_cmd cmd;
-      while( vg_msg_next( &recvtest, &cmd ) ){
-         if( cmd.code == k_vg_msg_code_frame ){
-            vg_info( "FRAME: [%u]%s\n", cmd.key_djb2, cmd.key );
-         }
-         else if( cmd.code == k_vg_msg_code_endframe ){
-            vg_info( "ENDFRAME\n" );
-         }
-         else if( cmd.code == k_vg_msg_code_kvstring ){
-            vg_info( "KVSTR: [%u]%s: [%u]%s\n", cmd.key_djb2, cmd.key,
-                                                cmd.value_djb2, 
-                                                (const char *)cmd.value._buf );
-         }
-      }
-   }
+   vg_build_syscall( "mkdir -p %s/tools", vg_compiler.build_dir );
+   vg_build_syscall( "cp blender_export.py %s/tools/", vg_compiler.build_dir );
+
+   write_generic_addon_inf( k_addon_type_board, 
+                            "Longboard", "board.mdl", 
+                            "boards_src/skaterift_long/addon.inf");
+   write_generic_addon_inf( k_addon_type_board, 
+                            "Fractal", "board.mdl", 
+                            "boards_src/skaterift_fract/addon.inf");
+   write_generic_addon_inf( k_addon_type_board,
+                            "Striped", "board.mdl",
+                            "boards_src/skaterift_striped/addon.inf");
+   write_generic_addon_inf( k_addon_type_board,
+                            "Licco", "board.mdl",
+                            "boards_src/skaterift_licco/addon.inf");
+   write_generic_addon_inf( k_addon_type_board,
+                            "Hypno", "board.mdl",
+                            "boards_src/skaterift_spiral/addon.inf");
+   write_generic_addon_inf( k_addon_type_board,
+                            "Shark", "board.mdl",
+                            "boards_src/skaterift_shark/addon.inf");
+
+   write_generic_addon_inf( k_addon_type_player,
+                            "De'folde", "ch_new.mdl",
+                            "playermodels_src/skaterift_new/addon.inf" );
+   write_generic_addon_inf( k_addon_type_player,
+                            "Jordan", "ch_jordan.mdl",
+                            "playermodels_src/skaterift_jordan/addon.inf" );
+   write_generic_addon_inf( k_addon_type_player,
+                            "Outlaw", "ch_outlaw.mdl",
+                            "playermodels_src/skaterift_outlaw/addon.inf" );
+   write_generic_addon_inf( k_addon_type_player,
+                            "Chip", "ch_chip.mdl",
+                            "playermodels_src/skaterift_chip/addon.inf" );
+   write_generic_addon_inf( k_addon_type_player,
+                            "Aaron", "ch_aaron.mdl",
+                            "playermodels_src/skaterift_aaron/addon.inf" );
 
    vg_build();
    compiled_something = 1;
 }
 
-int main( int argc, char *argv[] )
-{
+int main( int argc, char *argv[] ){
    time_t uid = time(NULL);
 
    char *arg;
@@ -109,6 +139,9 @@ int main( int argc, char *argv[] )
       if( vg_long_opt( "clang-server" ) )
          build_server( k_compiler_clang );
 
+      if( vg_long_opt( "clean" ) )
+         vg_build_clean();
+
       if( vg_long_opt( "clang" ) )
          build_game( k_compiler_clang );
 
@@ -156,6 +189,7 @@ void build_shaders(void)
    /* Scene */
    _S( "scene_standard",            "scene.vs", "scene_standard.fs" );
    _S( "scene_standard_alphatest",  "scene.vs", "scene_standard_alphatest.fs" );
+   _S( "scene_fxglow",              "scene.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.vs", "scene_route.fs" );