X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=fedaa3d8728b6b17dbf563784744c2d57c175e0f;hb=1f7014d965883820f984877b8ca15c1e439cf9cf;hp=6246be38d722a9b4651cdbddc578bdb1195713e4;hpb=926a64f679a23d8b0f3594d73405d2486c398a59;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 6246be3..fedaa3d 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -11,6 +11,8 @@
  * =============================================================================
  */
 
+#if 1
+
 #define SR_NETWORKED
 #define VG_DEVWINDOW
 #include "common.h"
@@ -22,9 +24,11 @@
 #include "font.h"
 #include "player.h"
 
+#include "entity.c"
+#include "workshop.c"
+
 VG_STATIC struct player_avatar localplayer_avatar;
 VG_STATIC struct player_model  localplayer_models[3];
-VG_STATIC struct player_board  localplayer_boards[1];
 VG_STATIC int skaterift_status = 0;
 
 #include "network.h"
@@ -93,11 +97,16 @@ VG_STATIC void load_playermodels(void)
    player_model_load( &localplayer_models[1], "models/ch_outlaw.mdl" );
    player_model_load( &localplayer_models[2], "models/ch_jordan.mdl" );
    
-   player_board_load( &localplayer_boards[0], "models/board_fish.mdl" );
+   /* load default board */
+#if 0
+   player_board_load( &localplayer_boards[0], 
+                      "models/boards/skaterift_fish.mdl" );
+#endif
 
    /* FIXME: hack */
    shader_model_character_view_register();
    shader_model_board_view_register();
+   shader_model_entity_register();
 }
 
 void temp_update_playermodel(void){
@@ -124,6 +133,8 @@ VG_STATIC void vg_load(void)
 
    vg_loader_step( player_init, NULL );
    vg_loader_step( player_ragdoll_init, NULL );
+   vg_loader_step( workshop_init, NULL );
+   vg_loader_step( skateshop_init, NULL );
    
    /* ----------------- */
    vg_loader_step( load_playermodels, NULL );
@@ -133,7 +144,7 @@ VG_STATIC void vg_load(void)
    player_avatar_load( &localplayer_avatar, "models/ch_new.mdl" );
    player__use_avatar( &localplayer, &localplayer_avatar );
    player__use_model( &localplayer, &localplayer_models[cl_playermdl_id] );
-   player__use_board( &localplayer, &localplayer_boards[0] );
+   //localplayer.board = &localplayer_boards[0];
    player__bind( &localplayer );
 
    /* --------------------- */
@@ -174,14 +185,18 @@ VG_STATIC void vg_update(void)
 {
    steam_update();
 
+   skaterift_preupdate_inputs();
+
    if( skaterift_status == 1 ){
       draw_origin_axis();
       network_update();
       
       player__pre_update( &localplayer );
+      global_skateshop_preupdate();
 
       world_update( get_active_world(), localplayer.rb.co );
       audio_ambient_sprites_update( get_active_world(), localplayer.rb.co );
+      //gui_helper_action( localplayer.input_use, "\x7f Hello \x1f""A \x1e\x84" );
    }
 }
 
@@ -392,6 +407,7 @@ VG_STATIC void render_main_game(void)
 
    main_camera.fov = vg_lerpf( localplayer.cam.fov, menu_smooth_fov,
                                menu_opacity );
+
    main_camera.nearz = 0.1f;
    main_camera.farz  = 2100.0f;
 
@@ -455,9 +471,10 @@ VG_STATIC void vg_render(void)
    glDisable(GL_DEPTH_TEST);
    vg_lines_drawall();
    glViewport( 0,0, vg.window_x, vg.window_y );
+   gui_draw();
 }
 
-VG_STATIC void vg_ui(void)
+VG_STATIC void vg_gui(void)
 {
    if( skaterift_status == 0 ){
       return;
@@ -468,6 +485,14 @@ VG_STATIC void vg_ui(void)
 #endif
    world_instance *world = get_active_world();
    menu_crap_ui();
+
+   workshop_form_gui();
    
    render_view_framebuffer_ui();
 }
+
+#else
+
+#include "skaterift_imgui_dev.c"
+
+#endif