From: hgn Date: Sun, 26 Nov 2023 03:21:13 +0000 (+0000) Subject: 3 new characters X-Git-Url: https://harrygodden.com/git/?a=commitdiff_plain;h=4e9c3ed7d90219258c6b7d88cf389188dbbdfd70;hp=61559a4d856351c40f5ad6be67b811ec01b037f9;p=carveJwlIkooP6JGAAIwe30JlM.git 3 new characters --- diff --git a/player_render.c b/player_render.c index ad56c24..4793637 100644 --- a/player_render.c +++ b/player_render.c @@ -225,7 +225,18 @@ static void player__animate(void){ localplayer.holdout_time -= vg.time_frame_delta * 2.0f; } - v3_fill( pose->keyframes[ localplayer.id_eyes-1 ].co, sinf(vg.time) ); + static float blinkt = 1.0f, + blinkl = 0.0f; + + if( blinkt < 0.0f ){ + blinkt = (1.0f-powf(vg_randf64(),4.0f))*4.0f; + blinkl = 0.08f; + } + + pose->keyframes[ localplayer.id_eyes-1 ].s[1] = blinkl > 0.0f? 0.2f: 1.0f; + + blinkt -= vg.time_delta; + blinkl -= vg.time_delta; apply_full_skeleton_pose( sk, &localplayer.pose, localplayer.final_mtx ); skeleton_debug( sk, localplayer.final_mtx ); diff --git a/playermodels_src/skaterift_aaron/ch_aaron.mdl b/playermodels_src/skaterift_aaron/ch_aaron.mdl index 763a8c1..808d496 100644 Binary files a/playermodels_src/skaterift_aaron/ch_aaron.mdl and b/playermodels_src/skaterift_aaron/ch_aaron.mdl differ diff --git a/playermodels_src/skaterift_chip/ch_chip.mdl b/playermodels_src/skaterift_chip/ch_chip.mdl index bc3d82d..92d3153 100644 Binary files a/playermodels_src/skaterift_chip/ch_chip.mdl and b/playermodels_src/skaterift_chip/ch_chip.mdl differ diff --git a/playermodels_src/skaterift_ela/ch_ela.mdl b/playermodels_src/skaterift_ela/ch_ela.mdl new file mode 100644 index 0000000..0d165c0 Binary files /dev/null and b/playermodels_src/skaterift_ela/ch_ela.mdl differ diff --git a/playermodels_src/skaterift_j/ch_j.mdl b/playermodels_src/skaterift_j/ch_j.mdl index 90809e5..876bcd7 100644 Binary files a/playermodels_src/skaterift_j/ch_j.mdl and b/playermodels_src/skaterift_j/ch_j.mdl differ diff --git a/playermodels_src/skaterift_john/ch_john.mdl b/playermodels_src/skaterift_john/ch_john.mdl new file mode 100644 index 0000000..f5f3239 Binary files /dev/null and b/playermodels_src/skaterift_john/ch_john.mdl differ diff --git a/playermodels_src/skaterift_jordan/ch_jordan.mdl b/playermodels_src/skaterift_jordan/ch_jordan.mdl index cdd96f7..c3d26f1 100644 Binary files a/playermodels_src/skaterift_jordan/ch_jordan.mdl and b/playermodels_src/skaterift_jordan/ch_jordan.mdl differ diff --git a/playermodels_src/skaterift_new/ch_new.mdl b/playermodels_src/skaterift_new/ch_new.mdl index 944eaf9..1a43925 100644 Binary files a/playermodels_src/skaterift_new/ch_new.mdl and b/playermodels_src/skaterift_new/ch_new.mdl differ diff --git a/playermodels_src/skaterift_outlaw/ch_outlaw.mdl b/playermodels_src/skaterift_outlaw/ch_outlaw.mdl index 902df62..c27a6e9 100644 Binary files a/playermodels_src/skaterift_outlaw/ch_outlaw.mdl and b/playermodels_src/skaterift_outlaw/ch_outlaw.mdl differ diff --git a/skeleton.h b/skeleton.h index b94fa68..868e624 100644 --- a/skeleton.h +++ b/skeleton.h @@ -212,6 +212,7 @@ static void skeleton_apply_pose( struct skeleton *skele, mdl_keyframe *pose, v3f *posemtx = final_mtx[i]; q_m3x3( kf->q, posemtx ); + m3x3_scale( posemtx, kf->s ); v3_copy( kf->co, posemtx[3] ); } return; @@ -239,6 +240,7 @@ static void skeleton_apply_pose( struct skeleton *skele, mdl_keyframe *pose, /* pose matrix */ mdl_keyframe *kf = &pose[i-1]; q_m3x3( kf->q, posemtx ); + m3x3_scale( posemtx, kf->s ); v3_copy( kf->co, posemtx[3] ); v3_add( temp_delta, posemtx[3], posemtx[3] );