Noratrieb/game-wip-dontplay
1
0
Fork 0
mirror of https://github.com/Noratrieb/game-wip-dontplay.git synced 2026-01-16 04:25:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Shorten the name of various scalar types

Browse source
This commit is contained in:
crumblingstatue 2023-04-08 22:12:05 +02:00
parent 390a4d45d2
commit e7c30d231b
4 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/math.rs
View file

@ -1,14 +1,14 @@
use egui_inspect::derive::Inspect;
use num_traits::{Num, Signed};
use crate::world::{TilePos, TilePosScalar};
use crate::world::{TPosSc, TilePos};
pub type WorldPosScalar = u32;
pub type WPosSc = u32;
#[derive(Clone, Copy, Debug, Inspect)]
pub struct WorldPos {
pub x: WorldPosScalar,
pub y: WorldPosScalar,
pub x: WPosSc,
pub y: WPosSc,
}
/// Tile size in pixels
@ -29,7 +29,7 @@ pub fn px_per_frame_to_km_h(px_per_frame: f32) -> f32 {
}
/// World extent in tiles. Roughly 50km*50km.
pub const WORLD_EXTENT: TilePosScalar = 100_000;
pub const WORLD_EXTENT: TPosSc = 100_000;
impl WorldPos {
pub fn tile_pos(&self) -> TilePos {
@ -39,18 +39,18 @@ impl WorldPos {
}
}
/// Horizontal center of the world
pub const CENTER: WorldPosScalar = (WORLD_EXTENT / 2) * TILE_SIZE as WorldPosScalar;
pub const CENTER: WPosSc = (WORLD_EXTENT / 2) * TILE_SIZE as WPosSc;
/// Vertical surface level.
/// You can build 10 km high.
pub const SURFACE: WorldPosScalar = 20_000 * TILE_SIZE as WorldPosScalar;
pub const SURFACE: WPosSc = 20_000 * TILE_SIZE as WPosSc;
pub const SURFACE_CENTER: Self = Self {
x: Self::CENTER,
y: Self::SURFACE,
};
}
pub fn wp_to_tp(wp: WorldPosScalar) -> TilePosScalar {
(wp / TILE_SIZE as WorldPosScalar) as TilePosScalar
pub fn wp_to_tp(wp: WPosSc) -> TPosSc {
(wp / TILE_SIZE as WPosSc) as TPosSc
}
// Get the offset required to center an object of `xw` width inside an object of `yw` width.