review: player_common.h

diff --git a/player.h b/player.h
index ec24b865a130c314a085a9bf1875ed18ce705f47..e5f3dc741ccf135863886de97074edc06b535d6c 100644 (file)
--- a/player.h
+++ b/player.h
@@ -41,6 +41,7 @@ struct player_instance{
 
    v3f fpv_offset,         /* expressed relative to rigidbody */
        tpv_offset,
+       tpv_offset_extra,
        fpv_viewpoint,      /* expressed relative to neck bone inverse final */
        fpv_offset_smooth,
        fpv_viewpoint_smooth,

diff --git a/player_common.c b/player_common.c
index cb83d532598fcf37fd342ea44ba0fe218e9554fa..5e1c88dba56a1fb2654dadc0152659f7b35877f3 100644 (file)
--- a/player_common.c
+++ b/player_common.c
@@ -75,7 +75,8 @@ VG_STATIC void player__cam_iterate( player_instance *player )
 #endif
       v3_copy( (v3f){0.0f,0.0f,0.0f}, player->fpv_offset );
       v3_copy( (v3f){0.0f,1.4f,0.0f}, player->tpv_offset );
-      v3_add( TEMP_TPV_EXTRA, player->tpv_offset, player->tpv_offset );
+      v3_add( player->tpv_offset_extra, player->tpv_offset, 
+              player->tpv_offset );
    }
 
    player->cam_velocity_constant = 0.25f;

diff --git a/player_common.h b/player_common.h
index 1b6ec71641950a08f2703ddb9346e08d968209ae..a83e39a10b5d3a605c8090857a2cdeb30e60bbb7 100644 (file)
--- a/player_common.h
+++ b/player_common.h
@@ -3,7 +3,6 @@
 
 #include "player_api.h"
 
-static v3f TEMP_TPV_EXTRA; /* TODO: what? */
 static float
    k_cam_spring            =  20.0f,
    k_cam_damp              =  6.7f,

diff --git a/player_skate.c b/player_skate.c
index 8598f20d7a1c85943b028529c58f2ba37afec053..2c38f7e1028ca2a056c9be671edf6fbebd8a9eba 100644 (file)
--- a/player_skate.c
+++ b/player_skate.c
@@ -2714,7 +2714,7 @@ VG_STATIC void player__skate_animate( player_instance *player,
    offset[0]=vg_clampf(offset[0],-0.8f,0.8f)*(1.0f-fabsf(s->blend_slide)*0.9f);
    offset[1]=vg_clampf(offset[1],-0.5f,0.0f);
 
-   v3_muls( offset, 0.3f, TEMP_TPV_EXTRA );
+   v3_muls( offset, 0.3f, player->tpv_offset_extra );
 
    /* 
     * Animation blending