mirror of
https://github.com/Xevion/Pac-Man.git
synced 2025-12-08 06:07:46 -06:00
refactor: center Rect with centered_with_size helper
This commit is contained in:
@@ -1,13 +1,13 @@
|
|||||||
use glam::Vec2;
|
use glam::{UVec2, Vec2};
|
||||||
|
|
||||||
use crate::constants::BOARD_PIXEL_OFFSET;
|
use crate::constants::BOARD_PIXEL_OFFSET;
|
||||||
use crate::entity::direction::Direction;
|
use crate::entity::direction::Direction;
|
||||||
use crate::entity::graph::{Graph, NodeId, Position, Traverser};
|
use crate::entity::graph::{Graph, NodeId, Position, Traverser};
|
||||||
|
use crate::helpers::centered_with_size;
|
||||||
use crate::texture::animated::AnimatedTexture;
|
use crate::texture::animated::AnimatedTexture;
|
||||||
use crate::texture::directional::DirectionalAnimatedTexture;
|
use crate::texture::directional::DirectionalAnimatedTexture;
|
||||||
use crate::texture::sprite::SpriteAtlas;
|
use crate::texture::sprite::SpriteAtlas;
|
||||||
use sdl2::keyboard::Keycode;
|
use sdl2::keyboard::Keycode;
|
||||||
use sdl2::rect::Rect;
|
|
||||||
use sdl2::render::{Canvas, RenderTarget};
|
use sdl2::render::{Canvas, RenderTarget};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
@@ -71,15 +71,14 @@ impl Pacman {
|
|||||||
Position::BetweenNodes { from, to, traversed } => {
|
Position::BetweenNodes { from, to, traversed } => {
|
||||||
let from_pos = graph.get_node(from).unwrap().position;
|
let from_pos = graph.get_node(from).unwrap().position;
|
||||||
let to_pos = graph.get_node(to).unwrap().position;
|
let to_pos = graph.get_node(to).unwrap().position;
|
||||||
let weight = from_pos.distance(to_pos);
|
from_pos.lerp(to_pos, traversed / from_pos.distance(to_pos))
|
||||||
from_pos.lerp(to_pos, traversed / weight)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn render<T: RenderTarget>(&self, canvas: &mut Canvas<T>, atlas: &mut SpriteAtlas, graph: &Graph) {
|
pub fn render<T: RenderTarget>(&self, canvas: &mut Canvas<T>, atlas: &mut SpriteAtlas, graph: &Graph) {
|
||||||
let pixel_pos = self.get_pixel_pos(graph).round().as_ivec2() + BOARD_PIXEL_OFFSET.as_ivec2();
|
let pixel_pos = self.get_pixel_pos(graph).round().as_ivec2() + BOARD_PIXEL_OFFSET.as_ivec2();
|
||||||
let dest = Rect::new(pixel_pos.x - 8, pixel_pos.y - 8, 16, 16);
|
let dest = centered_with_size(pixel_pos, UVec2::new(16, 16));
|
||||||
let is_stopped = self.traverser.position.is_stopped();
|
let is_stopped = self.traverser.position.is_stopped();
|
||||||
|
|
||||||
if is_stopped {
|
if is_stopped {
|
||||||
|
|||||||
11
src/helpers.rs
Normal file
11
src/helpers.rs
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
use glam::{IVec2, UVec2};
|
||||||
|
use sdl2::rect::Rect;
|
||||||
|
|
||||||
|
pub fn centered_with_size(pixel_pos: IVec2, size: UVec2) -> Rect {
|
||||||
|
Rect::new(
|
||||||
|
pixel_pos.x - size.x as i32 / 2,
|
||||||
|
pixel_pos.y - size.y as i32 / 2,
|
||||||
|
size.x,
|
||||||
|
size.y,
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -7,5 +7,6 @@ pub mod constants;
|
|||||||
pub mod emscripten;
|
pub mod emscripten;
|
||||||
pub mod entity;
|
pub mod entity;
|
||||||
pub mod game;
|
pub mod game;
|
||||||
|
pub mod helpers;
|
||||||
pub mod map;
|
pub mod map;
|
||||||
pub mod texture;
|
pub mod texture;
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ mod constants;
|
|||||||
mod emscripten;
|
mod emscripten;
|
||||||
mod entity;
|
mod entity;
|
||||||
mod game;
|
mod game;
|
||||||
|
mod helpers;
|
||||||
mod map;
|
mod map;
|
||||||
mod texture;
|
mod texture;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user