pub struct Level {
pub gravity: Point<f64>,
pub grid: Grid<bool>,
- walls: Vec<WallRegion>,
+ walls: Vec<Rc<WallRegion>>,
wall_grid: Grid<Vec<Rc<WallEdge>>>,
}
Level {
gravity,
grid,
- walls,
+ walls: walls.into_iter().map(|i| Rc::new(i)).collect(),
wall_grid,
}
}
for e in &wall.edges {
if !debug_mode {
let c = (e.p1 + e.p2) / 2.0;
- let a = (e.p2 - e.p1).to_angle() - std::f64::consts::FRAC_PI_2.radians();
+ let a = e.normal().reverse();
renderer.draw_line(
<(i32, i32)>::from(c.to_i32()),
for c in self.wall_grid.grid_coordinates_on_line(p1, p2) {
for w in &self.wall_grid.cells[c.x][c.y] {
if let Intersection::Point(p) = Intersection::lines(p1, p2, w.p1, w.p2) {
- let wall = Wall {
- region: &self.walls[w.region],
- edge: w,
- };
- return IntersectResult::Intersection(wall, p)
+ if w.point_is_in_front(p1) {
+ let wall = Wall {
+ region: Rc::clone(&self.walls[w.region]),
+ edge: Rc::clone(w),
+ };
+ return IntersectResult::Intersection(wall, p)
+ }
}
}
}
}
}
-pub enum IntersectResult<'a> {
- Intersection(Wall<'a>, Point<f64>),
+pub enum IntersectResult {
+ Intersection(Wall, Point<f64>),
None
}
}
impl<T> Grid<T> {
- pub fn at<C>(&self, c: C) -> Option<&T>
- where C: Into<(isize, isize)>
- {
- let c = c.into();
- if c.0 >= 0 && c.0 < self.size.width as isize && c.1 >= 0 && c.1 < self.size.height as isize {
- Some(&self.cells[c.0 as usize][c.1 as usize])
- } else {
- None
- }
- }
+ // pub fn at<C>(&self, c: C) -> Option<&T>
+ // where C: Into<(isize, isize)>
+ // {
+ // let c = c.into();
+ // if c.0 >= 0 && c.0 < self.size.width as isize && c.1 >= 0 && c.1 < self.size.height as isize {
+ // Some(&self.cells[c.0 as usize][c.1 as usize])
+ // } else {
+ // None
+ // }
+ // }
pub fn to_grid_coordinate<C>(&self, c: C) -> Option<Point<usize>>
where C: Into<(isize, isize)>
////////// WALL REGION /////////////////////////////////////////////////////////
-#[derive(Debug)]
+#[derive(Debug, Default)]
pub struct WallRegion {
edges: Vec<Rc<WallEdge>>,
}
impl WallRegion {
- pub fn new(points: Vec<Point<f64>>) -> Self {
- let index: RegionIndex = 0; // use as param
+ pub fn new(index: RegionIndex, points: Vec<Point<f64>>) -> Self {
let mut edges = Vec::with_capacity(points.len());
for i in 0..points.len() {
WallRegion { edges }
}
- // #[allow(dead_code)]
- // fn next(&self, index: EdgeIndex) -> Rc<WallEdge> {
- // let index = (index + 1) % self.edges.len();
- // Rc::clone(&self.edges[index])
- // }
+ fn next(&self, index: EdgeIndex) -> Rc<WallEdge> {
+ let index = (index + 1) % self.edges.len();
+ self.edges[index].clone()
+ }
- // #[allow(dead_code)]
- // fn previous(&self, index: EdgeIndex) -> Rc<WallEdge> {
- // let index = (index + self.edges.len() + 1) % self.edges.len();
- // Rc::clone(&self.edges[index])
- // }
+ fn previous(&self, index: EdgeIndex) -> Rc<WallEdge> {
+ let index = (index + self.edges.len() - 1) % self.edges.len();
+ self.edges[index].clone()
+ }
}
////////// WALL EDGE ///////////////////////////////////////////////////////////
pub p2: Point<f64>,
}
+impl WallEdge {
+ fn point_is_in_front(&self, p: Point<f64>) -> bool {
+ let cross = (self.p2 - self.p1).cross_product(p - self.p1);
+ cross > 0.0
+ }
+
+ fn normal(&self) -> Angle {
+ self.angle() + std::f64::consts::FRAC_PI_2.radians()
+ }
+
+ /// Angle from the right to the left point if the normal is up.
+ fn angle(&self) -> Angle {
+ (self.p2 - self.p1).to_angle()
+ }
+}
+
////////// WALL ////////////////////////////////////////////////////////////////
-/// kommer det här att fungera ifall nåt objekt ska spara en referens till Wall?
-/// kanske istället ska lägga Vec<WallRegion> i en Rc<Walls> och skicka med en klon av den, samt id:n till regionen och väggen?
-pub struct Wall<'a> {
- region: &'a WallRegion,
- edge: &'a WallEdge,
+pub struct Wall {
+ region: Rc<WallRegion>,
+ edge: Rc<WallEdge>,
}
-impl<'a> Wall<'a> {
- pub fn next(&self) -> Wall<'a> {
- let next = (self.edge.id + 1) % self.region.edges.len();
- let edge = &self.region.edges[next];
+impl Wall {
+ #[allow(dead_code)]
+ pub fn next(&self) -> Wall {
Wall {
- region: self.region,
- edge,
+ edge: self.region.next(self.edge.id),
+ region: self.region.clone(),
}
}
- pub fn previous(&self) -> Wall<'a> {
- let prev = (self.edge.id + self.region.edges.len() - 1) % self.region.edges.len();
- let edge = &self.region.edges[prev];
+ #[allow(dead_code)]
+ pub fn previous(&self) -> Wall {
Wall {
- region: self.region,
- edge,
+ edge: self.region.previous(self.edge.id),
+ region: self.region.clone(),
}
}
pub fn normal(&self) -> Angle {
- (self.edge.p2 - self.edge.p1).to_angle() + std::f64::consts::FRAC_PI_2.radians()
+ self.edge.normal()
+ }
+
+ pub fn angle(&self) -> Angle {
+ self.edge.angle()
+ }
+
+ pub fn from_2d(&self, pos: &Point<f64>, vel: &Point<f64>) -> (f64, f64) {
+ let pos = self.projection_of(*pos - self.edge.p1);
+ let vel = self.projection_of(*vel);
+ (pos, vel)
+ }
+
+ pub fn to_2d(&self, pos: f64, vel: f64) -> (Point<f64>, Point<f64>) {
+ let a = Point::from(self.edge.angle());
+ let pos = self.edge.p1 + a * pos;
+ let vel = a * vel;
+ (pos, vel)
+ }
+
+ /// Returns the 1D position of a point projected onto this wall.
+ /// This is done by rotating the point using a rotation matrix and then taking the resulting x value.
+ /// x'=xcos−ysin <- only this is used
+ /// y'=xsin+ycos
+ fn projection_of(&self, p: Point<f64>) -> f64 {
+ let r = Point::from(self.edge.angle());
+ p.x * r.x + p.y * r.y // r.y is inverted here instead of inverting the angle
}
}
Dolda2000 GitWeb / kaka / rust-sdl-test.git / blobdiff