X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_common.c;h=3711405226dc0bc4fa88a144fb1f7e73ce758474;hb=4b8fc63f926737ca0593a4e471550f9f4995c538;hp=21d52aa76871c6f978d10f3bda4334ae614e5671;hpb=8c376ed2e4021a18b0a6c6e800109d67ad09d198;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_common.c b/player_common.c
index 21d52aa..3711405 100644
--- a/player_common.c
+++ b/player_common.c
@@ -1,12 +1,11 @@
 #ifndef PLAYER_COMMON_C
 #define PLAYER_COMMON_C
 
+#include "ent_skateshop.h"
 #include "player.h"
-#include "conf.h"
-
-VG_STATIC float
-   k_cam_spring            = 20.0f,
-   k_cam_damp              = 6.7f;
+#include "input.h"
+#include "menu.h"
+#include "vg/vg_perlin.h"
 
 VG_STATIC void player_vector_angles( v3f angles, v3f v, float C, float k )
 {
@@ -41,12 +40,14 @@ VG_STATIC void player_camera_portal_correction( player_instance *player )
       q_mulv( player->gate_waiting->q[1], (v3f){0.0f,0.0f,1.0f}, plane );
       plane[3] = v3_dot( plane, player->gate_waiting->co[1] );
 
+      f32 pol = v3_dot( player->cam.pos, plane ) - plane[3];
+
       /* check camera polarity */
-      if( v3_dot( player->cam.pos, plane ) < plane[3] ) {
+      if( (pol < 0.0f) || (pol > 5.0f) ) {
          vg_success( "Plane cleared\n" );
          player_apply_transport_to_cam( player->gate_waiting->transport );
          player->gate_waiting = NULL;
-         player->viewable_world = get_active_world();
+         player->viewable_world = world_current_instance();
       }
       else{
          /* de-transform camera and player back */
@@ -60,25 +61,20 @@ VG_STATIC void player_camera_portal_correction( player_instance *player )
    }
 }
 
-static v3f TEMP_TPV_EXTRA;
-
-VG_STATIC void player__cam_iterate( player_instance *player )
-{
+VG_STATIC void player__cam_iterate( player_instance *player ){
    struct player_avatar *av = player->playeravatar;
+   struct player_cam_controller *cc = &player->cam_control;
 
    if( player->subsystem == k_player_subsystem_walk ){
-      v3_copy( (v3f){-0.1f,1.8f,0.0f}, player->fpv_viewpoint );
-      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_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 );
    }
    else{
-      v3_copy( (v3f){-0.15f,1.75f,0.0f}, player->fpv_viewpoint );
-#if 0
-      v3_copy( (v3f){-0.35f,0.0f,0.0f}, player->fpv_offset );
-#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_copy( (v3f){-0.15f,1.75f,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_add( cc->tpv_offset_extra, cc->tpv_offset, cc->tpv_offset );
    }
 
    player->cam_velocity_constant = 0.25f;
@@ -101,30 +97,30 @@ VG_STATIC void player__cam_iterate( player_instance *player )
          player->cam_velocity_constant,
          vg.time_frame_delta * 8.0f );
 
-   enum camera_mode target_mode = player->camera_mode;
+   enum camera_mode target_mode = cc->camera_mode;
 
    if( player->subsystem == k_player_subsystem_dead )
       target_mode = k_cam_thirdperson;
 
-   player->camera_type_blend = 
-      vg_lerpf( player->camera_type_blend, 
-                (target_mode == k_cam_firstperson)? 1.0f: 0.0f,
+   cc->camera_type_blend = 
+      vg_lerpf( cc->camera_type_blend, 
+               (target_mode == k_cam_firstperson)? 1.0f: 0.0f,
                 5.0f * vg.time_frame_delta );
 
-   v3_lerp( player->fpv_viewpoint_smooth, player->fpv_viewpoint,
-         vg.time_frame_delta * 8.0f, player->fpv_viewpoint_smooth );
+   v3_lerp( cc->fpv_viewpoint_smooth, cc->fpv_viewpoint,
+            vg.time_frame_delta * 8.0f, cc->fpv_viewpoint_smooth );
 
-   v3_lerp( player->fpv_offset_smooth, player->fpv_offset,
-         vg.time_frame_delta * 8.0f, player->fpv_offset_smooth );
+   v3_lerp( cc->fpv_offset_smooth, cc->fpv_offset,
+            vg.time_frame_delta * 8.0f, cc->fpv_offset_smooth );
 
-   v3_lerp( player->tpv_offset_smooth, player->tpv_offset,
-         vg.time_frame_delta * 8.0f, player->tpv_offset_smooth );
+   v3_lerp( cc->tpv_offset_smooth, cc->tpv_offset,
+            vg.time_frame_delta * 8.0f, cc->tpv_offset_smooth );
 
    /* fov -- simple blend */
-   float fov_skate = vg_lerpf( 97.0f, 135.0f, cl_fov ),
-         fov_walk  = vg_lerpf( 90.0f, 110.0f, cl_fov );
+   float fov_skate = vg_lerpf( 97.0f, 135.0f, k_fov ),
+         fov_walk  = vg_lerpf( 90.0f, 110.0f, k_fov );
 
-   player->cam.fov = vg_lerpf( fov_walk, fov_skate, player->camera_type_blend );
+   player->cam.fov = vg_lerpf( fov_walk, fov_skate, cc->camera_type_blend );
 
    /* 
     * first person camera
@@ -133,25 +129,24 @@ VG_STATIC void player__cam_iterate( player_instance *player )
    /* position */
    v3f fpv_pos, fpv_offset;
    m4x3_mulv( av->sk.final_mtx[ av->id_head-1 ], 
-               player->fpv_viewpoint_smooth, fpv_pos );
-   m3x3_mulv( player->rb.to_world, player->fpv_offset_smooth, fpv_offset );
+               cc->fpv_viewpoint_smooth, fpv_pos );
+   m3x3_mulv( player->rb.to_world, cc->fpv_offset_smooth, fpv_offset );
    v3_add( fpv_offset, fpv_pos, fpv_pos );
 
    /* angles */
    v3f velocity_angles;
-   v3_lerp( player->cam_velocity_smooth, player->rb.v, 4.0f*vg.time_frame_delta, 
-            player->cam_velocity_smooth );
+   v3_lerp( cc->cam_velocity_smooth, player->rb.v, 4.0f*vg.time_frame_delta, 
+            cc->cam_velocity_smooth );
 
    v3f velocity_local;
-   m3x3_mulv( player->invbasis, player->cam_velocity_smooth, velocity_local );
+   m3x3_mulv( player->invbasis, cc->cam_velocity_smooth, velocity_local );
    player_vector_angles( velocity_angles, velocity_local,
                          player->cam_velocity_coefficient_smooth,
                          player->cam_velocity_constant_smooth );
 
-   float inf_fpv = player->cam_velocity_influence_smooth *
-                   player->camera_type_blend,
+   float inf_fpv = player->cam_velocity_influence_smooth * cc->camera_type_blend,
          inf_tpv = player->cam_velocity_influence_smooth *
-                   (1.0f-player->camera_type_blend);
+                     (1.0f-cc->camera_type_blend);
 
    camera_lerp_angles( player->angles, velocity_angles, 
                         inf_fpv,
@@ -193,88 +188,102 @@ VG_STATIC void player__cam_iterate( player_instance *player )
    v3f pco;
    v4f pq;
    rb_extrapolate( &player->rb, pco, pq );
-   v3_lerp( player->tpv_lpf, pco, 20.0f*vg.time_frame_delta, player->tpv_lpf );
+   v3_lerp( cc->tpv_lpf, pco, 20.0f*vg.time_frame_delta, cc->tpv_lpf );
 
    /* now move into world */
+   v3f tpv_pos, tpv_offset, tpv_origin;
 
-   m3x3_mulv( player->basis, camera_follow_dir, camera_follow_dir );
-   v3f tpv_pos, tpv_offset;
+   /* origin */
+   q_mulv( pq, cc->tpv_offset_smooth, tpv_origin );
+   v3_add( tpv_origin, cc->tpv_lpf, tpv_origin );
 
-   v3_muladds( player->tpv_lpf, camera_follow_dir, 1.8f, tpv_pos );
-   q_mulv( pq, player->tpv_offset_smooth, tpv_offset );
-   v3_add( tpv_offset, tpv_pos, tpv_pos );
-   v3_muladds( tpv_pos, player->cam_velocity_smooth, -0.025f, tpv_pos );
+   /* offset */
+   m3x3_mulv( player->basis, camera_follow_dir, camera_follow_dir );
+   v3_muls( camera_follow_dir, 1.8f, tpv_offset );
+   v3_muladds( tpv_offset, cc->cam_velocity_smooth, -0.025f, tpv_offset );
+
+   v3_add( tpv_origin, tpv_offset, tpv_pos );
+   f32 t; v3f n;
+   if( spherecast_world( world_current_instance(), tpv_origin, tpv_pos, 
+                         0.2f, &t, n ) != -1 ){
+      v3_lerp( tpv_origin, tpv_pos, t, tpv_pos );
+   }
 
    /* 
     * Blend cameras 
     */
-   v3_lerp( tpv_pos, fpv_pos, player->camera_type_blend, player->cam.pos );
+   v3_lerp( tpv_pos, fpv_pos, cc->camera_type_blend, player->cam.pos );
    v3_copy( player->angles, player->cam.angles );
 
-   float Fd = -player->cam_land_punch_v * k_cam_damp,
-         Fs = -player->cam_land_punch   * k_cam_spring;
-   player->cam_land_punch   += player->cam_land_punch_v * vg.time_frame_delta;
-   player->cam_land_punch_v += ( Fd + Fs ) * vg.time_frame_delta;
-   player->cam.angles[1] += player->cam_land_punch;
-
-   /* override camera */
-   player->cam.angles[0] = 
-      vg_alerpf(  player->cam.angles[0], player->cam_override_angles[0], 
-                  player->cam_override_strength );
-   player->cam.angles[1] = 
-      vg_lerpf ( player->cam.angles[1], player->cam_override_angles[1], 
-                 player->cam_override_strength );
-   v3_lerp( player->cam.pos, player->cam_override_pos, 
-            player->cam_override_strength, player->cam.pos );
+   /* Camera shake */
+   f32 speed = v3_length(player->rb.v),
+       strength = k_cam_shake_strength * speed;
+   player->cam_trackshake += speed*k_cam_shake_trackspeed*vg.time_frame_delta;
+
+   v2f rnd = {perlin1d( player->cam_trackshake, 1.0f, 4, 20 ),
+              perlin1d( player->cam_trackshake, 1.0f, 4, 63 ) };
+   v2_muladds( player->cam.angles, rnd, strength, player->cam.angles );
+
+   v3f Fd, Fs, F;
+   v3_muls( player->cam_land_punch_v, -k_cam_damp, Fd );
+   v3_muls( player->cam_land_punch, -k_cam_spring, Fs );
+   v3_muladds( player->cam_land_punch, player->cam_land_punch_v,
+               vg.time_frame_delta, player->cam_land_punch );
+   v3_add( Fd, Fs, F );
+   v3_muladds( player->cam_land_punch_v, F, vg.time_frame_delta,
+               player->cam_land_punch_v );
+   v3_add( player->cam_land_punch, player->cam.pos, player->cam.pos );
+
+   if( k_cinema >= 0.0001f ){
+      ent_camera *cam = NULL;
+      f32 min_dist = k_cinema;
+
+      world_instance *world = player->viewable_world;
+      for( u32 i=0; i<mdl_arrcount(&world->ent_camera); i++ ){
+         ent_camera *c = mdl_arritm(&world->ent_camera,i);
+
+         f32 dist = v3_dist( c->transform.co, player->rb.co );
+
+         if( dist < min_dist ){
+            min_dist = dist;
+            cam = c;
+         }
+      }
+
+      if( cam ){
+         player->cam.fov = cam->fov;
+         v3_copy( cam->transform.co, player->cam.pos );
+         v3f v0;
+         if( k_cinema_fixed )
+            mdl_transform_vector( &cam->transform, (v3f){0.0f,-1.0f,0.0f}, v0 );
+         else v3_sub( player->rb.co, cam->transform.co, v0 );
+         m3x3_mulv( player->invbasis, v0, v0 );
+         player_vector_angles( player->cam.angles, v0, 1.0f, 0.0f );
+      }
+   }
 
    /* portal transitions */
    player_camera_portal_correction( player );
 }
 
-VG_STATIC void player_look( player_instance *player, v3f angles )
-{
+VG_STATIC void player_look( v3f angles, float speed ){
+   if( vg_ui.wants_mouse ) return;
+
    angles[2] = 0.0f;
 
    v2f mouse_input;
    v2_copy( vg.mouse_delta, mouse_input );
-   if( cl_invert_y )
-      mouse_input[1] *= -1.0f;
-   v2_muladds( angles, mouse_input, 0.0025f, angles );
-
-   if( vg_input.controller_should_use_trackpad_look ){
-      static v2f last_input;
-      static v2f vel;
-      static v2f vel_smooth;
-
-      v2f input = { player->input_js2h->axis.value,
-                    player->input_js2v->axis.value };
-
-      if( cl_invert_y )
-         input[1] *= -1.0f;
-
-      if( (v2_length2(last_input) > 0.001f) && (v2_length2(input) > 0.001f) ){
-         v2_sub( input, last_input, vel );
-         v2_muls( vel, 1.0f/vg.time_delta, vel );
-      }
-      else{
-         v2_zero( vel );
-      }
-
-      v2_lerp( vel_smooth, vel, vg.time_delta*8.0f, vel_smooth );
-      
-      v2_muladds( angles, vel_smooth, vg.time_delta, angles );
-      v2_copy( input, last_input );
-   }
-   else{
-      angles[0] += player->input_js2h->axis.value * vg.time_delta * 4.0f;
+   if( k_invert_y ) mouse_input[1] *= -1.0f;
+   v2_muladds( angles, mouse_input, 0.0025f * speed, angles );
 
-      float input_y = player->input_js2v->axis.value * vg.time_delta * 4.0f;
-      if( cl_invert_y )
-         input_y *= -1.0f;
+   v2f jlook;
+   joystick_state( k_srjoystick_look, jlook );
 
-      angles[1] += input_y;
-   }
+   angles[0] += jlook[0] * vg.time_frame_delta * 4.0f * speed;
+   float input_y = jlook[1] * vg.time_frame_delta * 4.0f;
+   if( k_invert_y ) input_y *= -1.0f;
 
+   angles[1] += input_y * speed;
    angles[1] = vg_clampf( angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );
 }