X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_render.c;h=0d7e9221f547e2b7042e1d3ee22e0cacc47cb139;hb=5bfb36032928ba9f8d12e72961af68bfab9ea648;hp=851b98fb34c2ef0dabf74ea67df68990a7b3ba7c;hpb=9eb3de757a997becb8406417a4bf613f4cb04900;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_render.c b/player_render.c
index 851b98f..0d7e922 100644
--- a/player_render.c
+++ b/player_render.c
@@ -7,6 +7,7 @@
 #include "player_model.h"
 #include "ent_skateshop.h"
 #include "audio.h"
+#include "input.h"
 
 #include "shaders/model_character_view.h"
 #include "shaders/model_board_view.h"
@@ -137,191 +138,121 @@ VG_STATIC void player_model_unload( struct player_model *board ){
    dynamic_model_unload( &board->mdl );
 }
 
-VG_STATIC void player_animate( player_instance *player ){
-   if( _player_animate[ player->subsystem ] ){
-      player_animation res;
-      res.type = k_player_animation_type_fk;
+VG_STATIC void player_apply_pose_to_skeleton( player_instance *player ){
+   struct skeleton *sk = &player->playeravatar->sk;
+   player_pose *pose = &player->pose;
 
-      _player_animate[ player->subsystem ]( player, &res );
+   m4x3f transform;
+   q_m3x3( pose->root_q, transform );
+   v3_copy( pose->root_co, transform[3] );
+   
+   if( pose->type == k_player_pose_type_ik ){
+      skeleton_apply_pose( sk, pose->keyframes, k_anim_apply_defer_ik );
+      skeleton_apply_ik_pass( sk );
+      skeleton_apply_pose( sk, pose->keyframes, k_anim_apply_deffered_only );
+      skeleton_apply_inverses( sk );
+      skeleton_apply_transform( sk, transform );
+   }
+   else if( pose->type == k_player_pose_type_fk_2 ){
+      skeleton_apply_pose( sk, pose->keyframes, k_anim_apply_always );
+      skeleton_apply_inverses( sk );
+      skeleton_apply_transform( sk, transform );
+   }
+}
+
+VG_STATIC void player__animate( player_instance *player ){
+   if( _player_animate[ player->subsystem ] && 
+      _player_pose[ player->subsystem ] ){
+      _player_animate[ player->subsystem ]( player );
+      _player_pose[ player->subsystem ]( player, &player->pose );
 
-      m4x3f transform;
-      q_m3x3( res.root_q, transform );
-      v3_copy( res.root_co, transform[3] );
 
       struct skeleton *sk = &player->playeravatar->sk;
 
       if( player->holdout_time > 0.0f ){
-         skeleton_lerp_pose( sk, res.pose, player->holdout_pose, 
-                                           player->holdout_time, res.pose );
+         player_pose *pose = &player->pose;
+         skeleton_lerp_pose( sk, 
+                             pose->keyframes, player->holdout_pose.keyframes, 
+                             player->holdout_time, pose->keyframes );
+         q_nlerp( pose->root_q, player->holdout_pose.root_q, 
+                  player->holdout_time, pose->root_q );
          player->holdout_time -= vg.time_frame_delta * 2.0f;
       }
 
-      if( res.type == k_player_animation_type_fk ){
-         skeleton_apply_pose( sk, res.pose, k_anim_apply_defer_ik );
-         skeleton_apply_ik_pass( sk );
-         skeleton_apply_pose( sk, res.pose, k_anim_apply_deffered_only );
-         skeleton_apply_inverses( sk );
-         skeleton_apply_transform( sk, transform );
-      }
-      else {
-         skeleton_apply_pose( sk, res.pose, k_anim_apply_absolute );
-      }
-
+      player_apply_pose_to_skeleton( player );
       skeleton_debug( sk );
    }
 
    if( _player_post_animate[ player->subsystem ] )
       _player_post_animate[ player->subsystem ]( player );
-}
 
-VG_STATIC void player__pre_render( player_instance *player ){
-   player->cam_override_strength = 0.0f;
-   player_animate( player );
-
-   /* dev playbacker */
-   if( k_replay_test ){
-      f64 speed = 1.0;
-      f64 target = player->replay.cursor;
-
-      if( vg_getkey( SDLK_9 ) ){
-         target -= vg.time_frame_delta * speed;
-         player->replay.control = k_replay_control_scrub;
-         replay_seek( &player->replay, target );
-      }
-      if( vg_getkey( SDLK_0 ) ){
-         target += vg.time_frame_delta * speed;
-         player->replay.control = k_replay_control_scrub;
-         replay_seek( &player->replay, target );
-      }
-
-      if( vg_getkey( SDLK_7 ) )
-         player->replay.control = k_replay_control_play;
-
-      if( player->replay.control == k_replay_control_play ){
-         target += vg.time_frame_delta;
-         replay_seek( &player->replay, target );
-      }
-
-      if( vg_getkey( SDLK_8 ) ){
-         replay_frame *prev = replay_find_recent_stateframe( &player->replay );
-
-         if( prev ){
-            /* TODO: Make gamestate_apply function / swap ... */
-            replay_gamestate *gs = replay_frame_gamestate( prev, 0 );
-
-            if( gs->system == k_player_subsystem_walk ){
-               memcpy( &player->_walk.state, &gs->walk, 
-                        sizeof(struct player_walk_state) );
-            }
-            else if( gs->system == k_player_subsystem_skate ){
-               memcpy( &player->_skate.state, &gs->skate, 
-                        sizeof(struct player_skate_state) );
-            }
-            player->subsystem = gs->system;
-
-            memcpy( &player->rb, &gs->rb, sizeof(rigidbody) );
-            v3_copy( gs->angles, player->angles );
-            v3_copy( prev->cam_pos, player->cam.pos );
-            v3_copy( prev->cam_angles, player->cam_override_angles );
-            player->cam.fov = prev->cam_fov;
-            memcpy( &player->cam_control, &gs->cam_control, 
-                     sizeof(struct player_cam_controller) );
-
-            /* chop end off replay */
-            prev->r = NULL;
-            player->replay.statehead = prev;
-            player->replay.head = prev;
-            player->replay.cursor_frame = prev;
-            player->replay.cursor = prev->time;
-            vg.time = prev->time;
-
-            k_replay_test = 0;
-            player__pre_render( player );
-            return;
-         }
-      }
+   player__cam_iterate( player );
+}
 
-      player_animation res;
-      replay_frame *frame = player->replay.cursor_frame;
-
-      if( frame ){
-         memcpy( &res, &frame->anim, sizeof(frame->anim) );
-         memcpy( &frame->board_pose, &player->board_pose, 
-                 sizeof(player->board_pose) );
-         v3_copy( frame->cam_pos, player->cam_override_pos );
-         v3_copy( frame->cam_angles, player->cam_override_angles );
-         player->cam_override_fov = frame->cam_fov;
-         player->cam_override_strength = 1.0f;
-      }
-      else return;
+VG_STATIC void player_copy_frame_animator( player_instance *player,
+                                           replay_frame *frame ){
+   void *animator_src = replay_frame_data( frame, k_replay_framedata_animator );
+   u16 animator_size = frame->data_table[ k_replay_framedata_animator ][1];
 
-      struct skeleton *sk = &player->playeravatar->sk;
-      skeleton_apply_pose( sk, res.pose, k_anim_apply_absolute );
+   if( frame->system == k_player_subsystem_walk ){
+      memcpy( &player->_walk.animator, animator_src, animator_size );
+   }
+   else if( frame->system == k_player_subsystem_dead ){
+      memcpy( &player->_dead.animator, animator_src, animator_size );
+   }
+   else if( frame->system == k_player_subsystem_skate ){
+      memcpy( &player->_skate.animator, animator_src, animator_size );
    }
-   else {
-      /* replay recorder */
-      replay_buffer *replay = &player->replay;
+   else if( frame->system == k_player_subsystem_drive ){
+      
+   }
+}
 
-      f64 delta      = 9999999.9,
-          statedelta = 9999999.9;
+VG_STATIC void player__animate_from_replay( player_instance *player,
+                                            replay_buffer *replay ){
+   replay_frame *frame = replay->cursor_frame,
+                *next = NULL;
+   if( frame ){
+      next = frame->r;
 
-      if( replay->head )
-         delta = vg.time - replay->head->time;
+      if( next ){
+         f32 t = replay_subframe_time( replay );
 
-      if( replay->statehead )
-         statedelta = vg.time - replay->statehead->time;
+         player_pose pose0, pose1;
 
-      const f64 k_replay_rate = 1.0/30.0,
-                k_gamestate_rate = 0.5;
+         player_copy_frame_animator( player, frame );
+         _player_pose[ frame->system ]( player, &pose0 );
 
-      u16 gamestates = 0;
-      if( statedelta > k_gamestate_rate /* or switching */ ){
-         gamestates = 1;
-      }
-      
-      if( (delta > k_replay_rate) || gamestates ){
-         replay_frame *frame = replay_newframe( replay, gamestates, 0 );
-         replay->cursor = vg.time;
-         replay->cursor_frame = frame;
+         player_copy_frame_animator( player, next );
+         _player_pose[ next->system ]( player, &pose1 );
 
-         player_animation *res = &frame->anim;
-         v3_zero( res->root_co );
-         q_identity( res->root_q );
-         res->type = k_player_animation_type_absolute;
+         v3_lerp( pose0.root_co, pose1.root_co, t, player->pose.root_co );
+         q_nlerp( pose0.root_q,  pose1.root_q,  t, player->pose.root_q );
+         player->pose.type = pose0.type;
+         player->pose.board.lean = vg_lerpf( pose0.board.lean,
+                                             pose1.board.lean, t );
 
          struct skeleton *sk = &player->playeravatar->sk;
-         skeleton_decompose_mtx_absolute( sk, res->pose );
-
-         memcpy( &frame->board_pose, &player->board_pose, 
-                  sizeof(player->board_pose) );
-         frame->time = vg.time;
-         v3_copy( player->cam.pos, frame->cam_pos );
-         v3_copy( player->cam.angles, frame->cam_angles );
-         frame->cam_fov = player->cam.fov;
-
-         if( gamestates ){
-            replay_gamestate *gs = replay_frame_gamestate( frame, 0 );
-            gs->system = player->subsystem;
-
-            if( player->subsystem == k_player_subsystem_walk ){
-               memcpy( &gs->walk, &player->_walk.state, 
-                        sizeof(struct player_walk_state) );
-            }
-            else if( player->subsystem == k_player_subsystem_skate ){
-               memcpy( &gs->skate, &player->_skate.state, 
-                        sizeof(struct player_skate_state) );
-            }
-
-            memcpy( &gs->rb, &player->rb, sizeof(rigidbody) );
-            memcpy( &gs->cam_control, &player->cam_control, 
-                     sizeof(struct player_cam_controller) );
-            v3_copy( player->angles, gs->angles );
+         if( pose0.type != pose1.type ){
+            /* it would be nice to apply IK pass in-keyframes. TOO BAD! */
+            skeleton_copy_pose( sk, pose0.keyframes, player->pose.keyframes );
+         }
+         else {
+            skeleton_lerp_pose( sk, pose0.keyframes, pose1.keyframes, 
+                                t, player->pose.keyframes );
          }
       }
+      else{
+         player_copy_frame_animator( player, frame );
+         _player_pose[ frame->system ]( player, &player->pose );
+      }
    }
+   else return;
 
-   player__cam_iterate( player );
+   player_apply_pose_to_skeleton( player );
+}
 
+VG_STATIC void player__pre_render( player_instance *player ){
    /* shadowing/ao info */
    struct player_avatar *av = player->playeravatar;
    struct player_board *board = 
@@ -344,7 +275,7 @@ VG_STATIC void player__pre_render( player_instance *player ){
 
 VG_STATIC void render_board( camera *cam, world_instance *world,
                              struct player_board *board, m4x3f root,
-                             struct board_pose *pose,
+                             struct player_board_pose *pose,
                              enum board_shader shader )
 {
    if( !board ) return;
@@ -364,7 +295,7 @@ VG_STATIC void render_board( camera *cam, world_instance *world,
 
       render_fb_inverse_ratio( gpipeline.fb_main, inverse );
 
-      inverse[2] = main_camera.farz-main_camera.nearz;
+      inverse[2] = skaterift.cam.farz-skaterift.cam.nearz;
 
       shader_model_board_view_uInverseRatioDepth( inverse );
       render_fb_inverse_ratio( NULL, inverse );
@@ -474,6 +405,7 @@ VG_STATIC void render_board( camera *cam, world_instance *world,
 }
 
 VG_STATIC void render_playermodel( camera *cam, world_instance *world,
+                                   int depth_compare,
                                    struct player_model *model,
                                    struct skeleton *skeleton ){
    if( !model ) return;
@@ -485,16 +417,20 @@ VG_STATIC void render_playermodel( camera *cam, world_instance *world,
    shader_model_character_view_uTexMain( 0 );
    shader_model_character_view_uCamera( cam->transform[3] );
    shader_model_character_view_uPv( cam->mtx.pv );
-   shader_model_character_view_uTexSceneDepth( 1 );
-   render_fb_bind_texture( gpipeline.fb_main, 2, 1 );
-   v3f inverse;
-   render_fb_inverse_ratio( gpipeline.fb_main, inverse );
-   inverse[2] = main_camera.farz-main_camera.nearz;
 
-   shader_model_character_view_uInverseRatioDepth( inverse );
-   render_fb_inverse_ratio( NULL, inverse );
-   inverse[2] = cam->farz-cam->nearz;
-   shader_model_character_view_uInverseRatioMain( inverse );
+   if( depth_compare ){
+      shader_model_character_view_uTexSceneDepth( 1 );
+      render_fb_bind_texture( gpipeline.fb_main, 2, 1 );
+      v3f inverse;
+      render_fb_inverse_ratio( gpipeline.fb_main, inverse );
+      inverse[2] = skaterift.cam.farz-skaterift.cam.nearz;
+
+      shader_model_character_view_uInverseRatioDepth( inverse );
+      render_fb_inverse_ratio( NULL, inverse );
+      inverse[2] = cam->farz-cam->nearz;
+      shader_model_character_view_uInverseRatioMain( inverse );
+   }
+   shader_model_character_view_uDepthCompare( depth_compare );
 
    world_link_lighting_ub( world, _shader_model_character_view.id );
    world_bind_position_texture( world, _shader_model_character_view.id,
@@ -513,8 +449,7 @@ VG_STATIC void render_playermodel( camera *cam, world_instance *world,
    mesh_draw( &model->mdl.mesh );
 }
 
-PLAYER_API void player__render( camera *cam, player_instance *player )
-{
+PLAYER_API void player__render( camera *cam, player_instance *player ){
    world_instance *world = world_current_instance();
    SDL_AtomicLock( &addon_system.sl_cache_using_resources );
 
@@ -523,7 +458,7 @@ PLAYER_API void player__render( camera *cam, player_instance *player )
                                   player->playermodel_view_slot );
 
    if( !model ) model = &player->fallback_model;
-   render_playermodel( cam, world, model, &player->playeravatar->sk );
+   render_playermodel( cam, world, 1, model, &player->playeravatar->sk );
 
    struct player_board *board = 
       addon_cache_item_if_loaded( k_addon_type_board,
@@ -531,7 +466,7 @@ PLAYER_API void player__render( camera *cam, player_instance *player )
 
    render_board( cam, world, board, player->playeravatar->sk.final_mtx[
                                     player->playeravatar->id_board],
-                                    &player->board_pose,
+                                    &player->pose.board,
                                     k_board_shader_player );
 
    SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );