a mess but stable

[carveJwlIkooP6JGAAIwe30JlM.git] / player_common.c

diff --git a/player_common.c b/player_common.c
index e1961b91a984cf0f9cc096d3895d6cc17f0b141b..1ecbae9a8eefa08ee7ae49d3cf602ae78ffb5041 100644 (file)
--- a/player_common.c
+++ b/player_common.c
@@ -68,7 +68,7 @@ void player__cam_iterate(void)
    if( localplayer.subsystem == k_player_subsystem_walk ){
       v3_copy( (v3f){-0.1f,1.8f,0.0f}, cc->fpv_viewpoint );
       v3_copy( (v3f){0.0f,0.0f,0.0f}, cc->fpv_offset );
-      v3_copy( (v3f){0.0f,1.4f,0.0f}, cc->tpv_offset );
+      v3_copy( (v3f){0.0f,1.8f,0.0f}, cc->tpv_offset );
    }
    else if( localplayer.subsystem == k_player_subsystem_glide ){
       v3_copy( (v3f){-0.15f,1.75f,0.0f}, cc->fpv_viewpoint );
@@ -224,6 +224,18 @@ void player__cam_iterate(void)
 
    v3_add( tpv_origin, tpv_offset, tpv_pos );
 
+#if 0
+   if( localplayer.subsystem == k_player_subsystem_walk )
+   {
+      v3f fwd, right;
+      v3_angles_vector( localplayer.angles, fwd );
+      v3_cross( fwd, (v3f){0,1.001f,0}, right );
+      right[1] = 0.0f;
+      v3_normalize( right );
+      v3_muladds( tpv_pos, right, 0.5f, tpv_pos );
+   }
+#endif
+
    /* 
     * Blend cameras 
     */
@@ -257,7 +269,7 @@ void player__cam_iterate(void)
 
 void player_look( v3f angles, float speed )
 {
-   if( vg_ui.wants_mouse ) return;
+   if( vg_ui.ctx.wants_mouse ) return;
 
    angles[2] = 0.0f;