point maps (wip)

[carveJwlIkooP6JGAAIwe30JlM.git] / player.h

diff --git a/player.h b/player.h
index 38e01ad2865bf73d72b12e64e43c433b007ef3e8..0911e8fc03380d776d84bd27e0d4759b30080476 100644 (file)
--- a/player.h
+++ b/player.h
@@ -1,8 +1,9 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "player_api.h"
-
+#include "player_ragdoll.h"
+#include "player_render.h"
+#include "player_model.h"
 #include "player_common.h"
 #include "player_walk.h"
 #include "player_skate.h"
@@ -45,7 +46,8 @@ struct player_instance
        cam_velocity_smooth;
 
    v3f cam_override_pos;
-   v2f cam_override_angles;
+   v3f cam_override_angles;
+   float cam_override_fov;
    float cam_override_strength;
 
    float cam_velocity_influence,
@@ -59,26 +61,7 @@ struct player_instance
 
    ent_gate *gate_waiting;
 
-   /*
-    * Input 
-    * --------------------------------
-    */
-   struct input_binding *input_js1h,
-                        *input_js1v,
-                        *input_js2h,
-                        *input_js2v,
-                        *input_jump,
-                        *input_push,
-                        *input_trick0,
-                        *input_trick1,
-                        *input_trick2,
-                        *input_walk,
-                        *input_walkh,
-                        *input_walkv,
-                        *input_use,
-                        *input_reset,
-                        *input_grab,
-                        *input_camera;
+   int immobile;
 
    /*
     * Animation
@@ -86,9 +69,10 @@ struct player_instance
     */
 
    struct player_avatar  *playeravatar;
-   glmesh                *playermesh;
+   struct player_model   *playermodel;
    struct player_ragdoll  ragdoll;
-   vg_tex2d              *playertex;
+   //struct player_board   *board;
+   struct cache_board  *board_view_slot;
 
    player_pose            holdout_pose;
    float                  holdout_time;
@@ -130,7 +114,8 @@ struct player_instance
    struct player_walk   _walk;
    struct player_dead   _dead;
    struct player_drive  _drive;
-};
+}
+static localplayer;
 
 /*
  * Gameloop tables
@@ -227,13 +212,21 @@ void( *_player_restore[] )( player_instance *player ) =
    NULL
 };
 
-VG_STATIC void player_init(void)
-{
-   for( u32 i=0; i<vg_list_size(_player_system_register); i++ ){
-      if( _player_system_register[i] )
-         _player_system_register[i]();
-   }
-}
+PLAYER_API void player__debugtext( int size, const char *fmt, ... );
+PLAYER_API void player__create( player_instance *inst );
+PLAYER_API void player__use_avatar( player_instance *player, 
+                                    struct player_avatar *av );
+PLAYER_API void player__use_mesh( player_instance *player, glmesh *mesh );
+PLAYER_API void player__use_texture( player_instance *player, vg_tex2d *tex );
+PLAYER_API void player__bind( player_instance *player );
+PLAYER_API void player__pre_update( player_instance *player );
+PLAYER_API void player__update( player_instance *player );
+PLAYER_API void player__post_update( player_instance *player );
+
+PLAYER_API void player__pass_gate( player_instance *player, ent_gate *gate );
+PLAYER_API void player__im_gui( player_instance *player );
+PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp );
+PLAYER_API void player__kill( player_instance *player );
 
 /* implementation */
 
@@ -243,5 +236,7 @@ VG_STATIC void player_init(void)
 #include "player_skate.c"
 #include "player_dead.c"
 #include "player_drive.c"
+#include "player_render.c"
+#include "player_ragdoll.c"
 
 #endif /* PLAYER_H */