X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Flevel%2Fmod.rs;h=cccd2538a4a1a69eafd3ddeed08ea2b3ed00ba60;hb=8065e2645a936275c7d69c6068d80ece598d6e57;hp=2a9073918a1eea528d14222923e9ec2c27288aeb;hpb=60058b918569190f437fe996dfc79daf5a431b91;p=kaka%2Frust-sdl-test.git diff --git a/src/core/level/mod.rs b/src/core/level/mod.rs index 2a90739..cccd253 100644 --- a/src/core/level/mod.rs +++ b/src/core/level/mod.rs @@ -1,4 +1,4 @@ -use common::{Point, Dimension, Intersection}; +use common::{Point, Dimension, Intersection, Radians, supercover_line}; use core::render::Renderer; use sprites::SpriteManager; use std::rc::Rc; @@ -14,15 +14,15 @@ pub use self::lvlgen::LevelGenerator; pub struct Level { pub gravity: Point, pub grid: Grid, - walls: Vec>, + walls: Vec, wall_grid: Grid>>, } impl Level { - pub fn new(gravity: Point, grid: Grid, mut walls: Vec>) -> Self { + pub fn new(gravity: Point, grid: Grid, mut walls: Vec) -> Self { let size = (2560, 1440); // TODO: get actual size from walls or something let wall_grid = Level::build_wall_grid(&mut walls, &size.into()); - dbg!(&wall_grid.cell_size); + dbg!(&wall_grid.scale); Level { gravity, grid, @@ -32,33 +32,31 @@ impl Level { } /// Creates a grid of wall edges for fast lookup - fn build_wall_grid(walls: &mut Vec>, lvlsize: &Dimension) -> Grid>> { + fn build_wall_grid(walls: &mut Vec, lvlsize: &Dimension) -> Grid>> { let size = dimen!(lvlsize.width / 20, lvlsize.height / 20); // TODO: make sure all walls fit within the grid bounds let cs = point!(lvlsize.width / size.width, lvlsize.height / size.height); - //let cs = point!(cell_size.width as f64, cell_size.height as f64); - let mut grid = vec!(vec!(vec!(); size.height); size.width); + //let cs = point!(scale.width as f64, scale.height as f64); + let mut grid = Grid { + cells: vec!(vec!(vec!(); size.height); size.width), + size, + scale: dimen!(cs.x as f64, cs.y as f64), + }; for wall in walls { for edge in &wall.edges { - // TODO: include cells that this edge overlaps - for p in &[edge.p1, edge.p2] { - let p = point!(p.x as usize, p.y as usize) / cs; - grid[0.max(p.x as usize).min(size.width - 1)][0.max(p.y as usize).min(size.height - 1)].push(Rc::clone(edge)); + for c in grid.grid_coordinates_on_line(edge.p1, edge.p2) { + grid.cells[c.x][c.y].push(Rc::clone(edge)); } } } - Grid { - size, - cell_size: dimen!(cs.x, cs.y), - cells: grid, - } + grid } pub fn render(&mut self, renderer: &mut Renderer, _sprites: &SpriteManager) { // original grid renderer.canvas().set_draw_color((64, 64, 64)); - let size = &self.grid.cell_size; + let size = &self.grid.scale; for x in 0..self.grid.size.width { for y in 0..self.grid.size.height { if self.grid.cells[x][y] { @@ -73,10 +71,12 @@ impl Level { // wall grid renderer.canvas().set_draw_color((0, 32, 0)); - let size = &self.wall_grid.cell_size; + let size = &self.wall_grid.scale; for x in 0..self.wall_grid.size.width { for y in 0..self.wall_grid.size.height { if !self.wall_grid.cells[x][y].is_empty() { + let num = self.wall_grid.cells[x][y].len(); + renderer.canvas().set_draw_color((0, 32*num as u8, 0)); renderer.canvas().fill_rect(sdl2::rect::Rect::new( x as i32 * size.width as i32, y as i32 * size.height as i32, @@ -89,6 +89,15 @@ impl Level { // walls for wall in &self.walls { for e in &wall.edges { + let c = (e.p1 + e.p2) / 2.0; + let mut rad = (e.p2 - e.p1).to_radians(); + rad.0 += std::f64::consts::FRAC_PI_2; + + renderer.draw_line( + <(i32, i32)>::from(c.to_i32()), + <(i32, i32)>::from((c + Point::from(rad) * 10.0).to_i32()), + (255, 128, 0)); + renderer.draw_line( <(i32, i32)>::from(e.p1.to_i32()), <(i32, i32)>::from(e.p2.to_i32()), @@ -98,12 +107,12 @@ impl Level { } pub fn intersect_walls(&self, p1: Point, p2: Point) -> IntersectResult { - let c = point!(p2.x as isize / self.wall_grid.cell_size.width as isize, p2.y as isize / self.wall_grid.cell_size.height as isize); - if let Some(walls) = self.wall_grid.at(c) { - for w in walls { + 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 { - edge: Rc::clone(&w), + region: &self.walls[w.region], + edge: w, }; return IntersectResult::Intersection(wall, p) } @@ -113,8 +122,8 @@ impl Level { } } -pub enum IntersectResult { - Intersection(Wall, Point), +pub enum IntersectResult<'a> { + Intersection(Wall<'a>, Point), None } @@ -123,7 +132,7 @@ pub enum IntersectResult { #[derive(Debug, Default)] pub struct Grid { pub size: Dimension, - pub cell_size: Dimension, + pub scale: Dimension, pub cells: Vec>, } @@ -138,6 +147,26 @@ impl Grid { None } } + + pub fn to_grid_coordinate(&self, c: C) -> Option> + 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(point!(c.0 as usize, c.1 as usize)) + } else { + None + } + } + + /// Returns a list of grid coordinates that a line in world coordinates passes through. + pub fn grid_coordinates_on_line(&self, p1: Point, p2: Point) -> Vec> { + supercover_line(p1 / self.scale, p2 / self.scale) + .iter() + .map(|c| self.to_grid_coordinate(*c)) + .flatten() + .collect() + } } ////////// WALL REGION ///////////////////////////////////////////////////////// @@ -148,46 +177,80 @@ pub struct WallRegion { } impl WallRegion { - pub fn new(points: Vec>) -> Rc { + pub fn new(points: Vec>) -> Self { + let index: RegionIndex = 0; // use as param let mut edges = Vec::with_capacity(points.len()); for i in 0..points.len() { let edge = Rc::new(WallEdge { - index: i, + region: index, + id: i, p1: points[i], p2: points[(i + 1) % points.len()], }); edges.push(edge); } - Rc::new(WallRegion { edges }) + WallRegion { edges } } - #[allow(dead_code)] - fn next(&self, index: usize) -> Rc { - let index = (index + 1) % self.edges.len(); - Rc::clone(&self.edges[index]) - } + // #[allow(dead_code)] + // fn next(&self, index: EdgeIndex) -> Rc { + // let index = (index + 1) % self.edges.len(); + // Rc::clone(&self.edges[index]) + // } - #[allow(dead_code)] - fn previous(&self, index: usize) -> Rc { - let index = (index + self.edges.len() + 1) % self.edges.len(); - Rc::clone(&self.edges[index]) - } + // #[allow(dead_code)] + // fn previous(&self, index: EdgeIndex) -> Rc { + // let index = (index + self.edges.len() + 1) % self.edges.len(); + // Rc::clone(&self.edges[index]) + // } } ////////// WALL EDGE /////////////////////////////////////////////////////////// +type RegionIndex = usize; +type EdgeIndex = usize; + #[derive(Debug, Default)] struct WallEdge { - index: usize, + region: RegionIndex, + id: EdgeIndex, pub p1: Point, pub p2: Point, } ////////// WALL //////////////////////////////////////////////////////////////// -pub struct Wall { -// region: Rc, - edge: Rc, +/// kommer det här att fungera ifall nåt objekt ska spara en referens till Wall? +/// kanske istället ska lägga Vec i en Rc 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, +} + +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]; + Wall { + region: self.region, + edge, + } + } + + 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]; + Wall { + region: self.region, + edge, + } + } + + pub fn normal(&self) -> Radians { + let mut rad = (self.edge.p2 - self.edge.p1).to_radians(); + rad.0 += std::f64::consts::FRAC_PI_2; + rad + } }