From 19ce5319e2250b7b0e1a188f69d24de282a85a7f Mon Sep 17 00:00:00 2001 From: troido Date: Mon, 3 Feb 2020 16:36:52 +0100 Subject: merged Draw into View; renamed Position to Pos --- src/components.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/components.rs') diff --git a/src/components.rs b/src/components.rs index aae6453..1613b7f 100644 --- a/src/components.rs +++ b/src/components.rs @@ -11,30 +11,30 @@ use super::util::clamp; #[derive(Component, Debug, Hash, PartialEq, Eq, Clone, Copy)] -pub struct Position { +pub struct Pos { pub x: i32, pub y: i32 } -impl ops::Add for Position { - type Output = Position; +impl ops::Add for Pos { + type Output = Pos; - fn add(self, other: Position) -> Position { - Position { + fn add(self, other: Pos) -> Pos { + Pos { x: self.x + other.x, y: self.y + other.y } } } -impl Position { +impl Pos { - pub fn new(x: i32, y: i32) -> Position { - Position {x, y} + pub fn new(x: i32, y: i32) -> Pos { + Pos {x, y} } - pub fn clamp(self, smaller: Position, larger: Position) -> Position { - Position { + pub fn clamp(self, smaller: Pos, larger: Pos) -> Pos { + Pos { x: clamp(self.x, smaller.x, larger.x), y: clamp(self.y, smaller.y, larger.y) } -- cgit