leif/lexys-labyrinth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix interpolation after the tic -> frame change

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-12-26 03:41:35 -07:00
parent 0500518537
commit 9c2809be29
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/game.js
View File

@ -40,7 +40,7 @@ export class Tile {
else { else {
// For a movement speed of N, the cooldown is set to N during the tic an actor starts // For a movement speed of N, the cooldown is set to N during the tic an actor starts
// moving, and we interpolate it from there to N - 1 over the course of the duration // moving, and we interpolate it from there to N - 1 over the course of the duration
let p = ((this.movement_speed - this.movement_cooldown) + tic_offset) / this.movement_speed; let p = ((this.movement_speed - this.movement_cooldown) + tic_offset * 3) / this.movement_speed;
return [ return [
(1 - p) * this.previous_cell.x + p * x, (1 - p) * this.previous_cell.x + p * x,
(1 - p) * this.previous_cell.y + p * y, (1 - p) * this.previous_cell.y + p * y,

16
js/tileset.js
View File

@ -915,8 +915,8 @@ export class Tileset {
if (coords[0] instanceof Array) { if (coords[0] instanceof Array) {
if (tic !== null) { if (tic !== null) {
if (tile && tile.movement_speed) { if (tile && tile.movement_speed) {
// This tile reports its own animation timing (in tics), so trust that, and just // This tile reports its own animation timing (in frames), so trust that, and
// use the current tic's fraction. // just use the current tic's fraction.
// That said: adjusting animation speed complicates this slightly. Consider the // That said: adjusting animation speed complicates this slightly. Consider the
// player's walk animation, which takes 4 tics to complete, during which time we // player's walk animation, which takes 4 tics to complete, during which time we
// cycle through 8 frames. Playing that at half speed means only half the // cycle through 8 frames. Playing that at half speed means only half the
@ -926,7 +926,7 @@ export class Tileset {
// first half; if it started on tics 5-8, play the second half. They could get // first half; if it started on tics 5-8, play the second half. They could get
// out of sync if the player hesitates, but no one will notice that, and this // out of sync if the player hesitates, but no one will notice that, and this
// approach minimizes storing extra state. // approach minimizes storing extra state.
let i = ((tile.movement_speed - tile.movement_cooldown) + tic % 1) / tile.movement_speed; let i = ((tile.movement_speed - tile.movement_cooldown) + tic % 1 * 3) / tile.movement_speed;
// But do NOT do this for explosions or splashes, which have a fixed duration // But do NOT do this for explosions or splashes, which have a fixed duration
// and only play once // and only play once
if (this.animation_slowdown > 1 && ! tile.type.ttl) { if (this.animation_slowdown > 1 && ! tile.type.ttl) {
@ -934,7 +934,7 @@ export class Tileset {
// 1/N of it before the game ends (or loops) the animation. // 1/N of it before the game ends (or loops) the animation.
// So increase by [0..N-1] to get it in some other range, then divide by N // So increase by [0..N-1] to get it in some other range, then divide by N
// to scale back down to [0, 1) // to scale back down to [0, 1)
i += Math.floor(tic / tile.movement_speed % this.animation_slowdown); i += Math.floor(tic * 3 / tile.movement_speed % this.animation_slowdown);
i /= this.animation_slowdown; i /= this.animation_slowdown;
} }
coords = coords[Math.floor(i * coords.length)]; coords = coords[Math.floor(i * coords.length)];
@ -1234,8 +1234,8 @@ export class Tileset {
if (coords[0] instanceof Array) { if (coords[0] instanceof Array) {
if (tic !== null) { if (tic !== null) {
if (tile && tile.movement_speed) { if (tile && tile.movement_speed) {
// This tile reports its own animation timing (in tics), so trust that, and just // This tile reports its own animation timing (in frames), so trust that, and
// use the current tic's fraction. // just use the current tic's fraction.
// That said: adjusting animation speed complicates this slightly. Consider the // That said: adjusting animation speed complicates this slightly. Consider the
// player's walk animation, which takes 4 tics to complete, during which time we // player's walk animation, which takes 4 tics to complete, during which time we
// cycle through 8 frames. Playing that at half speed means only half the // cycle through 8 frames. Playing that at half speed means only half the
@ -1245,7 +1245,7 @@ export class Tileset {
// first half; if it started on tics 5-8, play the second half. They could get // first half; if it started on tics 5-8, play the second half. They could get
// out of sync if the player hesitates, but no one will notice that, and this // out of sync if the player hesitates, but no one will notice that, and this
// approach minimizes storing extra state. // approach minimizes storing extra state.
let i = ((tile.movement_speed - tile.movement_cooldown) + tic % 1) / tile.movement_speed; let i = ((tile.movement_speed - tile.movement_cooldown) + tic % 1 * 3) / tile.movement_speed;
// But do NOT do this for explosions or splashes, which have a fixed duration // But do NOT do this for explosions or splashes, which have a fixed duration
// and only play once // and only play once
if (this.animation_slowdown > 1 && ! tile.type.ttl) { if (this.animation_slowdown > 1 && ! tile.type.ttl) {
@ -1253,7 +1253,7 @@ export class Tileset {
// 1/N of it before the game ends (or loops) the animation. // 1/N of it before the game ends (or loops) the animation.
// So increase by [0..N-1] to get it in some other range, then divide by N // So increase by [0..N-1] to get it in some other range, then divide by N
// to scale back down to [0, 1) // to scale back down to [0, 1)
i += Math.floor(tic / tile.movement_speed % this.animation_slowdown); i += Math.floor(tic * 3 / tile.movement_speed % this.animation_slowdown);
i /= this.animation_slowdown; i /= this.animation_slowdown;
} }
coords = coords[Math.floor(i * coords.length)]; coords = coords[Math.floor(i * coords.length)];