better? grinds

[carveJwlIkooP6JGAAIwe30JlM.git] / skaterift.c

diff --git a/skaterift.c b/skaterift.c
index 3923ca0140e29d032ba6d183b25acc208e04ef93..1851a73af538d7b23cbcbc57a2bc15e1434e2995 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -22,19 +22,26 @@
 #if 0
 #include "player.h"
 #else
+
+#include "player.h"
+VG_STATIC player_instance localplayer;
+
+#if 0
+
 #include "player_interface.h"
 #include "player_device_walk.h"
 #include "player_device_skate.h"
 #include "player_device_dead.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_device_dead localplayer_dead;
+#endif
+
 VG_STATIC struct player_avatar localplayer_avatar;
 VG_STATIC glmesh localplayer_meshes[3];
+vg_tex2d localplayer_texture = { .path = "textures/ch_gradient.qoi" };
 
 #endif
 
@@ -52,7 +59,7 @@ static int cl_ui      = 1,
 int main( int argc, char *argv[] )
 {
    vg_mem.use_libc_malloc = 0;
-   vg_set_mem_quota( 128*1024*1024 );
+   vg_set_mem_quota( 160*1024*1024 );
    vg_enter( argc, argv, "Voyager Game Engine" ); 
 
    return 0;
@@ -70,7 +77,9 @@ VG_STATIC void vg_launch_opt(void)
 
 VG_STATIC int __kill( int argc, const char *argv[] )
 {
+#if 0
    player_use_device( &localplayer, &player_device_dead, &localplayer_dead );
+#endif
    return 0;
 }
 
@@ -122,7 +131,7 @@ VG_STATIC int __respawn( int argc, const char *argv[] )
       rp = &world.spawns[0];
    }
 
-   player_spawn( &localplayer, rp );
+   player__spawn( &localplayer, rp );
    return 1;
 }
 
@@ -226,7 +235,7 @@ VG_STATIC void load_playermodels(void)
    shader_viewchar_register();
    vg_acquire_thread_sync();
    {
-      vg_tex2d_init( (vg_tex2d *[]){ &tex_characters }, 1 );
+      vg_tex2d_init( (vg_tex2d *[]){ &localplayer_texture }, 1 );
    }
    vg_release_thread_sync();
 }
@@ -245,13 +254,12 @@ VG_STATIC void vg_load(void)
    vg_loader_step( load_playermodels, NULL );
   
    /* player setup */
-   player_interface_create_player( &localplayer );
-   
+   player__create( &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 );
+   player__use_avatar( &localplayer, &localplayer_avatar );
+   player__use_mesh( &localplayer, &localplayer_meshes[0] );
+   player__use_texture( &localplayer, &localplayer_texture );
+   player__bind( &localplayer );
 
    /* --------------------- */
 
@@ -292,7 +300,7 @@ VG_STATIC void vg_update(void)
          player_update_pre();
 #endif
 
-      player_pre_update( &localplayer );
+      player__pre_update( &localplayer );
       world_update( localplayer.rb.co );
    }
 }
@@ -308,7 +316,7 @@ VG_STATIC void vg_update_fixed(void)
       vehicle_update_fixed();
 #endif
 
-      player_update( &localplayer );
+      player__update( &localplayer );
    }
 }
 
@@ -327,7 +335,7 @@ VG_STATIC void vg_update_post(void)
       }
 #endif
 
-      player_post_update( &localplayer );
+      player__post_update( &localplayer );
 
 #if 0
       menu_update();
@@ -398,7 +406,7 @@ VG_STATIC void render_player_transparent(void)
 
    /* Draw player to window buffer and blend background ontop */
    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
-   player_render( &small_cam, &localplayer );
+   player__render( &small_cam, &localplayer );
 }
 
 VG_STATIC void render_scene(void)
@@ -417,7 +425,7 @@ VG_STATIC void render_scene(void)
        player_draw        = 1;
 
    if( !player_transparent && player_draw )
-      player_render( &main_camera, &localplayer );
+      player__render( &main_camera, &localplayer );
 
    render_water_texture( &main_camera );
    render_fb_bind( gpipeline.fb_main );
@@ -457,7 +465,7 @@ VG_STATIC void render_main_game(void)
     * TODO: blend with camera from menu */
 
    /* FIXME: TEMP!! */
-   player_pre_render( &localplayer );
+   player__pre_render( &localplayer );
 
    v3_copy( localplayer.cam.pos, main_camera.pos );
    v3_copy( localplayer.cam.angles, main_camera.angles );
@@ -508,7 +516,7 @@ VG_STATIC void vg_render(void)
 VG_STATIC void run_light_widget( struct light_widget *lw );
 VG_STATIC void vg_ui(void)
 {
-   player_ui( &localplayer );
+   player__im_gui( &localplayer );
 
 #if 0
    menu_crap_ui();