mirror of
https://github.com/Xevion/Pac-Man.git
synced 2025-12-09 06:07:53 -06:00
feat: speed modulation to implement precise speed decrease despite integers
This commit is contained in:
@@ -13,6 +13,7 @@ mod direction;
|
||||
mod entity;
|
||||
mod game;
|
||||
mod pacman;
|
||||
mod modulation;
|
||||
|
||||
#[cfg(target_os = "emscripten")]
|
||||
mod emscripten;
|
||||
|
||||
26
src/modulation.rs
Normal file
26
src/modulation.rs
Normal file
@@ -0,0 +1,26 @@
|
||||
pub struct SpeedModulator {
|
||||
tick_count: u32,
|
||||
ticks_left: u32,
|
||||
}
|
||||
|
||||
impl SpeedModulator {
|
||||
pub fn new(percent: f32) -> Self {
|
||||
let ticks_required: u32 = (1f32 / (1f32 - percent)).round() as u32;
|
||||
|
||||
SpeedModulator {
|
||||
tick_count: ticks_required,
|
||||
ticks_left: ticks_required,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn next(&mut self) -> bool {
|
||||
self.ticks_left -= 1;
|
||||
|
||||
if self.ticks_left == 0 {
|
||||
self.ticks_left = self.tick_count;
|
||||
false
|
||||
} else {
|
||||
true
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,10 @@ use sdl2::{
|
||||
video::Window,
|
||||
};
|
||||
|
||||
use crate::{animation::AnimatedTexture, direction::Direction, entity::Entity, constants::CELL_SIZE};
|
||||
use crate::{
|
||||
animation::AnimatedTexture, constants::CELL_SIZE, direction::Direction, entity::Entity,
|
||||
modulation::SpeedModulator,
|
||||
};
|
||||
|
||||
pub struct Pacman<'a> {
|
||||
// Absolute position on the board (precise)
|
||||
@@ -11,6 +14,7 @@ pub struct Pacman<'a> {
|
||||
pub direction: Direction,
|
||||
pub next_direction: Option<Direction>,
|
||||
speed: u32,
|
||||
modulation: SpeedModulator,
|
||||
sprite: AnimatedTexture<'a>,
|
||||
}
|
||||
|
||||
@@ -21,6 +25,7 @@ impl Pacman<'_> {
|
||||
direction: Direction::Right,
|
||||
next_direction: None,
|
||||
speed: 2,
|
||||
modulation: SpeedModulator::new(0.9333),
|
||||
sprite: AnimatedTexture::new(atlas, 4, 3, 32, 32, Some((-4, -4))),
|
||||
}
|
||||
}
|
||||
@@ -53,7 +58,6 @@ impl Entity for Pacman<'_> {
|
||||
|
||||
fn tick(&mut self) {
|
||||
let can_change = self.internal_position() == (0, 0);
|
||||
println!("{:?} ({:?})", self.internal_position(), can_change);
|
||||
if can_change {
|
||||
if let Some(direction) = self.next_direction {
|
||||
self.direction = direction;
|
||||
@@ -61,6 +65,7 @@ impl Entity for Pacman<'_> {
|
||||
}
|
||||
}
|
||||
|
||||
if self.modulation.next() {
|
||||
let speed = self.speed as i32;
|
||||
match self.direction {
|
||||
Direction::Right => {
|
||||
@@ -78,3 +83,4 @@ impl Entity for Pacman<'_> {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user